summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2018-08-02 11:37:02 +0200
committerMartin Trigaux <mat@odoo.com>2018-08-02 13:32:24 +0200
commit6b2dcd064d18a8d949014a162b54d0befb6cdba9 (patch)
treeba455041ec6a19ed9028315bd9fbfc79a7a9cc2c
parentd91ec258e6a31153beb9eb16cfe8f916546b7688 (diff)
[I18N] export saas-11.4 source terms
For odoo-master transifex project
-rw-r--r--.tx/config15
-rw-r--r--addons/account/i18n/account.pot1724
-rw-r--r--addons/account_asset/i18n/account_asset.pot204
-rw-r--r--addons/account_bank_statement_import/i18n/account_bank_statement_import.pot114
-rw-r--r--addons/account_budget/i18n/account_budget.pot230
-rw-r--r--addons/account_payment/i18n/account_payment.pot110
-rw-r--r--addons/account_tax_python/i18n/account_tax_python.pot38
-rw-r--r--addons/account_voucher/i18n/account_voucher.pot125
-rw-r--r--addons/analytic/i18n/analytic.pot114
-rw-r--r--addons/auth_signup/i18n/auth_signup.pot184
-rw-r--r--addons/barcodes/i18n/barcodes.pot34
-rw-r--r--addons/base_automation/i18n/base_automation.pot30
-rw-r--r--addons/base_iban/i18n/base_iban.pot24
-rw-r--r--addons/base_import/i18n/base_import.pot36
-rw-r--r--addons/base_import_module/i18n/base_import_module.pot33
-rw-r--r--addons/base_setup/i18n/base_setup.pot35
-rw-r--r--addons/base_sparse_field/i18n/base_sparse_field.pot97
-rw-r--r--addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot12
-rw-r--r--addons/board/i18n/board.pot26
-rw-r--r--addons/calendar/i18n/calendar.pot184
-rw-r--r--addons/calendar_sms/i18n/calendar_sms.pot26
-rw-r--r--addons/crm/i18n/crm.pot396
-rw-r--r--addons/crm_project/i18n/crm_project.pot31
-rw-r--r--addons/delivery/i18n/delivery.pot57
-rw-r--r--addons/event/i18n/event.pot739
-rw-r--r--addons/event_sale/i18n/event_sale.pot26
-rw-r--r--addons/fleet/i18n/fleet.pot333
-rw-r--r--addons/gamification/i18n/gamification.pot467
-rw-r--r--addons/google_account/i18n/google_account.pot8
-rw-r--r--addons/google_drive/i18n/google_drive.pot8
-rw-r--r--addons/hr/i18n/hr.pot344
-rw-r--r--addons/hr_attendance/i18n/hr_attendance.pot192
-rw-r--r--addons/hr_contract/i18n/hr_contract.pot208
-rw-r--r--addons/hr_expense/i18n/hr_expense.pot431
-rw-r--r--addons/hr_gamification/i18n/hr_gamification.pot18
-rw-r--r--addons/hr_holidays/i18n/hr_holidays.pot851
-rw-r--r--addons/hr_maintenance/i18n/hr_maintenance.pot16
-rw-r--r--addons/hr_payroll/i18n/hr_payroll.pot80
-rw-r--r--addons/hr_recruitment/i18n/hr_recruitment.pot308
-rw-r--r--addons/hr_timesheet/i18n/hr_timesheet.pot138
-rw-r--r--addons/http_routing/i18n/http_routing.pot27
-rw-r--r--addons/im_livechat/i18n/im_livechat.pot109
-rw-r--r--addons/im_support/i18n/im_support.pot63
-rw-r--r--addons/link_tracker/i18n/link_tracker.pot36
-rw-r--r--addons/lunch/i18n/lunch.pot16
-rw-r--r--addons/mail/i18n/mail.pot2262
-rw-r--r--addons/maintenance/i18n/maintenance.pot208
-rw-r--r--addons/mass_mailing/i18n/mass_mailing.pot190
-rw-r--r--addons/mass_mailing_event/i18n/mass_mailing_event.pot14
-rw-r--r--addons/membership/i18n/membership.pot40
-rw-r--r--addons/mrp/i18n/mrp.pot882
-rw-r--r--addons/mrp_bom_cost/i18n/mrp_bom_cost.pot49
-rw-r--r--addons/mrp_byproduct/i18n/mrp_byproduct.pot8
-rw-r--r--addons/note/i18n/note.pot231
-rw-r--r--addons/payment/i18n/payment.pot296
-rw-r--r--addons/payment_adyen/i18n/payment_adyen.pot73
-rw-r--r--addons/payment_authorize/i18n/payment_authorize.pot67
-rw-r--r--addons/payment_buckaroo/i18n/payment_buckaroo.pot61
-rw-r--r--addons/payment_ogone/i18n/payment_ogone.pot61
-rw-r--r--addons/payment_paypal/i18n/payment_paypal.pot81
-rw-r--r--addons/payment_payumoney/i18n/payment_payumoney.pot61
-rw-r--r--addons/payment_sips/i18n/payment_sips.pot71
-rw-r--r--addons/payment_stripe/i18n/payment_stripe.pot61
-rw-r--r--addons/payment_transfer/i18n/payment_transfer.pot73
-rw-r--r--addons/point_of_sale/i18n/point_of_sale.pot463
-rw-r--r--addons/portal/i18n/portal.pot131
-rw-r--r--addons/pos_mercury/i18n/pos_mercury.pot82
-rw-r--r--addons/pos_restaurant/i18n/pos_restaurant.pot11
-rw-r--r--addons/pos_sale/i18n/pos_sale.pot27
-rw-r--r--addons/product/i18n/product.pot516
-rw-r--r--addons/project/i18n/project.pot596
-rw-r--r--addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot18
-rw-r--r--addons/purchase/i18n/purchase.pot504
-rw-r--r--addons/purchase_requisition/i18n/purchase_requisition.pot103
-rw-r--r--addons/purchase_stock/i18n/purchase_stock.pot346
-rw-r--r--addons/rating/i18n/rating.pot38
-rw-r--r--addons/repair/i18n/repair.pot254
-rw-r--r--addons/report_intrastat/i18n/report_intrastat.pot16
-rw-r--r--addons/resource/i18n/resource.pot121
-rw-r--r--addons/sale/i18n/sale.pot357
-rw-r--r--addons/sale_crm/i18n/sale_crm.pot42
-rw-r--r--addons/sale_order_dates/i18n/sale_order_dates.pot40
-rw-r--r--addons/sale_payment/i18n/sale_payment.pot148
-rw-r--r--addons/sale_stock/i18n/sale_stock.pot81
-rw-r--r--addons/sale_timesheet/i18n/sale_timesheet.pot558
-rw-r--r--addons/sales_team/i18n/sales_team.pot109
-rw-r--r--addons/social_media/i18n/social_media.pot11
-rw-r--r--addons/stock/i18n/stock.pot925
-rw-r--r--addons/stock_account/i18n/stock_account.pot128
-rw-r--r--addons/stock_landed_costs/i18n/stock_landed_costs.pot113
-rw-r--r--addons/stock_picking_batch/i18n/stock_picking_batch.pot103
-rw-r--r--addons/survey/i18n/survey.pot545
-rw-r--r--addons/uom/i18n/uom.pot376
-rw-r--r--addons/web/i18n/web.pot1000
-rw-r--r--addons/web_editor/i18n/web_editor.pot347
-rw-r--r--addons/web_settings_dashboard/i18n/web_settings_dashboard.pot81
-rw-r--r--addons/web_tour/i18n/web_tour.pot12
-rw-r--r--addons/website/i18n/website.pot348
-rw-r--r--addons/website_blog/i18n/website_blog.pot200
-rw-r--r--addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot30
-rw-r--r--addons/website_customer/i18n/website_customer.pot18
-rw-r--r--addons/website_event/i18n/website_event.pot102
-rw-r--r--addons/website_event_questions/i18n/website_event_questions.pot8
-rw-r--r--addons/website_event_sale/i18n/website_event_sale.pot13
-rw-r--r--addons/website_event_track/i18n/website_event_track.pot208
-rw-r--r--addons/website_form/i18n/website_form.pot24
-rw-r--r--addons/website_forum/i18n/website_forum.pot272
-rw-r--r--addons/website_forum_doc/i18n/website_forum_doc.pot49
-rw-r--r--addons/website_hr/i18n/website_hr.pot21
-rw-r--r--addons/website_hr_recruitment/i18n/website_hr_recruitment.pot37
-rw-r--r--addons/website_livechat/i18n/website_livechat.pot31
-rw-r--r--addons/website_mass_mailing/i18n/website_mass_mailing.pot12
-rw-r--r--addons/website_quote/i18n/website_quote.pot53
-rw-r--r--addons/website_sale/i18n/website_sale.pot353
-rw-r--r--addons/website_sale_delivery/i18n/website_sale_delivery.pot62
-rw-r--r--addons/website_slides/i18n/website_slides.pot177
-rw-r--r--odoo/addons/base/i18n/base.pot1606
117 files changed, 17501 insertions, 7411 deletions
diff --git a/.tx/config b/.tx/config
index da3e448a067..5db124b8f52 100644
--- a/.tx/config
+++ b/.tx/config
@@ -82,11 +82,6 @@ file_filter = addons/association/i18n/<lang>.po
source_file = addons/association/i18n/association.pot
source_lang = en
-[odoo-master.auth_crypt]
-file_filter = addons/auth_crypt/i18n/<lang>.po
-source_file = addons/auth_crypt/i18n/auth_crypt.pot
-source_lang = en
-
[odoo-master.auth_ldap]
file_filter = addons/auth_ldap/i18n/<lang>.po
source_file = addons/auth_ldap/i18n/auth_ldap.pot
@@ -352,6 +347,11 @@ file_filter = addons/hr_timesheet_attendance/i18n/<lang>.po
source_file = addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
source_lang = en
+[odoo-master.http_routing]
+file_filter = addons/http_routing/i18n/<lang>.po
+source_file = addons/http_routing/i18n/http_routing.pot
+source_lang = en
+
[odoo-master.iap]
file_filter = addons/iap/i18n/<lang>.po
source_file = addons/iap/i18n/iap.pot
@@ -592,6 +592,11 @@ file_filter = addons/purchase_requisition/i18n/<lang>.po
source_file = addons/purchase_requisition/i18n/purchase_requisition.pot
source_lang = en
+[odoo-master.purchase_stock]
+file_filter = addons/purchase_stock/i18n/<lang>.po
+source_file = addons/purchase_stock/i18n/purchase_stock.pot
+source_lang = en
+
[odoo-master.rating]
file_filter = addons/rating/i18n/<lang>.po
source_file = addons/rating/i18n/rating.pot
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 45ee10212fe..f2d08498227 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.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,27 +45,27 @@ 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
+#: code:addons/account/models/reconciliation_widget.py:44
#, python-format
msgid "%d transactions were automatically reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:832
+#: code:addons/account/models/account.py:892
#, 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:220
+#: code:addons/account/models/account.py:560
+#: code:addons/account/models/account.py:561
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:243
+#: code:addons/account/models/account_move.py:382
#, python-format
msgid "%sreversal of: "
msgstr ""
@@ -91,7 +91,7 @@ msgid "-> View partially reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:464
+#: code:addons/account/models/reconciliation_widget.py:45
#, python-format
msgid "1 transaction was automatically reconciled."
msgstr ""
@@ -122,7 +122,7 @@ msgid ": General ledger"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:588
+#: code:addons/account/models/account.py:644
#, python-format
msgid ": Refund"
msgstr ""
@@ -195,6 +195,17 @@ msgid "<div>\n"
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
+#: code:addons/account/models/account_invoice.py:699
+#, 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.portal_my_invoices
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Paid</span></span>"
msgstr ""
@@ -215,6 +226,16 @@ 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.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>"
msgstr ""
@@ -307,7 +328,7 @@ 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 ""
@@ -381,7 +402,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 +412,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 ""
@@ -476,7 +497,7 @@ 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 ""
@@ -495,27 +516,15 @@ 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
-#, python-format
-msgid "A Payment Terms should have its last line of type Balance."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_invoice.py:1707
+#: code:addons/account/models/account_invoice.py:1850
#, python-format
-msgid "A Payment Terms should have only one line of type Balance."
+msgid "A Payment Term should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:758
+#: code:addons/account/models/account.py:810
#, python-format
-msgid "A bank account can only belong to one journal."
+msgid "A bank account can belong to only one journal."
msgstr ""
#. module: account
@@ -543,7 +552,7 @@ 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/reconciliation_widget.py:731
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
@@ -554,14 +563,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:607
+#: code:addons/account/models/account_bank_statement.py:610
#, 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:618
#, python-format
msgid "A selected statement line was already reconciled with an account move."
msgstr ""
@@ -572,17 +581,18 @@ 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
#. 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:554
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:556
+#: code:addons/account/static/src/xml/account_reconciliation.xml:175
+#: code:addons/account/static/src/xml/account_reconciliation.xml:237
+#: code:addons/account/static/src/xml/account_reconciliation.xml:262
#: 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 +614,12 @@ msgid "Account"
msgstr ""
#. module: account
+#: code:addons/account/models/account_move.py:896
+#, 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 ""
@@ -673,6 +689,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
@@ -704,6 +732,7 @@ 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 +807,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"
@@ -823,6 +853,7 @@ msgstr ""
#: 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,6 +895,11 @@ msgid "Account groups"
msgstr ""
#. module: account
+#: 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
#: model:ir.model,name:account.model_account_move_line_reconcile
msgid "Account move line reconcile"
msgstr ""
@@ -906,13 +942,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 ""
@@ -931,6 +973,11 @@ msgid "Accounting"
msgstr ""
#. module: account
+#: 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_account_journal_form
msgid "Accounting App Options"
msgstr ""
@@ -946,6 +993,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 +1045,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 ""
@@ -1018,6 +1073,16 @@ msgid "Active"
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,6 +1096,13 @@ msgid "Add Credit Note"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:20
+#, python-format
+msgid "Add a Bank Account"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
msgid "Add a journal"
msgstr ""
@@ -1085,6 +1157,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"
@@ -1125,6 +1202,21 @@ msgid "Aged Partner Balance is a more detailed report of your receivables by int
msgstr ""
#. module: account
+#: 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
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
@@ -1195,7 +1287,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:52
#, python-format
msgid "All invoices and payments have been matched, your accounts' balances are clean."
msgstr ""
@@ -1211,7 +1303,7 @@ msgid "All selected journal entries will be validated and posted. You won't be a
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 +1334,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 +1345,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 +1361,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:202
+#: code:addons/account/static/src/xml/account_reconciliation.xml:244
+#: code:addons/account/static/src/xml/account_reconciliation.xml:261
#: 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
@@ -1328,7 +1426,7 @@ msgid "Amount Due in Invoice Currency"
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 "Amount Paid"
msgstr ""
@@ -1401,7 +1499,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:183
#, python-format
msgid "Analytic Acc."
msgstr ""
@@ -1470,7 +1568,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:187
#, python-format
msgid "Analytic Tags."
msgstr ""
@@ -1501,6 +1599,16 @@ 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.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."
@@ -1577,6 +1685,16 @@ 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 +1709,13 @@ msgid "Automated Entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:243
+#: code:addons/account/models/account_move.py:382
#, 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:394
#, python-format
msgid "Automatic Balancing Line"
msgstr ""
@@ -1620,13 +1737,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:24
+#: code:addons/account/static/src/xml/account_reconciliation.xml:29
#, python-format
msgid "Automatic reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:469
+#: code:addons/account/models/reconciliation_widget.py:50
#, python-format
msgid "Automatically reconciled items"
msgstr ""
@@ -1642,7 +1759,7 @@ msgid "Average Price in Currency"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:194
+#: code:addons/account/models/chart_template.py:226
#, python-format
msgid "BILL"
msgstr ""
@@ -1658,7 +1775,7 @@ msgstr ""
#: 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_payment_receipt_document
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "Balance"
msgstr ""
@@ -1684,8 +1801,9 @@ 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:788
#: 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,7 +1816,6 @@ 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
@@ -1706,7 +1823,6 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_journal__bank_account_id
#: 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,17 +1832,19 @@ 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
msgid "Bank Accounts"
msgstr ""
@@ -1741,6 +1859,11 @@ msgid "Bank Feeds"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__bank_bic
+msgid "Bank Identifier Code"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_yodlee
msgid "Bank Interface - Sync your bank feeds automatically"
msgstr ""
@@ -1756,6 +1879,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 ""
@@ -1778,6 +1908,12 @@ msgid "Bank Statement"
msgstr ""
#. module: account
+#: code:addons/account/models/account_bank_statement.py:663
+#, 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,12 +1925,21 @@ 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.model.fields,help:account.field_account_bank_statement_line__bank_account_id
+msgid "Bank account that was used in this transaction."
+msgstr ""
+
+#. module: account
+#: 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.ui.view,arch_db:account.partner_view_buttons
msgid "Bank account(s)"
msgstr ""
@@ -1805,13 +1950,6 @@ msgid "Bank and Cash"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:15
-#, python-format
-msgid "Bank reconciliation"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal__account_setup_bank_data_done
msgid "Bank setup marked as done"
msgstr ""
@@ -1845,6 +1983,12 @@ 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
#: selection:account.tax,tax_exigibility:0
#: selection:account.tax.template,tax_exigibility:0
msgid "Based on Invoice"
@@ -1912,6 +2056,11 @@ 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 ""
@@ -1984,8 +2133,8 @@ 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
+#: code:addons/account/models/chart_template.py:205
+#: code:addons/account/models/chart_template.py:229
#, python-format
msgid "CABA"
msgstr ""
@@ -2013,6 +2162,7 @@ msgstr ""
#: 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.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
@@ -2056,32 +2206,33 @@ 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:341
#, 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:373
#, 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:757
#, 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:95
+#: code:addons/account/models/chart_template.py:152
#, 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:712
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
@@ -2089,7 +2240,7 @@ 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:788
#, python-format
msgid "Cash"
msgstr ""
@@ -2110,13 +2261,13 @@ msgid "Cash Basis Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:197
+#: code:addons/account/models/chart_template.py:229
#, 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,17 +2301,12 @@ 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 ""
@@ -2197,18 +2343,26 @@ 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:145
#, 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:151
+#, 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:148
#, 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 ""
@@ -2235,8 +2389,8 @@ 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:295
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:10
#: model:ir.actions.act_window,name:account.action_account_form
#: model:ir.ui.menu,name:account.menu_action_account_form
#, python-format
@@ -2309,7 +2463,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:155
+#: code:addons/account/models/chart_template.py:187
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#, python-format
msgid "Choose Accounting Template"
@@ -2317,21 +2471,38 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
+#: code:addons/account/static/src/xml/account_reconciliation.xml:136
+#, 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/xml/account_reconciliation.xml:17
#, python-format
-msgid "Choose counterpart"
+msgid "Click to Rename"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:264
+#: code:addons/account/static/src/xml/account_reconciliation.xml:269
#, 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:65
#, python-format
msgid "Close statement"
msgstr ""
@@ -2349,6 +2520,7 @@ msgstr ""
#: 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 ""
@@ -2412,19 +2584,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
@@ -2433,18 +2604,16 @@ msgstr ""
#: 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
@@ -2464,8 +2633,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:147
-#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:30
+#: code:addons/account/models/company.py:238
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:25
#, python-format
msgid "Company Data"
msgstr ""
@@ -2481,22 +2650,15 @@ 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 ""
@@ -2508,7 +2670,7 @@ msgid "Complete Set of Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:576
+#: code:addons/account/models/account_invoice.py:608
#, python-format
msgid "Compose Email"
msgstr ""
@@ -2534,38 +2696,15 @@ 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
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:29
#, 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."
-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.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Configure"
msgstr ""
#. module: account
@@ -2608,7 +2747,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:52
+#: code:addons/account/static/src/xml/account_reconciliation.xml:57
#, python-format
msgid "Congrats, you're all done!"
msgstr ""
@@ -2624,12 +2763,6 @@ msgid "Contains the logic shared between models which allows to register payment
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"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner__contracts_count
#: model:ir.model.fields,field_description:account.field_res_users__contracts_count
msgid "Contracts Count"
@@ -2641,14 +2774,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:903
#, 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 +2818,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:251
#, python-format
-msgid "Create Write-off"
+msgid "Create a Bank Account"
msgstr ""
#. module: account
@@ -2757,13 +2906,13 @@ msgid "Create and post move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:281
+#: code:addons/account/models/account_journal_dashboard.py:284
#, python-format
msgid "Create cash statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:267
+#: code:addons/account/models/account_journal_dashboard.py:270
#, python-format
msgid "Create invoice/bill"
msgstr ""
@@ -2775,12 +2924,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:168
#, 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 ""
@@ -2812,6 +2966,7 @@ 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_invoice__create_uid
@@ -2825,7 +2980,6 @@ msgstr ""
#: 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 +2991,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
@@ -2878,6 +3033,7 @@ 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_invoice__create_date
@@ -2891,7 +3047,6 @@ msgstr ""
#: 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 +3058,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
@@ -2938,14 +3094,18 @@ 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:476
+#: code:addons/account/models/account_invoice.py:1336
#: 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
@@ -2960,7 +3120,7 @@ msgid "Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:446
+#: code:addons/account/models/account_invoice.py:477
#, python-format
msgid "Credit Note - %s"
msgstr ""
@@ -3023,10 +3183,10 @@ 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
@@ -3050,8 +3210,8 @@ 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:1409
+#: code:addons/account/models/account_move.py:1421
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3086,7 +3246,7 @@ 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:681
#, python-format
msgid "Customer Credit Note"
msgstr ""
@@ -3104,7 +3264,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:193
+#: code:addons/account/models/chart_template.py:225
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
#, python-format
@@ -3112,7 +3272,8 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:648
+#: code:addons/account/models/account_payment.py:679
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -3124,11 +3285,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__portal_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"
@@ -3151,7 +3319,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_dashboard_setup_bar.js:214
+#: code:addons/account/static/src/js/account_dashboard_setup_bar.js:222
#: model:ir.ui.menu,name:account.menu_board_journal_1
#, python-format
msgid "Dashboard"
@@ -3162,8 +3330,8 @@ 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:242
+#: code:addons/account/static/src/xml/account_reconciliation.xml:257
#: 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
@@ -3228,7 +3396,7 @@ 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:48
#, python-format
msgid "Dear Sir/Madam,\n"
"\n"
@@ -3256,11 +3424,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 ""
@@ -3348,6 +3511,11 @@ msgid "Define the smallest coinage of the currency used to pay by cash."
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 ""
@@ -3382,7 +3550,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:255
+#: code:addons/account/static/src/xml/account_reconciliation.xml:260
#: 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
@@ -3421,7 +3589,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 ""
@@ -3437,11 +3607,6 @@ msgid "Disc.(%)"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_opening_move_wizard_form
-msgid "Discard"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_line__discount
msgid "Discount (%)"
msgstr ""
@@ -3486,6 +3651,7 @@ 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_invoice__display_name
@@ -3500,7 +3666,6 @@ msgstr ""
#: 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 +3674,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
@@ -3599,7 +3766,7 @@ msgid "Draft Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:443
+#: code:addons/account/models/account_invoice.py:474
#: 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
@@ -3631,12 +3798,13 @@ 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/static/src/xml/account_reconciliation.xml:243
#: 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 +3815,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 +3835,7 @@ msgid "Due the"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1184
+#: code:addons/account/models/account_invoice.py:1296
#, python-format
msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note."
msgstr ""
@@ -3688,20 +3851,30 @@ 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
+#: code:addons/account/models/chart_template.py:203
+#: code:addons/account/models/chart_template.py:218
+#: code:addons/account/models/chart_template.py:228
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1090
+#: code:addons/account/models/account_move.py:956
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_journal_form
+msgid "Email Alias"
+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 +3886,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 +3911,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 +3926,9 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1055
+#: code:addons/account/models/account_move.py:894
#, python-format
-msgid "Entries are not of the same account!"
+msgid "Entries are not from the same account."
msgstr ""
#. module: account
@@ -3758,7 +3937,7 @@ msgid "Entries to Review"
msgstr ""
#. module: account
-#: code:addons/account/models/account_analytic_line.py:47
+#: code:addons/account/models/account_analytic_line.py:48
#, python-format
msgid "Entries: "
msgstr ""
@@ -3785,13 +3964,13 @@ msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config_settings.py:114
+#: code:addons/account/models/res_config_settings.py:115
#, python-format
msgid "Error!"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:196
+#: code:addons/account/models/chart_template.py:228
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -3858,11 +4037,6 @@ msgid "Federal States"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
-msgid "File Import"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.cash_box_in_form
msgid "Fill in this form if you put money in the cash register:"
msgstr ""
@@ -3874,7 +4048,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:146
#, python-format
msgid "Filter..."
msgstr ""
@@ -3965,13 +4139,25 @@ 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:268
+#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:15
+#: model:ir.model,name:account.model_account_fiscal_year
#, 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"
@@ -4022,6 +4208,37 @@ msgid "Follow-up Levels"
msgstr ""
#. module: account
+#: 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
#: model:ir.model.fields,help:account.field_account_financial_report__sign
msgid "For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
@@ -4043,7 +4260,7 @@ 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:214
#: 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
@@ -4081,6 +4298,12 @@ 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:387
+#, 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"
@@ -4162,13 +4385,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:57
+#: code:addons/account/static/src/xml/account_reconciliation.xml:62
#, 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:758
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -4180,7 +4403,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:51
#, python-format
msgid "Good Job!"
msgstr ""
@@ -4307,6 +4530,7 @@ 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_invoice__id
@@ -4321,7 +4545,6 @@ msgstr ""
#: 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 +4553,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
@@ -4356,18 +4581,39 @@ msgid "ID"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:193
+#: code:addons/account/models/chart_template.py:225
#, 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_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 ""
@@ -4384,6 +4630,12 @@ msgid "If set, taxes which are computed after this one will be computed based on
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)"
@@ -4500,19 +4752,19 @@ msgid "Import your bank statements in QIF"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:410
+#: 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:87
#, python-format
msgid "In order to pay multiple invoices at once, they must use the same currency."
msgstr ""
@@ -4565,7 +4817,7 @@ 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:719
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -4581,15 +4833,6 @@ msgid "Information addendum"
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
-#, python-format
-msgid "Initial Balances"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template__property_stock_account_input_categ_id
#: model:ir.model.fields,field_description:account.field_res_company__property_stock_account_input_categ_id
msgid "Input Account for Stock Valuation"
@@ -4606,9 +4849,7 @@ 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 ""
@@ -4629,6 +4870,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 ""
@@ -4645,7 +4892,7 @@ 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:1334
#: model:ir.model,name:account.model_account_invoice
#: 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
@@ -4653,7 +4900,6 @@ msgstr ""
#: 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
@@ -4669,7 +4915,7 @@ msgid "Invoice #"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:444
+#: code:addons/account/models/account_invoice.py:475
#, python-format
msgid "Invoice - %s"
msgstr ""
@@ -4684,13 +4930,18 @@ msgstr ""
#: code:addons/account/controllers/portal.py:70
#: 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.report_payment_receipt_document
#: 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.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
@@ -4704,7 +4955,7 @@ msgid "Invoice Lines"
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 "Invoice Number"
msgstr ""
@@ -4739,25 +4990,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:869
#, 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:893
#, 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:915
#, 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:907
#, python-format
msgid "Invoice must be validated in order to set it to register payment."
msgstr ""
@@ -4786,6 +5037,7 @@ msgstr ""
#: 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.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_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
@@ -4831,6 +5083,11 @@ 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 ""
@@ -4843,8 +5100,10 @@ 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
@@ -4875,6 +5134,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 +5149,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:954
#, 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:495
#, 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 +5183,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:194
+#: code:addons/account/static/src/xml/account_reconciliation.xml:238
#: 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 +5192,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 +5214,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 +5228,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 +5259,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:439
#: 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 +5288,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 +5298,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:316
#: model:ir.actions.client,name:account.action_manual_reconcile
#, python-format
msgid "Journal Items to Reconcile"
@@ -5133,7 +5399,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 ""
@@ -5145,12 +5413,13 @@ 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:555
+#: code:addons/account/static/src/xml/account_reconciliation.xml:198
+#: code:addons/account/static/src/xml/account_reconciliation.xml:239
#: 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"
@@ -5189,6 +5458,7 @@ 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_invoice____last_update
@@ -5203,7 +5473,6 @@ msgstr ""
#: 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 +5481,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
@@ -5244,7 +5515,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:119
+#: code:addons/account/static/src/xml/account_reconciliation.xml:124
#, python-format
msgid "Last Reconciliation:"
msgstr ""
@@ -5276,6 +5547,7 @@ 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_invoice__write_uid
@@ -5289,7 +5561,6 @@ msgstr ""
#: 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 +5572,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
@@ -5342,6 +5614,7 @@ 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_invoice__write_date
@@ -5355,7 +5628,6 @@ msgstr ""
#: 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 +5639,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
@@ -5405,11 +5678,6 @@ msgid "Latest Invoices & Payments Matching Date"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_group__parent_left
-msgid "Left Parent"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_account_position_form
msgid "Legal Notes..."
msgstr ""
@@ -5420,14 +5688,14 @@ 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:221
#, python-format
msgid "Less Payment"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:24
+#: code:addons/account/static/src/xml/account_reconciliation.xml:29
#, python-format
msgid "Let odoo try to reconcile entries for the user"
msgstr ""
@@ -5454,6 +5722,11 @@ msgid "Line Count"
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 +5738,12 @@ msgid "Liquidity"
msgstr ""
#. module: account
+#: code:addons/account/models/chart_template.py:155
+#, 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,7 +5755,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:29
+#: code:addons/account/static/src/xml/account_reconciliation.xml:34
#, python-format
msgid "Load more"
msgstr ""
@@ -5492,7 +5771,7 @@ msgid "Lock Date for Non-Advisers"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:173
+#: code:addons/account/models/account_bank_statement.py:175
#, python-format
msgid "Loss"
msgstr ""
@@ -5509,7 +5788,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:195
+#: code:addons/account/models/chart_template.py:227
#, python-format
msgid "MISC"
msgstr ""
@@ -5601,14 +5880,15 @@ 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"
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 "Mark invoice as fully paid"
msgstr ""
@@ -5670,12 +5950,26 @@ 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_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,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,13 +6001,12 @@ 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:227
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -5721,7 +6014,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:164
+#: code:addons/account/static/src/xml/account_reconciliation.xml:169
#, python-format
msgid "Modify models"
msgstr ""
@@ -5770,12 +6063,14 @@ msgid "Move Reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1396
+#: code:addons/account/models/account_move.py:1133
#, 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,9 +6107,11 @@ 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_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
@@ -5849,8 +6146,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 +6156,27 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1373
+#: code:addons/account/models/account_move.py:1110
#, 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,20 +6203,22 @@ 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:68
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:142
#, python-format
-msgid "No appropriate payment method enabled on journal %s"
+msgid "No Title"
msgstr ""
#. module: account
-#: selection:account.financial.report,display_detail:0
-msgid "No detail"
+#: code:addons/account/models/account_invoice.py:897
+#, python-format
+msgid "No account was found to create the invoice, be sure you have installed a chart of account."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:116
-#, python-format
-msgid "No opening move defined !"
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
msgstr ""
#. module: account
@@ -5946,7 +6260,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:258
+#: code:addons/account/static/src/xml/account_reconciliation.xml:263
#: model:ir.model.fields,field_description:account.field_account_account_template__note
#, python-format
msgid "Note"
@@ -5972,13 +6286,8 @@ 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:39
#, python-format
msgid "Nothing to do!"
msgstr ""
@@ -6001,6 +6310,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 +6327,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
@@ -6040,6 +6377,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 ""
@@ -6069,13 +6411,13 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:479
+#: code:addons/account/models/account_payment.py:509
#, 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:896
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -6086,26 +6428,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:683
+#: code:addons/account/static/src/xml/account_reconciliation.xml:136
#, 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 +6454,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:322
#: 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 +6471,7 @@ msgid "Opening Unit Numbers"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:138
+#: code:addons/account/models/account.py:148
#, python-format
msgid "Opening balance"
msgstr ""
@@ -6170,12 +6502,17 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:1002
+#: code:addons/account/models/account_bank_statement.py:725
#, 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."
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Operations"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_template__nocreate
msgid "Optional Create"
msgstr ""
@@ -6195,7 +6532,25 @@ msgid "Options"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.report_payment_receipt
+#: code:addons/account/models/account_invoice.py:696
+#, 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:692
+#, 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:694
+#, python-format
+msgid "Or share the emails %s to your vendors: bills will be created automatically upon mail reception."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_payment_receipt_document
msgid "Original Amount"
msgstr ""
@@ -6250,6 +6605,7 @@ 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 +6640,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:426
+#: code:addons/account/models/account_payment.py:455
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -6314,6 +6670,11 @@ msgid "Parent Chart Template"
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 ""
@@ -6331,8 +6692,8 @@ 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:241
+#: code:addons/account/static/src/xml/account_reconciliation.xml:258
#: 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 +6721,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
@@ -6406,7 +6773,6 @@ msgstr ""
#: 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 +6799,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 +6817,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 ""
@@ -6486,6 +6855,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 +6869,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,7 +6883,7 @@ 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 ""
@@ -6584,7 +6958,7 @@ msgid "Payment that created this entry"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:235
+#: code:addons/account/models/account_payment.py:292
#: 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
@@ -6610,20 +6984,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 +7028,9 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1785
+#: code:addons/account/models/account_invoice.py:1930
#, 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,6 +7049,11 @@ msgid "Plaid Connector"
msgstr ""
#. module: account
+#: selection:account.invoice,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: account
#: code:addons/account/wizard/pos_box.py:27
#, python-format
msgid "Please check that the field 'Journal' is set on the Bank Statement"
@@ -6696,31 +7066,31 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1078
+#: code:addons/account/models/account_invoice.py:1197
#, python-format
msgid "Please create some invoice lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:160
+#: code:addons/account/models/account_move.py:295
#, 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:300
#, 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:1195
#, 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:319
#, python-format
msgid "Please install a chart of accounts or create a miscellaneous journal before proceeding."
msgstr ""
@@ -6751,7 +7121,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__portal_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_move_form
msgid "Post"
msgstr ""
@@ -6762,6 +7136,7 @@ msgid "Post All Entries"
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 ""
@@ -6808,6 +7183,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"
@@ -6884,7 +7269,7 @@ 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 +7297,7 @@ msgid "Profit and Loss"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:136
+#: code:addons/account/models/account_payment.py:219
#, python-format
msgid "Programming error: wizard action executed without active_ids in context."
msgstr ""
@@ -7008,7 +7393,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 +7422,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,15 +7429,19 @@ 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
+#: model:ir.model.fields,field_description:account.field_account_move_line__recompute_tax_line
+msgid "Recompute Tax Line"
+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
+#: code:addons/account/static/src/xml/account_reconciliation.xml:78
+#: code:addons/account/static/src/xml/account_reconciliation.xml:110
+#: code:addons/account/static/src/xml/account_reconciliation.xml:111
#: 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
@@ -7074,19 +7461,12 @@ msgid "Reconcile With Write-Off"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_reconcile.py:86
+#: code:addons/account/wizard/account_reconcile.py:81
#, python-format
msgid "Reconcile Writeoff"
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"
-msgstr ""
-
-#. module: account
#: selection:account.payment,state:0
#: model:ir.model.fields,field_description:account.field_account_move_line__reconciled
#: model:ir.ui.view,arch_db:account.view_account_payment_search
@@ -7099,6 +7479,11 @@ 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 ""
@@ -7131,12 +7516,7 @@ 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 +7526,14 @@ msgid "Record transactions in foreign currencies"
msgstr ""
#. module: account
+#: code:addons/account/models/account.py:885
+#, 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:240
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_partnerledger
#, python-format
@@ -7202,16 +7588,6 @@ msgid "Refund Invoices"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice_refund__filter_refund
-msgid "Refund Method"
-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"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_account_invoice_payment
#: model:ir.actions.act_window,name:account.action_account_payment_from_invoices
#: model:ir.ui.view,arch_db:account.invoice_form
@@ -7230,6 +7606,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 ""
@@ -7302,13 +7679,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:245
#, python-format
msgid "Residual"
msgstr ""
@@ -7329,6 +7711,11 @@ 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_res_config_settings__module_account_deferred_revenue
msgid "Revenue Recognition"
msgstr ""
@@ -7373,11 +7760,6 @@ msgid "Reversed entry"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_group__parent_right
-msgid "Right Parent"
-msgstr ""
-
-#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round Globally"
msgstr ""
@@ -7476,17 +7858,19 @@ msgid "Salesperson"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.setup_bank_journal_form
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__sanitized_acc_number
+msgid "Sanitized Account Number"
+msgstr ""
+
+#. module: account
#: 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"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:203
+#: code:addons/account/static/src/xml/account_reconciliation.xml:208
#, python-format
msgid "Save and New"
msgstr ""
@@ -7542,16 +7926,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 ""
@@ -7616,12 +7996,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:79
#, 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 ""
@@ -7653,7 +8038,6 @@ 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 "Send Money"
msgstr ""
@@ -7691,6 +8075,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
@@ -7730,6 +8115,7 @@ msgstr ""
#. module: account
#: 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
msgid "Settings"
@@ -7782,7 +8168,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:107
+#: code:addons/account/static/src/xml/account_reconciliation.xml:112
#, python-format
msgid "Skip"
msgstr ""
@@ -7793,6 +8179,18 @@ msgid "Smallest Text"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:760
+#, 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 ""
@@ -7806,6 +8204,11 @@ 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 ""
@@ -7817,6 +8220,7 @@ msgstr ""
#: 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 +8235,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 ""
@@ -7853,11 +8262,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 +8285,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 ""
@@ -7905,6 +8316,14 @@ 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.model.fields,field_description:account.field_account_cashbox_line__subtotal
#: model:ir.ui.view,arch_db:account.invoice_form
msgid "Subtotal"
@@ -7955,12 +8374,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:179
#: 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.account_tax_view_search
#: model:ir.ui.view,arch_db:account.portal_invoice_report
#: model:ir.ui.view,arch_db:account.report_tax
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -7970,8 +8390,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:872
+#: code:addons/account/models/chart_template.py:875
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8001,6 +8421,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_tax__amount
+#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.report_journal
msgid "Tax Amount"
msgstr ""
@@ -8048,6 +8469,12 @@ 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"
@@ -8072,8 +8499,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,6 +8544,11 @@ 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 ""
@@ -8159,6 +8591,11 @@ 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 +8621,13 @@ 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_move_line__balance
msgid "Technical field holding the debit - credit in order to open meaningful graph views from reports"
msgstr ""
@@ -8225,6 +8669,8 @@ 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 ""
@@ -8268,6 +8714,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 +8731,23 @@ 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_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,7 +8803,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:58
#, python-format
msgid "That's on average"
msgstr ""
@@ -8354,18 +8815,13 @@ msgid "The 'Internal Type' is used for features available on different types of
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1243
+#: code:addons/account/models/account_move.py:1041
#, python-format
-msgid "The account %s (%s) is deprecated !"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_move.py:1057
-#, python-format
-msgid "The account %s (%s) is not marked as reconcilable !"
+msgid "The account %s (%s) is deprecated."
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,19 +8838,25 @@ 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:679
#, 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:887
#, 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:514
#, python-format
msgid "The bank account of a bank journal must belong to the same company (%s)."
msgstr ""
@@ -8405,7 +8867,7 @@ 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:1285
#, 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 +8899,42 @@ msgid "The commercial entity that will be used on Journal Entries for this invoi
msgstr ""
#. module: account
+#: code:addons/account/models/account.py:505
+#, 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:507
+#, 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:1936
#, 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:43
+#, 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 +8946,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:891
+#, 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:518
#, python-format
msgid "The holder of a journal's bank account must be the company (%s)."
msgstr ""
@@ -8483,7 +8969,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:615
+#: code:addons/account/models/account_payment.py:646
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -8494,7 +8980,6 @@ 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 +8991,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:1847
+#, 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:97
+#, 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 +9018,12 @@ msgid "The name that will be used on account move lines"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:101
+#, 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 +9034,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:1938
#, python-format
msgid "The number of days used for a payment term cannot be negative."
msgstr ""
@@ -8559,30 +9062,24 @@ 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
-#, python-format
-msgid "The partner has to be the same on all lines for receivable and payable accounts!"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_invoice__reference
msgid "The partner reference of this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:556
+#: code:addons/account/models/account.py:611
#, python-format
msgid "The partners of the journal's company and the related bank account mismatch."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:61
+#: code:addons/account/models/account_payment.py:115
#, python-format
msgid "The payment amount cannot be negative."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:482
+#: code:addons/account/models/account_payment.py:512
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -8598,15 +9095,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:664
#, 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:1741
#, 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,7 +9113,7 @@ 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
+#: code:addons/account/models/account_payment.py:648
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
@@ -8632,13 +9129,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:209
#, 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:374
+#, 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 +9153,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:1548
#, python-format
msgid "There is no tax cash basis journal defined for this company: \"%s\" \n"
"Configure it in Accounting/Configuration/Settings"
@@ -8658,7 +9161,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:51
#, python-format
msgid "There is nothing to reconcile."
msgstr ""
@@ -8679,9 +9182,9 @@ 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:1457
#, python-format
-msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>"
+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
@@ -8785,13 +9288,13 @@ msgid "This is the accounting dashboard"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:528
+#: code:addons/account/models/account.py:583
#, 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:592
#, python-format
msgid "This journal already contains items, therefore you cannot modify its short name."
msgstr ""
@@ -8802,14 +9305,14 @@ 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:558
#, 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
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:412
#, 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 ""
@@ -8826,14 +9329,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:40
#, 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:249
#, python-format
msgid "This payment is registered but not reconciled."
msgstr ""
@@ -8873,7 +9376,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:31
+#: code:addons/account/static/src/xml/account_reconciliation.xml:36
#, python-format
msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
msgstr ""
@@ -8904,9 +9407,21 @@ msgid "To pay"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1053
+#: code:addons/account/models/account_move.py:892
+#, python-format
+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:163
#, python-format
-msgid "To reconcile the entries company should be the same for all entries!"
+msgid "To speed up reconciliation, define"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,activity_state:0
+msgid "Today"
msgstr ""
#. module: account
@@ -8929,14 +9444,12 @@ 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_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"
@@ -9034,8 +9547,7 @@ 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
+#: code:addons/account/static/src/xml/account_reconciliation.xml:259
#, python-format
msgid "Transaction"
msgstr ""
@@ -9056,9 +9568,8 @@ 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"
+#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts__transfer_account_code_prefix
+msgid "Transfer Accounts Prefix"
msgstr ""
#. module: account
@@ -9067,19 +9578,13 @@ 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:621
#, python-format
msgid "Transfer from %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:671
+#: code:addons/account/models/account_payment.py:702
#, python-format
msgid "Transfer to %s"
msgstr ""
@@ -9112,6 +9617,7 @@ msgstr ""
#: 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,19 +9627,20 @@ msgid "UP"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
+#: code:addons/account/models/account.py:362
+#, python-format
msgid "Undefined Yet"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:304
+#: code:addons/account/models/company.py:350
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:386
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:409
#, python-format
msgid "Undo the partial reconciliation."
msgstr ""
@@ -9153,13 +9660,12 @@ 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:203
#, 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"
@@ -9167,6 +9673,7 @@ 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 +9695,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
@@ -9267,6 +9788,11 @@ 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
+#: model:ir.ui.view,arch_db:account.res_config_settings_view_form
msgid "Use depreciation boards, automate amortization entries"
msgstr ""
@@ -9316,6 +9842,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
@@ -9337,7 +9868,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:72
+#: code:addons/account/static/src/xml/account_reconciliation.xml:77
#: 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,9 +9908,11 @@ 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:478
+#: code:addons/account/models/account_invoice.py:1335
+#: 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.invoice_supplier_tree
#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9387,14 +9920,15 @@ msgid "Vendor Bill"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:448
+#: code:addons/account/models/account_invoice.py:479
#, 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
+#: code:addons/account/models/chart_template.py:226
+#: model:ir.actions.act_window,name:account.action_vendor_bill_template
+#: model:ir.actions.server,name:account.action_invoice_tree2
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
#, python-format
msgid "Vendor Bills"
@@ -9403,8 +9937,8 @@ 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
+#: code:addons/account/models/account_invoice.py:480
+#: code:addons/account/models/account_payment.py:684
#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9412,7 +9946,7 @@ msgid "Vendor Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:450
+#: code:addons/account/models/account_invoice.py:481
#, python-format
msgid "Vendor Credit Note - %s"
msgstr ""
@@ -9424,13 +9958,19 @@ msgid "Vendor Credit Notes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1225
+#: code:addons/account/models/account_invoice.py:1337
#, python-format
msgid "Vendor Credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:655
+#: 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:686
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Vendor Payment"
msgstr ""
@@ -9442,6 +9982,12 @@ msgid "Vendor Payment Terms"
msgstr ""
#. module: account
+#: 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.model.fields,field_description:account.field_account_invoice__reference
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Vendor Reference"
@@ -9459,7 +10005,10 @@ 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 +10018,7 @@ msgid "Warning"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:669
+#: code:addons/account/models/account_invoice.py:778
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -9480,8 +10029,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:1676
+#: code:addons/account/models/account_invoice.py:1740
#, python-format
msgid "Warning!"
msgstr ""
@@ -9497,11 +10046,30 @@ msgid "Warnings in Invoices"
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_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,7 +10109,8 @@ msgid "Wizard for Tax Adjustments"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1094
+#: code:addons/account/models/account_move.py:962
+#: code:addons/account/models/account_move.py:982
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#, python-format
msgid "Write-Off"
@@ -9573,9 +10142,9 @@ 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:890
#, 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,36 +10153,25 @@ 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:1895
#, 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:56
#, 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:1762
#, 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:84
#, python-format
msgid "You can only register payments for open invoices"
msgstr ""
@@ -9624,177 +10182,195 @@ msgid "You can set up here the format you want this record to be displayed. If y
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:214
+#: code:addons/account/models/account_move.py:353
#, 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:355
#, 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:228
#, 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:281
#, 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:671
#, 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:123
#, 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:493
#, 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:729
#, 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:727
#, 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:116
#, 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:1135
#, 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:1137
#, 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:56
#, python-format
msgid "You cannot have a receivable/payable account that is not reconcilable. (account code: %s)"
msgstr ""
#. module: account
+#: code:addons/account/models/company.py:112
+#, 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:720
#, 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:314
#, 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:909
#, 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:292
+#, 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:607
#, 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:297
#, 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:265
#, 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:1101
#, 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:1067
#, 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:895
#, 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:530
#, 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:126
+#, 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:1677
#, python-format
-msgid "You must first select a partner!"
+msgid "You must first select a partner."
msgstr ""
#. module: account
@@ -9811,37 +10387,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:58
#, python-format
msgid "You reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1958
+#: code:addons/account/models/account_move.py:1603
#, 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:1605
#, 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:1607
#, 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"
@@ -9882,13 +10451,18 @@ msgid "account.group"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_opening
-msgid "account.opening"
+#: model:ir.model,name:account.model_account_reconcile_model_template
+msgid "account.reconcile.model.template"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_reconcile_model_template
-msgid "account.reconcile.model.template"
+#: 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
@@ -9935,6 +10509,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 ""
@@ -9950,15 +10539,13 @@ msgid "for this supplier. You can allocate them to mark this bill as paid."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:158
-#, python-format
-msgid "here"
+#: model:ir.model,name:account.model_ir_model_data
+msgid "ir.model.data"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:41
+#: code:addons/account/static/src/xml/account_reconciliation.xml:46
#, python-format
msgid "o_manual_statement"
msgstr ""
@@ -9989,6 +10576,13 @@ msgid "outstanding payments"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:163
+#, python-format
+msgid "reconciliation models"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_report_account_report_agedpartnerbalance
msgid "report.account.report_agedpartnerbalance"
msgstr ""
@@ -10035,7 +10629,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:58
#, python-format
msgid "seconds per transaction."
msgstr ""
@@ -10047,7 +10641,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:53
+#: code:addons/account/static/src/xml/account_reconciliation.xml:58
#, python-format
msgid "transactions in"
msgstr ""
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 2b0ff77b828..775df8cdf79 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+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:407
+#: code:addons/account_asset/models/account_asset.py:426
#, python-format
msgid " (copy)"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:540
+#: code:addons/account_asset/models/account_asset.py:561
#, python-format
msgid " (grouped)"
msgstr ""
@@ -72,6 +72,11 @@ msgid "Accounting entries waiting for manual verification"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__active
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__active
msgid "Active"
@@ -83,7 +88,7 @@ msgid "Additional Options"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:606
+#: code:addons/account_asset/models/account_asset.py:627
#, python-format
msgid "Amount"
msgstr ""
@@ -177,7 +182,7 @@ msgid "Asset category"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:286
+#: code:addons/account_asset/models/account_asset.py:297
#, python-format
msgid "Asset created"
msgstr ""
@@ -188,7 +193,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:334
+#: code:addons/account_asset/models/account_asset.py:345
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -248,7 +253,13 @@ msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__open_asset
-msgid "Auto-confirm Assets"
+msgid "Auto-Confirm Assets"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,date_first_depreciation:0
+#: selection:account.asset.category,date_first_depreciation:0
+msgid "Based on Last Day of Purchase Period"
msgstr ""
#. module: account_asset
@@ -375,7 +386,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:606
+#: code:addons/account_asset/models/account_asset.py:627
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__currency_id
#, python-format
msgid "Currency"
@@ -394,6 +405,7 @@ msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__date
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report__date
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
msgid "Date"
msgstr ""
@@ -463,6 +475,12 @@ msgid "Depreciation Date"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__date_first_depreciation
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__date_first_depreciation
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__account_depreciation_id
msgid "Depreciation Entries: Asset Account"
msgstr ""
@@ -510,7 +528,7 @@ msgid "Depreciation board modified"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:609
+#: code:addons/account_asset/models/account_asset.py:630
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -526,19 +544,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:289
+#: code:addons/account_asset/models/account_asset.py:300
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:292
+#: code:addons/account_asset/models/account_asset.py:303
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:588
+#: code:addons/account_asset/models/account_asset.py:609
#, python-format
msgid "Document closed."
msgstr ""
@@ -569,6 +587,26 @@ msgid "Extended Filters..."
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__first_depreciation_manual_date
+msgid "First Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
msgid "From this report, you can have an overview on all depreciations. The\n"
" search bar can also be used to personalize your assets depreciation reporting."
@@ -626,8 +664,23 @@ msgid "ID"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset__prorata
-msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year"
+msgid "Indicates that the first depreciation entry for this asset have to be done from the asset date (purchase date) instead of the first January / Start date of fiscal year"
msgstr ""
#. module: account_asset
@@ -653,6 +706,11 @@ msgid "Invoice Line"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset__salvage_value
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
@@ -668,7 +726,7 @@ msgid "Journal"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:441
+#: code:addons/account_asset/models/account_asset.py:460
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
@@ -714,6 +772,26 @@ msgid "Linked"
msgstr ""
#. module: account_asset
+#: selection:account.asset.asset,date_first_depreciation:0
+msgid "Manual"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.category,date_first_depreciation:0
+msgid "Manual (Defaulted on Purchase Date)"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.asset_modify_form
msgid "Modify"
msgstr ""
@@ -731,11 +809,6 @@ msgid "Modify Depreciation"
msgstr ""
#. module: account_asset
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
-msgid "Month"
-msgstr ""
-
-#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_invoice_line__asset_mrr
msgid "Monthly Recurring Revenue"
msgstr ""
@@ -756,6 +829,16 @@ msgid "Note"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__first_depreciation_manual_date
+msgid "Note that this date does not alter the computation of the first journal entry in case of prorata temporis assets. It simply changes its accounting date"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__method_number
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category__method_number
#: model:ir.model.fields,field_description:account_asset.field_asset_modify__method_number
@@ -775,12 +858,32 @@ msgid "Number of Months in a Period"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "One Entry Every"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:608
+#: code:addons/account_asset/models/account_asset.py:629
#: 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
@@ -835,9 +938,9 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:373
+#: code:addons/account_asset/models/account_asset.py:391
#, python-format
-msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
+msgid "Prorata temporis can be applied only for the \"number of depreciations\" time method."
msgstr ""
#. module: account_asset
@@ -957,13 +1060,28 @@ msgstr ""
#. module: account_asset
#: code:addons/account_asset/models/account_invoice.py:63
#, python-format
-msgid "The number of depreciations or the period length of your asset category cannot be null."
+msgid "The number of depreciations or the period length of your asset category cannot be 0."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_category__date_first_depreciation
+msgid "The way to compute the date of the first depreciation.\n"
+" * Based on last day of purchase period: The depreciation dates will be based on the last day of the purchase month or the purchase year (depending on the periodicity of the depreciations).\n"
+" * Based on purchase date: The depreciation dates will be based on the purchase date."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:484
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__date_first_depreciation
+msgid "The way to compute the date of the first depreciation.\n"
+" * Based on last day of purchase period: The depreciation dates will be based on the last day of the purchase month or the purchase year (depending on the periodicity of the depreciations).\n"
+" * Based on purchase date: The depreciation dates will be based on the purchase date.\n"
+""
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:503
#, python-format
-msgid "This depreciation is already linked to a journal entry! Please post or delete it."
+msgid "This depreciation is already linked to a journal entry. Please post or delete it."
msgstr ""
#. module: account_asset
@@ -1004,12 +1122,32 @@ msgid "Unposted Amount"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_purchase_tree
msgid "Vendor"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset__state
#: model:ir.model.fields,help:account_asset.field_account_asset_depreciation_line__parent_state
msgid "When an asset is created, the status is 'Draft'.\n"
@@ -1023,25 +1161,25 @@ msgid "Year"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:111
+#: code:addons/account_asset/models/account_asset.py:134
#, python-format
-msgid "You cannot delete a document is in %s state."
+msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:114
+#: code:addons/account_asset/models/account_asset.py:131
#, python-format
-msgid "You cannot delete a document that contains posted entries."
+msgid "You cannot delete a document that is in %s state."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:617
+#: code:addons/account_asset/models/account_asset.py:638
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:619
+#: code:addons/account_asset/models/account_asset.py:640
#, 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 4fac52ef290..b2efc21a481 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,13 +23,13 @@ msgid " Import Template for Bank Statements"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:241
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:236
#, python-format
msgid "%d transactions had already been imported and were ignored."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:241
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:236
#, python-format
msgid "1 transaction had already been imported and was ignored."
msgstr ""
@@ -40,6 +40,11 @@ msgid "A bank account transactions can be imported only once !"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__company_partner_id
+msgid "Account Holder"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__bank_acc_number
msgid "Account Number"
msgstr ""
@@ -60,12 +65,27 @@ msgid "Active"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__alias_name
+msgid "Alias Name for Vendor Bills"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__update_posted
msgid "Allow Cancelling Entries"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:243
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:238
#, python-format
msgid "Already imported items"
msgstr ""
@@ -81,7 +101,7 @@ msgid "At Least One Outbound"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:78
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:82
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__bank_id
#, python-format
msgid "Bank"
@@ -129,7 +149,7 @@ msgid "Cancel"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:167
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:171
#, python-format
msgid "Cannot find in which journal import this statement. Please manually select a journal."
msgstr ""
@@ -165,7 +185,7 @@ msgid "Company related to this journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:108
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:112
#, python-format
msgid "Could not make sense of the given file.\n"
"Did you install the module to support this type of file ?"
@@ -199,11 +219,6 @@ msgid "Currency"
msgstr ""
#. module: account_bank_statement_import
-#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__inbound_payment_method_ids
-msgid "Debit Methods"
-msgstr ""
-
-#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__refund_sequence
msgid "Dedicated Credit Note Sequence"
msgstr ""
@@ -219,6 +234,11 @@ msgid "Default Debit Account"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__bank_statements_source
+msgid "Defines how the bank statements will be registered"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import__display_name
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__display_name
msgid "Display Name"
@@ -240,6 +260,16 @@ msgid "Filename"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__inbound_payment_method_ids
+msgid "For Incoming Payments"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__outbound_payment_method_ids
+msgid "For Outgoing Payments"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import__data_file
msgid "Get you bank statements in electronic format from your bank and select them here."
msgstr ""
@@ -261,7 +291,10 @@ msgid "If this box is checked, the system will try to group the accounting lines
msgstr ""
#. module: account_bank_statement_import
+#: code:addons/account_bank_statement_import/account_journal.py:20
#: model:ir.actions.act_window,name:account_bank_statement_import.action_account_bank_statement_import
+#: model:ir.ui.view,arch_db:account_bank_statement_import.journal_dashboard_view_inherit
+#, python-format
msgid "Import"
msgstr ""
@@ -291,6 +324,11 @@ msgid "Import Statement"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.actions.act_window,name:account_bank_statement_import.install_more_import_formats_action
+msgid "Install Import Format"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__default_credit_account_id
msgid "It acts as a default account for credit amount"
msgstr ""
@@ -301,13 +339,18 @@ msgid "It acts as a default account for debit amount"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__alias_name
+msgid "It creates draft vendor bill by sending an email."
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model,name:account_bank_statement_import.model_account_journal
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__journal_id
msgid "Journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:69
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:73
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
#, python-format
msgid "Journal Creation"
@@ -376,7 +419,7 @@ msgid "Next Number"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:138
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:142
#, python-format
msgid "No currency found matching '%s'."
msgstr ""
@@ -387,11 +430,6 @@ 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__outbound_payment_method_ids
-msgid "Payment Methods"
-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 ""
@@ -440,15 +478,15 @@ msgid "The account of the statement you are importing is not yet recorded in Odo
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:153
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:157
#, python-format
msgid "The account of this statement (%s) is not the same as the journal (%s)."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:163
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:167
#, python-format
-msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s) !"
+msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s)."
msgstr ""
#. module: account_bank_statement_import
@@ -482,13 +520,13 @@ msgid "This field contains the information related to the numbering of the journ
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:113
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:117
#, python-format
msgid "This file doesn't contain any statement."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:121
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:125
#, python-format
msgid "This file doesn't contain any transaction."
msgstr ""
@@ -519,9 +557,14 @@ msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:233
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:228
#, python-format
-msgid "You have already imported that file."
+msgid "You already have imported that file."
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
+msgid "You can install more file formats by"
msgstr ""
#. module: account_bank_statement_import
@@ -535,3 +578,18 @@ msgstr ""
msgid "_Import"
msgstr ""
+#. module: account_bank_statement_import
+#: model:ir.model,name:account_bank_statement_import.model_account_setup_bank_manual_config
+msgid "account.setup.bank.manual.config"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
+msgid "installing the related modules"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.ui.view,arch_db:account_bank_statement_import.journal_dashboard_view_inherit
+msgid "or"
+msgstr ""
+
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index 6859e21bae3..ff35bddeb47 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,15 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid "A budget is a forecast of your company's income and/or expenses\n"
-" expected for a period in the future. A budget is defined on some\n"
-" financial accounts and/or analytic accounts (that may represent\n"
-" projects, departments, categories of products, etc.)"
+#: code:addons/account_budget/models/account_budget.py:278
+#, python-format
+msgid "\"End Date\" of the budget line should be included in the Period of the budget"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/models/account_budget.py:273
+#, python-format
+msgid "\"Start Date\" of the budget line should be included in the Period of the budget"
msgstr ""
#. module: account_budget
@@ -35,12 +39,37 @@ msgid "Achievement"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget_lines__practical_amount
+msgid "Amount really earned/spent."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget_lines__theoritical_amount
+msgid "Amount you are supposed to have earned/spent at this date."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget_lines__planned_amount
+msgid "Amount you plan to earn/spend. Record a positive amount if it is a revenue and a negative amount if it is a cost."
+msgstr ""
+
+#. module: account_budget
#: model:ir.model,name:account_budget.model_account_analytic_account
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__analytic_account_id
msgid "Analytic Account"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__analytic_group_id
+msgid "Analytic Group"
+msgstr ""
+
+#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Approve"
msgstr ""
@@ -67,11 +96,11 @@ msgstr ""
#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_analytic_account__crossovered_budget_line
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__crossovered_budget_line
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__crossovered_budget_line
-#: model:ir.model.fields,field_description:account_budget.field_project_project__crossovered_budget_line
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_form
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_graph
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_pivot
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_search
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_tree
msgid "Budget Lines"
@@ -84,6 +113,11 @@ msgid "Budget Name"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__crossovered_budget_state
+msgid "Budget State"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model,name:account_budget.model_account_budget_post
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__general_budget_id
#: model:ir.ui.view,arch_db:account_budget.view_budget_post_form
@@ -100,20 +134,16 @@ msgid "Budgetary Positions"
msgstr ""
#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_search
msgid "Budgets"
msgstr ""
#. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid "By keeping track of where your money goes, you may be less\n"
-" likely to overspend, and more likely to meet your financial\n"
-" goals. Forecast a budget by detailing the expected revenue per\n"
-" analytic account and monitor its evolution based on the actuals\n"
-" realised during that period."
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budgets Analysis"
msgstr ""
#. module: account_budget
@@ -127,6 +157,11 @@ msgid "Cancelled"
msgstr ""
#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid "Click to create a new budget."
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__company_id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__company_id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__company_id
@@ -134,6 +169,11 @@ msgid "Company"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget_lines__percentage
+msgid "Comparison between practical and theoretical amount. This measure tells you if you are below or over budget."
+msgstr ""
+
+#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Confirm"
msgstr ""
@@ -144,11 +184,6 @@ msgid "Confirmed"
msgstr ""
#. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid "Create a new budget"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__create_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__create_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__create_uid
@@ -163,6 +198,11 @@ msgid "Created on"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__display_name
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__display_name
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__display_name
@@ -193,6 +233,31 @@ msgid "End Date"
msgstr ""
#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
+msgid "Entries..."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_search
+msgid "Group By"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__id
@@ -200,6 +265,31 @@ msgid "ID"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__is_above_budget
+msgid "Is Above Budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post____last_update
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget____last_update
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines____last_update
@@ -221,11 +311,52 @@ msgid "Last Updated on"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post__name
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__name
msgid "Name"
msgstr ""
#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_search
+msgid "Not Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__paid_date
msgid "Paid Date"
msgstr ""
@@ -242,6 +373,12 @@ msgid "Planned Amount"
msgstr ""
#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_graph
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_pivot
+msgid "Planned amount"
+msgstr ""
+
+#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines__practical_amount
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
#: model:ir.ui.view,arch_db:account_budget.view_account_analytic_account_form_inherit_budget
@@ -249,12 +386,18 @@ msgid "Practical Amount"
msgstr ""
#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_graph
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_pivot
+msgid "Practical amount"
+msgstr ""
+
+#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Reset to Draft"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__creating_user_id
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__user_id
msgid "Responsible"
msgstr ""
@@ -270,7 +413,7 @@ msgid "Status"
msgstr ""
#. module: account_budget
-#: code:addons/account_budget/models/account_budget.py:31
+#: code:addons/account_budget/models/account_budget.py:29
#, python-format
msgid "The budget must have at least one account."
msgstr ""
@@ -287,6 +430,12 @@ msgid "Theoritical Amount"
msgstr ""
#. module: account_budget
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_graph
+#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_line_pivot
+msgid "Theoritical amount"
+msgstr ""
+
+#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_search
msgid "To Approve"
msgstr ""
@@ -297,7 +446,38 @@ msgid "To Approve Budgets"
msgstr ""
#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid "Use budgets to compare actual with expected revenues and costs"
+msgstr ""
+
+#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Validated"
msgstr ""
+#. module: account_budget
+#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model.fields,help:account_budget.field_crossovered_budget__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/models/account_budget.py:242
+#, python-format
+msgid "You have to enter at least a budgetary position or analytic account on a budget line."
+msgstr ""
+
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index e648d77bb44..bee4691ab12 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,29 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.payment_confirmation_status
-msgid "&amp;times;"
-msgstr ""
-
-#. module: account_payment
-#: code:addons/account_payment/models/payment.py:61
-#, python-format
-msgid "<%s> transaction (%s) invoice confirmation failed : <%s>"
-msgstr ""
-
-#. module: account_payment
-#: code:addons/account_payment/models/payment.py:45
-#, python-format
-msgid "<%s> transaction (%s) failed : <%s>"
-msgstr ""
-
-#. module: account_payment
-#: code:addons/account_payment/models/payment.py:52
-#, python-format
-msgid "<%s> transaction (%s) invalid state : %s"
-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 ""
@@ -59,6 +36,11 @@ msgid "<i class=\"fa fa-check-circle\"/> Pending"
msgstr ""
#. module: account_payment
+#: model:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
+msgid "<i class=\"fa fa-info\"/> You have credits card registered, you can log-in to be able to use them."
+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>"
msgstr ""
@@ -74,41 +56,19 @@ msgid "<strong>Transactions</strong>"
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/models/payment.py:80
-#, python-format
-msgid "Amount Mismatch (%s)"
-msgstr ""
-
-#. module: account_payment
-#: code:addons/account_payment/controllers/payment.py:52
+#: code:addons/account_payment/controllers/payment.py:47
#, python-format
msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
#. module: account_payment
-#: model:ir.model,name:account_payment.model_account_invoice
-#: model:ir.model.fields,field_description:account_payment.field_payment_transaction__account_invoice_id
-msgid "Invoice"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.model.fields,field_description:account_payment.field_account_invoice__payment_tx_id
-msgid "Last Transaction"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.model.fields,field_description:account_payment.field_account_invoice__payment_tx_count
-msgid "Number of payment transactions"
-msgstr ""
-
-#. module: account_payment
-#: code:addons/account_payment/controllers/payment.py:49
+#: code:addons/account_payment/controllers/payment.py:44
#, python-format
msgid "Pay & Confirm"
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/models/payment.py:131
+#: 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"
@@ -120,43 +80,16 @@ msgid "Pay with"
msgstr ""
#. module: account_payment
-#: model:ir.model.fields,field_description:account_payment.field_account_invoice__payment_acquirer_id
-msgid "Payment Acquirer"
-msgstr ""
-
-#. module: account_payment
#: model:ir.model,name:account_payment.model_payment_transaction
msgid "Payment Transaction"
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/models/account_invoice.py:28
-#, python-format
-msgid "Payment Transactions"
-msgstr ""
-
-#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
msgid "Status"
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/models/payment.py:81
-#, python-format
-msgid "The invoice was not confirmed despite response from the acquirer (%s): invoice amount is %r but acquirer replied with %r."
-msgstr ""
-
-#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
-msgid "There was an error processing your payment: impossible to validate invoice."
-msgstr ""
-
-#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
-msgid "There was an error processing your payment: invalid invoice state."
-msgstr ""
-
-#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
msgid "There was an error processing your payment: invalid invoice."
msgstr ""
@@ -168,32 +101,11 @@ msgstr ""
#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
-msgid "There was an error processing your payment: transaction amount issue.<br/>"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
msgid "There was an error processing your payment: transaction failed.<br/>"
msgstr ""
#. module: account_payment
#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
-msgid "There was an error processing your payment: transaction issue.<br/>"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.portal_invoice_error
msgid "There was en error processing your payment: invalid credit card ID."
msgstr ""
-#. module: account_payment
-#: model:ir.model.fields,field_description:account_payment.field_account_invoice__payment_tx_ids
-#: model:ir.ui.view,arch_db:account_payment.account_invoice_view_form_inherit_payment
-msgid "Transactions"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.ui.view,arch_db:account_payment.payment_confirmation_status
-msgid "Your payment has been authorized."
-msgstr ""
-
diff --git a/addons/account_tax_python/i18n/account_tax_python.pot b/addons/account_tax_python/i18n/account_tax_python.pot
index cab7b8993b9..225b5148f25 100644
--- a/addons/account_tax_python/i18n/account_tax_python.pot
+++ b/addons/account_tax_python/i18n/account_tax_python.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,6 +66,32 @@ msgid "Determine if the tax will be applied by setting the variable 'result' to
msgstr ""
#. module: account_tax_python
+#: selection:account.tax,amount_type:0
+#: selection:account.tax.template,amount_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account_tax_python
+#: selection:account.tax,amount_type:0
+#: selection:account.tax.template,amount_type:0
+msgid "Group of Taxes"
+msgstr ""
+
+#. module: account_tax_python
+#: selection:account.tax,amount_type:0
+#: selection:account.tax.template,amount_type:0
+msgid "Percentage of Price"
+msgstr ""
+
+#. module: account_tax_python
+#: selection:account.tax,amount_type:0
+#: selection:account.tax.template,amount_type:0
+msgid "Percentage of Price Tax Included"
+msgstr ""
+
+#. module: account_tax_python
+#: selection:account.tax,amount_type:0
+#: selection:account.tax.template,amount_type:0
#: model:ir.model.fields,field_description:account_tax_python.field_account_tax__python_compute
#: model:ir.model.fields,field_description:account_tax_python.field_account_tax_template__python_compute
msgid "Python Code"
@@ -77,6 +103,12 @@ msgid "Tax"
msgstr ""
#. module: account_tax_python
+#: model:ir.model.fields,field_description:account_tax_python.field_account_tax__amount_type
+#: model:ir.model.fields,field_description:account_tax_python.field_account_tax_template__amount_type
+msgid "Tax Computation"
+msgstr ""
+
+#. module: account_tax_python
#: model:ir.model,name:account_tax_python.model_account_tax_template
msgid "Templates for Taxes"
msgstr ""
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index ed563d361c0..58499060c29 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,6 +45,11 @@ msgid "Accounting Voucher"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line__price_subtotal
msgid "Amount"
msgstr ""
@@ -98,7 +103,7 @@ msgid "Cancelled"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:193
+#: code:addons/account_voucher/models/account_voucher.py:172
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
msgstr ""
@@ -187,6 +192,21 @@ msgid "Effective date for accounting entries"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher_line__sequence
msgid "Gives the sequence of this line when displaying the voucher."
msgstr ""
@@ -205,6 +225,21 @@ msgid "ID"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher__tax_correction
msgid "In case we have a rounding problem in the tax, use this field to correct it"
msgstr ""
@@ -216,6 +251,11 @@ msgid "Internal Notes"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__journal_id
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale
@@ -253,13 +293,23 @@ msgid "Last Updated on"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:101
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/models/account_voucher.py:109
#, python-format
msgid "Missing Company"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:103
+#: code:addons/account_voucher/models/account_voucher.py:111
#, python-format
msgid "Missing Currency"
msgstr ""
@@ -275,6 +325,31 @@ msgid "Number"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher_line__tax_ids
msgid "Only for tax excluded from price"
msgstr ""
@@ -306,23 +381,23 @@ msgid "Payment"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__payment_journal_id
-msgid "Payment Method"
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__name
+msgid "Payment Memo"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__name
-msgid "Payment Reference"
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__payment_journal_id
+msgid "Payment Method"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:230
+#: code:addons/account_voucher/models/account_voucher.py:208
#, python-format
msgid "Please activate the sequence of selected journal !"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:233
+#: code:addons/account_voucher/models/account_voucher.py:211
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
@@ -497,6 +572,16 @@ msgid "Unit Price"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form
#: model:ir.ui.view,arch_db:account_voucher.view_sale_receipt_form
msgid "Validate"
@@ -515,7 +600,7 @@ msgid "Vendor Voucher"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/models/account_voucher.py:108
+#: code:addons/account_voucher/models/account_voucher.py:116
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line__voucher_id
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale
@@ -552,6 +637,16 @@ msgid "Vouchers Entries"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
msgid "When the purchase receipt is confirmed, you can record the\n"
" vendor payment related to this purchase receipt."
@@ -564,8 +659,8 @@ 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:445
+#: code:addons/account_voucher/models/account_voucher.py:456
#, python-format
-msgid "You must first select a partner!"
+msgid "You must first select a partner."
msgstr ""
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index c7252d573f3..6e62c1c0357 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__active
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag__active
msgid "Active"
@@ -57,11 +62,13 @@ msgid "Analytic Account Groups"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_res_users__has_group_analytic_accounting
#: model:res.groups,name:analytic.group_analytic_accounting
msgid "Analytic Accounting"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_res_users__has_group_analytic_tags
#: model:res.groups,name:analytic.group_analytic_tags
msgid "Analytic Accounting Tags"
msgstr ""
@@ -132,6 +139,7 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__balance
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_list
msgid "Balance"
msgstr ""
@@ -210,6 +218,7 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__credit
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_list
msgid "Credit"
msgstr ""
@@ -231,6 +240,7 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__debit
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_list
msgid "Debit"
msgstr ""
@@ -250,6 +260,21 @@ msgid "Display Name"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__group_id
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line__group_id
msgid "Group"
@@ -271,6 +296,21 @@ msgid "ID"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,help:analytic.field_account_analytic_account__active
msgid "If the active field is set to False, it will allow you to hide the account without removing it."
msgstr ""
@@ -284,6 +324,11 @@ msgid "In Odoo, sales orders and projects are implemented using\n"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account____last_update
#: model:ir.model.fields,field_description:analytic.field_account_analytic_distribution____last_update
#: model:ir.model.fields,field_description:analytic.field_account_analytic_group____last_update
@@ -311,8 +356,13 @@ msgid "Last Updated on"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_left
-msgid "Left Parent"
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_ids
+msgid "Messages"
msgstr ""
#. module: analytic
@@ -333,11 +383,41 @@ msgid "No activity yet on this account"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_id
msgid "Parent"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_path
+msgid "Parent Path"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_distribution__tag_id
msgid "Parent tag"
msgstr ""
@@ -373,11 +453,6 @@ msgid "Revenues will be created automatically when you create customer\n"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_right
-msgid "Right Parent"
-msgstr ""
-
-#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
msgid "Search Analytic Lines"
msgstr ""
@@ -394,7 +469,7 @@ msgstr ""
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
-msgid "Tasks Month"
+msgid "Tasks Date"
msgstr ""
#. module: analytic
@@ -403,7 +478,7 @@ msgid "The percentage of an analytic distribution should be between 0 and 100."
msgstr ""
#. module: analytic
-#: code:addons/analytic/models/analytic_account.py:165
+#: code:addons/analytic/models/analytic_account.py:193
#, python-format
msgid "The selected account belongs to another company that the one you're trying to create an analytic item for"
msgstr ""
@@ -419,11 +494,26 @@ msgid "Total"
msgstr ""
#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line__user_id
msgid "User"
msgstr ""
#. module: analytic
+#: model:ir.model,name:analytic.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_distribution
msgid "account.analytic.distribution"
msgstr ""
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index 379775c2600..96996c4290c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,41 +46,8 @@ msgid "\n"
msgstr ""
#. module: auth_signup
-#: model:mail.template,body_html:auth_signup.set_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>\n"
-" You have been invited to connect to \"${object.company_id.name}\" in order to get access to your documents in Odoo.\n"
-" </p>\n"
-" <p>\n"
-" To accept the invitation, click on the following link:\n"
-" </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\">Accept invitation to \"${object.company_id.name}\"</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>"
-msgstr ""
-
-#. module: auth_signup
#: model:mail.template,subject:auth_signup.set_password_email
-msgid "${object.company_id.name} invitation to connect on Odoo"
+msgid "${object.create_uid.name} from ${object.company_id.name} invites you to connect to Odoo"
msgstr ""
#. module: auth_signup
@@ -120,16 +87,103 @@ msgid "<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repe
msgstr ""
#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
+#: model:ir.ui.view,arch_db:auth_signup.res_users_view_form
msgid "<strong>A password reset has been requested for this user. An email containing the following link has been sent:</strong>"
msgstr ""
#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
+#: model:ir.ui.view,arch_db:auth_signup.res_users_view_form
msgid "<strong>An invitation email containing the following subscription link has been sent:</strong>"
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"
+" <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"
+" </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: #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>\n"
+" </td>\n"
+" </tr>\n"
+"</table>"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.ui.view,arch_db:auth_signup.signup
msgid "Already have an account?"
msgstr ""
@@ -147,7 +201,7 @@ msgid "Another user is already registered using this email address."
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:135
+#: code:addons/auth_signup/controllers/main.py:137
#, python-format
msgid "Authentication Failed."
msgstr ""
@@ -158,7 +212,7 @@ msgid "Back to Login"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:137
+#: code:addons/auth_signup/models/res_users.py:168
#, python-format
msgid "Cannot send email: user %s has no email address."
msgstr ""
@@ -190,7 +244,7 @@ msgid "Could not create a new account."
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:82
+#: code:addons/auth_signup/controllers/main.py:84
#, python-format
msgid "Could not reset your password"
msgstr ""
@@ -217,11 +271,6 @@ msgid "Enable password reset from Login page"
msgstr ""
#. module: auth_signup
-#: model:ir.model,name:auth_signup.model_ir_model_fields
-msgid "Fields"
-msgstr ""
-
-#. module: auth_signup
#: selection:res.config.settings,auth_signup_uninvited:0
msgid "Free sign up (B2C)"
msgstr ""
@@ -232,12 +281,7 @@ msgid "HTTP routing"
msgstr ""
#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
-msgid "If unchecked, only invited users may sign up."
-msgstr ""
-
-#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:113
+#: code:addons/auth_signup/controllers/main.py:115
#, python-format
msgid "Invalid signup token"
msgstr ""
@@ -279,7 +323,7 @@ msgid "Password reset"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:123
+#: code:addons/auth_signup/controllers/main.py:125
#, python-format
msgid "Passwords do not match; please retype them."
msgstr ""
@@ -290,18 +334,18 @@ msgid "Reset Password"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:110
+#: code:addons/auth_signup/models/res_users.py:141
#, python-format
msgid "Reset password: invalid username or email"
msgstr ""
#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
+#: model:ir.ui.view,arch_db:auth_signup.res_users_view_form
msgid "Send Reset Password Instructions"
msgstr ""
#. module: auth_signup
-#: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
+#: model:ir.ui.view,arch_db:auth_signup.res_users_view_form
msgid "Send an Invitation Email"
msgstr ""
@@ -341,24 +385,42 @@ msgid "Signup URL"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_users.py:88
+#: code:addons/auth_signup/models/res_users.py:110
#, python-format
msgid "Signup is not allowed for uninvited users"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_partner.py:146
+#: code:addons/auth_signup/models/res_partner.py:147
#, python-format
msgid "Signup token '%s' is no longer valid"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/models/res_partner.py:142
+#: code:addons/auth_signup/models/res_partner.py:143
#, python-format
msgid "Signup token '%s' is not valid"
msgstr ""
#. module: auth_signup
+#: code:addons/auth_signup/models/res_users.py:117
+#, python-format
+msgid "Signup: invalid template user"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/models/res_users.py:120
+#, python-format
+msgid "Signup: no login given for new user"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/models/res_users.py:122
+#, python-format
+msgid "Signup: no name or partner given for new user"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.model.fields,field_description:auth_signup.field_res_users__state
msgid "Status"
msgstr ""
@@ -369,7 +431,7 @@ msgid "Template user for new users created through signup"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:121
+#: code:addons/auth_signup/controllers/main.py:123
#, python-format
msgid "The form was not properly filled in."
msgstr ""
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index e9f65ef7a00..86381437db0 100644
--- a/addons/barcodes/i18n/barcodes.pot
+++ b/addons/barcodes/i18n/barcodes.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:363
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:390
#, python-format
msgid "Discard"
msgstr ""
@@ -182,23 +182,33 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:305
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:326
#, python-format
-msgid "Error : Barcode command is undefined"
+msgid "Error: Barcode command is undefined"
msgstr ""
#. module: barcodes
#. openerp-web
#: code:addons/barcodes/static/src/js/barcode_form_view.js:63
#, python-format
-msgid "Error : Document not editable"
+msgid "Error: Document not editable"
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:336
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:362
#, python-format
-msgid "Error : No last scanned barcode"
+msgid "Error: No last scanned barcode"
+msgstr ""
+
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:95
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:110
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:126
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:139
+#, python-format
+msgid "Error: Pager not available"
msgstr ""
#. module: barcodes
@@ -284,7 +294,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:356
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:382
#, python-format
msgid "Select"
msgstr ""
@@ -296,7 +306,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:355
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:381
#, python-format
msgid "Set quantity"
msgstr ""
@@ -343,7 +353,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/barcode_form_view.js:337
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:363
#, python-format
msgid "To set the quantity please scan a barcode first."
msgstr ""
diff --git a/addons/base_automation/i18n/base_automation.pot b/addons/base_automation/i18n/base_automation.pot
index ddd9aeaa166..8b8bf6834b2 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,6 +72,7 @@ msgid "Assigned to admin user"
msgstr ""
#. module: base_automation
+#: selection:ir.actions.server,usage:0
#: model:ir.model,name:base_automation.model_base_automation
msgid "Automated Action"
msgstr ""
@@ -406,11 +407,21 @@ msgid "Responsible"
msgstr ""
#. module: base_automation
+#: selection:ir.actions.server,usage:0
+msgid "Scheduled Action"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__sequence
msgid "Sequence"
msgstr ""
#. module: base_automation
+#: selection:ir.actions.server,usage:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__action_server_id
msgid "Server Actions"
msgstr ""
@@ -436,6 +447,12 @@ msgid "Subject"
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"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__trigger
msgid "Trigger Condition"
msgstr ""
@@ -458,6 +475,7 @@ msgstr ""
#. module: base_automation
#: model:ir.model.fields,field_description:base_automation.field_base_automation__usage
+#: model:ir.model.fields,field_description:base_automation.field_ir_actions_server__usage
msgid "Usage"
msgstr ""
@@ -486,6 +504,12 @@ msgid "Value Mapping"
msgstr ""
#. module: base_automation
+#: code:addons/base_automation/models/base_automation.py:86
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_automation
#: model:ir.model.fields,help:base_automation.field_base_automation__trg_date_calendar_id
msgid "When calculating a day-based timed condition, it is possible to use a calendar to compute the date based on working days."
msgstr ""
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index ec0120daadd..c34a07f4626 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,32 +21,38 @@ msgid "Bank Accounts"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/models/res_partner_bank.py:57
+#: code:addons/base_iban/models/res_partner_bank.py:67
#, python-format
msgid "Cannot compute the BBAN because the account number is not an IBAN."
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/models/res_partner_bank.py:26
+#: code:addons/base_iban/models/res_partner_bank.py:54
#, python-format
-msgid "No IBAN !"
+msgid "IBAN"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/models/res_partner_bank.py:34
+#: code:addons/base_iban/models/res_partner_bank.py:39
#, python-format
msgid "The IBAN does not seem to be correct. You should have entered something like this %s\n"
"Where B = National bank code, S = Branch code, C = Account No, k = Check digit"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/models/res_partner_bank.py:30
+#: code:addons/base_iban/models/res_partner_bank.py:35
#, python-format
msgid "The IBAN is invalid, it should begin with the country code"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/models/res_partner_bank.py:40
+#: code:addons/base_iban/models/res_partner_bank.py:31
+#, python-format
+msgid "There is no IBAN code."
+msgstr ""
+
+#. module: base_iban
+#: code:addons/base_iban/models/res_partner_bank.py:45
#, python-format
msgid "This IBAN does not pass the validation check, please verify it."
msgstr ""
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index 1af00ca5d6e..a2273031a9b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,14 +24,14 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:543
+#: code:addons/base_import/static/src/js/import_action.js:542
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:317
+#: code:addons/base_import/static/src/js/import_action.js:316
#, python-format
msgid "A single column was found in the file, this often means the file separator is incorrect"
msgstr ""
@@ -44,13 +44,13 @@ msgid "Cancel"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:598
+#: code:addons/base_import/models/base_import.py:597
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:631
+#: code:addons/base_import/models/base_import.py:630
#, python-format
msgid "Column %s contains incorrect values. Error in line %d: %s"
msgstr ""
@@ -156,7 +156,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:362
+#: code:addons/base_import/static/src/js/import_action.js:361
#, python-format
msgid "Don't import"
msgstr ""
@@ -177,7 +177,7 @@ msgid "Encoding:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:633
+#: code:addons/base_import/models/base_import.py:632
#, python-format
msgid "Error Parsing Date [%s:L%d]: %s"
msgstr ""
@@ -190,7 +190,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:520
+#: code:addons/base_import/static/src/js/import_action.js:519
#, python-format
msgid "Everything seems valid."
msgstr ""
@@ -231,7 +231,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:567
+#: code:addons/base_import/static/src/js/import_action.js:566
#, python-format
msgid "Get all possible values"
msgstr ""
@@ -245,7 +245,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:554
+#: code:addons/base_import/static/src/js/import_action.js:553
#, python-format
msgid "Here are the possible values:"
msgstr ""
@@ -296,7 +296,7 @@ msgstr ""
#. openerp-web
#: code:addons/base_import/static/src/xml/base_import.xml:74
#, 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."
+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
@@ -408,7 +408,7 @@ 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:426
#, python-format
msgid "Normal Fields"
msgstr ""
@@ -432,7 +432,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:428
+#: code:addons/base_import/static/src/js/import_action.js:427
#, python-format
msgid "Relation Fields"
msgstr ""
@@ -556,14 +556,14 @@ msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:535
+#: code:addons/base_import/models/base_import.py:534
#, 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:537
+#: code:addons/base_import/static/src/js/import_action.js:536
#, python-format
msgid "at row %d"
msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import_action.js:539
+#: code:addons/base_import/static/src/js/import_action.js:538
#, python-format
msgid "between rows %d and %d"
msgstr ""
diff --git a/addons/base_import_module/i18n/base_import_module.pot b/addons/base_import_module/i18n/base_import_module.pot
index dc517ee8690..ec5eef6f0f5 100644
--- a/addons/base_import_module/i18n/base_import_module.pot
+++ b/addons/base_import_module/i18n/base_import_module.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,18 +47,12 @@ msgid "Display Name"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:114
+#: code:addons/base_import_module/models/ir_module.py:123
#, python-format
msgid "File '%s' exceed maximum allowed file size"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:106
-#, python-format
-msgid "File is not a zip file!"
-msgstr ""
-
-#. module: base_import_module
#: model:ir.model.fields,field_description:base_import_module.field_base_import_module__force
msgid "Force init"
msgstr ""
@@ -127,7 +121,7 @@ msgid "Module .ZIP file"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:104
+#: code:addons/base_import_module/models/ir_module.py:113
#, python-format
msgid "No file sent."
msgstr ""
@@ -139,6 +133,12 @@ msgid "Only administrators can upload a module"
msgstr ""
#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:115
+#, python-format
+msgid "Only zip files are supported."
+msgstr ""
+
+#. module: base_import_module
#: model:ir.ui.view,arch_db:base_import_module.view_base_module_import
msgid "Open Modules"
msgstr ""
@@ -154,14 +154,19 @@ msgid "Status"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:41
-#: code:addons/base_import_module/models/ir_module.py:48
+#: code:addons/base_import_module/models/ir_module.py:50
#, python-format
msgid "Studio customizations require Studio"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:43
+#: code:addons/base_import_module/models/ir_module.py:57
+#, python-format
+msgid "Studio customizations require the Odoo Studio app."
+msgstr ""
+
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:52
#, python-format
msgid "Unmet module dependencies: %s"
msgstr ""
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index a4416b65fbb..2c6d8394820 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@ msgid "Access Rights"
msgstr ""
#. module: base_setup
+#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
+msgid "Add fun feedback and motivate your employees"
+msgstr ""
+
+#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_google_calendar
msgid "Allow the users to synchronize their calendar with Google Calendar"
msgstr ""
@@ -53,11 +58,6 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Automate inter-company transactions"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
msgid "Business Documents"
msgstr ""
@@ -72,7 +72,7 @@ msgid "Change Document Template"
msgstr ""
#. module: base_setup
-#: code:addons/base_setup/models/res_config_settings.py:97
+#: code:addons/base_setup/models/res_config_settings.py:98
#, python-format
msgid "Choose Your Document Layout"
msgstr ""
@@ -181,6 +181,11 @@ msgid "Google Spreadsheet"
msgstr ""
#. module: base_setup
+#: model:ir.model,name:base_setup.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
msgid "Import & Export"
msgstr ""
@@ -192,7 +197,7 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
-msgid "Inter-Company Transactions"
+msgid "Inter Company Flows"
msgstr ""
#. module: base_setup
@@ -269,6 +274,11 @@ msgid "Share your partners to all companies defined in your instance.\n"
msgstr ""
#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_res_config_settings__show_effect
+msgid "Show Effect"
+msgstr ""
+
+#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
msgid "Synchronize your calendar with Google Calendar"
msgstr ""
@@ -318,3 +328,8 @@ 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/base_sparse_field/i18n/base_sparse_field.pot b/addons/base_sparse_field/i18n/base_sparse_field.pot
index 59c9c9e54d3..f04ccd9c554 100644
--- a/addons/base_sparse_field/i18n/base_sparse_field.pot
+++ b/addons/base_sparse_field/i18n/base_sparse_field.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Boolean"
msgstr ""
#. module: base_sparse_field
-#: code:addons/base_sparse_field/models/models.py:24
+#: code:addons/base_sparse_field/models/models.py:25
#, python-format
msgid "Changing the storing system for field \"%s\" is not allowed."
msgstr ""
@@ -52,6 +52,11 @@ msgid "Display Name"
msgstr ""
#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_ir_model_fields__ttype
+msgid "Field Type"
+msgstr ""
+
+#. module: base_sparse_field
#: model:ir.model,name:base_sparse_field.model_ir_model_fields
msgid "Fields"
msgstr ""
@@ -102,7 +107,7 @@ msgid "Partner"
msgstr ""
#. module: base_sparse_field
-#: code:addons/base_sparse_field/models/models.py:26
+#: code:addons/base_sparse_field/models/models.py:27
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
@@ -118,7 +123,7 @@ msgid "Serialization Field"
msgstr ""
#. module: base_sparse_field
-#: code:addons/base_sparse_field/models/models.py:38
+#: code:addons/base_sparse_field/models/models.py:39
#, python-format
msgid "Serialization field `%s` not found for sparse field `%s`!"
msgstr ""
@@ -129,7 +134,87 @@ msgid "Two"
msgstr ""
#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "binary"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "boolean"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "char"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "date"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "datetime"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "float"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "html"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "integer"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "many2many"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "many2one"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "monetary"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "one2many"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "reference"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "selection"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "serialized"
+msgstr ""
+
+#. module: base_sparse_field
#: model:ir.model,name:base_sparse_field.model_sparse_fields_test
msgid "sparse_fields.test"
msgstr ""
+#. module: base_sparse_field
+#: selection:ir.model.fields,ttype:0
+msgid "text"
+msgstr ""
+
diff --git a/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot b/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
index 2e3bc22904c..d677aba70b9 100644
--- a/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
+++ b/addons/base_vat_autocomplete/i18n/base_vat_autocomplete.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_vat_autocomplete
+#: model:ir.model,name:base_vat_autocomplete.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_vat_autocomplete
#: model:ir.model,name:base_vat_autocomplete.model_res_partner
msgid "Contact"
msgstr ""
#. module: base_vat_autocomplete
+#: model:ir.ui.view,arch_db:base_vat_autocomplete.res_company_view_form
#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_form
#: model:ir.ui.view,arch_db:base_vat_autocomplete.view_partner_short_form
msgid "VAT"
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 34f9dc202a9..08eaaf25a88 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:55+0000\n"
+"PO-Revision-Date: 2018-08-02 09:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/favorite_menu.js:98
+#: code:addons/board/static/src/js/favorite_menu.js:103
#, python-format
msgid "'%s' added to dashboard"
msgstr ""
@@ -53,13 +53,16 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:337
+#: code:addons/board/static/src/js/board_view.js:362
#, python-format
msgid "Are you sure you want to remove this item?"
msgstr ""
#. module: board
+#. openerp-web
+#: code:addons/board/static/src/js/board_view.js:439
#: model:ir.model,name:board.model_board_board
+#, python-format
msgid "Board"
msgstr ""
@@ -86,7 +89,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/favorite_menu.js:100
+#: code:addons/board/static/src/js/favorite_menu.js:107
#, python-format
msgid "Could not add filter to dashboard"
msgstr ""
@@ -98,7 +101,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:85
+#: code:addons/board/static/src/js/board_view.js:80
#, python-format
msgid "Edit Layout"
msgstr ""
@@ -115,7 +118,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:48
+#: 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
#: model:ir.ui.view,arch_db:board.board_my_dash_view
@@ -125,6 +128,13 @@ msgstr ""
#. module: board
#. openerp-web
+#: code:addons/board/static/src/js/favorite_menu.js:104
+#, python-format
+msgid "Please refresh your browser for the changes to take effect."
+msgstr ""
+
+#. module: board
+#. openerp-web
#: code:addons/board/static/src/xml/board.xml:51
#, python-format
msgid "To add your first report into this dashboard, go to any\n"
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index ab1483026ae..75c77ccd38e 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-06 08:01+0000\n"
-"PO-Revision-Date: 2018-06-06 08:01+0000\n"
+"POT-Creation-Date: 2018-08-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -288,26 +288,26 @@ msgid "${object.event_id.name}: Date updated"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:720
+#: code:addons/calendar/models/calendar.py:741
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:711
+#: code:addons/calendar/models/calendar.py:732
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:225
+#: code:addons/calendar/models/calendar.py:227
#, python-format
msgid "%s has accepted invitation"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:233
+#: code:addons/calendar/models/calendar.py:235
#, python-format
msgid "%s has declined invitation"
msgstr ""
@@ -365,6 +365,11 @@ msgid "Accepted"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_contacts__active
#: model:ir.model.fields,field_description:calendar.field_calendar_event__active
msgid "Active"
@@ -386,12 +391,15 @@ msgid "Activity Type"
msgstr ""
#. module: calendar
+#. openerp-web
+#: code:addons/calendar/static/src/xml/base_calendar.xml:36
#: model:ir.model.fields,field_description:calendar.field_calendar_event__allday
+#, python-format
msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:707
+#: code:addons/calendar/models/calendar.py:728
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -430,7 +438,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1606
+#: code:addons/calendar/models/calendar.py:1673
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -474,6 +482,16 @@ msgid "Calendar: Event Reminder"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,help:calendar.field_mail_activity_type__category
+msgid "Categories may trigger specific behavior like opening calendar view"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_mail_activity_type__category
+msgid "Category"
+msgstr ""
+
+#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Click here to update only this instance and not all recurrences."
msgstr ""
@@ -644,18 +662,6 @@ msgid "Ending at"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:915
-#, python-format
-msgid "Ending date cannot be set before starting date."
-msgstr ""
-
-#. module: calendar
-#: code:addons/calendar/models/calendar.py:913
-#, python-format
-msgid "Ending datetime cannot be set before starting datetime."
-msgstr ""
-
-#. module: calendar
#: model:ir.model,name:calendar.model_calendar_event
msgid "Event"
msgstr ""
@@ -671,7 +677,7 @@ msgid "Event alarm"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1164
+#: code:addons/calendar/models/calendar.py:1225
#, python-format
msgid "Event recurrence interval cannot be negative."
msgstr ""
@@ -698,12 +704,27 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:955
+#: code:addons/calendar/models/calendar.py:990
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: calendar
#: selection:calendar.event,byday:0
msgid "Fourth"
msgstr ""
@@ -735,7 +756,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1549
+#: code:addons/calendar/models/calendar.py:1616
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -761,6 +782,21 @@ msgid "ID"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,help:calendar.field_calendar_event__active
msgid "If the active field is set to false, it will allow you to hide the event alarm information without removing it."
msgstr ""
@@ -796,6 +832,11 @@ msgid "Invite wizard"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__is_highlighted
msgid "Is the Event Highlighted"
msgstr ""
@@ -862,12 +903,13 @@ msgstr ""
#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
+#: selection:mail.activity.type,category:0
msgid "Meeting"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:933
-#: code:addons/calendar/models/calendar.py:937
+#: code:addons/calendar/models/calendar.py:936
+#: code:addons/calendar/models/calendar.py:941
#, python-format
msgid "Meeting '%s' starts '%s' and ends '%s'"
msgstr ""
@@ -915,6 +957,16 @@ msgid "Message"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: calendar
#: selection:calendar.alarm,interval:0
msgid "Minute(s)"
msgstr ""
@@ -972,11 +1024,36 @@ msgid "Notification"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: calendar
#: selection:calendar.event,end_type:0
msgid "Number of repetitions"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/xml/base_calendar.xml:17
#, python-format
@@ -994,6 +1071,11 @@ msgid "Only me"
msgstr ""
#. module: calendar
+#: model:ir.ui.view,arch_db:calendar.mail_activity_view_form_popup
+msgid "Open Calendar"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__month_by
msgid "Option"
msgstr ""
@@ -1004,6 +1086,11 @@ msgid "Options"
msgstr ""
#. module: calendar
+#: selection:mail.activity.type,category:0
+msgid "Other"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__user_id
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Owner"
@@ -1020,7 +1107,7 @@ msgid "Partner-related data of the user"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1177
+#: code:addons/calendar/models/calendar.py:1238
#, python-format
msgid "Please select a proper day of the month."
msgstr ""
@@ -1072,6 +1159,11 @@ msgid "Remind Before"
msgstr ""
#. module: calendar
+#: selection:mail.activity.type,category:0
+msgid "Reminder"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__alarm_ids
msgid "Reminders"
msgstr ""
@@ -1123,11 +1215,6 @@ msgid "Saturday"
msgstr ""
#. module: calendar
-#: model:ir.ui.view,arch_db:calendar.mail_activity_view_form_popup
-msgid "Schedule a meeting"
-msgstr ""
-
-#. module: calendar
#: model:ir.actions.act_window,help:calendar.action_calendar_event
msgid "Schedule a new meeting"
msgstr ""
@@ -1257,6 +1344,18 @@ msgid "The calendar is shared between employees and fully integrated with\n"
msgstr ""
#. module: calendar
+#: code:addons/calendar/models/calendar.py:935
+#, 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
+#, python-format
+msgid "The ending date cannot be earlier than the starting date."
+msgstr ""
+
+#. module: calendar
#: selection:calendar.event,byday:0
msgid "Third"
msgstr ""
@@ -1277,6 +1376,12 @@ msgid "Thursday"
msgstr ""
#. module: calendar
+#: code:addons/calendar/models/res_users.py:41
+#, python-format
+msgid "Today's Meetings"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__tu
msgid "Tue"
msgstr ""
@@ -1309,11 +1414,17 @@ msgid "Unit"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_unread
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
msgid "Unread Messages"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Until"
msgstr ""
@@ -1324,6 +1435,11 @@ msgid "Update only this instance"
msgstr ""
#. module: calendar
+#: model:ir.model,name:calendar.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event__we
msgid "Wed"
msgstr ""
@@ -1354,7 +1470,7 @@ msgid "Yes I'm going."
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:155
+#: code:addons/calendar/models/calendar.py:157
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
@@ -1375,7 +1491,7 @@ msgid "e.g. Business Lunch"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1162
+#: code:addons/calendar/models/calendar.py:1223
#, python-format
msgid "interval cannot be negative."
msgstr ""
diff --git a/addons/calendar_sms/i18n/calendar_sms.pot b/addons/calendar_sms/i18n/calendar_sms.pot
index 514402ae94b..ff922049520 100644
--- a/addons/calendar_sms/i18n/calendar_sms.pot
+++ b/addons/calendar_sms/i18n/calendar_sms.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: calendar_sms
+#: selection:calendar.alarm,type:0
+msgid "Email"
+msgstr ""
+
+#. module: calendar_sms
#: model:ir.model,name:calendar_sms.model_calendar_event
msgid "Event"
msgstr ""
@@ -32,6 +37,16 @@ msgid "Event reminder: %s on %s."
msgstr ""
#. module: calendar_sms
+#: selection:calendar.alarm,type:0
+msgid "Notification"
+msgstr ""
+
+#. module: calendar_sms
+#: selection:calendar.alarm,type:0
+msgid "SMS Text Message"
+msgstr ""
+
+#. module: calendar_sms
#: code:addons/calendar_sms/models/calendar.py:24
#, python-format
msgid "SMS text message reminder sent !"
@@ -43,6 +58,11 @@ msgid "Send SMS to attendees"
msgstr ""
#. module: calendar_sms
+#: model:ir.model.fields,field_description:calendar_sms.field_calendar_alarm__type
+msgid "Type"
+msgstr ""
+
+#. module: calendar_sms
#: model:ir.model,name:calendar_sms.model_calendar_alarm_manager
msgid "calendar.alarm_manager"
msgstr ""
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 73d4cb17aef..232c5950c7c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -131,15 +131,10 @@ msgid "# Meetings"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__nbr_activities
-msgid "# of Activities"
-msgstr ""
-
-#. module: crm
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:22
#, python-format
-msgid "<b>Choose a name</b> for your opportunity."
+msgid "<b>Choose a name</b> for your opportunity, example: <i>'Need a new website'</i>"
msgstr ""
#. module: crm
@@ -176,7 +171,7 @@ msgstr ""
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:46
#, python-format
-msgid "<p>You will be able to customize your followup activities. Examples:</p><ol><li>introductory email</li><li>call 10 days after</li><li>second call 3 days after, ...</li></ol><p class='mb0'><i>Select a standard activity for now on.</i></p>"
+msgid "<p>You will be able to customize your followup activities. Examples:</p><ol><li>introductory email</li><li>call 10 days after</li><li>second call 3 days after, ...</li></ol><p class='mb0'><i>Select a standard activity for now.</i></p>"
msgstr ""
#. module: crm
@@ -201,14 +196,19 @@ msgid "Accept Emails From"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__active
#: model:ir.model.fields,field_description:crm.field_crm_lead__active
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason__active
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__active
msgid "Active"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_ids
#: model:ir.ui.menu,name:crm.crm_activity_report_menu
msgid "Activities"
msgstr ""
@@ -234,6 +234,11 @@ msgid "Activities Todo"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__mail_activity_type_id
msgid "Activity Type"
msgstr ""
@@ -244,7 +249,7 @@ msgid "Activity Types"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:913
+#: code:addons/crm/models/crm_lead.py:925
#, python-format
msgid "Add a new lead"
msgstr ""
@@ -323,11 +328,6 @@ msgid "Assign this opportunity to"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__opening_date
-msgid "Assignation Date"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_open
msgid "Assigned"
msgstr ""
@@ -338,7 +338,7 @@ msgid "Avg. of Probability"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:392
+#: code:addons/crm/models/crm_lead.py:402
#, python-format
msgid "Boom! Team record for the past 30 days."
msgstr ""
@@ -360,12 +360,7 @@ msgid "CRM Activity Analysis"
msgstr ""
#. module: crm
-#: model:ir.model,name:crm.model_crm_opportunity_report
-msgid "CRM Opportunity Analysis"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__campaign_id
+#: model:ir.model.fields,field_description:crm.field_crm_lead__campaign_id
#: 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 "Campaign"
@@ -411,7 +406,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__city
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__city
#: 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
@@ -445,11 +439,6 @@ msgid "Click on the opportunity to zoom in."
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__date_closed
-msgid "Close Date"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_closed
msgid "Closed Date"
msgstr ""
@@ -469,7 +458,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__company_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__company_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__company_id
#: 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.view_crm_case_opportunities_filter
@@ -499,11 +487,6 @@ msgid "Contact"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
-msgid "Contact Information"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__contact_name
msgid "Contact Name"
msgstr ""
@@ -514,6 +497,11 @@ msgid "Contacts"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_team__dashboard_graph_model
+msgid "Content"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner__name
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__name
msgid "Conversion Action"
@@ -521,7 +509,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_conversion
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__date_conversion
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
msgid "Conversion Date"
msgstr ""
@@ -554,7 +541,7 @@ msgid "Convert to opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1096
+#: code:addons/crm/models/crm_lead.py:1108
#: selection:crm.lead2opportunity.partner,name:0
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
@@ -570,7 +557,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__country_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__country_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__country_id
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -600,7 +586,6 @@ msgid "Create Opportunity"
msgstr ""
#. module: crm
-#: selection:crm.lead.convert2task,action:0
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.partner.binding,action:0
msgid "Create a new customer"
@@ -613,12 +598,6 @@ msgid "Create a new lead"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:915
-#, python-format
-msgid "Create a new opportunity to add it to your pipeline"
-msgstr ""
-
-#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_tag_action
msgid "Create a new tag for your opportunities"
msgstr ""
@@ -635,6 +614,12 @@ msgid "Create an new opportunity related to this customer"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_lead.py:927
+#, python-format
+msgid "Create an opportunity in your pipeline"
+msgstr ""
+
+#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_tag_action
msgid "Create tags that fit your business (product structure, sales type, etc.) to better manage and tack your opportunities."
msgstr ""
@@ -671,15 +656,10 @@ msgid "Created on"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__create_date
-msgid "Creation Date"
-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
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Creation Month"
+msgid "Creation Date"
msgstr ""
#. module: crm
@@ -698,12 +678,10 @@ msgid "Current"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1140
+#: code:addons/crm/models/crm_lead.py:1156
#: 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
-#: model:ir.model.fields,field_description:crm.field_crm_lead_convert2task__partner_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__partner_id
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding__partner_id
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -720,7 +698,7 @@ msgid "Customer Autocomplete"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1142
+#: code:addons/crm/models/crm_lead.py:1158
#, python-format
msgid "Customer Email"
msgstr ""
@@ -738,25 +716,18 @@ msgid "Customers"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:121
-#, python-format
-msgid "Dashboard graph content cannot be Pipeline if the sales channel doesn't use it. (Pipeline is unchecked.)"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__date
+#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
msgid "Date"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__day_open
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__delay_open
msgid "Days to Assign"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__day_close
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__delay_close
msgid "Days to Close"
msgstr ""
@@ -799,14 +770,12 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_tag__display_name
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason__display_name
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity__display_name
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__display_name
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding__display_name
#: model:ir.model.fields,field_description:crm.field_crm_stage__display_name
msgid "Display Name"
msgstr ""
#. module: crm
-#: selection:crm.lead.convert2task,action:0
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2opportunity.partner.mass,action:0
#: selection:crm.partner.binding,action:0
@@ -862,7 +831,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_deadline
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__date_deadline
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
msgid "Expected Closing"
msgstr ""
@@ -908,11 +876,6 @@ msgid "Expected to Close"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-msgid "Expiration Closing Month"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_crm_stage__legend_priority
msgid "Explanation text to help users using the star and priority mechanism on stages or issues that are in this stage."
msgstr ""
@@ -933,6 +896,26 @@ msgid "Folded in Pipeline"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+msgid "Followup"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__force_assignation
msgid "Force assignation"
msgstr ""
@@ -943,7 +926,7 @@ msgid "Format phone numbers based on national conventions"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:588
+#: code:addons/crm/models/crm_lead.py:600
#, python-format
msgid "From %s : %s"
msgstr ""
@@ -985,7 +968,7 @@ msgid "Global CC"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:390
+#: code:addons/crm/models/crm_lead.py:400
#, python-format
msgid "Go, go, go! Congrats for your first deal."
msgstr ""
@@ -994,7 +977,7 @@ msgstr ""
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:80
#, python-format
-msgid "Good job! Your completed the tour of the CRM."
+msgid "Good job! You completed the tour of the CRM app."
msgstr ""
#. module: crm
@@ -1023,7 +1006,6 @@ msgstr ""
#. module: crm
#: selection:crm.lead,priority:0
-#: selection:crm.opportunity.report,priority:0
msgid "High"
msgstr ""
@@ -1041,7 +1023,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_tag__id
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason__id
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity__id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__id
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding__id
#: model:ir.model.fields,field_description:crm.field_crm_stage__id
msgid "ID"
@@ -1053,11 +1034,31 @@ msgid "ID of the parent record holding the alias (example: project holding the t
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__message_has_error
+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."
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"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,help:crm.field_crm_lead2opportunity_partner_mass__force_assignation
msgid "If unchecked, this will leave the salesman of duplicated opportunities"
msgstr ""
@@ -1073,12 +1074,27 @@ msgid "Include archived"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+msgid "Initial Contact Information"
+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 "Internal Notes"
msgstr ""
#. module: crm
+#: selection:crm.team,dashboard_graph_model:0
+msgid "Invoices"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__function
msgid "Job Position"
msgstr ""
@@ -1102,7 +1118,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_tag____last_update
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason____last_update
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity____last_update
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report____last_update
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding____last_update
#: model:ir.model.fields,field_description:crm.field_crm_stage____last_update
msgid "Last Modified on"
@@ -1116,7 +1131,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__date_last_stage_update
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__date_last_stage_update
msgid "Last Stage Update"
msgstr ""
@@ -1152,10 +1166,9 @@ msgid "Late Activities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:893
+#: code:addons/crm/models/crm_lead.py:905
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
-#: selection:crm.opportunity.report,type:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__lead_id
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_leads
@@ -1260,7 +1273,6 @@ msgid "Let's schedule an activity."
msgstr ""
#. module: crm
-#: selection:crm.lead.convert2task,action:0
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.partner.binding,action:0
msgid "Link to an existing customer"
@@ -1277,7 +1289,7 @@ msgid "Look up company information (name, logo, etc.)"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1102
+#: code:addons/crm/models/crm_lead.py:1114
#: 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_opportunities_filter
@@ -1289,7 +1301,6 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_lead_lost_action
#: model:ir.model.fields,field_description:crm.field_crm_lead__lost_reason
#: model:ir.model.fields,field_description:crm.field_crm_lead_lost__lost_reason_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__lost_reason
#: 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_opportunities_filter
@@ -1304,7 +1315,6 @@ msgstr ""
#. module: crm
#: selection:crm.lead,priority:0
-#: selection:crm.opportunity.report,priority:0
msgid "Low"
msgstr ""
@@ -1354,14 +1364,15 @@ msgid "Mass Lead To Opportunity Partner"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__medium_id
+#: selection:crm.lead,priority:0
+#: model:ir.model.fields,field_description:crm.field_crm_lead__medium_id
#: 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 "Medium"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:938
+#: code:addons/crm/models/crm_lead.py:950
#, python-format
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
msgstr ""
@@ -1408,30 +1419,40 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:539
+#: code:addons/crm/models/crm_lead.py:550
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:570
+#: code:addons/crm/models/crm_lead.py:582
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:570
+#: code:addons/crm/models/crm_lead.py:582
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:539
+#: code:addons/crm/models/crm_lead.py:550
#, python-format
msgid "Merged opportunity"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Misc"
msgstr ""
@@ -1443,11 +1464,6 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
-msgid "Month"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
msgid "My Activities"
msgstr ""
@@ -1490,6 +1506,21 @@ msgid "Next Activities"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: crm
#: selection:crm.lead,kanban_state:0
msgid "Next activity is planned"
msgstr ""
@@ -1500,7 +1531,7 @@ msgid "Next activity late"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1162
+#: code:addons/crm/models/crm_lead.py:1178
#, python-format
msgid "No Subject"
msgstr ""
@@ -1522,12 +1553,6 @@ msgid "No salesperson"
msgstr ""
#. module: crm
-#: selection:crm.lead,priority:0
-#: selection:crm.opportunity.report,priority:0
-msgid "Normal"
-msgstr ""
-
-#. module: crm
#: model:crm.lost.reason,name:crm.lost_reason_3
msgid "Not enough stock"
msgstr ""
@@ -1538,13 +1563,23 @@ msgid "Notes"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report__delay_close
-msgid "Number of Days to close the case"
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_has_error_counter
+msgid "Number of error"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report__delay_open
-msgid "Number of Days to open the case"
+#: model:ir.model.fields,help:crm.field_crm_lead__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__message_has_error_counter
+msgid "Number of messages with delivery error"
msgstr ""
#. module: crm
@@ -1553,6 +1588,11 @@ msgid "Number of open opportunities"
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
msgid "Odoo helps you keep track of your sales pipeline to follow\n"
" up potential sales and better forecast your future revenues."
@@ -1579,8 +1619,6 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_config_opportunity
#: 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_graph_view_leads
-#: model:ir.ui.view,arch_db:crm.crm_case_pivot_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
@@ -1619,11 +1657,10 @@ msgid "Opportunities with a date of Expected Closing which is in the past"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:438
-#: code:addons/crm/models/crm_lead.py:868
+#: code:addons/crm/models/crm_lead.py:448
+#: code:addons/crm/models/crm_lead.py:880
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
-#: selection:crm.opportunity.report,type:0
#: model:ir.model.fields,field_description:crm.field_calendar_event__opportunity_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__name
#: model:ir.model.fields,field_description:crm.field_res_partner__opportunity_count
@@ -1689,13 +1726,13 @@ msgid "Optional ID of a thread (record) to which all incoming messages will be a
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Overdue Opportunities"
+#: selection:crm.lead,activity_state:0
+msgid "Overdue"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__delay_expected
-msgid "Overpassed Deadline"
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+msgid "Overdue Opportunities"
msgstr ""
#. module: crm
@@ -1734,12 +1771,18 @@ msgid "Partner Contact Name"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__partner_address_phone
+msgid "Partner Contact Phone"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__partner_id
msgid "Partner/Customer"
msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__phone
+#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Phone"
msgstr ""
@@ -1750,6 +1793,7 @@ msgstr ""
#. module: crm
#: code:addons/crm/models/crm_team.py:165
+#: 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
#: model:ir.ui.menu,name:crm.crm_menu_pipeline
@@ -1794,7 +1838,12 @@ msgid "Pipeline: Expected Revenue"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:642
+#: selection:crm.lead,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:654
#, python-format
msgid "Please select more than one element (lead or opportunity) from the list view."
msgstr ""
@@ -1810,7 +1859,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__priority
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__priority
msgid "Priority"
msgstr ""
@@ -1822,7 +1870,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__probability
#: model:ir.model.fields,field_description:crm.field_crm_lead__probability
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__probability
msgid "Probability"
msgstr ""
@@ -1832,13 +1879,13 @@ msgid "Probability (%)"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__expected_revenue
-msgid "Probable Turnover"
+#: model:crm.stage,name:crm.stage_lead3
+msgid "Proposition"
msgstr ""
#. module: crm
-#: model:crm.stage,name:crm.stage_lead3
-msgid "Proposition"
+#: model:ir.model.fields,field_description:crm.field_crm_lead__expected_revenue
+msgid "Prorated Revenue"
msgstr ""
#. module: crm
@@ -1850,7 +1897,7 @@ msgstr ""
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:13
#, python-format
-msgid "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under <b>CRM</b> app."
+msgid "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under the <b>CRM</b> app."
msgstr ""
#. module: crm
@@ -1871,7 +1918,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner__action
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__action
-#: model:ir.model.fields,field_description:crm.field_crm_lead_convert2task__action
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding__action
msgid "Related Customer"
msgstr ""
@@ -1893,19 +1939,29 @@ msgid "Requirements"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
msgid "Restore"
msgstr ""
#. module: crm
+#: selection:crm.team,dashboard_graph_model:0
+msgid "Sales"
+msgstr ""
+
+#. module: crm
#: model:ir.model,name:crm.model_crm_team
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner__team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__team_id
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity__team_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__team_id
#: model:ir.model.fields,field_description:crm.field_crm_stage__team_id
+#: model:ir.model.fields,field_description:crm.field_res_partner__team_id
#: 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.view_crm_case_leads_filter
@@ -1935,7 +1991,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__user_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__user_id
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity__user_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__user_id
#: 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
@@ -1985,6 +2040,7 @@ msgid "Settings"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_res_users__has_group_use_lead
#: model:res.groups,name:crm.group_use_lead
msgid "Show Lead Menu"
msgstr ""
@@ -2017,7 +2073,7 @@ msgid "Some examples of lost reasons: \"We don't have people/skill\", \"Price to
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__source_id
+#: model:ir.model.fields,field_description:crm.field_crm_lead__source_id
#: 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 "Source"
@@ -2032,7 +2088,6 @@ msgstr ""
#: selection:crm.team,dashboard_graph_group_pipeline:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_report__stage_id
#: model:ir.model.fields,field_description:crm.field_crm_lead__stage_id
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__stage_id
#: 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
@@ -2046,7 +2101,6 @@ msgid "Stage Changed"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__stage_name
#: model:ir.model.fields,field_description:crm.field_crm_stage__name
msgid "Stage Name"
msgstr ""
@@ -2087,6 +2141,14 @@ msgid "State"
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__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: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__street
msgid "Street"
msgstr ""
@@ -2147,6 +2209,12 @@ msgid "The email address associated with this channel. New emails received will
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_team__dashboard_graph_model
+msgid "The graph this channel will display in the Dashboard.\n"
+""
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,help:crm.field_crm_team__alias_model_id
msgid "The model (Odoo Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)"
msgstr ""
@@ -2193,6 +2261,21 @@ msgid "This bar allows to filter the opportunities based on scheduled activities
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__campaign_id
+msgid "This is a name that helps you keep track of your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__medium_id
+msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__source_id
+msgid "This is the source of the link, e.g. Search Engine, another domain, or name of email list"
+msgstr ""
+
+#. module: crm
#. openerp-web
#: code:addons/crm/static/src/js/tour.js:36
#, python-format
@@ -2215,7 +2298,7 @@ msgid "This stage is folded in the kanban view when there are no records in that
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1068
+#: code:addons/crm/models/crm_lead.py:1080
#, python-format
msgid "This target does not exist."
msgstr ""
@@ -2233,13 +2316,8 @@ msgid "To Close This Month"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "To Close This Week"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "To Close Today"
+#: selection:crm.lead,activity_state:0
+msgid "Today"
msgstr ""
#. module: crm
@@ -2254,11 +2332,6 @@ msgid "Too expensive"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__total_revenue
-msgid "Total Revenue"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
msgid "Tracking"
msgstr ""
@@ -2266,14 +2339,12 @@ 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
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report__type
msgid "Type"
msgstr ""
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_activity_report__lead_type
#: model:ir.model.fields,help:crm.field_crm_lead__type
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report__type
msgid "Type is used to separate Leads and Opportunities"
msgstr ""
@@ -2301,6 +2372,7 @@ msgid "Undefined"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_unread
#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -2309,6 +2381,11 @@ msgid "Unread Messages"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead__write_date
msgid "Update Date"
msgstr ""
@@ -2381,7 +2458,6 @@ msgstr ""
#. module: crm
#: selection:crm.lead,priority:0
-#: selection:crm.opportunity.report,priority:0
msgid "Very High"
msgstr ""
@@ -2396,6 +2472,16 @@ msgid "Website"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,help:crm.field_crm_lead__website
msgid "Website of the contact"
msgstr ""
@@ -2426,7 +2512,7 @@ msgid "Within a Year"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1101
+#: code:addons/crm/models/crm_lead.py:1113
#: model:crm.stage,name:crm.stage_lead4
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
@@ -2453,19 +2539,25 @@ msgid "Won in Opportunities Target"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:394
+#: code:addons/crm/models/crm_lead.py:404
#, python-format
msgid "Yeah! Deal of the last 7 days for the team."
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:396
+#: 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"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:406
#, python-format
msgid "You just beat your personal record for the past 30 days."
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:398
+#: code:addons/crm/models/crm_lead.py:408
#, python-format
msgid "You just beat your personal record for the past 7 days."
msgstr ""
@@ -2517,7 +2609,7 @@ msgid "e.g. www.odoo.com"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:926
+#: code:addons/crm/models/crm_lead.py:938
#, python-format
msgid "or send an email to %s"
msgstr ""
@@ -2533,7 +2625,7 @@ msgid "team_count"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:932
+#: code:addons/crm/models/crm_lead.py:944
#, python-format
msgid "unknown"
msgstr ""
diff --git a/addons/crm_project/i18n/crm_project.pot b/addons/crm_project/i18n/crm_project.pot
index 1ab8e35f702..d20415f4bd3 100644
--- a/addons/crm_project/i18n/crm_project.pot
+++ b/addons/crm_project/i18n/crm_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -39,6 +39,11 @@ msgid "Create Task"
msgstr ""
#. module: crm_project
+#: selection:crm.lead.convert2task,action:0
+msgid "Create a new customer"
+msgstr ""
+
+#. module: crm_project
#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__create_uid
msgid "Created by"
msgstr ""
@@ -49,11 +54,21 @@ msgid "Created on"
msgstr ""
#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__partner_id
+msgid "Customer"
+msgstr ""
+
+#. module: crm_project
#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__display_name
msgid "Display Name"
msgstr ""
#. module: crm_project
+#: selection:crm.lead.convert2task,action:0
+msgid "Do not link to a customer"
+msgstr ""
+
+#. module: crm_project
#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__id
msgid "ID"
msgstr ""
@@ -79,11 +94,21 @@ msgid "Lead"
msgstr ""
#. module: crm_project
+#: selection:crm.lead.convert2task,action:0
+msgid "Link to an existing customer"
+msgstr ""
+
+#. module: crm_project
#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__project_id
msgid "Project"
msgstr ""
#. module: crm_project
+#: model:ir.model.fields,field_description:crm_project.field_crm_lead_convert2task__action
+msgid "Related Customer"
+msgstr ""
+
+#. module: crm_project
#: model:ir.model,name:crm_project.model_crm_lead_convert2task
msgid "crm.lead.convert2task"
msgstr ""
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 7fcbea3fd44..7731e230587 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,15 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
-msgid "<strong>Tracking Number</strong>"
+msgid "<strong>Shipping Weight</strong>"
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_delivery_document2
+msgid "<strong>Tracking Number</strong>"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.report_shipping2
msgid "<strong>Weight</strong>"
msgstr ""
@@ -276,6 +280,11 @@ msgid "Display Name"
msgstr ""
#. module: delivery
+#: model:ir.actions.act_window,name:delivery.act_delivery_trackers_url
+msgid "Display tracking links"
+msgstr ""
+
+#. module: delivery
#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
msgid "Each carrier (e.g. UPS) can have several delivery methods (e.g.\n"
" UPS Express, UPS Standard) with a set of pricing rules attached\n"
@@ -289,7 +298,6 @@ msgstr ""
#. module: delivery
#: code:addons/delivery/models/delivery_grid.py:50
-#: code:addons/delivery/models/delivery_grid.py:109
#, python-format
msgid "Error: no matching grid."
msgstr ""
@@ -316,6 +324,7 @@ msgid "Fixed Price"
msgstr ""
#. module: delivery
+#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.product_product_delivery
#: model:product.template,name:delivery.product_product_delivery_product_template
msgid "Free delivery charges"
@@ -434,11 +443,6 @@ msgid "Log requests in order to ease debugging"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-msgid "Manage Package Type"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier__margin
msgid "Margin"
msgstr ""
@@ -492,12 +496,17 @@ msgid "No carrier set for this order."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_grid.py:100
+#: code:addons/delivery/models/delivery_grid.py:102
#, python-format
msgid "No price rule matching this order; delivery cost cannot be computed."
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "OK"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__operator
msgid "Operator"
msgstr ""
@@ -513,8 +522,8 @@ msgid "Package Code"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:37
-#: code:addons/delivery/models/stock_picking.py:121
+#: code:addons/delivery/models/stock_picking.py:35
+#: code:addons/delivery/models/stock_picking.py:119
#, python-format
msgid "Package Details"
msgstr ""
@@ -654,7 +663,7 @@ msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:165
+#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid "Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: %.2f %s"
msgstr ""
@@ -699,6 +708,12 @@ msgid "The weight of your package is higher than the maximum weight authorized f
msgstr ""
#. module: delivery
+#: code:addons/delivery/models/delivery_grid.py:111
+#, python-format
+msgid "There is no matching delivery rule."
+msgstr ""
+
+#. module: delivery
#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
msgid "These methods allow to automatically compute the delivery price\n"
" according to your settings; on the sales order (based on the\n"
@@ -717,6 +732,11 @@ msgid "This percentage will be added to the shipping price."
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "Trackers URL"
+msgstr ""
+
+#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Tracking"
msgstr ""
@@ -811,7 +831,7 @@ msgid "Width must be positive"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:203
+#: code:addons/delivery/models/stock_picking.py:217
#, python-format
msgid "You are shipping different packaging types in the same shipment.\n"
"Packaging Types: %s"
@@ -824,7 +844,12 @@ msgid "You can add delivery price only on unconfirmed quotations."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:179
+#: model:ir.ui.view,arch_db:delivery.delivery_tracking_url_warning_form
+msgid "You have multiple tracker links, they are available in the chatter."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:180
#, python-format
msgid "Your delivery method has no redirect on courier provider's website to track this order."
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 79fbf521bb7..0f080dca90e 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,91 +16,146 @@ msgstr ""
"Plural-Forms: \n"
#. module: event
+#: model:mail.template,subject:event.event_reminder
+msgid "${object.event_id.name}: ${object.get_date_range_str()}"
+msgstr ""
+
+#. module: event
+#: code:addons/event/models/event.py:303
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: event
+#: model:mail.template,body_html:event.event_registration_mail_template_badge
+msgid "<div>\n"
+" Dear ${object.name},<br/>\n"
+" Thank you for your inquiry.<br/>\n"
+" Here is your badge for the event ${object.event_id.name}.<br/>\n"
+" If you have any questions, please let us know.\n"
+" <br/><br/>\n"
+" Thank you,<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>"
+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>"
+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"
+" </span>"
+msgstr ""
+
+#. module: event
#: model:mail.template,body_html:event.event_subscription
-msgid "\n"
-"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\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"
"% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
"% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
-" <table style=\"width:600px;margin:5px 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.event_id and object.event_id.website_url:\n"
-" <a href=\"${object.event_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">View Event</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:15px 20px 0px 20px; font-size:16px; font-weight:300;\">\n"
-" <p style=\"font-size:16px;\">\n"
-" Hi,\n"
-" </p><p style=\"font-size:16px;\">\n"
-" We are happy to confirm your registration to the event:\n"
-" </p>\n"
-" <ul>\n"
-" <li>Event: \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\" cellspacing=\"0\" 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 registration</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=%s' % object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${'%s' % 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"
+" <!-- EVENT DESCRIPTION -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <div>\n"
+" Hello ${object.name or ''},<br/>\n"
+" We are happy to confirm your registration to the event\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" <a href=\"${object.event_id.website_url}\" style=\"color:#875A7B;text-decoration:none;\">${object.event_id.name}</a>\n"
" % else:\n"
" <strong>${object.event_id.name}</strong>\n"
" % endif\n"
-" </li>\n"
-" <li>Attendee: ${object.name}</li>\n"
-" </ul>\n"
-" <p style=\"font-size:16px;\">\n"
-" See you soon,\n"
-" </p>\n"
-" <p style=\"font-size:16px; margin-bottom: 30px\">\n"
-" <i>\n"
-" -- <br/>\n"
+" for attendee ${object.name}.\n"
+" </div>\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"${object.event_id.website_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">View Event</a><br/>\n"
+" </div>\n"
+" % endif\n"
+" <div>\n"
+" See you soon,<br/>\n"
+" <span style=\"color: #454748;\">\n"
+" -- <br/>\n"
" % if object.event_id.organizer_id:\n"
" ${object.event_id.organizer_id.name}\n"
" % else:\n"
" The organizers.\n"
" % endif\n"
-" </i>\n"
-" </p>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td style=\"padding:15px 20px 0px 20px;\">\n"
-" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" </span>\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"
+" <!-- DETAILS -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <table style=\"width:100%;\">\n"
" <tr>\n"
-" <td style=\"padding:25px 0px;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"
+" <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"
" </td>\n"
-" <td style=\"padding:25px 10px 25px 10px;width:50%;line-height:20px;vertical-align:top;\">\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"
" <div><strong>To</strong> ${object.event_id.date_end_located}</div>\n"
" <div style=\"font-size:12px;color:#9e9e9e\"><i><strong>TZ</strong> ${object.event_id.date_tz}</i></div>\n"
" </td>\n"
" % if object.event_id.address_id.country_id.name:\n"
-" <td style=\"padding:25px 0px;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"
+" <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"
" </td>\n"
-" <td style=\"padding:30px 10px 25px 10px;width:50%;vertical-align:top;\">\n"
+" <td style=\"padding: 0px 10px 0px 10px;width:50%;vertical-align:top;\">\n"
" % set location = ''\n"
" % if object.event_id.address_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.name}</p>\n"
+" <div>${object.event_id.address_id.name}</div>\n"
" % endif\n"
" % if object.event_id.address_id.street:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street}</p>\n"
+" <div>${object.event_id.address_id.street}</div>\n"
" % set location = object.event_id.address_id.street\n"
" % endif\n"
" % if object.event_id.address_id.street2:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street2}</p>\n"
+" <div>${object.event_id.address_id.street2}</div>\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n"
" % endif\n"
-" <p style=\"margin:0px 0px 0px 0px;\">\n"
+" <div>\n"
" % if object.event_id.address_id.city:\n"
" ${object.event_id.address_id.city},\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n"
@@ -113,157 +168,181 @@ msgid "\n"
" ${object.event_id.address_id.zip}\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n"
" % endif\n"
-" </p>\n"
+" </div>\n"
" % if object.event_id.address_id.country_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.country_id.name}</p>\n"
+" <div>${object.event_id.address_id.country_id.name}</div>\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n"
" % endif\n"
" </td>\n"
" % endif\n"
" </tr>\n"
" </table>\n"
-" % if object.event_id.organizer_id:\n"
-" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"padding:10px 0px 25px 0px;\">\n"
-" <h2 style=\"font-weight:300;margin:10px 0px\">Questions about this event?</h2>\n"
-" <p>Please contact the organizer:</p>\n"
-" <ul>\n"
-" <li>${object.event_id.organizer_id.name}</li>\n"
-" % if object.event_id.organizer_id.email\n"
-" <li>Mail: <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#875A7B;\">${object.event_id.organizer_id.email}</a></li>\n"
-" % endif\n"
-" % if object.event_id.organizer_id.phone\n"
-" <li>Phone: ${object.event_id.organizer_id.phone}</li>\n"
-" % endif\n"
-" </ul>\n"
-"\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" % endif\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"
+" % if object.event_id.organizer_id:\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <div>\n"
+" <span style=\"font-weight:300;margin:10px 0px\">Questions about this event?</span>\n"
+" <div>Please contact the organizer:</div>\n"
+" <ul>\n"
+" <li>${object.event_id.organizer_id.name}</li>\n"
+" % if object.event_id.organizer_id.email\n"
+" <li>Mail: <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#875A7B;\">${object.event_id.organizer_id.email}</a></li>\n"
+" % endif\n"
+" % if object.event_id.organizer_id.phone\n"
+" <li>Phone: ${object.event_id.organizer_id.phone}</li>\n"
+" % endif\n"
+" </ul>\n"
+" </div>\n"
+" </td></tr>\n"
+" % endif\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
" <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&text=${object.event_id.name}&dates=${date_begin}/${date_end}&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&summary=${object.event_id.name}&dtstart=${date_begin}&dtend=${date_end}&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://calendar.yahoo.com/?v=60&view=d&type=20&title=${object.event_id.name}&in_loc=${location}&st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&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\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"> Yahoo</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\"/> 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://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"
" </td>\n"
" </tr>\n"
" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" % if object.event_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"
-" </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.event_id and object.event_id.website_url:\n"
-" <div>\n"
-" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\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"
+" % if object.event_id.address_id:\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <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"
+" </a>\n"
+" </div>\n"
+" </td></tr></table>\n"
+" </td></tr>\n"
+" % endif\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- FOOTER BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"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"
+" Sent by <a target=\"_blank\" href=\"object.company_id.website\" style=\"color: #875A7B;\">${object.company_id.name}</a>\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <br/>\n"
+" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
+" % endif\n"
+" </td></tr>\n"
" </table>\n"
-"</div>\n"
+"</td></tr>\n"
+"</table>\n"
" "
msgstr ""
#. module: event
#: model:mail.template,body_html:event.event_reminder
-msgid "\n"
-"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\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"
"% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
"% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
-" <table style=\"width:600px;margin:5px 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.event_id and object.event_id.website_url:\n"
-" <a href=\"${object.event_id.website_url}\" style=\"background-color: #1abc9c; padding: 12px; font-weight: 12px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">View Event</a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td style=\"padding:15px 20px 0px 20px; font-size:16px;\">\n"
-" <p style=\"font-size:16px;\">\n"
-" Hello,\n"
-" </p>\n"
-" <p style=\"font-size:16px;\">\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\" cellspacing=\"0\" 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 registration</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=%s' % object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${'%s' % 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"
+" <!-- EVENT DESCRIPTION -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <div>\n"
+" Hello ${object.name},<br/>\n"
" We are excited to remind you that the event\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" <a href=\"${object.event_id.website_url}\" style=\"color:#875A7B;text-decoration:none;\">${object.event_id.name}</a>\n"
" % else:\n"
-" ${object.event_id.name}\n"
+" <strong>${object.event_id.name}</strong>\n"
" % endif\n"
-" is starting\n"
-" <strong>${object.get_date_range_str()}</strong>.\n"
-" </p><p style=\"font-size:16px;\">\n"
-" We confirm your registration and hope to meet you there,\n"
-" </p><p style=\"font-size:16px; margin-bottom: 30px\">\n"
-" <i>\n"
-" -- <br/>\n"
+" is starting <strong>${object.get_date_range_str()}</strong>.\n"
+" </div>\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"${object.event_id.website_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:16px;\">View Event</a><br/>\n"
+" </div>\n"
+" % endif\n"
+" <div>\n"
+" We confirm your registration and hope to meet you there,<br/>\n"
+" <span style=\"color: #454748;\">\n"
+" -- <br/>\n"
" % if object.event_id.organizer_id:\n"
" ${object.event_id.organizer_id.name}\n"
" % else:\n"
" The organizers.\n"
" % endif\n"
-" </i>\n"
-" </p>\n"
-"\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td style=\"padding:15px 20px 0px 20px;\">\n"
-" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" </span>\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"
+" <!-- DETAILS -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <table style=\"width:100%;\">\n"
" <tr>\n"
-" <td style=\"padding:25px 0px;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"
+" <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"
" </td>\n"
-" <td style=\"padding:25px 10px 25px 10px;width:50%;line-height:20px;vertical-align:top;\">\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"
" <div><strong>To</strong> ${object.event_id.date_end_located}</div>\n"
" <div style=\"font-size:12px;color:#9e9e9e\"><i><strong>TZ</strong> ${object.event_id.date_tz}</i></div>\n"
" </td>\n"
-" % if object.event_id.address_id:\n"
-" <td style=\"padding:25px 0px;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"
+" % 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"
" </td>\n"
-" <td style=\"padding:30px 10px 25px 10px;width:50%;vertical-align:top;\">\n"
+" <td style=\"padding: 0px 10px 0px 10px;width:50%;vertical-align:top;\">\n"
" % set location = ''\n"
" % if object.event_id.address_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.name}</p>\n"
+" <div>${object.event_id.address_id.name}</div>\n"
" % endif\n"
" % if object.event_id.address_id.street:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street}</p>\n"
+" <div>${object.event_id.address_id.street}</div>\n"
" % set location = object.event_id.address_id.street\n"
" % endif\n"
" % if object.event_id.address_id.street2:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street2}</p>\n"
+" <div>${object.event_id.address_id.street2}</div>\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n"
" % endif\n"
-" <p style=\"margin:0px 0px 0px 0px;\">\n"
+" <div>\n"
" % if object.event_id.address_id.city:\n"
" ${object.event_id.address_id.city},\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n"
@@ -276,111 +355,89 @@ msgid "\n"
" ${object.event_id.address_id.zip}\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n"
" % endif\n"
-" </p>\n"
+" </div>\n"
" % if object.event_id.address_id.country_id.name:\n"
-" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.country_id.name}</p>\n"
+" <div>${object.event_id.address_id.country_id.name}</div>\n"
" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n"
" % endif\n"
" </td>\n"
" % endif\n"
" </tr>\n"
" </table>\n"
-" % if object.event_id.organizer_id.email:\n"
-" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"padding:10px 0px 25px 0px;\">\n"
-" <h2 style=\"font-weight:300;margin:10px 0px\">Questions about this event?</h2>\n"
-" <p>Please contact the organizer:</p>\n"
-" <ul>\n"
-" <li>${object.event_id.organizer_id.name}</li>\n"
-" % if object.event_id.organizer_id.email\n"
-" <li>Mail: <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#875A7B;\">${object.event_id.organizer_id.email}</a></li>\n"
-" % endif\n"
-" % if object.event_id.organizer_id.phone\n"
-" <li>Phone: ${object.event_id.organizer_id.phone}</li>\n"
-" % endif\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" % endif\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"
+" % if object.event_id.organizer_id:\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <div>\n"
+" <span style=\"font-weight:300;margin:10px 0px\">Questions about this event?</span>\n"
+" <div>Please contact the organizer:</div>\n"
+" <ul>\n"
+" <li>${object.event_id.organizer_id.name}</li>\n"
+" % if object.event_id.organizer_id.email\n"
+" <li>Mail: <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#875A7B;\">${object.event_id.organizer_id.email}</a></li>\n"
+" % endif\n"
+" % if object.event_id.organizer_id.phone\n"
+" <li>Phone: ${object.event_id.organizer_id.phone}</li>\n"
+" % endif\n"
+" </ul>\n"
+" </div>\n"
+" </td></tr>\n"
+" % endif\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
" <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&text=${object.event_id.name}&dates=${date_begin}/${date_end}&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&summary=${object.event_id.name}&dtstart=${date_begin}&dtend=${date_end}&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://calendar.yahoo.com/?v=60&view=d&type=20&title=${object.event_id.name}&in_loc=${location}&st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&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\"><img src=\"/web_editor/font_to_img/61525/rgb(135,90,123)/16\" style=\"vertical-align:middle;\" height=\"16\"> Yahoo</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\"/> 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://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"
" </td>\n"
" </tr>\n"
" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" % if object.event_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"
-" </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"
-" <p style=\"margin:0px 0px 9px 0px;padding-top:10px;\">Sent by ${object.company_id.name}</p>\n"
-" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
-" <div>\n"
-" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\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"
+" % if object.event_id.address_id:\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <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"
+" </a>\n"
+" </div>\n"
+" </td></tr></table>\n"
+" </td></tr>\n"
+" % endif\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- FOOTER BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"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"
+" Sent by <a target=\"_blank\" href=\"object.company_id.website\" style=\"color: #875A7B;\">${object.company_id.name}</a>\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <br/>\n"
+" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
+" % endif\n"
+" </td></tr>\n"
" </table>\n"
-"</div>\n"
+"</td></tr>\n"
+"</table>\n"
" "
msgstr ""
#. module: event
-#: model:mail.template,body_html:event.event_registration_mail_template_badge
-msgid "\n"
-"<p>Dear ${object.name},</p>\n"
-"<p>Thank you for your inquiry.</p>\n"
-"<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
-msgstr ""
-
-#. module: event
-#: model:mail.template,subject:event.event_reminder
-msgid "${object.event_id.name}: ${object.get_date_range_str()}"
-msgstr ""
-
-#. module: event
-#: code:addons/event/models/event.py:297
-#, python-format
-msgid "%s (copy)"
-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>"
-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"
-" </span>"
+#: model:ir.model.fields,field_description:event.field_event_event__message_needaction
+#: model:ir.model.fields,field_description:event.field_event_registration__message_needaction
+msgid "Action Needed"
msgstr ""
#. module: event
@@ -548,12 +605,6 @@ msgid "Category"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:264
-#, python-format
-msgid "Closing Date cannot be set before Beginning Date."
-msgstr ""
-
-#. module: event
#: model:ir.ui.view,arch_db:event.view_event_type_form
msgid "Communication"
msgstr ""
@@ -565,7 +616,7 @@ msgid "Company"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:481
+#: code:addons/event/models/event.py:493
#, python-format
msgid "Compose Email"
msgstr ""
@@ -646,13 +697,13 @@ msgid "Created on"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:444
+#: code:addons/event/models/event.py:455
#, python-format
msgid "Customer"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:446
+#: code:addons/event/models/event.py:457
#, python-format
msgid "Customer Email"
msgstr ""
@@ -805,6 +856,23 @@ msgid "Event Registration"
msgstr ""
#. module: event
+#: code:addons/event/models/event_mail.py:143
+#, python-format
+msgid "Event Scheduler for:\n"
+" - Event: %s (%s)\n"
+" - Scheduled: %s\n"
+" - Template: %s (%s)\n"
+"\n"
+" Failed with error:\n"
+" - %s\n"
+"\n"
+" You receive this email because you are:\n"
+" - the organizer of the event,\n"
+" - or the responsible of the event,\n"
+" - or the last writer of the template."
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__event_begin_date
msgid "Event Start Date"
msgstr ""
@@ -823,8 +891,7 @@ msgstr ""
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view
-#: model:ir.model.fields,field_description:event.field_res_partner__event_count
-#: model:ir.model.fields,field_description:event.field_res_users__event_count
+#: model:ir.model.fields,field_description:event.field_res_users__group_event_user
#: model:ir.ui.menu,name:event.event_event_menu_pivot_report
#: model:ir.ui.menu,name:event.event_main_menu
#: model:ir.ui.menu,name:event.menu_event_event
@@ -842,6 +909,12 @@ msgid "Events Analysis"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_res_partner__event_count
+#: model:ir.model.fields,field_description:event.field_res_users__event_count
+msgid "Events Count"
+msgstr ""
+
+#. module: event
#: model:ir.actions.act_window,name:event.action_event_mail
msgid "Events Mail Schedulers"
msgstr ""
@@ -878,6 +951,24 @@ msgid "Finish Event"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_follower_ids
+#: model:ir.model.fields,field_description:event.field_event_registration__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_channel_ids
+#: model:ir.model.fields,field_description:event.field_event_registration__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_partner_ids
+#: model:ir.model.fields,field_description:event.field_event_registration__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,help:event.field_event_event__seats_max
msgid "For each event you can define a maximum registration of seats(number of attendees), above this numbers the registrations are not accepted."
msgstr ""
@@ -911,6 +1002,24 @@ msgid "ID"
msgstr ""
#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_unread
+#: model:ir.model.fields,help:event.field_event_registration__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_needaction
+#: model:ir.model.fields,help:event.field_event_registration__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_has_error
+#: model:ir.model.fields,help:event.field_event_registration__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,help:event.field_event_event__state
msgid "If event is created, the status is 'Draft'. If event is confirmed for the particular dates the status is set to 'Confirmed'. If the event is over, the status is set to 'Done'. If event is cancelled the status is set to 'Cancelled'."
msgstr ""
@@ -928,6 +1037,12 @@ msgid "Interval"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_is_follower
+#: model:ir.model.fields,field_description:event.field_event_registration__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,help:event.field_event_type__default_registration_max
msgid "It will select this default maximum value when you choose this event"
msgstr ""
@@ -1053,12 +1168,24 @@ msgid "Maximum Registrations"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:253
+#: code:addons/event/models/event.py:258
#, python-format
msgid "Maximum attendees number should be greater than minimum attendees number."
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_has_error
+#: model:ir.model.fields,field_description:event.field_event_registration__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_ids
+#: model:ir.model.fields,field_description:event.field_event_registration__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,field_description:event.field_event_event__seats_min
msgid "Minimum Attendees"
msgstr ""
@@ -1080,18 +1207,24 @@ msgid "My Events"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:258
+#: code:addons/event/models/event.py:263
#, python-format
msgid "No more available seats."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:363
+#: code:addons/event/models/event.py:369
#, python-format
msgid "No more seats available for this event."
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_needaction_counter
+#: model:ir.model.fields,field_description:event.field_event_registration__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,field_description:event.field_event_event__seats_expected
msgid "Number of Expected Attendees"
msgstr ""
@@ -1102,12 +1235,36 @@ msgid "Number of Participants"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_has_error_counter
+#: model:ir.model.fields,field_description:event.field_event_registration__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,help:event.field_res_partner__event_count
#: model:ir.model.fields,help:event.field_res_users__event_count
msgid "Number of events the partner has participated."
msgstr ""
#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_needaction_counter
+#: model:ir.model.fields,help:event.field_event_registration__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_has_error_counter
+#: model:ir.model.fields,help:event.field_event_registration__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: event
+#: model:ir.model.fields,help:event.field_event_event__message_unread_counter
+#: model:ir.model.fields,help:event.field_event_registration__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: event
#: model:event.type,name:event.event_type_data_online
#: model:ir.ui.view,arch_db:event.view_event_form
msgid "Online"
@@ -1186,12 +1343,8 @@ msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__date_open
-msgid "Registration Date"
-msgstr ""
-
-#. module: event
#: model:ir.ui.view,arch_db:event.view_registration_search
-msgid "Registration Day"
+msgid "Registration Date"
msgstr ""
#. module: event
@@ -1210,11 +1363,6 @@ msgid "Registration Mails"
msgstr ""
#. module: event
-#: model:ir.ui.view,arch_db:event.view_registration_search
-msgid "Registration Month"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_res_config_settings__module_website_event_questions
msgid "Registration Survey"
msgstr ""
@@ -1309,6 +1457,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event__date_begin
+#: model:ir.ui.view,arch_db:event.view_event_search
msgid "Start Date"
msgstr ""
@@ -1318,11 +1467,6 @@ msgid "Start Date Located"
msgstr ""
#. module: event
-#: model:ir.ui.view,arch_db:event.view_event_search
-msgid "Start Month"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_event_event__state
#: model:ir.model.fields,field_description:event.field_event_registration__state
#: model:ir.ui.view,arch_db:event.view_event_search
@@ -1336,7 +1480,13 @@ msgid "Subscribe"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:307
+#: code:addons/event/models/event.py:269
+#, python-format
+msgid "The closing date cannot be earlier than the beginning date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/models/event.py:313
#, python-format
msgid "There are already attendees who attended this event. Please reset it to draft if you want to cancel this event."
msgstr ""
@@ -1403,12 +1553,20 @@ msgid "Unlimited"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_unread
+#: model:ir.model.fields,field_description:event.field_event_registration__message_unread
#: model:ir.ui.view,arch_db:event.view_event_search
#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Unread Messages"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event__message_unread_counter
+#: model:ir.model.fields,field_description:event.field_event_registration__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: event
#: model:ir.ui.view,arch_db:event.view_event_search
msgid "Upcoming events from today"
msgstr ""
@@ -1434,11 +1592,22 @@ msgid "User"
msgstr ""
#. module: event
+#: model:ir.model,name:event.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: event
#: model:ir.ui.view,arch_db:event.view_event_type_form
msgid "Visibility"
msgstr ""
#. module: event
+#: code:addons/event/models/event_mail.py:130
+#, python-format
+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 ""
@@ -1450,13 +1619,13 @@ msgid "Week(s)"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:420
+#: code:addons/event/models/event.py:426
#, python-format
msgid "You must wait the event confirmation before doing this action."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:422
+#: code:addons/event/models/event.py:428
#, python-format
msgid "You must wait the event starting day before doing this action."
msgstr ""
@@ -1482,25 +1651,25 @@ msgid "event.confirm"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:503
+#: code:addons/event/models/event.py:515
#, python-format
msgid "in %d days"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:507
+#: code:addons/event/models/event.py:519
#, python-format
msgid "next month"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:505
+#: code:addons/event/models/event.py:517
#, python-format
msgid "next week"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:509
+#: code:addons/event/models/event.py:521
#, python-format
msgid "on "
msgstr ""
@@ -1511,13 +1680,13 @@ msgid "res.config.settings"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:499
+#: code:addons/event/models/event.py:511
#, python-format
msgid "today"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:501
+#: code:addons/event/models/event.py:513
#, python-format
msgid "tomorrow"
msgstr ""
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index db9c270d9cb..f0c0541213f 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -217,15 +217,15 @@ msgid "Name"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:152
+#: code:addons/event_sale/models/event.py:179
#, python-format
-msgid "No more available seats for the ticket"
+msgid "No more available seats for this ticket"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:179
+#: code:addons/event_sale/models/event.py:152
#, python-format
-msgid "No more available seats for this ticket"
+msgid "No more available seats for this ticket type."
msgstr ""
#. module: event_sale
@@ -380,7 +380,7 @@ msgstr ""
#. module: event_sale
#: code:addons/event_sale/models/event.py:157
#, python-format
-msgid "Ticket should belong to either event category or event but not both"
+msgid "Ticket cannot belong to both the event category and the event itself."
msgstr ""
#. module: event_sale
@@ -432,3 +432,13 @@ msgstr ""
msgid "registration.editor.line"
msgstr ""
+#. module: event_sale
+#: model:ir.ui.view,arch_db:event_sale.view_event_form_inherit_ticket
+msgid "reserved +"
+msgstr ""
+
+#. module: event_sale
+#: model:ir.ui.view,arch_db:event_sale.view_event_form_inherit_ticket
+msgid "unconfirmed"
+msgstr ""
+
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 5325c19f554..052e3d2f0bd 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,18 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:198
-#, python-format
-msgid "%s %s has been added to the fleet!"
-msgstr ""
-
-#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle_cost.py:274
-#, python-format
-msgid "%s contract(s) will expire soon and should be renewed and/or closed!"
-msgstr ""
-
-#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "<span>g/km</span>"
msgstr ""
@@ -38,8 +26,13 @@ msgid "<span>kW</span>"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_tree
msgid "Activation Cost"
msgstr ""
@@ -50,6 +43,24 @@ msgid "Active"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_ids
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_state
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.mail_activity_type_action_config_fleet
+#: model:ir.ui.menu,name:fleet.fleet_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_tag_action
msgid "Add a new tag"
msgstr ""
@@ -84,6 +95,12 @@ msgid "Archived"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__log_drivers
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_assignation_log_view_list
+msgid "Assignation Logs"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle,transmission:0
msgid "Automatic"
msgstr ""
@@ -130,6 +147,12 @@ msgid "Category of the cost"
msgstr ""
#. module: fleet
+#: model:mail.message.subtype,description:fleet.mt_fleet_driver_updated
+#: model:mail.message.subtype,name:fleet.mt_fleet_driver_updated
+msgid "Changed Driver"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__vin_sn
msgid "Chassis Number"
msgstr ""
@@ -245,13 +268,13 @@ msgid "Contract logs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
-msgid "Contract(s)"
+#: model:mail.activity.type,name:fleet.mail_act_fleet_contract_to_renew
+msgid "Contract to Renew"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__purchaser_id
-msgid "Contractor"
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
+msgid "Contract(s)"
msgstr ""
#. module: fleet
@@ -393,6 +416,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__create_uid
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__create_uid
@@ -408,6 +432,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__create_date
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__create_date
@@ -436,6 +461,7 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services__date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer__date
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Date"
msgstr ""
@@ -470,6 +496,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__display_name
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__display_name
@@ -489,7 +516,10 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__driver_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__driver_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__purchaser_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer__driver_id
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
msgid "Driver"
msgstr ""
@@ -500,9 +530,14 @@ msgid "Driver of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:216
-#, python-format
-msgid "Driver: from '%s' to '%s'"
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Drivers History"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_assignation_log
+msgid "Drivers history on a vehicle"
msgstr ""
#. module: fleet
@@ -533,6 +568,11 @@ msgid "Emptying the odometer value of a vehicle is not allowed."
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__date_end
+msgid "End Date"
+msgstr ""
+
+#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Engine Options"
msgstr ""
@@ -550,6 +590,12 @@ msgid "Expiring Soon"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__first_contract_date
+msgid "First Contract Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_res_users__group_fleet_user
#: model:ir.module.category,name:fleet.module_fleet_category
#: model:ir.ui.menu,name:fleet.menu_root
msgid "Fleet"
@@ -563,6 +609,24 @@ msgid "Fleet: Generate contracts costs based on costs frequency"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_follower_ids
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_channel_ids
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_partner_ids
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost__cost_type
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__cost_type
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel__cost_type
@@ -614,6 +678,12 @@ msgid "Fuel log for vehicles"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Future Activities"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle,fuel_type:0
msgid "Gasoline"
msgstr ""
@@ -681,6 +751,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__id
@@ -694,6 +765,24 @@ msgid "ID"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_needaction
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_has_error
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__acquisition_date
msgid "Immatriculation Date"
msgstr ""
@@ -759,6 +848,12 @@ msgid "Invoice Reference"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_is_follower
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle,odometer_unit:0
msgid "Kilometers"
msgstr ""
@@ -771,6 +866,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type____last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle____last_update
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log____last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost____last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract____last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel____last_update
@@ -791,6 +887,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__write_uid
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__write_uid
@@ -806,6 +903,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type__write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__write_date
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__write_date
@@ -819,14 +917,14 @@ msgid "Last Updated on"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__license_plate
-msgid "License Plate"
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Late Activities"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:223
-#, python-format
-msgid "License Plate: from '%s' to '%s'"
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__license_plate
+msgid "License Plate"
msgstr ""
#. module: fleet
@@ -922,6 +1020,18 @@ msgid "Medium-sized logo of the brand. It is automatically resized as a 128x128p
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_has_error
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_ids
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle,odometer_unit:0
msgid "Miles"
msgstr ""
@@ -966,22 +1076,11 @@ msgid "Model of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:212
-#, python-format
-msgid "Model: from '%s' to '%s'"
-msgstr ""
-
-#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_tree
msgid "Models"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
-msgid "Month"
-msgstr ""
-
-#. module: fleet
#: selection:fleet.vehicle.log.contract,cost_frequency:0
msgid "Monthly"
msgstr ""
@@ -1005,23 +1104,38 @@ msgid "Name of contract to renew soon"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_date_deadline
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_summary
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_type_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle.log.contract,cost_frequency:0
msgid "No"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_action
-#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_non_effective_action
-msgid "No data for analysis"
+#: code:addons/fleet/models/fleet_vehicle.py:84
+#, python-format
+msgid "No Plate"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:211
-#: code:addons/fleet/models/fleet_vehicle.py:215
-#: code:addons/fleet/models/fleet_vehicle.py:219
-#: code:addons/fleet/models/fleet_vehicle.py:222
-#, python-format
-msgid "None"
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_action
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_non_effective_action
+msgid "No data for analysis"
msgstr ""
#. module: fleet
@@ -1032,16 +1146,46 @@ msgid "Notes"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle__doors
msgid "Number of doors of the vehicle"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_has_error_counter
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_needaction_counter
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_has_error_counter
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle__seats
msgid "Number of seats of the vehicle"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__odometer_count
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__odometer_id
@@ -1121,13 +1265,14 @@ msgid "Odoo helps you managing the costs for your different vehicles\n"
msgstr ""
#. module: fleet
-#: sql_constraint:fleet.vehicle:0
-msgid "Only one car can be assigned to the same employee!"
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
msgstr ""
#. module: fleet
-#: selection:fleet.vehicle.cost,cost_type:0
-msgid "Other"
+#: selection:fleet.vehicle,activity_state:0
+#: selection:fleet.vehicle.log.contract,activity_state:0
+msgid "Overdue"
msgstr ""
#. module: fleet
@@ -1153,6 +1298,12 @@ msgid "Person to which the contract is signed for"
msgstr ""
#. module: fleet
+#: selection:fleet.vehicle,activity_state:0
+#: selection:fleet.vehicle.log.contract,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__power
msgid "Power"
msgstr ""
@@ -1197,7 +1348,7 @@ msgid "Refueling Details"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle_cost.py:200
+#: code:addons/fleet/models/fleet_vehicle_cost.py:201
#: 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
@@ -1215,6 +1366,17 @@ msgid "Residual Value"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__user_id
+msgid "Responsible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_user_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__seats
msgid "Seats Number"
msgstr ""
@@ -1232,6 +1394,7 @@ msgid "Service"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Service Type"
msgstr ""
@@ -1279,6 +1442,12 @@ msgid "Set Contract In Progress"
msgstr ""
#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Show all records which has next action date is before today"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand__image_small
msgid "Small-sized image"
msgstr ""
@@ -1291,6 +1460,11 @@ msgid "Small-sized logo of the brand. It is automatically resized as a 64x64px i
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__date_start
+msgid "Start Date"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__state_id
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_state_view_tree
msgid "State"
@@ -1302,18 +1476,21 @@ msgid "State name already exists"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet_vehicle.py:220
-#, python-format
-msgid "State: from '%s' to '%s'"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__state
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Status"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle__activity_state
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract__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: fleet
#: sql_constraint:fleet.vehicle.tag:0
msgid "Tag name already exists !"
msgstr ""
@@ -1344,6 +1521,18 @@ msgid "This field holds the image used as logo for the brand, limited to 1024x10
msgstr ""
#. module: fleet
+#: selection:fleet.vehicle,activity_state:0
+#: selection:fleet.vehicle.log.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Today Activities"
+msgstr ""
+
+#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_tree
msgid "Total"
msgstr ""
@@ -1415,6 +1604,18 @@ msgid "Unit of the odometer "
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_unread
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_unread_counter
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state__sequence
msgid "Used to order the note stages"
msgstr ""
@@ -1425,11 +1626,17 @@ msgid "User"
msgstr ""
#. module: fleet
+#: model:ir.model,name:fleet.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle__car_value
msgid "Value of the bought vehicle"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost__vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__vehicle_id
@@ -1454,7 +1661,7 @@ msgstr ""
#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
-msgid "Vehicle Costs by Month"
+msgid "Vehicle Costs by Date"
msgstr ""
#. module: fleet
@@ -1546,6 +1753,7 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__insurer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__vendor_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services__vendor_id
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
msgid "Vendor"
msgstr ""
@@ -1586,11 +1794,6 @@ msgid "Write here any other information related to the service completed."
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
-msgid "Year"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle__model_year
msgid "Year of the model"
msgstr ""
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
index 2fb9f9d4f60..3e58efd2ee9 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,27 +16,184 @@ msgstr ""
"Plural-Forms: \n"
#. module: gamification
+#: code:addons/gamification/models/challenge.py:594
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:603
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: model:mail.template,body_html:gamification.email_template_badge_received
+msgid "<?xml version=\"1.0\"?>\n"
+"<table border=\"0\" cellpadding=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" width=\"590\" cellpadding=\"0\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\" summary=\"o_mail_notification\">\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: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"middle\">\n"
+" <span style=\"font-size: 10px;\">Your Badge</span><br/>\n"
+" <span style=\"font-size: 20px; font-weight: bold;\">\n"
+" ${object.badge_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 width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" <div>\n"
+" Congratulations ${object.user_id.name} !<br/>\n"
+" You just received badge <strong>${object.badge_id.name}</strong> !<br/>\n"
+" % if object.badge_id.description\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 560px; margin-top: 5px;\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\">\n"
+" <img src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
+" </td>\n"
+" <td valign=\"center\">\n"
+" <cite>${object.badge_id.description}</cite>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+" % endif\n"
+" <br/>\n"
+" % if object.sender_id\n"
+" This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
+" % endif\n"
+" <br/>\n"
+" % if object.comment\n"
+" ${object.comment}\n"
+" % endif\n"
+" <br/><br/>\n"
+" Thank you,\n"
+" <br/>\n"
+" % if object.sender_id and object.sender_id.signature:\n"
+" ${object.sender_id.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 width=\"590\" border=\"0\" cellpadding=\"0\" style=\"min-width: 590px; background-color: white; font-size: 12px; 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 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"
+" </td></tr>\n"
+" </table>\n"
+"</td></tr>\n"
+"</table>\n"
+"\n"
+"\n"
+""
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:660
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this challenge."
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:655
+#, python-format
+msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:665
+#, python-format
+msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+msgstr ""
+
+#. module: gamification
+#: model:mail.template,body_html:gamification.email_template_goal_reminder
+msgid "<div>\n"
+" <strong>Reminder ${object.name}</strong><br/>\n"
+"You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.\n"
+"<br/><br/>\n"
+"Thank you,\n"
+" <br/>\n"
+" % if object.challenge_id.manager_id and object.challenge_id.manager_id.signature:\n"
+" ${object.challenge_id.manager_id.signature | safe}\n"
+" % endif\n"
+"</div>"
+msgstr ""
+
+#. module: gamification
+#: model:ir.ui.view,arch_db:gamification.challenge_form_view
+msgid "<span class=\"o_stat_text\">Related</span>\n"
+" <span class=\"o_stat_text\">Goals</span>"
+msgstr ""
+
+#. module: gamification
#: model:mail.template,body_html:gamification.simple_report_template
-msgid "\n"
-" \n"
-"% set record = ctx.get('record')\n"
-"% set company = record and record.company_id or user.company_id\n"
-"% set challenge_lines = ctx.get('challenge_lines', []) \n"
-"<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"font-family: 'Helvetica'; background-color: #EEE; border-collapse: collapse;\">\n"
+msgid "<table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"background-color: #EEE; border-collapse: collapse;\">\n"
"<tr>\n"
" <td valign=\"top\" align=\"center\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\">\n"
+" % set record = ctx.get('record')\n"
+" % set company = record and record.company_id or user.company_id\n"
+" % set challenge_lines = ctx.get('challenge_lines', []) \n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 570px;\">\n"
" <tr><td>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n"
" <tr>\n"
-" <td valign=\"middle\" align=\"left\" style=\"padding:30px 15px;\">\n"
-" <img width=\"90\" src=\"/logo.png?company=${user.company_id.id}\" style=\"width:80px;\"/>\n"
-" </td>\n"
-" % if object.visibility_mode == 'ranking':\n"
-" <td style=\"padding:15px;\">\n"
-" <p style=\"font-size:20px;color:#666666;\" align=\"right\">Leaderboard</p>\n"
-" </td>\n"
-" % endif\n"
+" <div>\n"
+" % if object.visibility_mode == 'ranking':\n"
+" <td style=\"padding:15px;\">\n"
+" <p style=\"font-size:20px;color:#666666;\" align=\"center\">Leaderboard</p>\n"
+" </td>\n"
+" % endif\n"
+" </div>\n"
" </tr>\n"
" </table>\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\">\n"
@@ -46,7 +203,7 @@ msgid "\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:20px;\">\n"
" <tr>\n"
" <td align=\"center\">\n"
-" <p style=\"font-size:27px;color:#666666;\">Personal Performance</p>\n"
+" <div>Personal Performance</div>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
@@ -59,16 +216,12 @@ msgid "\n"
" <th style=\"width:20%;text-align:right;\" align=\"right\">Completeness</th>\n"
" </tr>\n"
" <tr>\n"
-" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td>\n"
+" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"/>\n"
" </tr>\n"
" </thead>\n"
" <tbody>\n"
" % for line in challenge_lines:\n"
-" <tr\n"
-" % if line['completeness'] >= 100:\n"
-" style=\"font-weight:bold;\"\n"
-" % endif\n"
-" >\n"
+" <tr style=\"font-weight:bold;\">\n"
" <td style=\"padding: 20px 0;\" align=\"left\">\n"
" ${line['name']}\n"
" % if line['suffix'] or line['monetary']:\n"
@@ -88,7 +241,7 @@ msgid "\n"
" <td style=\"padding: 20px 0;font-size:25px;color:#9A6C8E;\" align=\"right\"><strong>${line['completeness']| int}%</strong></td>\n"
" </tr>\n"
" <tr>\n"
-" <td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"></td>\n"
+" <td colspan=\"5\" style=\"height:1px;background-color:#e3e3e3;\"/>\n"
" </tr>\n"
" % endfor \n"
" </tbody>\n"
@@ -99,15 +252,15 @@ msgid "\n"
" </span> \n"
" % for line in challenge_lines:\n"
" <!-- Header + Button table -->\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\"style=\"margin-top:35px;\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:35px;\">\n"
" <tr>\n"
" <td width=\"50%\">\n"
-" <p style=\"font-size:22px;color:#666666;\">Top Achievers for goal <strong>${line['name']}</strong></p>\n"
+" <div>Top Achievers for goal <strong>${line['name']}</strong></div>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
" <!-- Podium -->\n"
-" % if len(line['goals'])>2:\n"
+" % if len(line['goals']) == 2:\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:10px;\">\n"
" <tr><td style=\"padding:0 30px;\">\n"
" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"table-layout: fixed;\">\n"
@@ -116,7 +269,7 @@ msgid "\n"
" % for goal in top_goals:\n"
" <td align=\"center\" style=\"width:32%;\">\n"
" % if loop.index == 1:\n"
-" % set extra_div = '<div style=\"height:40px;\"></div>'\n"
+" % set extra_div = '<div style=\"height:40px;\"/>'\n"
" % set heightA = 95\n"
" % set heightB = 75\n"
" % set bgColor = '#b898b0'\n"
@@ -130,7 +283,7 @@ msgid "\n"
" % set fontSize = 85\n"
" % set podiumPosition = '1'\n"
" % elif loop.index == 3:\n"
-" % set extra_div = '<div style=\"height:60px;\"></div>'\n"
+" % set extra_div = '<div style=\"height:60px;\"/>'\n"
" % set heightA = 115\n"
" % set heightB = 55\n"
" % set bgColor = '#c8afc1'\n"
@@ -144,20 +297,18 @@ msgid "\n"
" % set path = object.env['res.users'].browse(goal['user_id']).partner_id.image_small\n"
" <img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"data:image/jpeg;base64,${path}\" alt=\"${goal['name']}\"/>\n"
" </div> \n"
-" <div align=\"center\" style =\"color:${bgColor};height:20px\">\n"
+" <div align=\"center\" style=\"color:${bgColor};height:20px\">\n"
" ${goal['name']}\n"
-" </div \n"
+" </div>\n"
" </div>\n"
" <div style=\"background-color:${bgColor | safe};height:${heightB}px;\">\n"
" <strong><span style=\"color:#fff;font-size:${fontSize}px;\">${podiumPosition | safe}</span></strong>\n"
" </div>\n"
" <div style=\"height:30px;\">\n"
-" <p style=\"color:#9A6C8E;font-size:20px;margin-top:10px;\">\n"
-" ${\"%.2f\" % goal['current']}\n"
-" % if line['suffix'] or line['monetary']:\n"
-" ${line['full_suffix']}\n"
-" % endif\n"
-" </p>\n"
+" ${\"%.2f\" % goal['current']}\n"
+" % if line['suffix'] or line['monetary']:\n"
+" ${line['full_suffix']}\n"
+" % endif\n"
" </div>\n"
" </div>\n"
" </td>\n"
@@ -184,10 +335,10 @@ msgid "\n"
" (${company.currency_id.symbol})\n"
" % endif\n"
" </th>\n"
-" <th style=\"width:30%;text-align:right;\"\">Completeness</th>\n"
+" <th style=\"width:30%;text-align:right;\">Completeness</th>\n"
" </tr>\n"
" <tr>\n"
-" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"></td>\n"
+" <td colspan=\"5\" style=\"height:1px;background-color:#9A6C8E;\"/>\n"
" </tr>\n"
" </thead>\n"
" <tbody>\n"
@@ -205,7 +356,7 @@ msgid "\n"
" <td width=\"30%\" style=\"color:${tdPercentageColor};background-color:${tdBgColor};padding-right:15px;font-size:22px;\" align=\"right\"><strong>${goal['completeness'] | int}%</strong></td>\n"
" </tr>\n"
" <tr>\n"
-" <td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"></td>\n"
+" <td colspan=\"5\" style=\"height:1px;background-color:#DADADA;\"/>\n"
" </tr>\n"
" % endfor\n"
" </tbody>\n"
@@ -217,135 +368,15 @@ msgid "\n"
" % endif\n"
" </td></tr>\n"
" </table>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"padding: 15px; color: #666666;margin-bottom: 5px;\">\n"
-" <tr>\n"
-" <td align=\"center\" style=\"min-width: 590px;\">\n"
-" <table width=\"580\" border=\"0\" cellpadding=\"0\" style=\"min-width: 580px; font-size: 12px;\">\n"
-" <tr>\n"
-" <td valign=\"middle\" align=\"left\" style=\"padding-top: 10px; padding-bottom: 10px;\">\n"
-" ${company.name}<br/>\n"
-" ${company.phone or ''}\n"
-" </td>\n"
-" <td valign=\"middle\" align=\"right\" style=\"padding-top: 10px; padding-bottom: 10px;\">\n"
-" % if company.email:\n"
-" <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: #666666;\">${company.email}</a><br/>\n"
-" % endif\n"
-" % if company.website:\n"
-" <a href=\"${company.website}\" style=\"text-decoration:none; color: #666666;\">\n"
-" ${company.website}\n"
-" </a>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr> \n"
-" <tr>\n"
-" <td align=\"center\">\n"
-" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
" </td></tr>\n"
" </table>\n"
" </td>\n"
"</tr>\n"
"</table>\n"
-" \n"
-"\n"
-""
-msgstr ""
-
-#. module: gamification
-#: model:mail.template,body_html:gamification.email_template_goal_reminder
-msgid "\n"
-" <p>\n"
-" <strong>Reminder ${object.name}</strong>\n"
-" </p>\n"
-" \n"
-" <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
" "
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:589
-#, python-format
-msgid "%s has joined the challenge"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:598
-#, python-format
-msgid "%s has refused the challenge"
-msgstr ""
-
-#. module: gamification
-#: model:mail.template,body_html:gamification.email_template_badge_received
-msgid "<?xml version=\"1.0\"?>\n"
-"<data><div>\n"
-" <p>Congratulations ${object.user_id.name} !</p>\n"
-" <p>You just received badge <strong>${object.badge_id.name}</strong> !</p>\n"
-"</div>\n"
-"<div>\n"
-"% if object.badge_id.description\n"
-"<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 600px; margin-top: 5px;\">\n"
-"<tbody><tr>\n"
-" <td valign=\"center\">\n"
-" <img src=\"/web/image/gamification.badge/${object.badge_id.id}/image/80x80\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\"/>\n"
-" </td>\n"
-" <td valign=\"center\">\n"
-" <cite>${object.badge_id.description}</cite>\n"
-" </td>\n"
-"</tr></tbody>\n"
-"</table>\n"
-"% endif\n"
-"</div>\n"
-"<div>\n"
-" <p>\n"
-"% if object.sender_id\n"
-" This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
-"% endif\n"
-" </p>\n"
-" <p>\n"
-"% if object.comment\n"
-" <em>${object.comment}</em>\n"
-"% endif\n"
-" </p>\n"
-"</div>\n"
-"</data>"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:655
-#, python-format
-msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:652
-#, python-format
-msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewarded for this challenge."
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:650
-#, python-format
-msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:660
-#, python-format
-msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
-msgstr ""
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.challenge_form_view
-msgid "<span class=\"o_stat_text\">Related</span>\n"
-" <span class=\"o_stat_text\">Goals</span>"
-msgstr ""
-
-#. module: gamification
#: model:ir.actions.act_window,help:gamification.badge_list_action
msgid "A badge is a symbolic token granted to a user as a sign of reward.\n"
" It can be deserved automatically when some conditions are met or manually by users.\n"
@@ -382,6 +413,12 @@ msgid "Action"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_needaction
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge__active
msgid "Active"
msgstr ""
@@ -495,7 +532,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:412
+#: code:addons/gamification/models/goal.py:413
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -806,6 +843,24 @@ msgid "Filter Domain"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_follower_ids
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_channel_ids
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_partner_ids
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__reward_first_id
msgid "For 1st user"
msgstr ""
@@ -1038,6 +1093,24 @@ msgid "If a maximum is set"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_unread
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_needaction
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_has_error
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_badge_user__challenge_id
msgid "If this badge was rewarded through a challenge"
msgstr ""
@@ -1084,6 +1157,12 @@ msgid "Invite new Users"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_is_follower
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge____last_update
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user____last_update
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard____last_update
@@ -1165,6 +1244,18 @@ msgid "Mail Group Following"
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"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_ids
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition__model_id
#: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
msgid "Model"
@@ -1262,7 +1353,7 @@ msgid "No one, assigned through challenges"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:667
+#: code:addons/gamification/models/challenge.py:672
#, python-format
msgid "Nobody reached the required conditions to receive special badges."
msgstr ""
@@ -1283,6 +1374,36 @@ msgid "Notification Messages"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_has_error_counter
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_needaction_counter
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_has_error_counter
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,help:gamification.field_gamification_challenge__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge__stat_count_distinct
msgid "Number of users"
msgstr ""
@@ -1618,7 +1739,7 @@ msgid "The action that will be called to update the goal value."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:646
+#: code:addons/gamification/models/challenge.py:651
#, python-format
msgid "The challenge %s is finished."
msgstr ""
@@ -1829,12 +1950,24 @@ msgid "Unit"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_unread
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_unread_counter
+#: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: gamification
#: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
msgid "Update"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:447
+#: code:addons/gamification/models/goal.py:448
#, python-format
msgid "Update %s"
msgstr ""
@@ -1903,7 +2036,7 @@ msgstr ""
#. module: gamification
#: code:addons/gamification/wizard/grant_badge.py:24
#, python-format
-msgid "You can not grant a badge to yourself"
+msgid "You can not grant a badge to yourself."
msgstr ""
#. module: gamification
diff --git a/addons/google_account/i18n/google_account.pot b/addons/google_account/i18n/google_account.pot
index a7e0c7e6684..50c8c4a1f40 100644
--- a/addons/google_account/i18n/google_account.pot
+++ b/addons/google_account/i18n/google_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr ""
#. module: google_account
#: code:addons/google_account/models/google_service.py:130
#, python-format
-msgid "The account for the Google service '%s' is not configured"
+msgid "The account for the Google service '%s' is not configured."
msgstr ""
#. module: google_account
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index aea34c8d5f2..01312d05b2c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
#. module: google_drive
#: code:addons/google_drive/models/google_drive.py:42
#, python-format
-msgid "At least one key cannot be found in your Google Drive name pattern"
+msgid "At least one key cannot be found in your Google Drive name pattern."
msgstr ""
#. module: google_drive
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index d8d90119574..13144cc100b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr
-#: code:addons/hr/models/hr.py:75
+#: code:addons/hr/models/hr.py:76
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -27,12 +27,6 @@ msgid "&amp;nbsp;"
msgstr ""
#. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
-msgid "<span class=\"o_unfollow\">Unfollow</span>\n"
-" <span class=\"o_following\">Following</span>"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_department_view_kanban
msgid "<span>Reporting</span>"
msgstr ""
@@ -48,24 +42,66 @@ msgid "<span>To Do</span>"
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
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__active
#: model:ir.model.fields,field_description:hr.field_hr_employee__active
msgid "Active"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: hr
#: model:ir.actions.act_window,help:hr.act_employee_from_department
#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
msgid "Add a new employee"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__additional_note
+msgid "Additional Note"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_mail_alias__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_department_filter
#: model:ir.ui.view,arch_db:hr.view_employee_filter
msgid "Archived"
msgstr ""
#. module: hr
+#: selection:mail.alias,alias_contact:0
+msgid "Authenticated Employees"
+msgstr ""
+
+#. module: hr
+#: selection:mail.alias,alias_contact:0
+msgid "Authenticated Partners"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,certificate:0
+msgid "Bachelor"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee__bank_account_id
msgid "Bank Account Number"
msgstr ""
@@ -76,6 +112,11 @@ msgid "Birth"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__certificate
+msgid "Certificate Level"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__child_ids
msgid "Child Departments"
msgstr ""
@@ -105,6 +146,7 @@ msgstr ""
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__company_id
+#: model:ir.model.fields,field_description:hr.field_hr_employee__company_id
#: model:ir.model.fields,field_description:hr.field_hr_job__company_id
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_job_filter
@@ -137,6 +179,11 @@ msgid "Contact Information"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__country_of_birth
+msgid "Country of Birth"
+msgstr ""
+
+#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
msgid "Create a new department"
msgstr ""
@@ -168,6 +215,11 @@ msgid "Date of Birth"
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_employee__resource_calendar_id
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee__department_id
#: model:ir.model.fields,field_description:hr.field_hr_job__department_id
#: model:ir.ui.view,arch_db:hr.view_department_filter
@@ -202,11 +254,26 @@ msgid "Divorced"
msgstr ""
#. module: hr
+#: model:ir.ui.view,arch_db:hr.view_employee_form
+msgid "Education"
+msgstr ""
+
+#. module: hr
#: model:ir.model,name:hr.model_mail_alias
msgid "Email Aliases"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__emergency_contact
+msgid "Emergency Contact"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__emergency_phone
+msgid "Emergency Phone"
+msgstr ""
+
+#. module: hr
#: model:ir.model,name:hr.model_hr_employee
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Employee"
@@ -218,6 +285,11 @@ msgid "Employee Category"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__google_drive_link
+msgid "Employee Documents"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_category__name
msgid "Employee Tag"
msgstr ""
@@ -271,15 +343,8 @@ msgid "Enter here the private address of the employee, not the one linked to you
msgstr ""
#. module: hr
-#: code:addons/hr/models/hr.py:310
-#, python-format
-msgid "Error! You cannot create recursive departments."
-msgstr ""
-
-#. module: hr
-#: code:addons/hr/models/hr.py:187
-#, python-format
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+#: selection:mail.alias,alias_contact:0
+msgid "Everyone"
msgstr ""
#. module: hr
@@ -298,16 +363,38 @@ msgid "Female"
msgstr ""
#. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
-msgid "Follow"
+#: model:ir.model.fields,field_description:hr.field_hr_employee__study_field
+msgid "Field of Study"
msgstr ""
#. module: hr
+#: 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 ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_channel_ids
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_channel_ids
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_partner_ids
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_partner_ids
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr
+#: selection:mail.alias,alias_contact:0
+msgid "Followers only"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee__gender
msgid "Gender"
msgstr ""
@@ -334,6 +421,7 @@ msgid "Hired Employees"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_res_users__group_hr_user
#: model:ir.ui.menu,name:hr.menu_hr_main
msgid "Human Resources"
msgstr ""
@@ -352,6 +440,27 @@ msgid "Identification No"
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_unread
+#: model:ir.model.fields,help:hr.field_hr_employee__message_unread
+#: model:ir.model.fields,help:hr.field_hr_job__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_needaction
+#: model:ir.model.fields,help:hr.field_hr_employee__message_needaction
+#: model:ir.model.fields,help:hr.field_hr_job__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_has_error
+#: model:ir.model.fields,help:hr.field_hr_employee__message_has_error
+#: model:ir.model.fields,help:hr.field_hr_job__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,help:hr.field_hr_employee__active
msgid "If the active field is set to False, it will allow you to hide the resource record without removing it."
msgstr ""
@@ -367,6 +476,13 @@ msgid "In Recruitment"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_is_follower
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_is_follower
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
#: model:ir.ui.view,arch_db:hr.view_hr_job_tree
@@ -392,12 +508,22 @@ msgid "Job Positions"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__job_title
+msgid "Job Title"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__jobs_ids
#: model:ir.ui.view,arch_db:hr.view_job_filter
msgid "Jobs"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__km_home_work
+msgid "Km home-work"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department____last_update
#: model:ir.model.fields,field_description:hr.field_hr_employee____last_update
#: model:ir.model.fields,field_description:hr.field_hr_employee_category____last_update
@@ -455,6 +581,11 @@ msgid "Married"
msgstr ""
#. module: hr
+#: selection:hr.employee,certificate:0
+msgid "Master"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee__image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -470,6 +601,16 @@ msgid "Members"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_has_error
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_has_error
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr
+#: 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 ""
@@ -485,6 +626,21 @@ msgid "Nationality (Country)"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: hr
#: selection:hr.job,state:0
msgid "Not Recruiting"
msgstr ""
@@ -500,21 +656,61 @@ msgid "Notes"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__children
+msgid "Number of Children"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job__no_of_employee
msgid "Number of employees currently occupying this job position."
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_has_error_counter
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_has_error_counter
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job__no_of_hired_employee
msgid "Number of hired employees for this job position during recruitment phase."
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_needaction_counter
+#: model:ir.model.fields,help:hr.field_hr_employee__message_needaction_counter
+#: model:ir.model.fields,help:hr.field_hr_job__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_has_error_counter
+#: model:ir.model.fields,help:hr.field_hr_employee__message_has_error_counter
+#: model:ir.model.fields,help:hr.field_hr_job__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job__no_of_recruitment
msgid "Number of new employees you expect to recruit."
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_department__message_unread_counter
+#: model:ir.model.fields,help:hr.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,help:hr.field_hr_job__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
msgid "Odoo's department structure is used to manage all documents\n"
" related to employees by departments: expenses, timesheets,\n"
@@ -527,6 +723,13 @@ msgid "Officer"
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_res_users__group_hr_user
+msgid "Officer: The user will be able to approve document created by employees.\n"
+"Manager: The user will have an access to the human resources configuration as well as statistic reports."
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,certificate:0
#: selection:hr.employee,gender:0
msgid "Other"
msgstr ""
@@ -537,6 +740,11 @@ msgid "Other Information ..."
msgstr ""
#. module: hr
+#: selection:hr.employee,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department__parent_id
msgid "Parent Department"
msgstr ""
@@ -552,6 +760,25 @@ msgid "Photo"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__place_of_birth
+msgid "Place of Birth"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,help:hr.field_mail_alias__alias_contact
+msgid "Policy to post a message on the document using the mailgateway.\n"
+"- everyone: everyone can post\n"
+"- partners: only authenticated partners\n"
+"- followers: only followers of the related document or members of following channels\n"
+""
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Position"
msgstr ""
@@ -607,6 +834,16 @@ msgid "Requirements"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__resource_id
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee__sinid
msgid "SIN No"
msgstr ""
@@ -617,6 +854,11 @@ msgid "SSN No"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__study_school
+msgid "School"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.res_config_settings_view_form
msgid "Set default calendar used to compute time allocation for leaves, timesheets, ..."
msgstr ""
@@ -674,6 +916,16 @@ msgid "Social Security Number"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__spouse_birthdate
+msgid "Spouse Birthdate"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__spouse_complete_name
+msgid "Spouse Complete Name"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
msgid "Start Recruitment"
msgstr ""
@@ -686,6 +938,14 @@ msgid "Status"
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_employee__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: hr
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
msgid "Stop Recruitment"
msgstr ""
@@ -736,11 +996,29 @@ msgid "This field holds the image used as photo for the employee, limited to 102
msgstr ""
#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_employee__tz
+msgid "This field is used in order to define in which timezone the resources will work."
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__tz
+msgid "Timezone"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_job__expected_employees
msgid "Total Forecasted Employees"
msgstr ""
#. module: hr
+#: 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
@@ -749,6 +1027,13 @@ msgid "Unread Messages"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department__message_unread_counter
+#: model:ir.model.fields,field_description:hr.field_hr_employee__message_unread_counter
+#: model:ir.model.fields,field_description:hr.field_hr_job__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Use here the home address of the employee.\n"
" This private address is used in the expense report reimbursement document.\n"
@@ -839,6 +1124,23 @@ msgid "Work Phone"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee__resource_calendar_id
+msgid "Working Hours"
+msgstr ""
+
+#. module: hr
+#: code:addons/hr/models/hr.py:206
+#, python-format
+msgid "You cannot create a recursive hierarchy."
+msgstr ""
+
+#. module: hr
+#: code:addons/hr/models/hr.py:307
+#, python-format
+msgid "You cannot create recursive departments."
+msgstr ""
+
+#. module: hr
#: model:mail.template,subject:hr.mail_template_data_unknown_employee_email_address
msgid "Your document has not been created"
msgstr ""
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 243a66b465a..917d52dbbd2 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,13 @@ msgid "%(empl_name)s from %(check_in)s to %(check_out)s"
msgstr ""
#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:109
+#, python-format
+msgid "<b>Warning! Last check in was over 12 hours ago.</b><br/>If this isn't right, please contact Human Resource staff"
+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 ""
@@ -46,14 +53,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:117
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:124
#, python-format
msgid "An apple a day keeps the doctor away"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:106
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:113
#, python-format
msgid "Another good day's work! See you soon!"
msgstr ""
@@ -62,6 +69,7 @@ msgstr ""
#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_my_attendances
#: model:ir.model,name:hr_attendance.model_hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee__attendance_ids
+#: model:ir.model.fields,field_description:hr_attendance.field_res_users__group_hr_attendance_user
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_graph
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_pivot
#: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
@@ -109,13 +117,13 @@ msgid "Cannot create new attendance record for %(empl_name)s, the employee was a
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:108
+#: code:addons/hr_attendance/models/hr_employee.py:109
#, python-format
msgid "Cannot perform check in or check out on multiple employees."
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:122
+#: code:addons/hr_attendance/models/hr_employee.py:123
#, python-format
msgid "Cannot perform check out on %(empl_name)s, could not find corresponding check in. Your attendances have probably been modified manually by human resources."
msgstr ""
@@ -136,20 +144,6 @@ msgid "Check Out"
msgstr ""
#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:53
-#, python-format
-msgid "Check in"
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:49
-#, python-format
-msgid "Check out"
-msgstr ""
-
-#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.res_config_settings_view_form
msgid "Check-In/Out"
msgstr ""
@@ -161,7 +155,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:109
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:122
#, python-format
msgid "Checked in at"
msgstr ""
@@ -173,28 +167,22 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:97
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:113
#, python-format
msgid "Checked out at"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:27
-#, python-format
-msgid "Click to check in"
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:31
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:73
#, python-format
-msgid "Click to check out"
+msgid "Click to"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:12
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:14
#: model:ir.ui.view,arch_db:hr_attendance.print_employee_badge
#, python-format
msgid "Company Logo"
@@ -226,6 +214,11 @@ msgid "Current Month"
msgstr ""
#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "Date"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance__department_id
msgid "Department"
msgstr ""
@@ -237,14 +230,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:123
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:130
#, python-format
msgid "Early to bed and early to rise, makes a man healthy, wealthy and wise"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:115
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:122
#, python-format
msgid "Eat breakfast as a king, lunch as a merchant and supper as a beggar"
msgstr ""
@@ -285,6 +278,7 @@ msgid "Employees"
msgstr ""
#. module: hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_res_users__has_group_hr_attendance_use_pin
#: model:res.groups,name:hr_attendance.group_hr_attendance_use_pin
msgid "Enable PIN use"
msgstr ""
@@ -298,64 +292,73 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:35
+#: 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:81
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:94
#, python-format
msgid "Error: could not find corresponding employee."
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:70
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:77
#, python-format
msgid "First come, first served"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:85
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:92
#, python-format
msgid "Glad to have you back, it's been a while!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:76
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:62
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:135
+#, python-format
+msgid "Go back"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:83
#, python-format
msgid "Good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:78
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:85
#, python-format
msgid "Good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:73
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:80
#, python-format
msgid "Good morning"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:64
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:80
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:71
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:87
#, python-format
msgid "Good night"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:100
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:111
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:129
#, python-format
msgid "Goodbye"
msgstr ""
@@ -367,28 +370,28 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:120
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:127
#, python-format
msgid "Have a good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:111
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:118
#, python-format
msgid "Have a good day!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:125
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:132
#, python-format
msgid "Have a good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:113
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:120
#, python-format
msgid "Have a nice lunch!"
msgstr ""
@@ -410,14 +413,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:88
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:95
#, python-format
msgid "If a job is worth doing, it is worth doing well!"
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:134
#, python-format
msgid "Invalid request, please return to the main menu."
msgstr ""
@@ -459,6 +462,7 @@ msgstr ""
#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee__manual_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_res_users__has_group_hr_attendance
#: model:res.groups,name:hr_attendance.group_hr_attendance
msgid "Manual Attendance"
msgstr ""
@@ -470,11 +474,6 @@ msgstr ""
#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
-msgid "Month"
-msgstr ""
-
-#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "My Attendances"
msgstr ""
@@ -494,12 +493,19 @@ msgid "No attendance records to display"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:72
+#: code:addons/hr_attendance/models/hr_employee.py:73
#, python-format
msgid "No employee corresponding to barcode %(barcode)s"
msgstr ""
#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:130
+#, python-format
+msgid "OK"
+msgstr ""
+
+#. module: hr_attendance
#: model:res.groups,name:hr_attendance.group_hr_attendance_user
msgid "Officer"
msgstr ""
@@ -516,21 +522,14 @@ 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:76
#, python-format
-msgid "Please enter your PIN to check in"
+msgid "Please enter your PIN to"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:59
-#, python-format
-msgid "Please enter your PIN to check out"
-msgstr ""
-
-#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:82
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:94
#, python-format
msgid "Please return to the main menu."
msgstr ""
@@ -547,14 +546,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:13
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:18
#, python-format
msgid "Scan your badge"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:15
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:25
#, python-format
msgid "Select Employee"
msgstr ""
@@ -585,7 +584,7 @@ msgid "The Badge ID must be unique, this one is already assigned to another empl
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:63
+#: code:addons/hr_attendance/models/hr_employee.py:64
#, python-format
msgid "The PIN must be a sequence of digits."
msgstr ""
@@ -598,7 +597,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:68
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:75
#, python-format
msgid "The early bird catches the worm"
msgstr ""
@@ -609,11 +608,13 @@ msgid "The employee will have access to the \"My Attendances\" menu to check in
msgstr ""
#. module: hr_attendance
+#: model:ir.model.fields,help:hr_attendance.field_res_users__has_group_hr_attendance
#: model:res.groups,comment:hr_attendance.group_hr_attendance
msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance."
msgstr ""
#. module: hr_attendance
+#: model:ir.model.fields,help:hr_attendance.field_res_users__has_group_hr_attendance_use_pin
#: model:res.groups,comment:hr_attendance.group_hr_attendance_use_pin
msgid "The user will have to enter his PIN to check in and out manually at the company screen."
msgstr ""
@@ -629,60 +630,83 @@ msgid "Use PIN codes to check in in Kiosk Mode"
msgstr ""
#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:102
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:44
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:70
#, python-format
-msgid "Warning! Last check in was over 12 hours ago.<br/>If this isn't right, please contact Human Resources."
+msgid "Want to check out?"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:25
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:112
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:120
#, python-format
msgid "Welcome"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:11
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:13
#, python-format
msgid "Welcome to"
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
+#, python-format
+msgid "Welcome!"
+msgstr ""
+
+#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance__worked_hours
msgid "Worked Hours"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_employee.py:79
+#: code:addons/hr_attendance/models/hr_employee.py:80
#, python-format
msgid "Wrong PIN"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/models/hr_attendance.py:106
+#: code:addons/hr_attendance/models/hr_attendance.py:107
#, python-format
msgid "You cannot duplicate an attendance."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,help:hr_attendance.field_hr_employee__attendance_ids
-msgid "list of attendances for the employee"
+#. 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
+#, python-format
+msgid "check in"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:123
+#: 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
#, python-format
-msgid "ok"
+msgid "check out"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,help:hr_attendance.field_hr_employee__attendance_ids
+msgid "list of attendances for the employee"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/xml/attendance.xml:14
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:21
#, python-format
msgid "or"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 6e85800dc69..8e5e205c940 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,26 @@ msgid "<span>/ month</span>"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__active
+msgid "Active"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__advantages
msgid "Advantages"
msgstr ""
@@ -36,6 +56,11 @@ msgid "Advantages..."
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: hr_contract
#: selection:hr.contract,state:0
msgid "Cancelled"
msgstr ""
@@ -73,7 +98,6 @@ msgstr ""
#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_contract_type
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__type_id
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type__name
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_form
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_search
@@ -100,9 +124,9 @@ msgid "Contract expired"
msgstr ""
#. module: hr_contract
-#: code:addons/hr_contract/models/hr_contract.py:100
+#: code:addons/hr_contract/models/hr_contract.py:99
#, python-format
-msgid "Contract start date must be less than contract end date."
+msgid "Contract start date must be earlier than contract end date."
msgstr ""
#. module: hr_contract
@@ -113,7 +137,7 @@ msgstr ""
#. module: hr_contract
#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_employee__contract_ids
+#: model:ir.model.fields,field_description:hr_contract.field_res_users__group_hr_contract_user
#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_tree
@@ -184,11 +208,21 @@ msgid "Employee"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__type_id
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model,name:hr_contract.model_hr_contract
msgid "Employee Contract"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_employee__contract_ids
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract__wage
msgid "Employee's monthly gross wage."
msgstr ""
@@ -225,11 +259,31 @@ msgid "Expired"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_type__sequence
msgid "Gives the sequence when displaying a list of Contract."
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__reported_to_secretariat
+msgid "Green this button when the contract information has been transfered to the social secretariat."
+msgstr ""
+
+#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
msgid "Group By"
msgstr ""
@@ -242,24 +296,34 @@ msgid "HR Contract: update state"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_employee__vehicle_distance
-msgid "Home-Work Dist."
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__id
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type__id
msgid "ID"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
msgid "Important Messages"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_employee__vehicle_distance
-msgid "In kilometers"
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_is_follower
+msgid "Is Follower"
msgstr ""
#. module: hr_contract
@@ -301,6 +365,11 @@ msgid "Latest contract of the employee"
msgstr ""
#. module: hr_contract
+#: model:res.groups,name:hr_contract.group_hr_contract_manager
+msgid "Manager"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_hr_employee_view_form2
msgid "Medical Exam"
msgstr ""
@@ -311,6 +380,16 @@ msgid "Medical Examination Date"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Monthly Advantages in Cash"
msgstr ""
@@ -321,19 +400,64 @@ msgid "New"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__notes
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Notes"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_employee__children
-msgid "Number of Children"
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_contract
+#: selection:hr.contract,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: hr_contract
+#: selection:hr.contract,activity_state:0
+msgid "Planned"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_employee__place_of_birth
-msgid "Place of Birth"
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_user_id
+msgid "Responsible User"
msgstr ""
#. module: hr_contract
@@ -363,6 +487,11 @@ msgid "Sequence"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__reported_to_secretariat
+msgid "Social Secretariat"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__date_start
msgid "Start Date"
msgstr ""
@@ -383,6 +512,14 @@ msgid "Status"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__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: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract__state
msgid "Status of the contract"
msgstr ""
@@ -395,6 +532,31 @@ msgid "To Renew"
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
+msgid "To Report to Social Secretariat"
+msgstr ""
+
+#. module: hr_contract
+#: selection:hr.contract,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model,name:hr_contract.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__visa_expire
msgid "Visa Expire Date"
msgstr ""
@@ -410,6 +572,16 @@ msgid "Wage"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract__permit_no
msgid "Work Permit No"
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 76eec9b5a27..0fed92484c7 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,42 +22,42 @@ msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:43
+#: code:addons/hr_expense/static/src/js/tour.js:46
#, python-format
-msgid "<p>Approve the sheet here.</p><p>Tip: if you refuse, don’t forget to give the reason thanks to the hereunder message tool</p>"
+msgid "<p>Approve the report here.</p><p>Tip: if you refuse, don’t forget to give the reason thanks to the hereunder message tool</p>"
msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:39
+#: code:addons/hr_expense/static/src/js/tour.js:38
#, python-format
-msgid "<p>Click on <b> Action Submit To Manager </b> to submit selected expenses to your manager</p>"
+msgid "<p>Click on <b> Action Create Report </b> to submit selected expenses to your manager</p>"
msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:21
+#: code:addons/hr_expense/static/src/js/tour.js:29
#, python-format
-msgid "<p>Let’s start by creating your first expense.</p>"
+msgid "<p>Click on <b> Create Report </b> to create the report.</p>"
msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:26
+#: code:addons/hr_expense/static/src/js/tour.js:20
#, python-format
-msgid "<p>Once your <b>Expense report</b> is ready, you can save it and wait for the approval from your manager.</p>"
+msgid "<p>Once your <b> Expense </b> is ready, you can save it.</p>"
msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:34
+#: code:addons/hr_expense/static/src/js/tour.js:33
#, python-format
msgid "<p>Select expenses to submit them to your manager</p>"
msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:47
+#: code:addons/hr_expense/static/src/js/tour.js:50
#, python-format
msgid "<p>The accountant receive approved expense reports.</p><p>He can post journal entries in one click if taxes and accounts are right.</p>"
msgstr ""
@@ -114,12 +114,36 @@ msgid "Accounting"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_needaction
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_state
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.mail_activity_type_action_config_hr_expense
+#: model:ir.ui.menu,name:hr_expense.hr_expense_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "Actual expense sheets, not the refused ones"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:141
+#: code:addons/hr_expense/models/hr_expense.py:159
#, python-format
msgid "Add a new expense,"
msgstr ""
@@ -169,8 +193,13 @@ msgid "Approved Expenses"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_form
+msgid "Attach Document"
+msgstr ""
+
+#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:30
+#: code:addons/hr_expense/static/src/js/tour.js:24
#, python-format
msgid "Attach your receipt here."
msgstr ""
@@ -186,8 +215,8 @@ msgid "Bill Reference"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
-msgid "Billing"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__can_reset
+msgid "Can Reset"
msgstr ""
#. module: hr_expense
@@ -208,11 +237,6 @@ msgid "Certified honest and conform,<br/>(Date and signature).<br/><br/>"
msgstr ""
#. module: hr_expense
-#: model:mail.message.subtype,description:hr_expense.mt_expense_responsible
-msgid "Changes of responsible"
-msgstr ""
-
-#. module: hr_expense
#: selection:hr.expense,payment_mode:0
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__company_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__company_id
@@ -239,6 +263,12 @@ 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 ""
+
+#. module: hr_expense
#: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense_sheet
#: model:ir.actions.act_window,help:hr_expense.action_request_to_pay_expense_sheet
#: model:ir.actions.act_window,help:hr_expense.action_request_to_post_expense_sheet
@@ -284,14 +314,11 @@ msgid "Currency"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_res_config_settings__module_sale_expense
-msgid "Customer Billing"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__date
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__accounting_date
#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+#: 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 "Date"
msgstr ""
@@ -326,6 +353,12 @@ msgid "Documents"
msgstr ""
#. module: hr_expense
+#: selection:hr.expense.sheet,state:0
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "Draft"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
msgid "Draft Payment"
msgstr ""
@@ -374,6 +407,16 @@ msgid "Expense"
msgstr ""
#. module: hr_expense
+#: model:mail.activity.type,name:hr_expense.mail_act_expense_approval
+msgid "Expense Approval"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Expense Date"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__journal_id
msgid "Expense Journal"
msgstr ""
@@ -393,6 +436,7 @@ msgstr ""
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_sheet
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__sheet_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
msgid "Expense Report"
msgstr ""
@@ -448,21 +492,11 @@ msgid "Expense Reports to Approve"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.account_journal_dashboard_kanban_view_inherit_hr_expense
-msgid "Expense Reports to Process"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_employee__expense_manager_id
msgid "Expense Responsible"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
-msgid "Expense Sheet"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_refuse_wizard
msgid "Expense refuse Reason wizard"
msgstr ""
@@ -488,16 +522,12 @@ msgid "Expense report refused"
msgstr ""
#. module: hr_expense
-#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
-msgid "Expense report submitted, waiting approval"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_account_move_line__expense_id
msgid "Expense where the move line come from"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_res_users__group_hr_expense_user
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_root
#: model:ir.ui.view,arch_db:hr_expense.hr_employee_view_form_inherit_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_form
@@ -505,7 +535,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
#: 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:product.category,name:hr_expense.cat_expense
#: model:product.product,name:hr_expense.product_product_fixed_cost
#: model:product.template,name:hr_expense.product_product_fixed_cost_product_template
msgid "Expenses"
@@ -522,12 +551,6 @@ msgid "Expenses Analysis"
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 "Expenses Month"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.actions.report,name:hr_expense.action_report_hr_expense_sheet
#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Expenses Report"
@@ -539,26 +562,25 @@ msgid "Expenses Reports to Approve"
msgstr ""
#. module: hr_expense
-#: model:mail.message.subtype,name:hr_expense.mt_department_expense_confirmed
-msgid "Expenses To Approve"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "Expenses by Date"
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 "Expenses by Month"
+msgid "Expenses in Draft"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:613
+#: code:addons/hr_expense/models/hr_expense.py:567
#, python-format
-msgid "Expenses must have an expense journal specified to generate accounting entries."
+msgid "Expenses must be paid by the same entity (Company or employee)."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:519
+#: code:addons/hr_expense/models/hr_expense.py:622
#, python-format
-msgid "Expenses must have been paid by the same entity (Company or employee)"
+msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
#. module: hr_expense
@@ -573,6 +595,11 @@ msgid "Expenses to Invoice"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.account_journal_dashboard_kanban_view_inherit_hr_expense
+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 ""
@@ -583,6 +610,24 @@ msgid "Explicitely Refused by manager or acccountant"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_follower_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_channel_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_partner_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_partner_ids
+msgid "Followers (Partners)"
+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 "Former Employees"
@@ -595,6 +640,12 @@ msgid "From here the accountant will be able to approve as well as refuse the ex
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 "Future Activities"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
msgid "General Information"
msgstr ""
@@ -639,6 +690,30 @@ msgid "ID"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_unread
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_needaction
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_has_error
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_is_follower
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model,name:hr_expense.model_account_journal
msgid "Journal"
msgstr ""
@@ -678,6 +753,12 @@ msgid "Last Updated on"
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 "Late Activities"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_res_config_settings__use_mailgateway
#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
msgid "Let your employees record expenses by email"
@@ -691,7 +772,7 @@ msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:55
+#: code:addons/hr_expense/static/src/js/tour.js:58
#, python-format
msgid "Managers can get all reports to approve from this menu."
msgstr ""
@@ -702,6 +783,18 @@ msgid "Memo"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_has_error
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_ids
+msgid "Messages"
+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.view,arch_db:hr_expense.view_hr_expense_filter
@@ -740,7 +833,7 @@ msgid "New Expense"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:167
+#: code:addons/hr_expense/models/hr_expense.py:185
#, python-format
msgid "New Expense Report"
msgstr ""
@@ -752,13 +845,31 @@ msgid "New Mail"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:225
+#: 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"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_summary
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_type_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:243
#, 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:242
+#: code:addons/hr_expense/models/hr_expense.py:260
#, python-format
msgid "No Home Address found for the employee %s, please configure one."
msgstr ""
@@ -769,8 +880,8 @@ msgid "No approved employee expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:238
-#: code:addons/hr_expense/models/hr_expense.py:348
+#: code:addons/hr_expense/models/hr_expense.py:256
+#: code:addons/hr_expense/models/hr_expense.py:367
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
@@ -791,18 +902,53 @@ 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..."
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__attachment_number
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__attachment_number
msgid "Number of Attachments"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_has_error_counter
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_needaction_counter
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_has_error_counter
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_expense
#: model:res.groups,name:hr_expense.group_hr_expense_user
msgid "Officer"
msgstr ""
@@ -819,15 +965,23 @@ msgid "Once you have created your expense, submit it to your manager who will va
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:651
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:42
#, python-format
-msgid "Only HR Officers can approve expenses"
+msgid "Once your <b>Expense report</b> is ready, you can submit it to your manager and wait for the approval from your manager."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:662
+#: code:addons/hr_expense/models/hr_expense.py:704
#, python-format
-msgid "Only HR Officers can refuse expenses"
+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
+#, python-format
+msgid "Only Managers and HR Officers can approve expenses"
msgstr ""
#. module: hr_expense
@@ -836,6 +990,12 @@ msgid "Other Info"
msgstr ""
#. module: hr_expense
+#: selection:hr.expense,activity_state:0
+#: selection:hr.expense.sheet,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: hr_expense
#: selection:hr.expense,state:0
#: selection:hr.expense.sheet,state:0
#: model:mail.message.subtype,name:hr_expense.mt_expense_paid
@@ -874,7 +1034,13 @@ msgid "Payment Type"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:229
+#: selection:hr.expense,activity_state:0
+#: selection:hr.expense.sheet,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:247
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
@@ -1023,24 +1189,20 @@ msgid "Reports to Post"
msgstr ""
#. module: hr_expense
-#: model:mail.message.subtype,name:hr_expense.mt_expense_responsible
-msgid "Responsible"
-msgstr ""
-
-#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
-msgid "Resubmit"
+msgid "Reset to Draft"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:118
-#, python-format
-msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_user_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_user_id
+msgid "Responsible User"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
-msgid "Sell services and invoice expenses to customer"
+#: code:addons/hr_expense/models/hr_expense.py:136
+#, python-format
+msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure."
msgstr ""
#. module: hr_expense
@@ -1055,6 +1217,12 @@ msgid "Setup your domain alias"
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"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_product_product__can_be_expensed
#: model:ir.model.fields,help:hr_expense.field_product_template__can_be_expensed
msgid "Specify whether the product can be selected in an HR expense."
@@ -1073,24 +1241,27 @@ msgid "Status"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense__state
-msgid "Status of the expense."
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__activity_state
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__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: hr_expense
-#: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
-msgid "Submit To Manager"
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__state
+msgid "Status of the expense."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Submit to Manager"
msgstr ""
#. module: hr_expense
#: selection:hr.expense,state:0
#: selection:hr.expense.sheet,state:0
-#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
msgid "Submitted"
msgstr ""
@@ -1112,7 +1283,7 @@ msgstr ""
#. module: hr_expense
#. openerp-web
-#: code:addons/hr_expense/static/src/js/tour.js:51
+#: code:addons/hr_expense/static/src/js/tour.js:54
#, python-format
msgid "The accountant can register a payment to reimburse the employee directly."
msgstr ""
@@ -1134,11 +1305,6 @@ msgid "The payment method used when the expense is paid by the company."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
-msgid "This installs the Sales Management app. Expenses can be invoiced to customers from sales orders."
-msgstr ""
-
-#. module: hr_expense
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "To Approve"
@@ -1161,6 +1327,18 @@ msgid "To Submit"
msgstr ""
#. module: hr_expense
+#: selection:hr.expense,activity_state:0
+#: selection:hr.expense.sheet,activity_state:0
+msgid "Today"
+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 "Today Activities"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__total_amount
msgid "Total"
msgstr ""
@@ -1189,6 +1367,18 @@ msgid "Unit of Measure"
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"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_unread_counter
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.action_unsubmitted_expense
msgid "Unreported Expenses"
msgstr ""
@@ -1199,6 +1389,11 @@ msgid "User responsible of expense approval. Should be Expense Manager."
msgstr ""
#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_sheet_register_payment_view_form
msgid "Validate"
msgstr ""
@@ -1226,42 +1421,78 @@ msgid "Want to manage your expenses? It starts here."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:610
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense__website_message_ids
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense__website_message_ids
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:673
+#, python-format
+msgid "You can only approve your department expenses"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:619
#, 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
+#, python-format
+msgid "You can only refuse your department expenses"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.res_config_settings_view_form
msgid "You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:526
+#: code:addons/hr_expense/models/hr_expense.py:574
+#, python-format
+msgid "You cannot add expenses of another employee."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:670
#, python-format
-msgid "You cannot add expense lines of another employee."
+msgid "You cannot approve your own expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:128
+#: code:addons/hr_expense/models/hr_expense.py:146
#, python-format
msgid "You cannot delete a posted or approved expense."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:545
+#: code:addons/hr_expense/models/hr_expense.py:586
#, python-format
msgid "You cannot delete a posted or paid expense."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:165
+#: code:addons/hr_expense/models/hr_expense.py:691
+#, python-format
+msgid "You cannot refuse your own expenses"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:183
#, python-format
-msgid "You cannot report expenses for different employees in the same report!"
+msgid "You cannot report expenses for different employees in the same report."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:163
+#: code:addons/hr_expense/models/hr_expense.py:181
#, python-format
msgid "You cannot report twice the same line!"
msgstr ""
@@ -1298,7 +1529,7 @@ msgid "kg"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:142
+#: code:addons/hr_expense/models/hr_expense.py:160
#, python-format
msgid "or send receipts by email to %s."
msgstr ""
diff --git a/addons/hr_gamification/i18n/hr_gamification.pot b/addons/hr_gamification/i18n/hr_gamification.pot
index 80cb05c16f2..80a9b8e2cf2 100644
--- a/addons/hr_gamification/i18n/hr_gamification.pot
+++ b/addons/hr_gamification/i18n/hr_gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -150,6 +150,11 @@ msgid "Received Badges"
msgstr ""
#. module: hr_gamification
+#: model:ir.model.fields,help:hr_gamification.field_gamification_badge_user_wizard__user_id
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: hr_gamification
#: model:ir.actions.act_window,name:hr_gamification.action_reward_wizard
#: model:ir.ui.view,arch_db:hr_gamification.view_badge_wizard_reward
msgid "Reward Employee"
@@ -167,6 +172,11 @@ msgid "The selected employee does not correspond to the selected user."
msgstr ""
#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_user_wizard__user_id
+msgid "User"
+msgstr ""
+
+#. module: hr_gamification
#: model:ir.model,name:hr_gamification.model_res_users
msgid "Users"
msgstr ""
@@ -179,7 +189,7 @@ msgstr ""
#. module: hr_gamification
#: code:addons/hr_gamification/wizard/gamification_badge_user_wizard.py:21
#, python-format
-msgid "You can not send a badge to yourself"
+msgid "You can not send a badge to yourself."
msgstr ""
#. module: hr_gamification
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 42a4aa08f4b..b8651ef19dc 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,19 +41,19 @@ msgid "!important; font-size: 8px; min-width: 18px\"&gt;"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave_type.py:124
+#: code:addons/hr_holidays/models/hr_leave_type.py:218
#, python-format
msgid "%g remaining out of %g"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:205
+#: code:addons/hr_holidays/models/hr_leave.py:363
#, python-format
msgid "%s : %.2f day(s)"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:207
+#: code:addons/hr_holidays/models/hr_leave.py:365
#, python-format
msgid "%s on %s : %.2f day(s)"
msgstr ""
@@ -84,6 +84,12 @@ msgid "&lt;th class=\"text-center\" colspan="
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave,request_unit_all:0
+#: selection:hr.leave,request_unit_day:0
+msgid "1 Day"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.hr_leave_report_kanban
msgid "<small class=\"text-muted\">from</small>"
msgstr ""
@@ -94,18 +100,33 @@ msgid "<small class=\"text-muted\">to</small>"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
+msgid "<span attrs=\"{'invisible': [('request_unit_all', '!=', 'period')]}\">From </span>"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
+msgid "<span attrs=\"{'invisible': [('request_unit_all', '!=', 'period')]}\">To </span>"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
msgid "<strong>Departments and Employees</strong>"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:245
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:148
+#: code:addons/hr_holidays/models/hr_leave.py:418
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:327
#, python-format
msgid "A leave cannot be duplicated."
msgstr ""
#. module: hr_holidays
+#: sql_constraint:hr.leave.type:0
+msgid "A leave type cannot be accrual and considered as unpaid leaves"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_employee__show_leaves
msgid "Able to see Remaining Leaves"
msgstr ""
@@ -137,6 +158,29 @@ msgid "Absent Today"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__accrual
+msgid "Accrual"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
+msgid "Accrual Allocations"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.server,name:hr_holidays.hr_leave_allocation_cron_accrual_ir_actions_server
+#: model:ir.cron,cron_name:hr_holidays.hr_leave_allocation_cron_accrual
+#: model:ir.cron,name:hr_holidays.hr_leave_allocation_cron_accrual
+msgid "Accrual Leave: Updates the number of leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_needaction
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__active
msgid "Active"
msgstr ""
@@ -160,11 +204,45 @@ msgid "Active Types"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_state
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.mail_activity_type_action_config_hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.hr_holidays_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "Add"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
msgid "Add a reason..."
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__validity_start
+msgid "Adding validity to types of leaves so that it cannot be selected outsidethis time period"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave,request_date_from_period:0
+#: selection:hr.leave,request_date_to_period:0
+msgid "Afternoon"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_dashboard
msgid "All Leaves"
msgstr ""
@@ -182,13 +260,16 @@ msgid "Allocated Days"
msgstr ""
#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_leave_allocation
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__number_of_days_temp
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__number_of_days_temp
+#: 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 ""
+
+#. module: hr_holidays
#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_allocation_approved
msgid "Allocation Approved"
msgstr ""
@@ -228,30 +309,31 @@ msgid "Allocation Requests to Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr.py:138
-#, python-format
-msgid "Allocation for %s"
+#: model:mail.activity.type,name:hr_holidays.mail_act_leave_allocation_second_approval
+msgid "Allocation Second Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:114
+#: code:addons/hr_holidays/models/hr.py:139
#, python-format
-msgid "Allocation of %s : %.2f day(s) To %s"
+msgid "Allocation for %s"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_department__allocation_to_approve_count
-msgid "Allocation to Approve"
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:277
+#, python-format
+msgid "Allocation of %s : %.2f day(s) To %s"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_allocation_confirmed
-msgid "Allocations Confirmed"
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:275
+#, python-format
+msgid "Allocation of %s : %.2f hour(s) To %s"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_allocation_first_validated
-msgid "Allocations First Approval"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_department__allocation_to_approve_count
+msgid "Allocation to Approve"
msgstr ""
#. module: hr_holidays
@@ -260,8 +342,8 @@ msgid "Allocations to Approve"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__limit
-msgid "Allow to Override Limit"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__negative
+msgid "Allow Negative"
msgstr ""
#. module: hr_holidays
@@ -270,20 +352,13 @@ msgid "Analyze from"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__double_validation
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__double_validation
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__double_validation
-msgid "Apply Double Validation"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_evaluation_report_graph
msgid "Appraisal Analysis"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:435
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:280
+#: code:addons/hr_holidays/models/hr_leave.py:662
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:507
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
#, python-format
@@ -323,6 +398,11 @@ 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 ""
@@ -374,6 +454,17 @@ msgid "By Employee: Allocation/Request for individual Employee, By Employee Tag:
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
+msgid "Calendar"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__can_approve
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__can_approve
+msgid "Can Approve"
+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"
@@ -445,8 +536,6 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
-#: model:mail.message.subtype,name:hr_holidays.mt_leave_allocation_confirmed
-#: model:mail.message.subtype,name:hr_holidays.mt_leave_confirmed
msgid "Confirmed"
msgstr ""
@@ -509,6 +598,31 @@ msgid "Dashboard"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_date_to_period
+msgid "Date Period End"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_date_from_period
+msgid "Date Period Start"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__nextcall
+msgid "Date of the next accrual allocation"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.type,request_unit:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.allocation,unit_per_interval:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__department_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__department_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__department_id
@@ -553,9 +667,28 @@ msgid "Display Name"
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"
+#: selection:hr.leave.type,validation_type:0
+msgid "Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__number_of_days_temp
+msgid "Duration (Days)"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__number_of_hours
+msgid "Duration (Hours)"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__number_of_days_temp
+msgid "Duration (days)"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__number_of_hours
+msgid "Duration (hours)"
msgstr ""
#. module: hr_holidays
@@ -584,11 +717,19 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__date_to
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__date_to
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__date_to
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__validity_stop
msgid "End Date"
msgstr ""
#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_type.py:107
+#, python-format
+msgid "End of validity period should be greater than start of validity period"
+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 ""
@@ -606,6 +747,24 @@ msgid "First Approval"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_follower_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_channel_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_partner_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr_holidays
#: code:addons/hr_holidays/report/holidays_summary_report.py:112
#, python-format
msgid "Form content is missing, this report cannot be printed."
@@ -623,6 +782,12 @@ msgid "From Date"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
+msgid "Future Activities"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave__payslip_status
msgid "Green this button when the leave has been taken into account in the payslip."
msgstr ""
@@ -655,6 +820,27 @@ msgid "HR Leaves Summary Report By Employee"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave,request_unit_all:0
+#: selection:hr.leave.type,request_unit:0
+msgid "Half-day"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.allocation,unit_per_interval:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.type,request_unit:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.type,validation_type:0
+msgid "Human Resource Responsible"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept__id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee__id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__id
@@ -666,13 +852,57 @@ msgid "ID"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_unread
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_needaction
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_has_error
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "If no value set, runs indefinitely"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__active
msgid "If the active field is set to false, it will allow you to hide the leave type without removing it."
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__limit
-msgid "If you select this check box, the system allows the employees to take more leaves than the available ones for this type and will not take them into account for the \"Remaining Legal Leaves\" defined on the employee form."
+msgid "If you select this check box, the system will allow the employees to askfor leaves without allocating some beforehand"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.leave:0
+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"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__unpaid
+msgid "Is Unpaid"
msgstr ""
#. module: hr_holidays
@@ -681,6 +911,11 @@ msgid "Ivory"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__time_type
+msgid "Kind of Leave"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept____last_update
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee____last_update
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave____last_update
@@ -710,11 +945,18 @@ msgid "Last Updated on"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
+msgid "Late Activities"
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.leave.type,color_name:0
msgid "Lavender"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave.type,time_type:0
#: model:ir.model,name:hr_holidays.model_hr_leave
msgid "Leave"
msgstr ""
@@ -744,6 +986,11 @@ msgid "Leave Requests"
msgstr ""
#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_leave_report
+msgid "Leave Summary / Report"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_leave_type
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept__holiday_type
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__holiday_status_id
@@ -760,42 +1007,48 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.ui.menu,name:hr_holidays.hr_holidays_status_menu_configuration
#: model:ir.ui.view,arch_db:hr_holidays.view_holidays_status_filter
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_status_search
msgid "Leave Types"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:350
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:201
+#: code:addons/hr_holidays/models/hr_leave.py:530
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:383
#, python-format
msgid "Leave request must be confirmed (\"To Approve\") in order to approve it."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:364
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:215
+#: code:addons/hr_holidays/models/hr_leave.py:557
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:410
#, python-format
msgid "Leave request must be confirmed in order to approve it."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:395
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:244
+#: code:addons/hr_holidays/models/hr_leave.py:589
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:440
#, python-format
msgid "Leave request must be confirmed or validated in order to refuse it."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:338
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:189
+#: code:addons/hr_holidays/models/hr_leave.py:516
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:369
#, python-format
msgid "Leave request must be in Draft state (\"To Submit\") in order to confirm it."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:323
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:174
+#: code:addons/hr_holidays/models/hr_leave.py:500
+#, python-format
+msgid "Leave request state must be \"Refused\" or \"To Approve\" in order to be reset to draft."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:353
#, python-format
msgid "Leave request state must be \"Refused\" or \"To Approve\" in order to reset to Draft."
msgstr ""
@@ -807,6 +1060,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.model.fields,field_description:hr_holidays.field_res_users__group_hr_holidays_user
#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_root
#: model:ir.ui.view,arch_db:hr_holidays.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_holidays.view_employee_form_leave_inherit
@@ -814,6 +1068,11 @@ msgid "Leaves"
msgstr ""
#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_leave_allocation
+msgid "Leaves Allocation"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__leaves_taken
msgid "Leaves Already Taken"
msgstr ""
@@ -827,18 +1086,13 @@ msgid "Leaves Analysis"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_approved
-msgid "Leaves Approved"
-msgstr ""
-
-#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_confirmed
-msgid "Leaves Confirmed"
+#: model:mail.activity.type,name:hr_holidays.mail_act_leave_approval
+msgid "Leaves Approval"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_first_validated
-msgid "Leaves First Approval"
+#: model:mail.message.subtype,name:hr_holidays.mt_department_leave_approved
+msgid "Leaves Approved"
msgstr ""
#. module: hr_holidays
@@ -864,6 +1118,11 @@ msgid "Leaves Request"
msgstr ""
#. module: hr_holidays
+#: model:mail.activity.type,name:hr_holidays.mail_act_leave_second_approval
+msgid "Leaves Second Approve"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
#: model:ir.actions.report,name:hr_holidays.action_report_holidayssummary
@@ -962,9 +1221,9 @@ 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:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter_report
#: model:res.groups,name:hr_holidays.group_hr_holidays_manager
msgid "Manager"
msgstr ""
@@ -975,11 +1234,22 @@ msgid "Managers"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__balance_limit
+msgid "Max Balance Limit"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.hr_holiday_status_view_kanban
msgid "Max Leaves:"
msgstr ""
#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_type.py:114
+#, python-format
+msgid "Max balance limit can only be set for accrual leaves"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__max_leaves
msgid "Maximum Allowed"
msgstr ""
@@ -1005,6 +1275,18 @@ msgid "Meeting Type"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_has_error
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_ids
+msgid "Messages"
+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
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
@@ -1017,6 +1299,17 @@ msgid "Month"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave.allocation,interval_unit:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave,request_date_from_period:0
+#: selection:hr.leave,request_date_to_period:0
+msgid "Morning"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
msgid "My Allocations"
msgstr ""
@@ -1052,6 +1345,30 @@ msgid "New"
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"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_summary
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_type_id
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__number_of_days
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__number_of_days
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__number_of_days
@@ -1072,11 +1389,60 @@ msgid "Number of days of the leave request according to your working schedule."
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_has_error_counter
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__number_of_hours
+msgid "Number of hours of the leave allocation according to your working schedule."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__number_of_hours
+msgid "Number of hours of the leave request according to your working schedule."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_needaction_counter
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_has_error_counter
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__interval_number
+msgid "Number of unit between two intervals"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__number_per_interval
+msgid "Number of unit per interval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_holidays
#: model:res.groups,name:hr_holidays.group_hr_holidays_user
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 ""
@@ -1091,38 +1457,71 @@ msgid "Once you have recorded your leave request, it will be sent\n"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:366
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:217
+#: 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
msgid "Only an HR Manager can apply the second approval on leave requests."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:321
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:172
+#: code:addons/hr_holidays/models/hr_leave.py:498
+#, python-format
+msgid "Only an HR Manager or the concerned employee can reset the leave request to draft."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:351
#, python-format
msgid "Only an HR Manager or the concerned employee can reset to draft."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:346
-#: code:addons/hr_holidays/models/hr_leave.py:359
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:197
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:210
+#: code:addons/hr_holidays/models/hr_leave.py:526
+#: code:addons/hr_holidays/models/hr_leave.py:549
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:379
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:402
#, python-format
msgid "Only an HR Officer or Manager can approve leave requests."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:390
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:239
+#: code:addons/hr_holidays/models/hr_leave.py:584
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:435
#, python-format
msgid "Only an HR Officer or Manager can refuse leave requests."
msgstr ""
#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
-msgid "Options"
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:405
+#, python-format
+msgid "Only your manager can approve your allocations"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave.py:552
+#, python-format
+msgid "Only your manager can approve your leave requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.type,time_type:0
+msgid "Other"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave,activity_state:0
+#: selection:hr.leave.allocation,activity_state:0
+msgid "Overdue"
msgstr ""
#. module: hr_holidays
@@ -1132,6 +1531,18 @@ msgid "Parent"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave,request_unit_all:0
+#: selection:hr.leave,request_unit_day:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave,activity_state:0
+#: selection:hr.leave.allocation,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_summary_dept
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_summary_employee
msgid "Print"
@@ -1149,8 +1560,8 @@ msgid "Red"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:438
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:283
+#: code:addons/hr_holidays/models/hr_leave.py:665
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:510
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new_request
#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
#, python-format
@@ -1173,11 +1584,7 @@ msgid "Related user name for the resource to manage its access."
msgstr ""
#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.hr_holidays_view_list_my_allocation
#: model:ir.ui.view,arch_db:hr_holidays.hr_leave_report_tree
-#: model:ir.ui.view,arch_db:hr_holidays.view_allocation_tree
-#: model:ir.ui.view,arch_db:hr_holidays.view_allocation_tree_customize
-#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
msgid "Remaining Days"
msgstr ""
@@ -1209,32 +1616,40 @@ msgid "Reporting"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_date_to
+msgid "Request End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_date_from
+msgid "Request Start Date"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__type
msgid "Request Type"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_approved
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_approved
-msgid "Request approved"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_unit_all
+msgid "Request Unit All"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_confirmed
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_confirmed
-msgid "Request created and waiting confirmation"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__request_unit_day
+msgid "Request Unit Day"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_refused
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_refused
-msgid "Request refused"
+#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_approved
+#: model:mail.message.subtype,description:hr_holidays.mt_leave_approved
+msgid "Request approved"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_first_validated
-#: model:mail.message.subtype,description:hr_holidays.mt_leave_first_validated
-msgid "Request validated, waiting second validation"
+#: model:mail.message.subtype,description:hr_holidays.mt_leave_allocation_refused
+#: model:mail.message.subtype,description:hr_holidays.mt_leave_refused
+msgid "Request refused"
msgstr ""
#. module: hr_holidays
@@ -1249,6 +1664,17 @@ msgid "Reset to Draft"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_user_id
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "Run Until"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter_report
msgid "Search Leave"
@@ -1279,20 +1705,29 @@ msgid "Select Leave Type"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
+msgid "Show all records which has next action date is before today"
+msgstr ""
+
+#. module: hr_holidays
#: model:hr.leave.type,name:hr_holidays.holiday_status_sl
msgid "Sick Leaves"
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__date_from
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__date_from
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_report__date_from
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__validity_start
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter_report
-msgid "Start Month"
+msgid "Start Date"
msgstr ""
#. module: hr_holidays
@@ -1303,34 +1738,69 @@ msgid "Status"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__activity_state
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__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: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
msgid "Sum"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__leave_type_request_unit
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__type_request_unit
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__request_unit
+msgid "Take Leaves in"
+msgstr ""
+
+#. module: hr_holidays
#: sql_constraint:hr.leave:0
#: sql_constraint:hr.leave.allocation:0
msgid "The employee, department or employee category of this request is missing. Please make sure that your user login is linked to an employee."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr.py:126
+#: code:addons/hr_holidays/models/hr.py:127
#, python-format
msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
" You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in Leaves Application to manage the leave days of the employees if the configuration does not allow to use this field."
msgstr ""
#. module: hr_holidays
-#: sql_constraint:hr.leave:0
+#: sql_constraint:hr.leave.allocation:0
+msgid "The interval number should be greater than 0"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.leave.type:0
+msgid "The max balance limit cannot be negative"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__balance_limit
+msgid "The maximum quantity of allocated days on this allocation, zero meaning infinite amount"
+msgstr ""
+
+#. module: hr_holidays
#: sql_constraint:hr.leave.allocation:0
msgid "The number of days must be greater than 0."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:181
+#: code:addons/hr_holidays/models/hr_leave.py:342
#, python-format
msgid "The number of remaining leaves is not sufficient for this leave type.\n"
-"Please verify also the leaves waiting for validation."
+"Please also check the leaves waiting for validation."
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.leave.allocation:0
+msgid "The number per interval should be greater than 0"
msgstr ""
#. module: hr_holidays
@@ -1348,6 +1818,11 @@ msgid "The status is set to 'To Submit', when a leave request is created.\n"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__sequence
+msgid "The type with the smallest sequence is the default value in leave request"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave__first_approver_id
#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__first_approver_id
msgid "This area is automatically filled by the user who validate the leave"
@@ -1365,6 +1840,27 @@ msgid "This color will be used in the leaves summary located in Reporting > Leav
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__valid
+msgid "This indicates if it is still possible to use this type of leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__employee_applicability
+msgid "This leave type will be available on Leave / Allocation request based on selected value"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__negative
+msgid "This option allows to take more leaves than allocated"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__accrual
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__accrual
+msgid "This option forces this type of leave to be allocated accrually"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__leaves_taken
msgid "This value is given by the sum of all leaves requests with a negative value."
msgstr ""
@@ -1409,11 +1905,35 @@ msgid "To Submit"
msgstr ""
#. module: hr_holidays
+#: selection:hr.leave,activity_state:0
+#: selection:hr.leave.allocation,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
+msgid "Today Activities"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_department__total_employee
msgid "Total Employee"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.hr_holidays_view_list_my_allocation
+#: model:ir.ui.view,arch_db:hr_holidays.view_allocation_tree
+msgid "Total allocated days"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_allocation_tree_customize
+#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
+msgid "Total leaves"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_employee__remaining_leaves
msgid "Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit."
msgstr ""
@@ -1426,11 +1946,28 @@ msgid "Type"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__unit_per_interval
+msgid "Unit of time added at each interval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__interval_unit
+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 ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_unread
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_unread
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter_report
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
@@ -1438,24 +1975,56 @@ msgid "Unread Messages"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_unread_counter
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__user_id
msgid "User"
msgstr ""
#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__valid
+msgid "Valid"
+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 "Validate"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
+msgid "Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__validation_type
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__validation_type
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__validation_type
+msgid "Validation By"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter_report
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
msgid "Validator"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
+msgid "Validity"
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.leave.type,color_name:0
msgid "Violet"
msgstr ""
@@ -1466,6 +2035,11 @@ msgid "Virtual Remaining Leaves"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
+msgid "Visibility"
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0
msgid "Waiting Approval"
msgstr ""
@@ -1476,9 +2050,20 @@ msgid "Waiting Second Approval"
msgstr ""
#. module: hr_holidays
-#: model:mail.message.subtype,name:hr_holidays.mt_leave_allocation_first_validated
-#: model:mail.message.subtype,name:hr_holidays.mt_leave_first_validated
-msgid "Waiting Second Validation"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__website_message_ids
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave__website_message_ids
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.allocation,interval_unit:0
+msgid "Week(s)"
msgstr ""
#. module: hr_holidays
@@ -1487,10 +2072,19 @@ msgid "Wheat"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_leave__double_validation
-#: model:ir.model.fields,help:hr_holidays.field_hr_leave_allocation__double_validation
-#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__double_validation
-msgid "When selected, the Allocation/Leave Requests for this type require a second validation to be approved."
+#: model:ir.model.fields,help:hr_holidays.field_hr_leave_type__time_type
+msgid "Whether this should be computed as a holiday or as work time (eg: formation)"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.leave.allocation,interval_unit:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:296
+#, python-format
+msgid "You can allocate %s only between %s and %s"
msgstr ""
#. module: hr_holidays
@@ -1500,33 +2094,56 @@ msgid "You can assign remaining Legal Leaves for each employee, Odoo\n"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:171
+#: code:addons/hr_holidays/models/hr_leave.py:332
#, python-format
-msgid "You can not have 2 leaves that overlaps on same day!"
+msgid "You can not have 2 leaves that overlaps on the same day."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_leave.py:240
-#: code:addons/hr_holidays/models/hr_leave_allocation.py:143
+#: code:addons/hr_holidays/models/hr_leave.py:385
+#, python-format
+msgid "You can take %s only between %s and %s"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave.py:413
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:322
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr.py:148
+#: code:addons/hr_holidays/models/hr.py:149
#, python-format
-msgid "You cannot reduce validated allocation requests"
+msgid "You cannot reduce validated allocation requests."
msgstr ""
#. module: hr_holidays
#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:27
#, python-format
-msgid "You have to select at least one Department. And try again."
+msgid "You have to select at least one department."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave.py:537
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:390
+#, python-format
+msgid "You must be %s manager to approve this leave"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave_allocation.py:392
+#, python-format
+msgid "You must be a Human Resource Manager to approve this Leave."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_leave.py:539
+#, python-format
+msgid "You must be a Human Resource Manager to approve this leave."
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
#: model:ir.ui.view,arch_db:hr_holidays.hr_leave_report_kanban
#: model:ir.ui.view,arch_db:hr_holidays.view_employee_form_leave_inherit
msgid "days"
@@ -1538,8 +2155,8 @@ msgid "e.g. Report to the next month..."
msgstr ""
#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_leave_report
-msgid "hr.leave.report"
+#: model:ir.ui.view,arch_db:hr_holidays.edit_new_allocation
+msgid "of leaves every"
msgstr ""
#. module: hr_holidays
diff --git a/addons/hr_maintenance/i18n/hr_maintenance.pot b/addons/hr_maintenance/i18n/hr_maintenance.pot
index 06a31e7b13a..170504eeb79 100644
--- a/addons/hr_maintenance/i18n/hr_maintenance.pot
+++ b/addons/hr_maintenance/i18n/hr_maintenance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,11 @@ msgid "Created By"
msgstr ""
#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request__owner_user_id
+msgid "Created by User"
+msgstr ""
+
+#. module: hr_maintenance
#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request__department_id
#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_form_inherit_hr
#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_search_inherit_hr
@@ -70,6 +75,11 @@ msgid "Other"
msgstr ""
#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_equipment__owner_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: hr_maintenance
#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_kanban_inherit_hr
msgid "Unassigned"
msgstr ""
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 5ced0b2a8ae..61c0af4536e 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:41
+#: code:addons/hr_payroll/models/hr_salary_rule.py:42
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -120,6 +120,11 @@ msgid "A contribution register is a third party involved in the salary\n"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_res_config_settings__module_account_accountant
+msgid "Account Accountant"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form
msgid "Accounting"
@@ -241,7 +246,7 @@ msgid "Cancel Payslip"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:98
+#: code:addons/hr_payroll/models/hr_payslip.py:96
#, python-format
msgid "Cannot cancel a payslip that is done."
msgstr ""
@@ -582,6 +587,11 @@ msgid "Employee's Advantage on Contract"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,help:hr_payroll.field_hr_contract__resource_calendar_id
+msgid "Employee's working schedule."
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_employees__employee_ids
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_by_employees
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter
@@ -590,9 +600,15 @@ msgid "Employees"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:36
+#: code:addons/hr_payroll/models/hr_salary_rule.py:92
#, python-format
-msgid "Error ! You cannot create a recursive Salary Structure."
+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
+#, python-format
+msgid "Error! You cannot create recursive hierarchy of Salary Rules."
msgstr ""
#. module: hr_payroll
@@ -858,7 +874,7 @@ msgid "Net Salary"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:199
+#: code:addons/hr_payroll/models/hr_payslip.py:201
#, python-format
msgid "Normal Working Days paid at 100%"
msgstr ""
@@ -952,6 +968,7 @@ msgstr ""
#. module: hr_payroll
#: model:ir.actions.act_window,name:hr_payroll.open_payroll_modules
+#: model:ir.model.fields,field_description:hr_payroll.field_res_users__group_hr_payroll_user
#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_root
#: model:ir.ui.view,arch_db:hr_payroll.res_config_settings_view_form
msgid "Payroll"
@@ -984,9 +1001,9 @@ msgid "Payslip"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:84
+#: code:addons/hr_payroll/models/hr_payslip.py:82
#, python-format
-msgid "Payslip 'Date From' must be before 'Date To'."
+msgid "Payslip 'Date From' must be earlier 'Date To'."
msgstr ""
#. module: hr_payroll
@@ -1174,7 +1191,7 @@ msgid "Refund"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:104
+#: code:addons/hr_payroll/models/hr_payslip.py:102
#, python-format
msgid "Refund: "
msgstr ""
@@ -1208,18 +1225,11 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
#: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_category_tree
-#: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_category_tree_view
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_salary_rule_category_filter
msgid "Salary Rule Categories"
msgstr ""
#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
-msgid "Salary Rule Categories Hierarchy"
-msgstr ""
-
-#. module: hr_payroll
#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
#: model:ir.ui.view,arch_db:hr_payroll.report_payslipdetails
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_line_filter
@@ -1245,8 +1255,8 @@ msgid "Salary Rules"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:401
-#: code:addons/hr_payroll/models/hr_payslip.py:451
+#: code:addons/hr_payroll/models/hr_payslip.py:403
+#: code:addons/hr_payroll/models/hr_payslip.py:453
#, python-format
msgid "Salary Slip of %s for %s"
msgstr ""
@@ -1416,6 +1426,11 @@ msgid "Used to display the salary rule on payslip."
msgstr ""
#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_payroll
#: selection:hr.payslip,state:0
msgid "Waiting"
msgstr ""
@@ -1441,37 +1456,48 @@ msgid "Worked Days & Inputs"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:198
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract__resource_calendar_id
+msgid "Working Schedule"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/models/hr_salary_rule.py:209
#, 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:204
+#: code:addons/hr_payroll/models/hr_salary_rule.py:215
#, 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:227
+#: code:addons/hr_payroll/models/hr_salary_rule.py:238
#, 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:191
+#: code:addons/hr_payroll/models/hr_salary_rule.py:202
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_salary_rule.py:221
+#: code:addons/hr_payroll/models/hr_salary_rule.py:232
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payslip.py:129
+#: code:addons/hr_payroll/models/hr_salary_rule.py:36
+#, python-format
+msgid "You cannot create a recursive salary structure."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/models/hr_payslip.py:127
#, python-format
msgid "You cannot delete a payslip which is not draft or cancelled!"
msgstr ""
@@ -1483,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:522
+#: code:addons/hr_payroll/models/hr_payslip.py:524
#, 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 bac39ba0320..1b582a9f4ac 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -407,11 +407,32 @@ msgid "A Python dictionary that will be evaluated to provide default values when
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__active
msgid "Active"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.mail_activity_type_action_config_hr_applicant
+#: model:ir.ui.menu,name:hr_recruitment.hr_recruitment_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee
msgid "Add a new employee"
msgstr ""
@@ -595,6 +616,18 @@ msgid "Bachelor Degree"
msgstr ""
#. module: hr_recruitment
+#: code:addons/hr_recruitment/models/hr_recruitment.py:67
+#: 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
+#: model:hr.recruitment.stage,legend_blocked:hr_recruitment.stage_job4
+#: model:hr.recruitment.stage,legend_blocked:hr_recruitment.stage_job5
+#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+#, python-format
+msgid "Blocked"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.filters,name:hr_recruitment.hr_applicant_filter_department
msgid "By Department"
msgstr ""
@@ -610,6 +643,11 @@ msgid "By Recruiter"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__campaign_id
+msgid "Campaign"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_graph_view_job
msgid "Cases By Stage and Estimates"
msgstr ""
@@ -650,14 +688,14 @@ msgid "Configuration"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:350
+#: code:addons/hr_recruitment/models/hr_recruitment.py:370
#: 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:352
+#: code:addons/hr_recruitment/models/hr_recruitment.py:372
#, python-format
msgid "Contact Email"
msgstr ""
@@ -727,16 +765,12 @@ msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__create_date
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Creation Date"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
-msgid "Creation Week"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__day_close
msgid "Days to Close"
msgstr ""
@@ -846,7 +880,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
msgid "Documents"
msgstr ""
@@ -957,6 +990,21 @@ msgid "Folded in Recruitment Pipe"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Future Activities"
msgstr ""
@@ -982,6 +1030,26 @@ msgid "Graduate"
msgstr ""
#. module: hr_recruitment
+#: selection:hr.applicant,kanban_state:0
+msgid "Green"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage__legend_done
+msgid "Green Kanban Label"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,kanban_state:0
+msgid "Grey"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage__legend_normal
+msgid "Grey Kanban Label"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_view_search
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Group By"
@@ -1017,6 +1085,21 @@ msgid "ID of the parent record holding the alias (example: project holding the t
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage__template_id
msgid "If set, a message is posted on the applicant using the template when the applicant is set to the stage."
msgstr ""
@@ -1027,6 +1110,22 @@ 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
+#: 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
+#: model:hr.recruitment.stage,legend_normal:hr_recruitment.stage_job4
+#: model:hr.recruitment.stage,legend_normal:hr_recruitment.stage_job5
+#, python-format
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
msgid "Initial Qualification"
msgstr ""
@@ -1038,6 +1137,11 @@ msgid "Interview Forms"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: hr_recruitment
#: code:addons/hr_recruitment/models/hr_job.py:94
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
@@ -1119,6 +1223,26 @@ msgid "Jobs Sources"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__legend_blocked
+msgid "Kanban Blocked"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__legend_normal
+msgid "Kanban Ongoing"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__kanban_state
+msgid "Kanban State"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__legend_done
+msgid "Kanban Valid"
+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
@@ -1184,6 +1308,21 @@ msgid "Master Degree"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__medium_id
+msgid "Medium"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__partner_mobile
msgid "Mobile"
msgstr ""
@@ -1235,7 +1374,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:426
+#: code:addons/hr_recruitment/models/hr_recruitment.py:446
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -1267,7 +1406,22 @@ msgid "Next Activities"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:368
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/models/hr_recruitment.py:388
#, python-format
msgid "No Subject"
msgstr ""
@@ -1294,6 +1448,11 @@ msgid "Normal"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__attachment_number
msgid "Number of Attachments"
msgstr ""
@@ -1304,6 +1463,26 @@ msgid "Number of days to close"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_applications
msgid "Odoo helps you track applicants in the recruitment\n"
" process and follow up all operations: meetings, interviews, etc."
@@ -1342,6 +1521,11 @@ msgid "Optional ID of a thread (record) to which all incoming messages will be a
msgstr ""
#. module: hr_recruitment
+#: selection:hr.applicant,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job__alias_user_id
msgid "Owner"
msgstr ""
@@ -1372,6 +1556,11 @@ msgid "Phone"
msgstr ""
#. module: hr_recruitment
+#: selection:hr.applicant,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_job__alias_contact
msgid "Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
@@ -1401,6 +1590,18 @@ msgid "Publish available jobs on your website"
msgstr ""
#. module: hr_recruitment
+#: code:addons/hr_recruitment/models/hr_recruitment.py:69
+#: 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
+#: model:hr.recruitment.stage,legend_done:hr_recruitment.stage_job4
+#: model:hr.recruitment.stage,legend_done:hr_recruitment.stage_job5
+#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
+#, python-format
+msgid "Ready for Next Stage"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
msgid "Ready to recruit more efficiently?"
@@ -1412,6 +1613,7 @@ msgid "Record Thread ID"
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.res_config_settings_view_form
msgid "Recruitment"
@@ -1453,6 +1655,16 @@ msgid "Recruitments"
msgstr ""
#. module: hr_recruitment
+#: selection:hr.applicant,kanban_state:0
+msgid "Red"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage__legend_blocked
+msgid "Red Kanban Label"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__reference
msgid "Referred By"
msgstr ""
@@ -1491,6 +1703,11 @@ msgid "Responsible"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_resumes
#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job02
msgid "Resumes and Letters"
@@ -1554,6 +1771,7 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__source_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source__source_id
msgid "Source"
msgstr ""
@@ -1636,6 +1854,14 @@ msgid "Start recruitment"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__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: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Subject / Applicant"
msgstr ""
@@ -1704,6 +1930,21 @@ 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 ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__medium_id
+msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__source_id
+msgid "This is the source of the link, e.g. Search Engine, another domain, or name of email list"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
msgid "This menu helps you search through resumes and motivation\n"
" letters. Odoo automatically indexes .PDF, .DOC, DOCX, .TXT\n"
@@ -1717,11 +1958,21 @@ msgid "This stage is folded in the kanban view when there are no records in that
msgstr ""
#. module: hr_recruitment
+#: selection:hr.applicant,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Today Activities"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_stage_form
+msgid "Tooltips"
+msgstr ""
+
+#. module: hr_recruitment
#. openerp-web
#: code:addons/hr_recruitment/static/src/js/tour.js:31
#, python-format
@@ -1735,6 +1986,7 @@ msgid "Unassigned"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_unread
#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
#: model:ir.ui.view,arch_db:hr_recruitment.view_job_filter_recruitment
@@ -1742,6 +1994,11 @@ msgid "Unread Messages"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__write_date
msgid "Update Date"
msgstr ""
@@ -1769,6 +2026,11 @@ msgid "User Email"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_recruitment
#: selection:hr.applicant,priority:0
msgid "Very Good"
msgstr ""
@@ -1786,6 +2048,16 @@ msgid "Watchers Emails"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: hr_recruitment
#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_employee
msgid "Welcome ${object.name} "
msgstr ""
@@ -1798,7 +2070,13 @@ msgid "With just a quick glance on the Odoo employee screen, you\n"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:430
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_stage_form
+msgid "You can define here the labels that will be displayed for the kanban state instead\n"
+" of the default labels."
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/models/hr_recruitment.py:450
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
@@ -1819,7 +2097,7 @@ msgid "e.g. Sales Manager"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:281
+#: code:addons/hr_recruitment/models/hr_recruitment.py:298
#, 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 5d86a963c60..02e00209a3b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -58,11 +58,19 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project__allow_timesheets
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__allow_timesheets
#: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
msgid "Allow timesheets"
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
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
msgid "Analytic Entry"
msgstr ""
@@ -83,11 +91,6 @@ msgid "Awesome Timesheet"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
-msgid "Billing"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_report
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_activity_analysis
msgid "By Employee"
@@ -106,6 +109,11 @@ msgid "By Task"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_account__company_uom_id
+msgid "Company UOM"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,help:hr_timesheet.field_project_task__total_hours_spent
msgid "Computed as: Time Spent + Sub-tasks Hours."
msgstr ""
@@ -121,6 +129,11 @@ msgid "Configuration"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_hr_employee__currency_id
+msgid "Currency"
+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 "Date"
@@ -154,6 +167,7 @@ msgid "Effective Hours"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_employee
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line__employee_id
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Employee"
@@ -186,6 +200,12 @@ msgid "Leaves"
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 ""
+
+#. module: hr_timesheet
#: model:res.groups,name:hr_timesheet.group_timesheet_manager
msgid "Manager"
msgstr ""
@@ -203,6 +223,12 @@ msgid "Planned Hours"
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/models/analytic_account.py:28
+#, python-format
+msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
+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"
@@ -221,6 +247,17 @@ msgid "Project -"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_account__project_count
+msgid "Project Count"
+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"
+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
@@ -230,6 +267,7 @@ msgid "Record a new activity"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__remaining_hours
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user__remaining_hours
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
msgid "Remaining Hours"
@@ -252,16 +290,6 @@ msgid "Responsible"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
-msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
-msgid "Sell services and invoice time spent"
-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"
@@ -301,6 +329,12 @@ msgid "Tasks by user and project"
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/models/hr_timesheet.py:84
+#, 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"
msgstr ""
@@ -311,9 +345,15 @@ msgid "This Week"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/models/project.py:63
+#: code:addons/hr_timesheet/models/project.py:156
#, python-format
-msgid "This task must have a project since they are linked to timesheets."
+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
+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
@@ -327,11 +367,6 @@ msgid "Time (Hours)"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_res_config_settings__module_sale_timesheet
-msgid "Time Billing"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
#: model:ir.ui.menu,name:hr_timesheet.menu_timesheets_reports_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
@@ -351,24 +386,30 @@ msgid "Timesheet Apps"
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"
+#: model:ir.model.fields,field_description:hr_timesheet.field_hr_employee__timesheet_cost
+msgid "Timesheet Cost"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Timesheet Month"
+msgid "Timesheet Date"
+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"
msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Timesheet by Month"
+msgid "Timesheet by Date"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_from_employee
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__timesheet_ids
+#: model:ir.model.fields,field_description:hr_timesheet.field_res_users__group_hr_timesheet_user
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_root
#: model:ir.ui.view,arch_db:hr_timesheet.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
@@ -380,21 +421,48 @@ msgid "Timesheets"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,help:hr_timesheet.field_project_task__allow_timesheets
+msgid "Timesheets can be logged on this task."
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/models/project.py:32
+#, python-format
+msgid "To allow timesheet, your project %s should have an analytic account set."
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__total_hours_spent
msgid "Total Hours"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,help:hr_timesheet.field_project_task__remaining_hours
+msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
+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"
+msgstr ""
+
+#. module: hr_timesheet
#: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
msgid "User"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
msgid "Validated leaves create timesheets automatically."
msgstr ""
@@ -411,6 +479,16 @@ 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 ""
+
+#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_res_config_settings
msgid "res.config.settings"
msgstr ""
diff --git a/addons/http_routing/i18n/http_routing.pot b/addons/http_routing/i18n/http_routing.pot
new file mode 100644
index 00000000000..bedeb7ebd93
--- /dev/null
+++ b/addons/http_routing/i18n/http_routing.pot
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * http_routing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.4\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"
+"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: http_routing
+#: model:ir.model,name:http_routing.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: http_routing
+#: model:ir.model,name:http_routing.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index 7a9564a6113..aa6fdb28b41 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+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:46
+#: code:addons/im_livechat/static/src/js/im_livechat.js:52
#, python-format
msgid "Ask something ..."
msgstr ""
@@ -126,6 +126,7 @@ msgstr ""
#: 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
+#: selection:mail.channel,channel_type:0
msgid "Channel"
msgstr ""
@@ -146,18 +147,28 @@ msgid "Channel Rules"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__channel_type
+msgid "Channel Type"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.ui.menu,name:im_livechat.support_channels
msgid "Channels"
msgstr ""
#. module: im_livechat
+#: selection:mail.channel,channel_type:0
+msgid "Chat Discussion"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel__input_placeholder
msgid "Chat Input Placeholder"
msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:48
+#: code:addons/im_livechat/static/src/js/im_livechat.js:54
#, python-format
msgid "Chat with one of our collaborators"
msgstr ""
@@ -205,6 +216,11 @@ msgid "Country"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__create_date
+msgid "Create Date"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.mail_channel_action
msgid "Create a channel and start chatting to fill up your history."
msgstr ""
@@ -227,36 +243,19 @@ msgid "Created 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
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
-msgid "Creation date (day)"
-msgstr ""
-
-#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
-msgid "Creation date (hour)"
+msgid "Creation Date"
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
-#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
-msgid "Creation date (month)"
+msgid "Creation date"
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
-#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
-msgid "Creation date (week)"
-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
-#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
-msgid "Creation date (year)"
+msgid "Creation date (hour)"
msgstr ""
#. module: im_livechat
@@ -367,7 +366,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:49
+#: code:addons/im_livechat/static/src/js/im_livechat.js:55
#, python-format
msgid "How may I help you?"
msgstr ""
@@ -379,7 +378,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/xml/im_livechat.xml:15
+#: code:addons/im_livechat/static/src/xml/im_livechat.xml:16
#, python-format
msgid "I don't want to rate this conversation"
msgstr ""
@@ -465,6 +464,7 @@ msgid "Live Chat"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_res_users__group_im_livechat_user
#: model:ir.module.category,name:im_livechat.module_category_im_livechat
msgid "Live Support"
msgstr ""
@@ -484,6 +484,11 @@ msgid "Livechat Channel"
msgstr ""
#. module: im_livechat
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.im_livechat_report_channel_action
#: model:ir.actions.act_window,help:im_livechat.im_livechat_report_operator_action
msgid "Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract information about the missed sessions, the audiance, the duration of a session, etc."
@@ -552,7 +557,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:151
+#: code:addons/im_livechat/static/src/js/im_livechat.js:157
#, python-format
msgid "None of our collaborators seems to be available, please try again later."
msgstr ""
@@ -623,16 +628,37 @@ msgstr ""
#. module: im_livechat
#: model:ir.model,name:im_livechat.model_rating_rating
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__rating_ids
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree
msgid "Rating"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__rating_last_feedback
+msgid "Rating Last Feedback"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__rating_last_image
+msgid "Rating Last Image"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__rating_last_value
+msgid "Rating Last Value"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_mail_channel__rating_count
+msgid "Rating count"
+msgstr ""
+
+#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:346
+#: code:addons/im_livechat/static/src/js/im_livechat.js:354
#, python-format
-msgid "Rating: :rating_%d"
+msgid "Rating: %s"
msgstr ""
#. module: im_livechat
@@ -656,6 +682,11 @@ msgid "Ratings for livechat channel"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,help:im_livechat.field_mail_channel__rating_last_feedback
+msgid "Reason of the rating"
+msgstr ""
+
+#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule__regex_url
msgid "Regular expression specifying the web pages this rule will be applied on."
msgstr ""
@@ -745,6 +776,11 @@ msgid "Text of the Button"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel__input_placeholder
+msgid "Text that prompts the user to initiate the chat."
+msgstr ""
+
+#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule__channel_id
msgid "The channel of the rule"
msgstr ""
@@ -820,9 +856,20 @@ msgid "User"
msgstr ""
#. module: im_livechat
+#: model:ir.model.fields,help:im_livechat.field_res_users__group_im_livechat_user
+msgid "User: The user will be able to join support channels.\n"
+"Manager: The user will be able to delete support channels."
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.model,name:im_livechat.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: im_livechat
#. openerp-web
#: code:addons/im_livechat/controllers/main.py:37
-#: code:addons/im_livechat/static/src/js/im_livechat.js:47
+#: code:addons/im_livechat/static/src/js/im_livechat.js:53
#, python-format
msgid "Visitor"
msgstr ""
diff --git a/addons/im_support/i18n/im_support.pot b/addons/im_support/i18n/im_support.pot
new file mode 100644
index 00000000000..b1b4ad5f7fc
--- /dev/null
+++ b/addons/im_support/i18n/im_support.pot
@@ -0,0 +1,63 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * im_support
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.4\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"
+"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_support
+#. openerp-web
+#: code:addons/im_support/static/src/js/chat_manager.js:344
+#, python-format
+msgid " (offline)"
+msgstr ""
+
+#. module: im_support
+#: model:ir.model,name:im_support.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: im_support
+#: model:ir.ui.view,arch_db:im_support.support_qunit_suite
+msgid "IM Support Tests"
+msgstr ""
+
+#. module: im_support
+#. openerp-web
+#: code:addons/im_support/static/src/js/chat_manager.js:268
+#, python-format
+msgid "None of our operators are available. <a href='https://www.odoo.com/help' target='_blank'>Submit a ticket</a> to ask your question now."
+msgstr ""
+
+#. module: im_support
+#. openerp-web
+#: code:addons/im_support/static/src/xml/discuss.xml:10
+#, python-format
+msgid "Odoo Support"
+msgstr ""
+
+#. module: im_support
+#. openerp-web
+#: code:addons/im_support/static/src/js/chat_manager.js:341
+#: code:addons/im_support/static/src/js/systray.js:32
+#, python-format
+msgid "Support"
+msgstr ""
+
+#. module: im_support
+#. openerp-web
+#: code:addons/im_support/static/src/js/chat_manager.js:226
+#, python-format
+msgid "The Support server can't be reached."
+msgstr ""
+
diff --git a/addons/link_tracker/i18n/link_tracker.pot b/addons/link_tracker/i18n/link_tracker.pot
index 9b05a132069..44983285927 100644
--- a/addons/link_tracker/i18n/link_tracker.pot
+++ b/addons/link_tracker/i18n/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.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: link_tracker
+#: model:ir.model.fields,field_description:link_tracker.field_link_tracker__campaign_id
+msgid "Campaign"
+msgstr ""
+
+#. module: link_tracker
#: model:ir.model.fields,field_description:link_tracker.field_link_tracker__link_click_ids
#: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form
msgid "Clicks"
@@ -128,6 +133,11 @@ msgid "Link Tracker"
msgstr ""
#. module: link_tracker
+#: model:ir.model.fields,field_description:link_tracker.field_link_tracker__medium_id
+msgid "Medium"
+msgstr ""
+
+#. module: link_tracker
#: model:ir.model.fields,field_description:link_tracker.field_link_tracker__count
msgid "Number of Clicks"
msgstr ""
@@ -153,6 +163,11 @@ msgid "Short URL code"
msgstr ""
#. module: link_tracker
+#: model:ir.model.fields,field_description:link_tracker.field_link_tracker__source_id
+msgid "Source"
+msgstr ""
+
+#. module: link_tracker
#: model:ir.actions.act_window,name:link_tracker.action_view_click_statistics
msgid "Statistics of Clicks"
msgstr ""
@@ -163,6 +178,21 @@ msgid "Target URL"
msgstr ""
#. module: link_tracker
+#: model:ir.model.fields,help:link_tracker.field_link_tracker__campaign_id
+msgid "This is a name that helps you keep track of your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
+msgstr ""
+
+#. module: link_tracker
+#: model:ir.model.fields,help:link_tracker.field_link_tracker__medium_id
+msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
+msgstr ""
+
+#. module: link_tracker
+#: model:ir.model.fields,help:link_tracker.field_link_tracker__source_id
+msgid "This is the source of the link, e.g. Search Engine, another domain, or name of email list"
+msgstr ""
+
+#. module: link_tracker
#: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter
msgid "Title and URL"
msgstr ""
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 43e9d74532c..6d831dbe83e 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -416,6 +416,7 @@ msgid "List"
msgstr ""
#. module: lunch
+#: model:ir.model.fields,field_description:lunch.field_res_users__group_lunch_user
#: model:ir.module.category,name:lunch.module_lunch_category
#: model:ir.ui.menu,name:lunch.menu_lunch
msgid "Lunch"
@@ -586,7 +587,7 @@ msgstr ""
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
-msgid "Order Month"
+msgid "Order Date"
msgstr ""
#. module: lunch
@@ -861,6 +862,11 @@ msgid "User"
msgstr ""
#. module: lunch
+#: model:ir.model,name:lunch.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: lunch
#: 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
@@ -870,7 +876,7 @@ msgstr ""
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
-msgid "Vendor Orders by Month"
+msgid "Vendor Orders by Date"
msgstr ""
#. module: lunch
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 1927a4784f5..11a038d7241 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,63 +16,52 @@ msgstr ""
"Plural-Forms: \n"
#. module: mail
-#: code:addons/mail/models/mail_channel.py:680
+#: code:addons/mail/models/mail_channel.py:888
#, 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:1634
+#: code:addons/mail/static/src/js/services/chat_manager.js:1879
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:88
+#: code:addons/mail/static/src/js/activity.js:89
#, python-format
msgid "%d days overdue"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:279
+#: code:addons/mail/models/mail_template.py:249
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:261
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:80
-#, python-format
-msgid "%s has joined the %s network."
-msgstr ""
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:225
#, python-format
msgid "&nbsp;("
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:184
+#: code:addons/mail/static/src/xml/thread.xml:174
#, python-format
msgid "(from"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode__shortcode_type
-msgid "* Smiley are only used for HTML code to display an image * Text (default value) is used to substitute text with another text"
-msgstr ""
-
-#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:49
#, python-format
@@ -81,7 +70,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:336
+#: code:addons/mail/static/src/xml/thread.xml:364
#, python-format
msgid "-------- Show older messages --------"
msgstr ""
@@ -108,7 +97,21 @@ msgid "0 Today"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:684
+#: model:mail.template,body_html:mail.mail_template_channel_send_guidelines
+msgid "<?xml version=\"1.0\"?>\n"
+"<div>\n"
+"<p>Hello ${object.name or ''},</p>\n"
+"<p>Please find below the guidelines of the ${ctx['channel'].name} channel.</p>\n"
+"<p>\n"
+"${ctx['channel'].moderation_guidelines_msg}\n"
+"</p>\n"
+"<p/>\n"
+"</div>\n"
+""
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:892
#, python-format
msgid "<br><br>\n"
" You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
@@ -118,26 +121,26 @@ msgid "<br><br>\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:507
+#: code:addons/mail/models/mail_channel.py:712
#, 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:590
+#: code:addons/mail/models/mail_channel.py:798
#, 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:514
-#: code:addons/mail/models/mail_channel.py:567
+#: code:addons/mail/models/mail_channel.py:719
+#: code:addons/mail/models/mail_channel.py:772
#, 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:182
+#: code:addons/mail/models/mail_channel.py:292
#, python-format
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
@@ -196,6 +199,11 @@ msgid "<span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">\n"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send this mail again to the recipients you did not select."
+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>"
@@ -209,7 +217,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
-msgid "<span class=\"oe_inline\">days</span>"
+msgid "<span class=\"oe_inline ml4\">days</span>"
msgstr ""
#. module: mail
@@ -256,80 +264,52 @@ msgid "A shortcode is a keyboard shortcut. For instance, you type #gm and it wil
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:148
+#: code:addons/mail/static/src/xml/thread.xml:251
+#, python-format
+msgid "Accept"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:148
+#, python-format
+msgid "Accept selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:251
+#, python-format
+msgid "Accept |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Accepted"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_res_groups
msgid "Access Groups"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction
-#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction
-#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction
-#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction
-#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction
#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction
#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction
msgid "Action Needed"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_ir_actions_server__state
+msgid "Action To Do"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype__default
msgid "Activated by default when subscribing."
msgstr ""
@@ -342,35 +322,15 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__active_domain
msgid "Active domain"
msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/systray.xml:87
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_ids
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__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.model.fields,field_description:mail.field_sale_order__activity_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__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
@@ -398,28 +358,9 @@ msgid "Activity Mixin"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_state
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_state
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_state
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_state
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_state
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_state
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_state
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_state
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_state
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_state
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_state
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_state
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_state
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_state
#: model:ir.model.fields,field_description:mail.field_res_users__activity_state
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_state
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_state
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_state
msgid "Activity State"
msgstr ""
@@ -445,7 +386,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:87
+#: code:addons/mail/static/src/xml/discuss.xml:93
#, python-format
msgid "Add"
msgstr ""
@@ -461,6 +402,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/followers.xml:61
+#: 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
#, python-format
@@ -474,6 +416,13 @@ msgid "Add Followers can only be done on a mail thread model"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign
+#: model:ir.model.fields,field_description:mail.field_mail_message__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature
#: model:ir.model.fields,field_description:mail.field_mail_template__user_signature
msgid "Add Signature"
@@ -481,21 +430,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:41
-#: code:addons/mail/static/src/xml/discuss.xml:186
+#: code:addons/mail/static/src/xml/discuss.xml:47
+#: code:addons/mail/static/src/xml/discuss.xml:200
#, python-format
msgid "Add a channel"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:335
+#: code:addons/mail/models/mail_thread.py:362
#, 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:60
+#: code:addons/mail/static/src/xml/discuss.xml:66
#, python-format
msgid "Add a private channel"
msgstr ""
@@ -512,6 +461,13 @@ msgid "Add contacts to notify..."
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:257
+#, python-format
+msgid "Add this email address to white list of people"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids
msgid "Additional Contacts"
msgstr ""
@@ -584,13 +540,31 @@ msgid "All"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Allowed Emails"
+msgstr ""
+
+#. module: mail
#: selection:ir.model.fields,track_visibility:0
msgid "Always"
msgstr ""
#. module: mail
+#: selection:mail.moderation,status:0
+msgid "Always Allow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:257
+#, python-format
+msgid "Always Allow |"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1328
+#: code:addons/mail/models/mail_channel.py:891
+#: code:addons/mail/static/src/js/services/chat_manager.js:1486
#, python-format
msgid "Anonymous"
msgstr ""
@@ -599,7 +573,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__no_auto_thread
#: model:ir.model.fields,help:mail.field_mail_mail__no_auto_thread
#: model:ir.model.fields,help:mail.field_mail_message__no_auto_thread
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__no_auto_thread
msgid "Answers do not go in the original document discussion thread. This has an impact on the generated message-id."
msgstr ""
@@ -622,6 +595,12 @@ msgid "Archived"
msgstr ""
#. module: mail
+#: code:addons/mail/wizard/mail_resend_message.py:96
+#, 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
#: model:ir.model.fields,field_description:mail.field_mail_activity__user_id
@@ -630,6 +609,13 @@ msgid "Assigned to"
msgstr ""
#. module: mail
+#: code:addons/mail/models/mail_activity.py:198
+#: code:addons/mail/models/mail_activity.py:205
+#, python-format
+msgid "Assigned user %s has no access to the document and is not able to handle this activity."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Attach a file"
msgstr ""
@@ -665,7 +651,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_id
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Author"
msgstr ""
@@ -679,7 +664,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__author_id
#: model:ir.model.fields,help:mail.field_mail_mail__author_id
#: model:ir.model.fields,help:mail.field_mail_message__author_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__author_id
msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
msgstr ""
@@ -687,7 +671,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_avatar
#: model:ir.model.fields,field_description:mail.field_mail_mail__author_avatar
#: model:ir.model.fields,field_description:mail.field_mail_message__author_avatar
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__author_avatar
msgid "Author's avatar"
msgstr ""
@@ -714,12 +697,46 @@ msgid "Auto subscription"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity__automated
+msgid "Automated activity"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify
+msgid "Automatic notification"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "Available for mass mailing"
msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:259
+#, python-format
+msgid "Ban"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Ban List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:259
+#, python-format
+msgid "Ban this email address"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Banned Emails"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/followers.xml:89
#, python-format
msgid "Be careful with channels following internal notifications"
@@ -754,6 +771,8 @@ msgstr ""
#: code:addons/mail/static/src/js/followers.js:341
#: code:addons/mail/static/src/xml/activity.xml:65
#: 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
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
@@ -766,13 +785,18 @@ msgid "Cancel Email"
msgstr ""
#. module: mail
-#: selection:mail.mail,state:0
-msgid "Cancelled"
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Cancel notification in failure"
msgstr ""
#. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Canned Response"
+#: selection:mail.notification,email_status:0
+msgid "Canceled"
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
msgstr ""
#. module: mail
@@ -792,6 +816,11 @@ msgid "Carbon copy recipients (placeholders may be used here)"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_company__catchall
+msgid "Catchall Email"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_activity__activity_category
#: model:ir.model.fields,help:mail.field_mail_activity_type__category
msgid "Categories may trigger specific behavior like opening calendar view"
@@ -822,6 +851,7 @@ msgstr ""
#. module: mail
#: 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
#: selection:mail.channel,channel_type:0
msgid "Channel"
@@ -838,9 +868,21 @@ msgid "Channel Type"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_mail_moderation
+msgid "Channel black/white list"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:117
+#, python-format
+msgid "Channel settings"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:36
-#: code:addons/mail/static/src/xml/discuss.xml:172
+#: 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
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__channel_ids
@@ -849,7 +891,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__channel_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__channel_ids
#: model:ir.ui.menu,name:mail.mail_channel_menu_settings
#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
#, python-format
@@ -864,7 +905,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:168
+#: 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
@@ -886,7 +927,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__child_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__child_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__child_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__child_ids
msgid "Child Messages"
msgstr ""
@@ -931,11 +971,15 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.view_mail_search
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
msgid "Comment"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Compose Email"
@@ -943,7 +987,6 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__composition_mode
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__composition_mode
msgid "Composition mode"
msgstr ""
@@ -954,14 +997,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:99
#, python-format
msgid "Congratulations, your inbox is empty"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:662
+#: code:addons/mail/static/src/js/discuss.js:866
#, python-format
msgid "Congratulations, your inbox is empty!"
msgstr ""
@@ -981,7 +1024,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__body
#: model:ir.model.fields,field_description:mail.field_mail_mail__body
#: model:ir.model.fields,field_description:mail.field_mail_message__body
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__body
msgid "Contents"
msgstr ""
@@ -1010,7 +1052,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:318
+#: code:addons/mail/static/src/js/discuss.js:502
#, python-format
msgid "Create %s"
msgstr ""
@@ -1021,12 +1063,23 @@ msgid "Create Date"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:350
+#: code:addons/mail/models/mail_thread.py:377
#, python-format
msgid "Create a new %(document)s"
msgstr ""
#. module: mail
+#: code:addons/mail/models/mail_thread.py:369
+#, python-format
+msgid "Create a new %(document)s by sending an email to %(email_link)s"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Create a new Record"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
msgid "Created By"
msgstr ""
@@ -1043,6 +1096,10 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_message__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_template__create_uid
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_uid
@@ -1063,6 +1120,10 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
#: model:ir.model.fields,field_description:mail.field_mail_message__create_date
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__create_date
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__create_date
#: model:ir.model.fields,field_description:mail.field_mail_template__create_date
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__create_date
@@ -1073,22 +1134,26 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Creation Month"
+msgid "Creation Date"
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
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__starred
msgid "Current user has a starred notification linked to this message"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__is_moderator
+msgid "Current user is a moderator of the channel"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
#: model:ir.model.fields,field_description:mail.field_mail_mail__date
#: model:ir.model.fields,field_description:mail.field_mail_message__date
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__date
+#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Date"
msgstr ""
@@ -1141,30 +1206,20 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete
msgid "Delete Emails"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__auto_delete_message
msgid "Delete Message Copy"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete
msgid "Delete sent emails (mass mailing only)"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:325
-#, python-format
-msgid "Delete this attachment"
-msgstr ""
-
-#. module: mail
#: selection:mail.mail,state:0
msgid "Delivery Failed"
msgstr ""
@@ -1184,7 +1239,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:46
+#: code:addons/mail/static/src/xml/discuss.xml:52
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1192,6 +1247,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:81
+#: code:addons/mail/static/src/xml/discuss.xml:150
#: 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
@@ -1199,6 +1255,30 @@ msgid "Discard"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "Discard delivery failures"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_resend_cancel_action
+msgid "Discard mail delivery failures"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:150
+#, python-format
+msgid "Discard selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:255
+#, python-format
+msgid "Discard |"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Discuss"
@@ -1215,6 +1295,11 @@ msgid "Discussions"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_mail_resend_cancel
+msgid "Dismiss notification for resend by model"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__display_name
#: model:ir.model.fields,field_description:mail.field_mail_activity__display_name
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__display_name
@@ -1228,7 +1313,11 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__display_name
#: model:ir.model.fields,field_description:mail.field_mail_message__display_name
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__display_name
#: model:ir.model.fields,field_description:mail.field_mail_notification__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__display_name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__display_name
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__display_name
#: model:ir.model.fields,field_description:mail.field_mail_template__display_name
#: model:ir.model.fields,field_description:mail.field_mail_thread__display_name
@@ -1250,7 +1339,6 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete_message
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__auto_delete_message
msgid "Do not keep a copy of the email in the document communication history (mass mailing only)"
msgstr ""
@@ -1286,18 +1374,10 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:301
+#: code:addons/mail/static/src/xml/thread.xml:30
+#: code:addons/mail/static/src/xml/thread.xml:57
#, python-format
-msgid "Download this PDF"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:277
-#: code:addons/mail/static/src/xml/thread.xml:290
-#: code:addons/mail/static/src/xml/thread.xml:313
-#, python-format
-msgid "Download this attachment"
+msgid "Download"
msgstr ""
#. module: mail
@@ -1307,7 +1387,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:94
+#: code:addons/mail/static/src/js/activity.js:95
#, python-format
msgid "Due in %d days"
msgstr ""
@@ -1325,6 +1405,11 @@ msgid "Edit"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Edit Partners"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:330
#, python-format
@@ -1340,11 +1425,12 @@ msgstr ""
#. module: mail
#: 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.view_mail_search
#: model:mail.activity.type,name:mail.mail_activity_data_email
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
msgid "Email"
msgstr ""
@@ -1404,10 +1490,14 @@ msgid "Email address internally associated with this user. Incoming emails will
msgstr ""
#. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Email address not found"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
#: model:ir.model.fields,help:mail.field_mail_mail__email_from
#: model:ir.model.fields,help:mail.field_mail_message__email_from
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__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 ""
@@ -1428,6 +1518,11 @@ msgid "Email message"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_mail_resend_message
+msgid "Email resend wizard"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_mail
#: model:ir.ui.menu,name:mail.menu_mail_mail
#: model:ir.ui.view,arch_db:mail.view_mail_tree
@@ -1441,7 +1536,12 @@ msgid "Error during communication with the publisher warranty server."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:300
+#: selection:mail.notification,failure_type:0
+msgid "Error while connecting to smtp server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_mail.py:306
#, python-format
msgid "Error without exception. Probably due do sending an email without computed recipients."
msgstr ""
@@ -1473,6 +1573,16 @@ msgid "Exception"
msgstr ""
#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute Python Code"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Execute several actions"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Extended Filters..."
msgstr ""
@@ -1488,7 +1598,7 @@ msgid "Failed"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:368
+#: code:addons/mail/models/mail_template.py:338
#, python-format
msgid "Failed to render template %r using values %r"
msgstr ""
@@ -1500,21 +1610,30 @@ msgid "Failure Reason"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_reason
+msgid "Failure reason"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
msgid "Failure reason. This is usually the exception thrown by the email server, stored to ease the debugging of mailing issues."
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_type
+msgid "Failure type"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__starred_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred_partner_ids
msgid "Favorited By"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:245
+#: code:addons/mail/static/src/js/activity.js:247
#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
#, python-format
msgid "Feedback"
@@ -1572,211 +1691,28 @@ msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_followers
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__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_mass_mailing_contact__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_follower_ids
#: model:ir.ui.menu,name:mail.menu_email_followers
#: model:ir.ui.view,arch_db:mail.view_followers_tree
msgid "Followers"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__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_mass_mailing_contact__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_channel_ids
msgid "Followers (Channels)"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__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_mass_mailing_contact__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_partner_ids
msgid "Followers (Partners)"
msgstr ""
@@ -1816,7 +1752,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__email_from
#: model:ir.model.fields,field_description:mail.field_mail_message__email_from
#: model:ir.model.fields,field_description:mail.field_mail_template__email_from
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__email_from
msgid "From"
msgstr ""
@@ -1839,7 +1774,7 @@ msgid "Gateway"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:54
+#: code:addons/mail/models/res_users.py:87
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -1862,6 +1797,16 @@ msgid "Groups"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines_msg
+msgid "Guidelines"
+msgstr ""
+
+#. module: mail
+#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
+msgid "Guidelines of channel ${ctx['channel'].name}"
+msgstr ""
+
+#. module: mail
#: selection:res.users,notification_type:0
msgid "Handle by Emails"
msgstr ""
@@ -1872,6 +1817,11 @@ msgid "Handle in Odoo"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel
+msgid "Has Cancel"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_search
msgid "Has Mentions"
msgstr ""
@@ -1882,6 +1832,16 @@ msgid "Has attachments"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_mail__has_error
+#: model:ir.model.fields,field_description:mail.field_mail_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_compose_message__has_error
+#: model:ir.model.fields,help:mail.field_mail_mail__has_error
+#: model:ir.model.fields,help:mail.field_mail_message__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
#: model:ir.ui.view,arch_db:mail.view_mail_form
msgid "Headers"
@@ -1889,10 +1849,17 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
msgid "Hello"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__help_message
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__message
+msgid "Help message"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
msgid "Hidden"
msgstr ""
@@ -1916,7 +1883,11 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__id
#: model:ir.model.fields,field_description:mail.field_mail_message__id
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__id
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__id
#: model:ir.model.fields,field_description:mail.field_mail_notification__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__id
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__id
#: model:ir.model.fields,field_description:mail.field_mail_template__id
#: model:ir.model.fields,field_description:mail.field_mail_thread__id
@@ -1947,151 +1918,37 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:119
-#: code:addons/mail/static/src/xml/discuss.xml:203
+#: code:addons/mail/static/src/xml/discuss.xml:127
+#: code:addons/mail/static/src/xml/discuss.xml:217
#, python-format
msgid "Idle"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread
-#: model:ir.model.fields,help:mail.field_account_invoice__message_unread
-#: model:ir.model.fields,help:mail.field_account_payment__message_unread
-#: model:ir.model.fields,help:mail.field_account_voucher__message_unread
-#: model:ir.model.fields,help:mail.field_blog_blog__message_unread
-#: model:ir.model.fields,help:mail.field_blog_post__message_unread
-#: model:ir.model.fields,help:mail.field_calendar_event__message_unread
-#: model:ir.model.fields,help:mail.field_crm_lead__message_unread
-#: model:ir.model.fields,help:mail.field_crm_team__message_unread
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread
-#: model:ir.model.fields,help:mail.field_event_event__message_unread
-#: model:ir.model.fields,help:mail.field_event_registration__message_unread
-#: model:ir.model.fields,help:mail.field_event_track__message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread
-#: model:ir.model.fields,help:mail.field_forum_forum__message_unread
-#: model:ir.model.fields,help:mail.field_forum_post__message_unread
-#: model:ir.model.fields,help:mail.field_forum_tag__message_unread
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread
-#: model:ir.model.fields,help:mail.field_hr_contract__message_unread
-#: model:ir.model.fields,help:mail.field_hr_department__message_unread
-#: model:ir.model.fields,help:mail.field_hr_employee__message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense__message_unread
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread
-#: model:ir.model.fields,help:mail.field_hr_job__message_unread
-#: model:ir.model.fields,help:mail.field_hr_leave__message_unread
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread
#: model:ir.model.fields,help:mail.field_mail_channel__message_unread
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread
#: model:ir.model.fields,help:mail.field_mail_thread__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread
-#: model:ir.model.fields,help:mail.field_note_note__message_unread
-#: model:ir.model.fields,help:mail.field_product_product__message_unread
-#: model:ir.model.fields,help:mail.field_product_template__message_unread
-#: model:ir.model.fields,help:mail.field_project_project__message_unread
-#: model:ir.model.fields,help:mail.field_project_task__message_unread
-#: model:ir.model.fields,help:mail.field_purchase_order__message_unread
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread
-#: model:ir.model.fields,help:mail.field_repair_order__message_unread
#: model:ir.model.fields,help:mail.field_res_partner__message_unread
#: model:ir.model.fields,help:mail.field_res_users__message_unread
-#: model:ir.model.fields,help:mail.field_sale_order__message_unread
-#: model:ir.model.fields,help:mail.field_slide_channel__message_unread
-#: model:ir.model.fields,help:mail.field_slide_slide__message_unread
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking__message_unread
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread
-#: model:ir.model.fields,help:mail.field_survey_survey__message_unread
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread
msgid "If checked new messages require your attention."
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction
-#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction
-#: model:ir.model.fields,help:mail.field_account_payment__message_needaction
-#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction
-#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction
-#: model:ir.model.fields,help:mail.field_blog_post__message_needaction
-#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction
-#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction
-#: model:ir.model.fields,help:mail.field_crm_team__message_needaction
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction
-#: model:ir.model.fields,help:mail.field_event_event__message_needaction
-#: model:ir.model.fields,help:mail.field_event_registration__message_needaction
-#: model:ir.model.fields,help:mail.field_event_track__message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_post__message_needaction
-#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_department__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_job__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction
#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction
#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction
-#: model:ir.model.fields,help:mail.field_note_note__message_needaction
-#: model:ir.model.fields,help:mail.field_product_product__message_needaction
-#: model:ir.model.fields,help:mail.field_product_template__message_needaction
-#: model:ir.model.fields,help:mail.field_project_project__message_needaction
-#: model:ir.model.fields,help:mail.field_project_task__message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction
-#: model:ir.model.fields,help:mail.field_repair_order__message_needaction
#: model:ir.model.fields,help:mail.field_res_partner__message_needaction
#: model:ir.model.fields,help:mail.field_res_users__message_needaction
-#: model:ir.model.fields,help:mail.field_sale_order__message_needaction
-#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction
-#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction
-#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction
msgid "If checked, new messages require your attention."
msgstr ""
#. module: mail
+#: 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
+#: model:ir.model.fields,help:mail.field_res_users__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite__send_mail
msgid "If checked, the partners will receive an email warning they have been added in the document's followers."
msgstr ""
@@ -2125,6 +1982,16 @@ msgid "If you have setup a catch-all email domain redirected to the Odoo server,
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+msgid "If you want to re-send them, click Cancel now, then click on the notification and review them one by one by clicking on the red envelope next to each message."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Ignore all failures"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_alias.py:130
#, python-format
msgid "Inactive Alias"
@@ -2132,19 +1999,23 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:84
+#: 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:154
-#: code:addons/mail/static/src/xml/discuss.xml:164
+#: code:addons/mail/static/src/xml/discuss.xml:168
+#: code:addons/mail/static/src/xml/discuss.xml:178
#, python-format
msgid "Inbox"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity__automated
+msgid "Indicates this activity has been created automatically and not by any user."
+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
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__parent_id
msgid "Initial thread message."
msgstr ""
@@ -2160,14 +2031,19 @@ msgid "Internal Only"
msgstr ""
#. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Invalid email adress"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_alias.py:88
#, python-format
msgid "Invalid expression, it must be a literal python dictionary definition e.g. \"{'field': 'value'}\""
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1811
-#: code:addons/mail/models/mail_thread.py:1996
+#: code:addons/mail/models/mail_thread.py:1925
+#: code:addons/mail/models/mail_thread.py:2136
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
@@ -2180,7 +2056,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1446
+#: code:addons/mail/static/src/js/services/chat_manager.js:1611
#, python-format
msgid "Invitation"
msgstr ""
@@ -2194,7 +2070,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/discuss.js:44
-#: code:addons/mail/static/src/xml/discuss.xml:133
+#: code:addons/mail/static/src/xml/discuss.xml:141
#, python-format
msgid "Invite"
msgstr ""
@@ -2209,14 +2085,14 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/discuss.js:29
-#: code:addons/mail/static/src/xml/discuss.xml:133
+#: code:addons/mail/static/src/xml/discuss.xml:141
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:882
+#: code:addons/mail/static/src/js/discuss.js:1039
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -2232,71 +2108,20 @@ msgid "Invited people only"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_event__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_event_track__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_is_follower
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Allowed"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Is Banned"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_note_note__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_product__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_product_template__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_project__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_project_task__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_partner__message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_users__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_is_follower
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_is_follower
msgid "Is Follower"
msgstr ""
@@ -2321,6 +2146,11 @@ msgid "Is a member"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__is_moderator
+msgid "Is moderator"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
msgid "Is pinned on the interface"
msgstr ""
@@ -2355,7 +2185,11 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail____last_update
#: model:ir.model.fields,field_description:mail.field_mail_message____last_update
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_moderation____last_update
#: model:ir.model.fields,field_description:mail.field_mail_notification____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message____last_update
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner____last_update
#: model:ir.model.fields,field_description:mail.field_mail_shortcode____last_update
#: model:ir.model.fields,field_description:mail.field_mail_template____last_update
#: model:ir.model.fields,field_description:mail.field_mail_thread____last_update
@@ -2383,6 +2217,10 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_message__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_template__write_uid
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_uid
@@ -2402,6 +2240,10 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__write_date
#: model:ir.model.fields,field_description:mail.field_mail_message__write_date
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__write_date
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__write_date
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__write_date
#: model:ir.model.fields,field_description:mail.field_mail_template__write_date
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__write_date
@@ -2423,14 +2265,21 @@ msgid "Late Activities"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__layout
+#: model:ir.model.fields,field_description:mail.field_mail_mail__layout
+#: model:ir.model.fields,field_description:mail.field_mail_message__layout
+msgid "Layout"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Leave"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_channel.py:693
-#: code:addons/mail/static/src/xml/discuss.xml:112
+#: code:addons/mail/models/mail_channel.py:901
+#: code:addons/mail/static/src/xml/discuss.xml:120
#, python-format
msgid "Leave this channel"
msgstr ""
@@ -2446,7 +2295,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:704
+#: code:addons/mail/models/mail_channel.py:912
#, python-format
msgid "List users in the current channel"
msgstr ""
@@ -2473,6 +2322,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:361
+#, python-format
+msgid "Loading older messages..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/js/chatter_composer.js:30
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
@@ -2498,7 +2354,6 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__is_log
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__is_log
msgid "Log an Internal Note"
msgstr ""
@@ -2517,20 +2372,31 @@ msgid "Log or schedule an activity"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_id
+msgid "Mail"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_message__mail_activity_type_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_activity_type_id
msgid "Mail Activity Type"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:161
+#, python-format
+msgid "Mail Body"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Mail Channel Form"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:367
+#: code:addons/mail/models/mail_mail.py:374
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
@@ -2559,7 +2425,14 @@ msgid "Mail: Email Queue Manager"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:813
+#: model:ir.actions.server,name:mail.ir_cron_mail_notify_channel_moderators_ir_actions_server
+#: model:ir.cron,cron_name:mail.ir_cron_mail_notify_channel_moderators
+#: model:ir.cron,name:mail.ir_cron_mail_notify_channel_moderators
+msgid "Mail: Notify channel moderators"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:915
#, python-format
msgid "Mailbox unavailable - %s"
msgstr ""
@@ -2578,14 +2451,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:142
#, python-format
msgid "Mark all as read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:134
+#: code:addons/mail/static/src/xml/discuss.xml:142
#, python-format
msgid "Mark all read"
msgstr ""
@@ -2597,15 +2470,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:211
+#: code:addons/mail/static/src/xml/discuss.xml:240
+#: code:addons/mail/static/src/xml/thread.xml:206
#, python-format
msgid "Mark as Read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:158
-#: code:addons/mail/static/src/xml/thread.xml:205
+#: code:addons/mail/static/src/xml/thread.xml:147
+#: code:addons/mail/static/src/xml/thread.xml:200
#, python-format
msgid "Mark as Todo"
msgstr ""
@@ -2653,12 +2527,21 @@ msgstr ""
#: model:ir.model,name:mail.model_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
#: model:ir.ui.view,arch_db:mail.view_message_form
msgid "Message"
msgstr ""
#. module: mail
+#: 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
+#: model:ir.model.fields,field_description:mail.field_res_users__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value__mail_message_id
msgid "Message ID"
msgstr ""
@@ -2672,7 +2555,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__record_name
#: model:ir.model.fields,field_description:mail.field_mail_mail__record_name
#: model:ir.model.fields,field_description:mail.field_mail_message__record_name
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__record_name
msgid "Message Record Name"
msgstr ""
@@ -2682,6 +2564,12 @@ msgid "Message Type"
msgstr ""
#. module: mail
+#: code:addons/mail/models/mail_message.py:1194
+#, python-format
+msgid "Message are pending moderation"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_mail__email_to
msgid "Message recipients (emails)"
msgstr ""
@@ -2693,7 +2581,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:124
+#: code:addons/mail/static/src/xml/discuss.xml:132
#, python-format
msgid "Message sent in \""
msgstr ""
@@ -2717,7 +2605,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__message_type
#: model:ir.model.fields,help:mail.field_mail_mail__message_type
#: model:ir.model.fields,help:mail.field_mail_message__message_type
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_type
msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
msgstr ""
@@ -2725,7 +2612,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__message_id
#: model:ir.model.fields,help:mail.field_mail_mail__message_id
#: model:ir.model.fields,help:mail.field_mail_message__message_id
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__message_id
msgid "Message unique identifier"
msgstr ""
@@ -2733,77 +2619,15 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
#: model:ir.model.fields,field_description:mail.field_mail_message__message_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__message_id
msgid "Message-Id"
msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_ids
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_ids
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_ids
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_ids
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_ids
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_event__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_ids
-#: model:ir.model.fields,field_description:mail.field_event_track__message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_ids
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_ids
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_ids
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_ids
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_ids
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_ids
-#: model:ir.model.fields,field_description:mail.field_note_note__message_ids
-#: model:ir.model.fields,field_description:mail.field_product_product__message_ids
-#: model:ir.model.fields,field_description:mail.field_product_template__message_ids
-#: model:ir.model.fields,field_description:mail.field_project_project__message_ids
-#: model:ir.model.fields,field_description:mail.field_project_task__message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_ids
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_ids
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_ids
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_ids
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_ids
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_ids
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
msgid "Messages"
@@ -2829,6 +2653,7 @@ 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
#: model:ir.ui.view,arch_db:mail.view_email_template_search
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Model"
@@ -2850,13 +2675,83 @@ msgid "Models"
msgstr ""
#. module: mail
-#: model:ir.model,name:mail.model_base_module_uninstall
-msgid "Module Uninstallation"
+#. openerp-web
+#: code:addons/mail/static/src/js/services/chat_manager.js:1241
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#, python-format
+msgid "Moderate Messages"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
-msgid "Month"
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation
+msgid "Moderate this channel"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
+msgid "Moderated Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_channel_ids
+msgid "Moderated channels"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_count
+msgid "Moderated emails count"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.mail_moderation_action
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Moderation"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_tree
+msgid "Moderation Lists"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:34
+#, python-format
+msgid "Moderation Queue"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
+#: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
+msgid "Moderation count"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
+msgid "Moderator"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderator_ids
+msgid "Moderators"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_module_uninstall
+msgid "Module Uninstallation"
msgstr ""
#. module: mail
@@ -2869,6 +2764,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_email_template_preview__name
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__name
#: model:ir.model.fields,field_description:mail.field_mail_channel__name
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__name
#: model:ir.model.fields,field_description:mail.field_mail_template__name
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Name"
@@ -2878,7 +2774,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__record_name
#: model:ir.model.fields,help:mail.field_mail_mail__record_name
#: model:ir.model.fields,help:mail.field_mail_message__record_name
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__record_name
msgid "Name get of the related document."
msgstr ""
@@ -2893,30 +2788,35 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction
#: model:ir.model.fields,field_description:mail.field_mail_mail__needaction
#: model:ir.model.fields,field_description:mail.field_mail_message__needaction
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction
#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
#: model:ir.model.fields,help:mail.field_mail_mail__needaction
#: model:ir.model.fields,help:mail.field_mail_message__needaction
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__needaction
#: model:ir.ui.view,arch_db:mail.view_message_search
msgid "Need Action"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
+#: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
msgid "Needaction Recipient"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:138
+#: code:addons/mail/static/src/xml/discuss.xml:145
#, python-format
msgid "New Channel"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:137
+#: code:addons/mail/static/src/xml/discuss.xml:144
#, python-format
msgid "New Message"
msgstr ""
@@ -2953,7 +2853,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1625
+#: 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
@@ -2963,14 +2863,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:238
+#: code:addons/mail/static/src/xml/thread.xml:271
#, python-format
msgid "New messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:115
+#: code:addons/mail/static/src/xml/thread.xml:100
#, python-format
msgid "New messages appear here."
msgstr ""
@@ -2983,85 +2883,33 @@ msgid "New people"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_guidelines
+msgid "Newcomers on this moderated channel will automatically receive the guidelines."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_activity_view_tree
msgid "Next Activities"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_date_deadline
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_date_deadline
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_date_deadline
#: model:ir.model.fields,field_description:mail.field_res_users__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_date_deadline
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_date_deadline
msgid "Next Activity Deadline"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_summary
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_summary
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_summary
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_summary
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_summary
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_summary
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_summary
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_summary
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_summary
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_summary
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_summary
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_summary
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_summary
#: model:ir.model.fields,field_description:mail.field_res_users__activity_summary
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_summary
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_summary
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_summary
msgid "Next Activity Summary"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_repair_order__activity_type_id
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
#: model:ir.model.fields,field_description:mail.field_res_users__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_type_id
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_type_id
msgid "Next Activity Type"
msgstr ""
@@ -3086,6 +2934,11 @@ msgid "No discussion yet..."
msgstr ""
#. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "No error"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:185
#, python-format
@@ -3108,7 +2961,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:118
+#: code:addons/mail/static/src/xml/thread.xml:103
#, python-format
msgid "No starred message"
msgstr ""
@@ -3117,7 +2970,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_mail__no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_message__no_auto_thread
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__no_auto_thread
msgid "No threading for answers"
msgstr ""
@@ -3129,7 +2981,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:162
+#: code:addons/mail/static/src/xml/thread.xml:152
#, python-format
msgid "Note by"
msgstr ""
@@ -3145,91 +2997,33 @@ msgid "Notification Management"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify_msg
+msgid "Notification message"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notification_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__notification_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__notification_ids
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notification_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__notification_ids
msgid "Notifications"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notify
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__notify
msgid "Notify followers"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__notify
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__notify
msgid "Notify followers of the document (mass post only)"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_event__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_event_track__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__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_mass_mailing_contact__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_note_note__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_product__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_product_template__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_project__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_project_task__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_partner__message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_users__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_needaction_counter
msgid "Number of Actions"
msgstr ""
@@ -3239,153 +3033,47 @@ msgid "Number of days before executing the action. It allows to plan the action
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_invoice__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_payment__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_account_voucher__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_blog__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_blog_post__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_calendar_event__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_lead__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crm_team__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_event__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_registration__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_event_track__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_forum__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_post__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_forum_tag__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_contract__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_department__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_employee__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_job__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_leave__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_needaction_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
+#: model:ir.model.fields,field_description:mail.field_res_users__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_thread__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_note_note__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_product__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_product_template__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_project__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_project_task__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_order__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_repair_order__message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_partner__message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_users__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_sale_order__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_channel__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_slide_slide__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_survey_survey__message_needaction_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_needaction_counter
msgid "Number of messages which requires an action"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_account_analytic_account__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_asset_asset__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_bank_statement__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_invoice__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_payment__message_unread_counter
-#: model:ir.model.fields,help:mail.field_account_voucher__message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_blog__message_unread_counter
-#: model:ir.model.fields,help:mail.field_blog_post__message_unread_counter
-#: model:ir.model.fields,help:mail.field_calendar_event__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_lead__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crm_team__message_unread_counter
-#: model:ir.model.fields,help:mail.field_crossovered_budget__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_event__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_registration__message_unread_counter
-#: model:ir.model.fields,help:mail.field_event_track__message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle__message_unread_counter
-#: model:ir.model.fields,help:mail.field_fleet_vehicle_log_contract__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_forum__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_post__message_unread_counter
-#: model:ir.model.fields,help:mail.field_forum_tag__message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_badge__message_unread_counter
-#: model:ir.model.fields,help:mail.field_gamification_challenge__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_applicant__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_contract__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_department__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_employee__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_expense_sheet__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_job__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_leave__message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_leave_allocation__message_unread_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
+#: model:ir.model.fields,help:mail.field_res_users__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_activity__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_full__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_simple__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mail_test_track__message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_thread__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_equipment_category__message_unread_counter
-#: model:ir.model.fields,help:mail.field_maintenance_request__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_bom__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_workorder__message_unread_counter
-#: model:ir.model.fields,help:mail.field_note_note__message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_product__message_unread_counter
-#: model:ir.model.fields,help:mail.field_product_template__message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_project__message_unread_counter
-#: model:ir.model.fields,help:mail.field_project_task__message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_order__message_unread_counter
-#: model:ir.model.fields,help:mail.field_purchase_requisition__message_unread_counter
-#: model:ir.model.fields,help:mail.field_repair_order__message_unread_counter
#: model:ir.model.fields,help:mail.field_res_partner__message_unread_counter
#: model:ir.model.fields,help:mail.field_res_users__message_unread_counter
-#: model:ir.model.fields,help:mail.field_sale_order__message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_channel__message_unread_counter
-#: model:ir.model.fields,help:mail.field_slide_slide__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_landed_cost__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_picking_batch__message_unread_counter
-#: model:ir.model.fields,help:mail.field_stock_production_lot__message_unread_counter
-#: model:ir.model.fields,help:mail.field_survey_survey__message_unread_counter
-#: model:ir.model.fields,help:mail.field_test_performance_mail__message_unread_counter
msgid "Number of unread messages"
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.message_notification_email
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
msgid "Odoo"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:910
+#: code:addons/mail/static/src/js/discuss.js:1193
#, python-format
msgid "Odoo has now the permission to send you native notifications on this device."
msgstr ""
@@ -3399,14 +3087,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:907
+#: code:addons/mail/static/src/js/discuss.js:1190
#, 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:120
+#: code:addons/mail/static/src/xml/discuss.xml:128
#, python-format
msgid "Offline"
msgstr ""
@@ -3462,8 +3150,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:118
-#: code:addons/mail/static/src/xml/discuss.xml:202
+#: code:addons/mail/static/src/xml/discuss.xml:126
+#: code:addons/mail/static/src/xml/discuss.xml:216
#, python-format
msgid "Online"
msgstr ""
@@ -3491,14 +3179,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:139
-#, python-format
-msgid "Open channel settings"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:187
+#: code:addons/mail/static/src/xml/discuss.xml:201
#, python-format
msgid "Open chat"
msgstr ""
@@ -3573,33 +3254,13 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__mail_server_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__mail_server_id
#: model:ir.model.fields,field_description:mail.field_mail_message__mail_server_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__mail_server_id
msgid "Outgoing mail server"
msgstr ""
#. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0
-#: selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0
#: selection:mail.activity,state:0
#: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0
-#: selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
#: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
msgid "Overdue"
msgstr ""
@@ -3624,7 +3285,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__parent_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__parent_id
#: model:ir.model.fields,field_description:mail.field_mail_message__parent_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__parent_id
msgid "Parent Message"
msgstr ""
@@ -3655,6 +3315,11 @@ msgid "Parent subtype, used for automatic subscription. This field is not correc
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
msgid "Partner Mass Mailing"
msgstr ""
@@ -3666,6 +3331,16 @@ msgid "Partner Profile"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_readonly
+msgid "Partner Readonly"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_resend_partner
+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 ""
@@ -3674,11 +3349,40 @@ msgstr ""
#: 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__needaction_partner_ids
msgid "Partners with Need Action"
msgstr ""
#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Pending Moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:263
+#, python-format
+msgid "Pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:108
+#, python-format
+msgid "Pending moderation messages appear here."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_channel__moderation_notify
+msgid "People receive an automatic notification about their message being waiting for moderation."
+msgstr ""
+
+#. module: mail
+#: selection:mail.moderation,status:0
+msgid "Permanent Ban"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
#: model:ir.model.fields,help:mail.field_mail_mail__auto_delete
#: model:ir.model.fields,help:mail.field_mail_template__auto_delete
@@ -3687,14 +3391,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:906
+#: code:addons/mail/static/src/js/discuss.js:1189
#, python-format
msgid "Permission denied"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:909
+#: code:addons/mail/static/src/js/discuss.js:1192
#, python-format
msgid "Permission granted"
msgstr ""
@@ -3711,28 +3415,9 @@ msgid "Placeholder Expression"
msgstr ""
#. module: mail
-#: selection:account.invoice,activity_state:0
-#: selection:crm.lead,activity_state:0
-#: selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0
#: selection:mail.activity,state:0
#: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0
-#: selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
#: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
msgid "Planned"
msgstr ""
@@ -3749,22 +3434,20 @@ msgid "Planned in"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:287
-#, python-format
-msgid "Play this video"
+#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+msgid "Planned in (days)"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter_composer.js:157
+#: code:addons/mail/static/src/js/chatter_composer.js:158
#, python-format
msgid "Please complete customer's informations"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:96
+#: code:addons/mail/static/src/js/many2many_tags_email.js:85
#, python-format
msgid "Please complete customer's informations and email"
msgstr ""
@@ -3776,7 +3459,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:731
+#: code:addons/mail/static/src/js/composer.js:674
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
@@ -3802,7 +3485,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_notification_borders
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
+#: model:ir.ui.view,arch_db:mail.mail_notification_light
msgid "Powered by"
msgstr ""
@@ -3838,6 +3521,13 @@ msgid "Previous Activity Type"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:56
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__public
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Privacy"
@@ -3845,15 +3535,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:56
-#: code:addons/mail/static/src/xml/discuss.xml:176
+#: code:addons/mail/static/src/xml/discuss.xml:62
+#: code:addons/mail/static/src/xml/discuss.xml:190
#, python-format
msgid "Private Channels"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:863
+#: code:addons/mail/static/src/js/discuss.js:1168
#, python-format
msgid "Public Channels"
msgstr ""
@@ -3884,6 +3574,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid "Recipient"
msgstr ""
@@ -3891,6 +3582,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_email_template_preview__partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.view_message_form
@@ -3925,13 +3617,39 @@ msgid "Regards,"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:149
+#, python-format
+msgid "Reject"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:149
+#, python-format
+msgid "Reject selected messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:253
+#, python-format
+msgid "Reject |"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,moderation_status:0
+#: selection:mail.message,moderation_status:0
+msgid "Rejected"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity__res_id
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__res_id
#: model:ir.model.fields,field_description:mail.field_mail_followers__res_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__res_id
#: model:ir.model.fields,field_description:mail.field_mail_message__res_id
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__res_id
msgid "Related Document ID"
msgstr ""
@@ -3943,7 +3661,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_message__model
#: model:ir.model.fields,field_description:mail.field_mail_template__model
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__res_model
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__model
msgid "Related Document Model"
msgstr ""
@@ -3968,6 +3685,25 @@ msgid "Relation field"
msgstr ""
#. module: mail
+#: selection:mail.activity.type,category:0
+msgid "Reminder"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:253
+#, python-format
+msgid "Remove message with explanation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:255
+#, python-format
+msgid "Remove message without explanation"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Remove the contextual action to use this template on related documents"
msgstr ""
@@ -3981,7 +3717,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:208
+#: code:addons/mail/static/src/xml/thread.xml:203
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "Reply"
@@ -3991,7 +3727,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__reply_to
#: model:ir.model.fields,help:mail.field_mail_mail__reply_to
#: model:ir.model.fields,help:mail.field_mail_message__reply_to
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__reply_to
msgid "Reply email address. Setting the reply_to bypasses the automatic thread creation."
msgstr ""
@@ -4001,7 +3736,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail__reply_to
#: model:ir.model.fields,field_description:mail.field_mail_message__reply_to
#: model:ir.model.fields,field_description:mail.field_mail_template__reply_to
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__reply_to
msgid "Reply-To"
msgstr ""
@@ -4012,28 +3746,31 @@ msgid "Report Filename"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_invoice__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_crm_lead__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_event_track__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_hr_employee__activity_user_id
+#: model:ir.actions.act_window,name:mail.mail_resend_message_action
+msgid "Resend mail"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Resend to selected"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend_wizard_id
+msgid "Resend wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:49
+#, python-format
+msgid "Reset Zoom"
+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_mail_test_activity__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_production__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_note_note__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_product__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_product_template__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_project_task__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_purchase_order__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_repair_order__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
-#: model:ir.model.fields,field_description:mail.field_sale_order__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_stock_picking__activity_user_id
-#: model:ir.model.fields,field_description:mail.field_survey_survey__activity_user_id
msgid "Responsible User"
msgstr ""
@@ -4054,6 +3791,13 @@ msgid "Rich-text/HTML message"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:53
+#, python-format
+msgid "Rotate"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_email_template_search
msgid "SMTP Server"
msgstr ""
@@ -4075,7 +3819,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:40
+#: code:addons/mail/static/src/js/chat_window.js:41
#, python-format
msgid "Say something"
msgstr ""
@@ -4093,7 +3837,7 @@ msgid "Schedule activity"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_activity.py:260
+#: code:addons/mail/models/mail_activity.py:297
#, python-format
msgid "Schedule an Activity"
msgstr ""
@@ -4128,6 +3872,25 @@ msgid "Search Groups"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+msgid "Search Moderation List"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:146
+#, python-format
+msgid "Select All"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:146
+#, python-format
+msgid "Select all messages to moderate"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__model_object_field
#: model:ir.model.fields,help:mail.field_mail_template__model_object_field
msgid "Select target field from the related document model.\n"
@@ -4135,25 +3898,37 @@ msgid "Select target field from the related document model.\n"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+msgid "Select the action to do on each mail and correct the email address if needed. The modified address will be saved on the corresponding contact."
+msgstr ""
+
+#. module: mail
#: selection:mail.channel,public:0
msgid "Selected group of users"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:428
+#: code:addons/mail/static/src/js/composer.js:384
+#: code:addons/mail/static/src/js/discuss.js:141
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Send"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend
+msgid "Send Again"
+msgstr ""
+
+#. module: mail
+#: selection:ir.actions.server,state:0
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail
msgid "Send Email"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:295
+#: code:addons/mail/models/mail_template.py:265
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -4173,6 +3948,23 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:138
+#, python-format
+msgid "Send explanation to author"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Send guidelines"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines
+msgid "Send guidelines to new subscribers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:53
#, python-format
msgid "Send message"
@@ -4198,7 +3990,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:108
+#: code:addons/mail/static/src/xml/discuss.xml:114
#, python-format
msgid "Sends messages by email"
msgstr ""
@@ -4227,18 +4019,6 @@ msgid "Sequence"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:139
-#, python-format
-msgid "Settings"
-msgstr ""
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode__shortcode_type
-msgid "Shortcode Type"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form
#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_tree
msgid "Shortcodes"
@@ -4256,7 +4036,7 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:673
+#: code:addons/mail/models/mail_channel.py:881
#, python-format
msgid "Show an helper message"
msgstr ""
@@ -4277,7 +4057,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__author_avatar
#: model:ir.model.fields,help:mail.field_mail_mail__author_avatar
#: model:ir.model.fields,help:mail.field_mail_message__author_avatar
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__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 ""
@@ -4292,24 +4071,18 @@ msgid "Small-sized photo of the group. It is automatically resized as a 64x64px
msgstr ""
#. module: mail
-#: selection:mail.shortcode,shortcode_type:0
-msgid "Smiley"
-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:89
+#: 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:156
+#: code:addons/mail/static/src/xml/discuss.xml:170
#: 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__starred
#, python-format
msgid "Starred"
msgstr ""
@@ -4321,34 +4094,16 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__state
+#: model:ir.model.fields,field_description:mail.field_mail_moderation__status
#: model:ir.ui.view,arch_db:mail.view_mail_form
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Status"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_account_invoice__activity_state
-#: model:ir.model.fields,help:mail.field_crm_lead__activity_state
-#: model:ir.model.fields,help:mail.field_event_track__activity_state
-#: model:ir.model.fields,help:mail.field_hr_applicant__activity_state
-#: model:ir.model.fields,help:mail.field_hr_employee__activity_state
#: model:ir.model.fields,help:mail.field_mail_activity_mixin__activity_state
-#: model:ir.model.fields,help:mail.field_mail_test_activity__activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_equipment__activity_state
-#: model:ir.model.fields,help:mail.field_maintenance_request__activity_state
-#: model:ir.model.fields,help:mail.field_mrp_production__activity_state
-#: model:ir.model.fields,help:mail.field_mrp_unbuild__activity_state
-#: model:ir.model.fields,help:mail.field_note_note__activity_state
-#: model:ir.model.fields,help:mail.field_product_product__activity_state
-#: model:ir.model.fields,help:mail.field_product_template__activity_state
-#: model:ir.model.fields,help:mail.field_project_task__activity_state
-#: model:ir.model.fields,help:mail.field_purchase_order__activity_state
-#: model:ir.model.fields,help:mail.field_repair_order__activity_state
#: model:ir.model.fields,help:mail.field_res_partner__activity_state
#: model:ir.model.fields,help:mail.field_res_users__activity_state
-#: model:ir.model.fields,help:mail.field_sale_order__activity_state
-#: model:ir.model.fields,help:mail.field_stock_picking__activity_state
-#: model:ir.model.fields,help:mail.field_survey_survey__activity_state
msgid "Status based on activities\n"
"Overdue: Due date is already passed\n"
"Today: Activity date is today\n"
@@ -4370,12 +4125,12 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/composer.xml:8
+#: code:addons/mail/static/src/xml/discuss.xml:160
#: 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
#: model:ir.model.fields,field_description:mail.field_mail_message__subject
#: model:ir.model.fields,field_description:mail.field_mail_template__subject
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subject
#, python-format
msgid "Subject"
msgstr ""
@@ -4394,7 +4149,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:221
+#: code:addons/mail/static/src/xml/thread.xml:225
#, python-format
msgid "Subject:"
msgstr ""
@@ -4409,7 +4164,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_followers__subtype_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__subtype_id
#: model:ir.model.fields,field_description:mail.field_mail_message__subtype_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__subtype_id
#: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
msgid "Subtype"
msgstr ""
@@ -4429,7 +4183,6 @@ msgstr ""
#. module: mail
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
-#: selection:survey.mail.compose.message,message_type:0
msgid "System notification"
msgstr ""
@@ -4444,12 +4197,6 @@ msgid "Template Preview"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:264
-#, python-format
-msgid "Template rendering failed, this could mean that your template contains python syntax errors"
-msgstr ""
-
-#. module: mail
#: model:ir.actions.act_window,name:mail.action_email_template_tree_all
#: model:ir.ui.menu,name:mail.menu_email_templates
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -4459,11 +4206,21 @@ msgid "Templates"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "Thank you!"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "The"
msgstr ""
#. module: mail
+#: sql_constraint:mail.moderation:0
+msgid "The email address must be unique per channel !"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "The email sent to"
msgstr ""
@@ -4495,9 +4252,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:175
-#: code:addons/mail/models/mail_message.py:578
-#: code:addons/mail/models/mail_message.py:678
+#: code:addons/mail/models/mail_activity.py:183
+#: code:addons/mail/models/mail_message.py:680
+#: code:addons/mail/models/mail_message.py:850
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -4510,11 +4267,6 @@ msgid "The shortcut which must be replaced in the Chat Messages"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_shortcode__unicode_source
-msgid "The source is replaced by this unicode character in the Chat Messages"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__model_id
#: model:ir.model.fields,help:mail.field_mail_template__model_id
msgid "The type of document this template can be used with"
@@ -4559,6 +4311,11 @@ msgid "To (Partners)"
msgstr ""
#. module: mail
+#: model:mail.activity.type,name:mail.mail_activity_data_todo
+msgid "To Do"
+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
@@ -4568,31 +4325,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:82
-#: code:addons/mail/static/src/js/thread.js:328
+#: 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
-#: selection:crm.lead,activity_state:0
-#: selection:event.track,activity_state:0
-#: selection:hr.applicant,activity_state:0
-#: selection:hr.employee,activity_state:0
#: selection:mail.activity,state:0
#: selection:mail.activity.mixin,activity_state:0
-#: selection:mail.test.activity,activity_state:0
-#: selection:maintenance.equipment,activity_state:0
-#: selection:maintenance.request,activity_state:0
-#: selection:mrp.production,activity_state:0
-#: selection:mrp.unbuild,activity_state:0
-#: selection:note.note,activity_state:0
-#: selection:product.product,activity_state:0
-#: selection:product.template,activity_state:0
-#: selection:project.task,activity_state:0
-#: selection:purchase.order,activity_state:0
-#: selection:repair.order,activity_state:0
#: selection:res.partner,activity_state:0
-#: selection:sale.order,activity_state:0
-#: selection:stock.picking,activity_state:0
-#: selection:survey.survey,activity_state:0
#, python-format
msgid "Today"
msgstr ""
@@ -4604,13 +4342,8 @@ msgid "Today Activities"
msgstr ""
#. module: mail
-#: model:mail.activity.type,name:mail.mail_activity_data_todo
-msgid "Todo"
-msgstr ""
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:92
+#: code:addons/mail/static/src/js/activity.js:93
#, python-format
msgid "Tomorrow"
msgstr ""
@@ -4624,7 +4357,6 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__tracking_value_ids
#: model:ir.model.fields,help:mail.field_mail_mail__tracking_value_ids
#: model:ir.model.fields,help:mail.field_mail_message__tracking_value_ids
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__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 ""
@@ -4650,7 +4382,6 @@ msgstr ""
#: 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
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__tracking_value_ids
msgid "Tracking values"
msgstr ""
@@ -4658,25 +4389,47 @@ 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.model.fields,field_description:mail.field_survey_mail_compose_message__message_type
msgid "Type"
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"
+"- 'Create or Copy a new Record': create a new record with new values, or copy an existing record in your database\n"
+"- 'Write on a Record': update the values of a record\n"
+"- 'Execute several actions': define an action that triggers several other server actions\n"
+"- 'Add Followers': add followers to a record (available in Discuss)\n"
+"- 'Send Email': automatically send an email (available in email_template)"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__uuid
msgid "UUID"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:233
+#: code:addons/mail/models/mail_mail.py:238
#, python-format
msgid "Unable to connect to SMTP Server"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:31
+#: code:addons/mail/models/mail_thread.py:2144
#, python-format
-msgid "Unable to send email, please configure the sender's email address."
+msgid "Unable to log message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:2109
+#, python-format
+msgid "Unable to notify message, please configure the sender's email address."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_message.py:34
+#, python-format
+msgid "Unable to post message, please configure the sender's email address."
msgstr ""
#. module: mail
@@ -4692,145 +4445,23 @@ msgid "Unfortunately this email alias is already used, please choose a unique on
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_shortcode__unicode_source
-msgid "Unicode Character"
-msgstr ""
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_event__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread
-#: model:ir.model.fields,field_description:mail.field_event_track__message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__message_unread
+#: selection:mail.notification,failure_type:0
+msgid "Unknown error occured"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread
-#: model:ir.model.fields,field_description:mail.field_note_note__message_unread
-#: model:ir.model.fields,field_description:mail.field_product_product__message_unread
-#: model:ir.model.fields,field_description:mail.field_product_template__message_unread
-#: model:ir.model.fields,field_description:mail.field_project_project__message_unread
-#: model:ir.model.fields,field_description:mail.field_project_task__message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread
#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread
#: model:ir.model.fields,field_description:mail.field_res_users__message_unread
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread
msgid "Unread Messages"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_account_analytic_account__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_asset_asset__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_bank_statement__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_invoice__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_payment__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_account_voucher__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_blog__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_blog_post__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_calendar_event__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_lead__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crm_team__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_crossovered_budget__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_event__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_registration__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_event_track__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_log_contract__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_forum__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_post__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_forum_tag__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_badge__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_gamification_challenge__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_applicant__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_contract__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_department__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_employee__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_job__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_leave_allocation__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_mass_mailing_contact__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_activity__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_full__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_simple__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mail_test_track__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_maintenance_request__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_bom__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_unbuild__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_workorder__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_note_note__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_product__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_product_template__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_project__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_project_task__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_order__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_purchase_requisition__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_repair_order__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_partner__message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_users__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_sale_order__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_channel__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_slide_slide__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_landed_cost__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_picking_batch__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_stock_production_lot__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_survey_survey__message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_test_performance_mail__message_unread_counter
msgid "Unread Messages Counter"
msgstr ""
@@ -4841,61 +4472,71 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:147
#, python-format
-msgid "Unstar all"
+msgid "Unselect All"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:135
+#: code:addons/mail/static/src/xml/discuss.xml:147
#, python-format
-msgid "Unstar all messages"
+msgid "Unselect all messages to moderate"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:136
+#: code:addons/mail/static/src/xml/discuss.xml:143
#, python-format
-msgid "Unsubscribe"
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:143
+#, python-format
+msgid "Unstar all messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:136
+#: code:addons/mail/static/src/js/services/chat_manager.js:1772
#, python-format
-msgid "Unsubscribe from channel"
+msgid "Unsubscribed"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:504
+#: code:addons/mail/models/mail_template.py:474
#, python-format
msgid "Unsupported report type %s found."
msgstr ""
#. module: mail
+#: selection:ir.actions.server,state:0
+msgid "Update the Record"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:327
+#: code:addons/mail/static/src/xml/thread.xml:344
#, python-format
msgid "Uploading"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:731
+#: code:addons/mail/static/src/js/composer.js:674
#, python-format
msgid "Uploading error"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__use_active_domain
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__use_active_domain
msgid "Use active domain"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__template_id
-#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message__template_id
msgid "Use template"
msgstr ""
@@ -4918,7 +4559,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:51
+#: code:addons/mail/static/src/xml/discuss.xml:57
#: code:addons/mail/static/src/xml/extended_chat_window.xml:8
#, python-format
msgid "User name"
@@ -4930,7 +4571,7 @@ msgid "Users"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:717
+#: code:addons/mail/models/mail_channel.py:925
#, python-format
msgid "Users in this channel: %s %s and you."
msgstr ""
@@ -4941,14 +4582,14 @@ msgid "Using your own email server is required to send/receive emails in Communi
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:696
+#: code:addons/mail/models/mail_thread.py:723
#: model:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:694
+#: code:addons/mail/models/mail_thread.py:721
#, python-format
msgid "View %s"
msgstr ""
@@ -4981,7 +4622,6 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__is_log
-#: model:ir.model.fields,help:mail.field_survey_mail_compose_message__is_log
msgid "Whether the message is an internal note (comment mode only)"
msgstr ""
@@ -4991,6 +4631,11 @@ 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 ""
@@ -5004,15 +4649,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:11
+#: code:addons/mail/static/src/xml/composer.xml:12
#, python-format
-msgid "Write Something..."
+msgid "Write something..."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:86
-#: code:addons/mail/static/src/js/thread.js:330
+#: code:addons/mail/static/src/js/activity.js:87
+#: code:addons/mail/static/src/js/thread.js:350
#, python-format
msgid "Yesterday"
msgstr ""
@@ -5025,59 +4670,91 @@ msgid "You added <b>%s</b> to the conversation."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:714
+#: code:addons/mail/models/mail_channel.py:922
#, python-format
msgid "You are alone in this channel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:683
+#. openerp-web
+#: code:addons/mail/static/src/js/discuss.js:317
+#, 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
+#, 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
+#, python-format
+msgid "You are going to discard 1 message. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "You are going to send the guidelines to all the subscribers. Do you confirm the action?"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:891
#, python-format
msgid "You are in a private conversation with <b>@%s</b>."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:886
#, python-format
msgid "You are in channel <b>#%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:119
+#: code:addons/mail/static/src/xml/thread.xml:104
#, python-format
msgid "You can mark any message as 'starred', and it shows up in this channel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:53
+#: code:addons/mail/models/res_users.py:86
#, python-format
msgid "You cannot create a new user from here.\n"
" To create new user please go to configuration panel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:144
+#: code:addons/mail/models/mail_channel.py:239
#, python-format
msgid "You cannot delete those groups, as the Whole Company group is required by other modules."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:342
+#: model:ir.ui.view,arch_db:mail.message_user_assigned
+msgid "You have been assigned to the"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/services/chat_manager.js:1611
#, python-format
-msgid "You could also add a new %(document)s by sending an email to %(email_link)s"
+msgid "You have been invited to: "
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
-msgid "You have been assigned to the"
+#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+msgid "You have messages to moderate, please go for the proceedings."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1446
+#: code:addons/mail/static/src/xml/thread.xml:107
#, python-format
-msgid "You have been invited to: "
+msgid "You have no message to moderate"
msgstr ""
#. module: mail
@@ -5088,26 +4765,31 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/services/chat_manager.js:1536
+#: code:addons/mail/static/src/js/services/chat_manager.js:1768
#, 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:1534
+#: code:addons/mail/static/src/js/services/chat_manager.js:1766
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/discuss.xml:217
+#: code:addons/mail/static/src/xml/discuss.xml:231
#, python-format
msgid "You:"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_notification_light
+msgid "Your"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/thread_field.js:92
#, python-format
@@ -5115,13 +4797,41 @@ msgid "Your message has not been sent."
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:263
+#, python-format
+msgid "Your message is pending moderation"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/discuss.xml:161
+#, python-format
+msgid "Your message was rejected by moderator."
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/ir_actions.py:30
#, python-format
msgid "Your template should define email_from"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:948
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:48
+#, python-format
+msgid "Zoom In"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:50
+#, python-format
+msgid "Zoom Out"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:1050
#, python-format
msgid "alias %s: %s"
msgstr ""
@@ -5148,7 +4858,7 @@ msgid "created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:309
+#: code:addons/mail/models/mail_thread.py:336
#, python-format
msgid "document"
msgstr ""
@@ -5228,19 +4938,19 @@ msgid "mail.alias.mixin"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:1027
#, python-format
msgid "model %s does not accept document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:920
+#: code:addons/mail/models/mail_thread.py:1022
#, python-format
msgid "model %s does not accept document update"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:1015
#, python-format
msgid "model %s does not accept document update, fall back on document creation"
msgstr ""
@@ -5264,20 +4974,20 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:181
+#: code:addons/mail/static/src/xml/thread.xml:171
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:895
+#: code:addons/mail/models/mail_thread.py:997
#, 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:899
+#: code:addons/mail/models/mail_thread.py:1001
#, python-format
msgid "posting a message without model should be with a parent_id (private message)"
msgstr ""
@@ -5307,13 +5017,13 @@ msgid "record:"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:917
+#: code:addons/mail/models/mail_thread.py:1019
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:910
+#: code:addons/mail/models/mail_thread.py:1012
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr ""
@@ -5324,13 +5034,13 @@ msgid "res.config.settings"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:895
+#: code:addons/mail/models/mail_thread.py:997
#, python-format
msgid "resetting thread_id"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:252
+#: code:addons/mail/models/mail_channel.py:403
#, python-format
msgid "restricted to channel members"
msgstr ""
@@ -5348,11 +5058,11 @@ msgid "restricted to known authors"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:899
-#: code:addons/mail/models/mail_thread.py:917
-#: code:addons/mail/models/mail_thread.py:920
-#: code:addons/mail/models/mail_thread.py:925
-#: code:addons/mail/models/mail_thread.py:948
+#: 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
#, python-format
msgid "skipping"
msgstr ""
@@ -5370,13 +5080,13 @@ msgid "this document"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:948
+#: code:addons/mail/models/mail_thread.py:1050
#, python-format
msgid "unknown error"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:888
+#: code:addons/mail/models/mail_thread.py:990
#, python-format
msgid "unknown target model %s"
msgstr ""
diff --git a/addons/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot
index ac10c045120..c557f8a009c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,12 +66,37 @@ msgid "A Python dictionary that will be evaluated to provide default values when
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__active
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team__active
msgid "Active"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.mail_activity_type_action_config_maintenance
+#: model:ir.ui.menu,name:maintenance.maintenance_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: maintenance
#: model:ir.actions.act_window,help:maintenance.hr_equipment_action
#: model:ir.actions.act_window,help:maintenance.hr_equipment_action_from_category_form
msgid "Add a new equipment"
@@ -393,6 +418,7 @@ msgid "Equipment Category"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_res_users__has_group_equipment_manager
#: model:res.groups,name:maintenance.group_equipment_manager
msgid "Equipment Manager"
msgstr ""
@@ -430,6 +456,27 @@ msgid "Follow the process of the request and communicate with the collaborator."
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_follower_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_follower_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_channel_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_channel_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_partner_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_partner_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
msgid "Future Activities"
@@ -462,6 +509,27 @@ msgid "ID of the parent record holding the alias (example: project holding the t
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_needaction
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_needaction
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_has_error
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_has_error
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
#: selection:maintenance.request,kanban_state:0
@@ -480,6 +548,13 @@ msgid "Internal Note ......."
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_is_follower
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_is_follower
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__kanban_state
msgid "Kanban State"
msgstr ""
@@ -566,6 +641,7 @@ msgstr ""
#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+#: model:mail.activity.type,name:maintenance.mail_act_maintenance_request
msgid "Maintenance Request"
msgstr ""
@@ -640,6 +716,20 @@ msgid "Maintenance: generate preventive maintenance requests"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_has_error
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_has_error
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__model
msgid "Model"
msgstr ""
@@ -675,6 +765,24 @@ msgid "New Request"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_date_deadline
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_summary
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_type_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
msgid "Next Preventive Maintenance"
msgstr ""
@@ -690,6 +798,13 @@ msgid "Note"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team__todo_request_count
msgid "Number of Requests"
msgstr ""
@@ -715,6 +830,34 @@ msgid "Number of Requests in High Priority"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_has_error_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_has_error_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_needaction_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_needaction_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_has_error_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_has_error_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__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 ""
@@ -725,9 +868,14 @@ msgid "Overall Equipment Effectiveness (OEE)"
msgstr ""
#. module: maintenance
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__owner_user_id
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__alias_user_id
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__technician_user_id
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_tree
@@ -750,6 +898,12 @@ msgid "Parent model holding the alias. The model holding the alias reference is
msgstr ""
#. module: maintenance
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__alias_contact
msgid "Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
@@ -764,7 +918,7 @@ msgid "Preventive"
msgstr ""
#. module: maintenance
-#: code:addons/maintenance/models/maintenance.py:240
+#: code:addons/maintenance/models/maintenance.py:231
#, python-format
msgid "Preventive Maintenance - %s"
msgstr ""
@@ -837,6 +991,12 @@ msgid "Request Done"
msgstr ""
#. module: maintenance
+#: code:addons/maintenance/models/maintenance.py:369
+#, python-format
+msgid "Request planned for <a href=\"#\" data-oe-model=\"%s\" data-oe-id=\"%s\">%s</a>"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
msgid "Requested By"
msgstr ""
@@ -859,6 +1019,12 @@ msgid "Responsible"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_user_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Scheduled"
msgstr ""
@@ -928,6 +1094,15 @@ msgid "Status Changed"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment__activity_state
+#: model:ir.model.fields,help:maintenance.field_maintenance_request__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: maintenance
#: model:mail.message.subtype,description:maintenance.mt_req_status
msgid "Status changed"
msgstr ""
@@ -959,6 +1134,7 @@ msgstr ""
#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__technician_user_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__technician_user_id
msgid "Technician"
msgstr ""
@@ -983,6 +1159,7 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_res_users__has_group_equipment_manager
#: model:res.groups,comment:maintenance.group_equipment_manager
msgid "The user will be able to manage equipments."
msgstr ""
@@ -998,6 +1175,12 @@ msgid "To do"
msgstr ""
#. module: maintenance
+#: selection:maintenance.equipment,activity_state:0
+#: selection:maintenance.request,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
msgid "Today Activities"
@@ -1022,6 +1205,9 @@ msgid "Under Maintenance"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_unread
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_unread
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_unread
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
@@ -1029,6 +1215,13 @@ msgid "Unread Messages"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__message_unread_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_unread_counter
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Unscheduled"
msgstr ""
@@ -1044,6 +1237,11 @@ msgid "Used in location"
msgstr ""
#. module: maintenance
+#: model:ir.model,name:maintenance.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__partner_id
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
msgid "Vendor"
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index de748249cad..d985538b63a 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -209,6 +209,11 @@ msgid "ALL DAY"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__active
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list__active
msgid "Active"
@@ -345,6 +350,8 @@ 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
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
msgid "Clicked"
msgstr ""
@@ -468,6 +475,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__create_uid
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__create_uid
msgid "Created by"
msgstr ""
@@ -478,6 +486,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__create_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__create_date
msgid "Created on"
msgstr ""
@@ -576,6 +585,7 @@ msgid "Destination Mailing List"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mass_mailing_schedule_date_view_form
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_form_simplified
msgid "Discard"
msgstr ""
@@ -591,6 +601,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report__display_name
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__display_name
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__display_name
msgid "Display Name"
msgstr ""
@@ -610,10 +621,8 @@ msgid "Domain"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:559
#: selection:mail.mass_mailing,state:0
#: selection:mail.statistics.report,state:0
-#, python-format
msgid "Draft"
msgstr ""
@@ -692,6 +701,11 @@ msgid "Exclude Opt Out"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__expected
+msgid "Expected"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
msgid "Extended Filters..."
msgstr ""
@@ -709,8 +723,18 @@ msgid "Failed"
msgstr ""
#. module: mass_mailing
-#: model:ir.model,name:mass_mailing.model_ir_model_fields
-msgid "Fields"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_partner_ids
+msgid "Followers (Partners)"
msgstr ""
#. module: mass_mailing
@@ -749,6 +773,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test__id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report__id
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__id
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__id
msgid "ID"
msgstr ""
@@ -758,18 +783,36 @@ msgid "ID of the related mail_mail. This field is an integer field because the r
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign__unique_ab_testing
msgid "If checked, recipients will be mailed only once for the whole campaign. This lets you send different mailings to randomly selected recipients and test the effectiveness of the mailings, without causing duplicate messages."
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:559
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mass_mailing
#: selection:mail.mass_mailing,state:0
-#, python-format
msgid "In Queue"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_is_follower
+msgid "Is Follower"
+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 ""
@@ -795,6 +838,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report____last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge____last_update
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date____last_update
msgid "Last Modified on"
msgstr ""
@@ -813,6 +857,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__write_uid
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__write_uid
msgid "Last Updated by"
msgstr ""
@@ -826,6 +871,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__write_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__write_date
msgid "Last Updated on"
msgstr ""
@@ -865,6 +911,12 @@ msgid "Mail ID (tech)"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__mail_server_id
+#: model:ir.model.fields,field_description:mass_mailing.field_res_config_settings__mass_mailing_mail_server_id
+msgid "Mail Server"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_view_mail_mail_statistics
#: model:ir.actions.act_window,name:mass_mailing.action_view_mail_mail_statistics_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_link_tracker_click__mail_stat_id
@@ -899,7 +951,6 @@ 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_survey_mail_compose_message__mailing_list_ids
msgid "Mailing List"
msgstr ""
@@ -971,6 +1022,7 @@ msgid "Mailings that are assigned to me"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_users__has_group_mass_mailing_campaign
#: model:res.groups,name:mass_mailing.group_mass_mailing_campaign
msgid "Manage Mass Mailing Campaigns"
msgstr ""
@@ -997,7 +1049,8 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message__mass_mailing_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail__mailing_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__mass_mailing_id
-#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message__mass_mailing_id
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__mass_mailing_id
+#: model:ir.model.fields,field_description:mass_mailing.field_res_users__group_mass_mailing_user
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
msgid "Mass Mailing"
msgstr ""
@@ -1014,7 +1067,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message__mass_mailing_campaign_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__mass_mailing_campaign_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__mass_mailing_campaign_id
-#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message__mass_mailing_campaign_id
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
msgid "Mass Mailing Campaign"
msgstr ""
@@ -1036,7 +1088,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message__mass_mailing_name
-#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message__mass_mailing_name
msgid "Mass Mailing Name"
msgstr ""
@@ -1112,11 +1163,21 @@ msgid "Merge into an existing mailing list"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__message_id
msgid "Message-ID"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
msgid "More"
msgstr ""
@@ -1179,6 +1240,11 @@ msgid "No support"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__clicks_ratio
msgid "Number of Clicks"
msgstr ""
@@ -1204,6 +1270,26 @@ msgid "Number of clicks"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1
msgid "OFF"
msgstr ""
@@ -1288,9 +1374,9 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:742
+#: code:addons/mass_mailing/wizard/mass_mailing_schedule_date.py:19
#, python-format
-msgid "Please select recipients."
+msgid "Please select a date equal/or greater than the current date."
msgstr ""
#. module: mass_mailing
@@ -1428,12 +1514,16 @@ msgid "Sample Mail Wizard"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.mass_mailing_schedule_date_view_form
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
#: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_1
msgid "Schedule"
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_mass_mailing_schedule_date
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__schedule_date
+#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__schedule_date
msgid "Schedule in the Future"
msgstr ""
@@ -1476,6 +1566,11 @@ msgid "Select mailing lists:"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
+msgid "Send Now"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_test_form
msgid "Send Sample Mail"
msgstr ""
@@ -1501,19 +1596,11 @@ msgid "Send new Mailing"
msgstr ""
#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
-msgid "Send to All"
-msgstr ""
-
-#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:559
#: selection:mail.mass_mailing,state:0
-#, python-format
msgid "Sending"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:559
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__sent
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__sent
#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report__sent
@@ -1522,7 +1609,6 @@ msgstr ""
#: selection:mail.mass_mailing,state:0
#: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_3
#: selection:mail.statistics.report,state:0
-#, python-format
msgid "Sent"
msgstr ""
@@ -1570,6 +1656,11 @@ msgid "Source Name"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_res_config_settings__mass_mailing_outgoing_mail_server
+msgid "Specific Mail Server"
+msgstr ""
+
+#. module: mass_mailing
#: selection:mail.mass_mailing,reply_to_mode:0
msgid "Specified Email Address"
msgstr ""
@@ -1628,8 +1719,17 @@ msgid "Tags"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:615
+#: model:ir.ui.view,arch_db:mass_mailing.mass_mailing_schedule_date_view_form
+msgid "Take Future Schedule Date"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
+msgid "Test"
+msgstr ""
+
+#. module: mass_mailing
+#: code:addons/mass_mailing/models/mass_mailing.py:592
#, python-format
msgid "Test Mailing"
msgstr ""
@@ -1666,6 +1766,12 @@ 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
+#, python-format
+msgid "There is no recipients selected."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing__medium_id
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign__medium_id
msgid "This is the delivery method, e.g. Postcard, Email, or Banner Ad"
@@ -1729,6 +1835,16 @@ msgid "Tracking"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_unread_counter
+msgid "Unread Messages Counter"
+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 "Unsubscribe"
@@ -1751,6 +1867,18 @@ msgid "Use This Promo Code BEFORE 1st of August"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
+msgid "Use a specific mail server for mailings"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing__mail_server_id
+#: model:ir.model.fields,help:mass_mailing.field_res_config_settings__mass_mailing_outgoing_mail_server
+#: model:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form
+msgid "Use a specific mail server in priority. Otherwise Odoo relies on the first outgoing mail server available (based on their sequencing) as it does for normal mails."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
msgid "Use now"
msgstr ""
@@ -1761,6 +1889,11 @@ msgid "User"
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_res_users
+msgid "Users"
+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 ""
@@ -1771,6 +1904,11 @@ msgid "We want to take this opportunity to welcome you to our ever-growing commu
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 ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph
msgid "With strong technical foundations, Odoo's framework is unique.\n"
" It provides top notch usability that scales across all apps."
@@ -1789,7 +1927,7 @@ msgid "Write one paragraph describing your product,\n"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/controllers/main.py:33
+#: code:addons/mass_mailing/controllers/main.py:38
#, python-format
msgid "You have been unsubscribed successfully"
msgstr ""
diff --git a/addons/mass_mailing_event/i18n/mass_mailing_event.pot b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
index 3e3195654cb..a9fc5e7fc03 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,12 @@ msgstr ""
"Plural-Forms: \n"
#. module: mass_mailing_event
-#: model:ir.model,name:mass_mailing_event.model_event_event
-msgid "Event"
+#: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
+msgid "<span class=\"o_stat_text\">Mail Attendees</span>"
msgstr ""
#. module: mass_mailing_event
-#: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
-msgid "Mail Attendees"
+#: model:ir.model,name:mass_mailing_event.model_event_event
+msgid "Event"
msgstr ""
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 01f2cfb2610..2b0ede6c3af 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -220,6 +220,7 @@ msgstr ""
#. module: membership
#: model:ir.model.fields,field_description:membership.field_report_membership__date_to
+#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
msgid "End Date"
msgstr ""
@@ -229,18 +230,13 @@ msgid "End Membership Date"
msgstr ""
#. module: membership
-#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
-msgid "End Month"
-msgstr ""
-
-#. module: membership
#: model:ir.model.fields,help:membership.field_report_membership__date_to
msgid "End membership date"
msgstr ""
#. module: membership
#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
-msgid "Ending Month Of Membership"
+msgid "Ending Date Of Membership"
msgstr ""
#. module: membership
@@ -249,12 +245,6 @@ msgid "Error ! Ending Date cannot be set before Beginning Date."
msgstr ""
#. module: membership
-#: code:addons/membership/models/partner.py:159
-#, python-format
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: membership
#: model:ir.ui.view,arch_db:membership.view_report_membership_search
msgid "Forecast"
msgstr ""
@@ -274,11 +264,6 @@ msgid "From"
msgstr ""
#. module: membership
-#: model:ir.ui.view,arch_db:membership.membership_product_search_form_view
-msgid "From Month"
-msgstr ""
-
-#. module: membership
#: model:ir.ui.view,arch_db:membership.view_report_membership_search
#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
msgid "Group By"
@@ -599,17 +584,14 @@ msgstr ""
#. module: membership
#: model:ir.model.fields,field_description:membership.field_report_membership__start_date
-msgid "Start Date"
-msgstr ""
-
-#. module: membership
+#: model:ir.ui.view,arch_db:membership.membership_product_search_form_view
#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
-msgid "Start Month"
+msgid "Start Date"
msgstr ""
#. module: membership
#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
-msgid "Starting Month Of Membership"
+msgid "Starting Date Of Membership"
msgstr ""
#. module: membership
@@ -656,6 +638,12 @@ msgid "Waiting Member"
msgstr ""
#. module: membership
+#: code:addons/membership/models/partner.py:159
+#, python-format
+msgid "You cannot create recursive associated members."
+msgstr ""
+
+#. module: membership
#: model:ir.model,name:membership.model_membership_membership_line
msgid "membership.membership_line"
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 539e25b8c15..f7d793d8fe0 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgid "# of BoM Where is Used"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:298
+#: code:addons/mrp/models/mrp_bom.py:301
#, python-format
msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
" Upload files to your product\n"
@@ -92,7 +92,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "<span class=\"o_stat_text\">Scraps</span>"
msgstr ""
@@ -112,11 +112,22 @@ msgid "<span class=\"o_stat_text\">Work Orders</span>"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "<span><strong>Unit Cost</strong></span>"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
msgid "<span>Actions</span>"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom_line
+#: model:ir.ui.view,arch_db:mrp.report_mrp_operation_line
+msgid "<span>Minutes</span>"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
msgid "<span>New</span>"
msgstr ""
@@ -142,13 +153,13 @@ msgid "<span>WORK ORDERS</span>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "<strong attrs=\"{'invisible': [('date_planned_finished', '=', False)]}\" class=\"mr8\">to</strong>\n"
" <strong class=\"oe_edit_only mr8\" attrs=\"{'invisible': [('date_planned_finished', '!=', False)]}\">to</strong>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "<strong class=\"mr8\">to</strong>"
msgstr ""
@@ -158,48 +169,33 @@ msgid "<strong>Effectiveness Category: </strong>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
-msgid "<strong>Is a Blocking Reason? </strong>"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Name</strong>"
+msgid "<strong>Finished Product:</strong><br/>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>No. Of Minutes</strong>"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Printing date:</strong><br/>"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Product:</strong><br/>"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_productivity_loss_kanban
+msgid "<strong>Is a Blocking Reason? </strong>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Product</strong>"
+msgid "<strong>No. Of Minutes</strong>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Products to Consume</strong>"
+msgid "<strong>Operation</strong>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Quantity:</strong><br/>"
+msgid "<strong>Printing date:</strong><br/>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Quantity</strong>"
+msgid "<strong>Quantity to Produce:</strong><br/>"
msgstr ""
#. module: mrp
@@ -209,17 +205,17 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Scheduled Date:</strong><br/>"
+msgid "<strong>Responsible:</strong><br/>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Source Document:</strong><br/>"
+msgid "<strong>Scheduled Date:</strong><br/>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Work Orders</strong>"
+msgid "<strong>Source Document:</strong><br/>"
msgstr ""
#. module: mrp
@@ -228,9 +224,9 @@ msgid "<strong>WorkCenter</strong>"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:493
+#: code:addons/mrp/models/mrp_workorder.py:515
#, python-format
-msgid "A Manufacturing Order is already done or cancelled!"
+msgid "A Manufacturing Order is already done or cancelled."
msgstr ""
#. module: mrp
@@ -246,11 +242,23 @@ msgid "Access Token"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_procurement_rule__action
+msgid "Action"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_needaction
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_needaction
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__active
#: model:ir.model.fields,field_description:mrp.field_mrp_document__active
#: model:ir.model.fields,field_description:mrp.field_mrp_routing__active
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__active
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
msgid "Active"
msgstr ""
@@ -260,6 +268,18 @@ msgid "Active Move Line"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_state
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
msgid "Add a description..."
msgstr ""
@@ -290,6 +310,11 @@ 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 ""
+
+#. module: mrp
#: sql_constraint:mrp.bom.line:0
msgid "All product quantities must be greater or equal to 0.\n"
"Lines with 0 quantities can be used as optional lines. \n"
@@ -334,17 +359,12 @@ msgid "Attachment URL"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:290
+#: code:addons/mrp/models/mrp_bom.py:293
#, python-format
msgid "Attachments"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
-msgid "Author"
-msgstr ""
-
-#. module: mrp
#: selection:mrp.workcenter.productivity.loss,loss_type:0
msgid "Availability"
msgstr ""
@@ -355,7 +375,7 @@ msgid "Availability Losses"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
#: selection:mrp.production,availability:0
msgid "Available"
msgstr ""
@@ -367,13 +387,8 @@ msgid "Average lead time in days to manufacture this product. In the case of mul
msgstr ""
#. module: mrp
-#: model:ir.actions.report,name:mrp.action_report_bom_price
-msgid "BOM Cost"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
-msgid "BOM Name"
+#: model:ir.model.fields,field_description:mrp.field_product_product__variant_bom_ids
+msgid "BOM Product Variants"
msgstr ""
#. module: mrp
@@ -382,30 +397,18 @@ msgid "BOM Product Variants needed form apply this line."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
-msgid "BOM Ref"
-msgstr ""
-
-#. module: mrp
-#: model:ir.actions.report,name:mrp.action_report_bom_structure
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
-msgid "BOM Structure"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__child_line_ids
msgid "BOM lines of the referred bom"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__time_mode_batch
-msgid "Based on"
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Barcode"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Bill Of Material"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__time_mode_batch
+msgid "Based on"
msgstr ""
#. module: mrp
@@ -452,7 +455,7 @@ msgid "Bills of materials allow you to define the list of required raw\n"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
msgid "Block"
msgstr ""
@@ -480,11 +483,21 @@ msgid "Blocked hour(s) over the last month"
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
msgid "BoM Components"
msgstr ""
#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:33
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+#, python-format
+msgid "BoM Cost"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move__bom_line_id
msgid "BoM Line"
msgstr ""
@@ -495,6 +508,26 @@ msgid "BoM Lines"
msgstr ""
#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:32
+#: model:ir.actions.report,name:mrp.action_report_bom_structure
+#, python-format
+msgid "BoM Structure"
+msgstr ""
+
+#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:31
+#, python-format
+msgid "BoM Structure & Cost"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "BoM Structure &amp; Cost"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__type
msgid "BoM Type"
msgstr ""
@@ -511,6 +544,11 @@ msgid "BoM line product %s should not be same as BoM product."
msgstr ""
#. module: mrp
+#: selection:procurement.rule,action:0
+msgid "Buy"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_mrp_byproduct
msgid "By-Products"
msgstr ""
@@ -536,7 +574,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:318
+#: code:addons/mrp/models/mrp_production.py:335
#, python-format
msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
@@ -578,13 +616,6 @@ msgid "Checksum/SHA1"
msgstr ""
#. module: mrp
-#. openerp-web
-#: code:addons/mrp/static/src/xml/mrp.xml:9
-#, python-format
-msgid "Clear"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__code
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view_kanban
msgid "Code"
@@ -607,12 +638,12 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_production__company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing__company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__company_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__company_id
#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
msgid "Company"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_component_tree_view
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
msgid "Components"
@@ -635,6 +666,7 @@ msgid "Confirmed"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__qty_done
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
#: model:ir.ui.view,arch_db:mrp.production_message
msgid "Consumed"
@@ -661,18 +693,34 @@ msgid "Consumed Materials"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Consumed Products"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__operation_id
msgid "Consumed in Operation"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Continue Production"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
-msgid "Cost Structure"
+#: model:ir.actions.client,name:mrp.action_report_mrp_bom
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+msgid "Cost & Structure"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__costs_hour
+msgid "Cost per hour"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "Costing Information"
msgstr ""
#. module: mrp
@@ -704,11 +752,6 @@ msgid "Create a new work center"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Create a new work order message"
-msgstr ""
-
-#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_workorder_report
#: model:ir.actions.act_window,help:mrp.mrp_workorder_workcenter_report
msgid "Create a new work orders performance"
@@ -765,12 +808,12 @@ msgid "Created on"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Current Production"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Current Qty"
msgstr ""
@@ -780,6 +823,11 @@ msgid "Currently Produced Quantity"
msgstr ""
#. module: mrp
+#: selection:stock.picking.type,code:0
+msgid "Customers"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_dashboard
msgid "Dashboard"
msgstr ""
@@ -816,11 +864,15 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
msgid "Default Unit of Measure"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter__resource_calendar_id
+msgid "Define the schedule of resource"
+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
@@ -852,12 +904,6 @@ msgid "Disassembly Order"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
-msgid "Discard"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_change_production_qty__display_name
#: 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
@@ -873,16 +919,14 @@ msgstr ""
#: 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_workorder__display_name
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report__display_name
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report__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
msgid "Display Name"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__qty_done
#: model:ir.model.fields,field_description:mrp.field_stock_move__is_done
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
@@ -930,7 +974,7 @@ msgid "Duration Per Unit"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Effective Date"
msgstr ""
@@ -951,7 +995,7 @@ msgid "Effectiveness Category"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Efficiency"
msgstr ""
@@ -992,19 +1036,19 @@ msgid "Filters"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Finish Order"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
#: selection:mrp.workorder,state:0
msgid "Finished"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move_line__lot_produced_id
-msgid "Finished Lot"
+msgid "Finished Lot/Serial Number"
msgstr ""
#. module: mrp
@@ -1030,6 +1074,35 @@ msgid "Finished Products Location"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_follower_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_follower_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_follower_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_channel_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_channel_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_channel_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_partner_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_partner_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_partner_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "From"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.oee_search_view
msgid "Fully Productive"
msgstr ""
@@ -1075,14 +1148,13 @@ msgid "Gives the sequence order when displaying."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Group By"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
msgid "Group By..."
@@ -1130,8 +1202,7 @@ msgstr ""
#: 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_workorder__id
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report__id
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report__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
msgid "ID"
msgstr ""
@@ -1142,6 +1213,30 @@ msgid "If a product variant is defined the BOM is available only for this produc
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_unread
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_unread
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_needaction
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_needaction
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_needaction
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_has_error
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_has_error
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_has_error
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_production__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 ""
@@ -1181,7 +1276,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
#: selection:mrp.production,state:0
#: selection:mrp.workcenter,working_state:0
#: selection:mrp.workorder,state:0
@@ -1205,10 +1300,8 @@ msgid "Insufficient Quantity"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
-msgid "Inventory Message"
+#: selection:stock.picking.type,code:0
+msgid "Internal"
msgstr ""
#. module: mrp
@@ -1223,6 +1316,14 @@ msgid "Inventory moves for which you must scan a lot number at this work order"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_is_follower
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_is_follower
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_is_follower
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__is_locked
msgid "Is Locked"
msgstr ""
@@ -1248,9 +1349,9 @@ msgid "Is the Current User Working"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workcenter.py:162
+#: code:addons/mrp/models/mrp_workcenter.py:163
#, python-format
-msgid "It has been unblocked already. "
+msgid "It has already been unblocked."
msgstr ""
#. module: mrp
@@ -1280,8 +1381,7 @@ msgstr ""
#: 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_workorder____last_update
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_cost_report____last_update
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_mrp_bom_structure_report____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
msgid "Last Modified on"
msgstr ""
@@ -1336,7 +1436,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Late"
msgstr ""
@@ -1347,13 +1447,14 @@ msgid "Late Activities"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:434
+#: code:addons/mrp/models/mrp_production.py:451
#, python-format
msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__location_id
+#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__location_id
msgid "Location"
msgstr ""
@@ -1396,6 +1497,11 @@ msgid "Lot/Serial Number"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Lot/Serial barcode"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_finisehd_move_line
msgid "Lot/Serial number"
msgstr ""
@@ -1422,11 +1528,7 @@ msgid "MRP Work Orders"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_mrp_maintenance
-msgid "Maintenance"
-msgstr ""
-
-#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_res_users__has_group_mrp_routings
#: model:res.groups,name:mrp.group_mrp_routings
msgid "Manage Work Order Operations"
msgstr ""
@@ -1443,6 +1545,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/stock_warehouse.py:34
+#: selection:procurement.rule,action:0
#: model:stock.location.route,name:mrp.route_warehouse0_manufacture
#, python-format
msgid "Manufacture"
@@ -1464,7 +1567,14 @@ msgid "Manufacture this product"
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
+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
@@ -1483,6 +1593,11 @@ msgid "Manufacturing Lead Time"
msgstr ""
#. module: mrp
+#: selection:stock.picking.type,code:0
+msgid "Manufacturing Operation"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_warehouse__manu_type_id
msgid "Manufacturing Operation Type"
msgstr ""
@@ -1581,11 +1696,26 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_message__message
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
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
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__mimetype
msgid "Mime Type"
msgstr ""
@@ -1593,7 +1723,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Miscellaneous"
msgstr ""
@@ -1608,6 +1738,11 @@ 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 ""
@@ -1639,20 +1774,15 @@ msgid "My Activities"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
-msgid "My Messages"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_message__name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__name
msgid "Name"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:46
-#: code:addons/mrp/models/mrp_production.py:304
-#: code:addons/mrp/models/mrp_production.py:308
+#: 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_routing.py:18
#: code:addons/mrp/models/mrp_routing.py:34
#: code:addons/mrp/models/mrp_routing.py:35
@@ -1664,6 +1794,24 @@ msgid "New"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_date_deadline
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_summary
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_type_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__batch
msgid "Next Operation"
msgstr ""
@@ -1684,6 +1832,11 @@ msgid "No Routing"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "No data available."
+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 "No data to display"
@@ -1733,6 +1886,14 @@ msgid "Notes"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_picking_type__count_mo_late
msgid "Number of Manufacturing Orders Late"
msgstr ""
@@ -1748,12 +1909,44 @@ msgid "Number of Manufacturing Orders to Process"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_has_error_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_has_error_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_has_error_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_needaction_counter
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_needaction_counter
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_needaction_counter
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_has_error_counter
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_has_error_counter
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_has_error_counter
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter__capacity
#: model:ir.model.fields,help:mrp.field_mrp_workorder__capacity
msgid "Number of pieces that can be produced in parallel."
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,help:mrp.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
msgid "OEE"
msgstr ""
@@ -1802,20 +1995,33 @@ msgid "Operation Type"
msgstr ""
#. module: mrp
+#: code:addons/mrp/report/mrp_report_bom_structure.py:196
#: 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
#: model:ir.ui.view,arch_db:mrp.oee_loss_search_view
#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom_line
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
#: model:ir.ui.view,arch_db:mrp.workcenter_line_calendar
#: model:ir.ui.view,arch_db:mrp.workcenter_line_gantt_production
#: model:ir.ui.view,arch_db:mrp.workcenter_line_graph
#: model:ir.ui.view,arch_db:mrp.workcenter_line_pivot
+#, python-format
msgid "Operations"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Operations Done"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Operations Planned"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move__order_finished_lot_ids
msgid "Order Finished Lot"
msgstr ""
@@ -1849,6 +2055,12 @@ msgid "Overall Equipment Effectiveness: no working or blocked time"
msgstr ""
#. module: mrp
+#: selection:mrp.production,activity_state:0
+#: selection:mrp.unbuild,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: mrp
#: model:ir.model,name:mrp.model_stock_move_line
msgid "Packing Operation"
msgstr ""
@@ -1869,13 +2081,13 @@ msgid "Partially Available"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Pause"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
#: selection:mrp.workorder,state:0
msgid "Pending"
msgstr ""
@@ -1910,12 +2122,14 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: selection:mrp.production,activity_state:0
#: selection:mrp.production,state:0
+#: selection:mrp.unbuild,activity_state:0
msgid "Planned"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Planned Date"
msgstr ""
@@ -1926,13 +2140,13 @@ msgid "Planning"
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:149
+#: code:addons/mrp/wizard/mrp_product_produce.py:103
#, python-format
msgid "Please enter a lot or serial number for %s !"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:297
+#: code:addons/mrp/models/mrp_workorder.py:310
#, python-format
msgid "Please set the quantity you are currently producing. It should be different from zero."
msgstr ""
@@ -1995,15 +2209,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_production__product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__product_id
+#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__product_id
#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
msgid "Product"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "Product Cost"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_mrp_plm
msgid "Product Lifecycle Management (PLM)"
msgstr ""
@@ -2026,6 +2247,7 @@ 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"
@@ -2044,20 +2266,20 @@ msgid "Product Variant"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__produce_line_ids
-msgid "Product to Track"
+#: model:ir.ui.menu,name:mrp.product_variant_mrp
+msgid "Product Variants"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_message_kanban
-msgid "Product:"
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__produce_line_ids
+msgid "Product to Track"
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__production_id
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Production"
msgstr ""
@@ -2091,11 +2313,6 @@ msgid "Production Order"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "Production Order # :"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move__production_id
msgid "Production Order for finished products"
msgstr ""
@@ -2106,13 +2323,13 @@ msgid "Production Order for raw materials"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Production Workcenter"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Production started late"
msgstr ""
@@ -2151,6 +2368,11 @@ msgid "Products"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Products to Consume"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__propagate
msgid "Propagate cancel and split"
msgstr ""
@@ -2172,15 +2394,20 @@ msgid "Quality Losses"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_warn_insufficient_qty_unbuild__quant_ids
+msgid "Quant"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__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
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_bom_line_view_form
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
#: model:ir.ui.view,arch_db:mrp.view_finisehd_move_line
msgid "Quantity"
msgstr ""
@@ -2192,7 +2419,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__qty_produced
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Quantity Produced"
msgstr ""
@@ -2213,13 +2440,19 @@ msgid "Quantity to Process"
msgstr ""
#. module: mrp
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:10
+#, python-format
+msgid "Quantity:"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
msgid "Raw Material"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__move_raw_ids
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Raw Materials"
msgstr ""
@@ -2230,14 +2463,14 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
#: selection:mrp.workorder,state:0
msgid "Ready"
msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:147
+#: code:addons/mrp/static/src/js/mrp.js:38
#, python-format
msgid "Ready to produce"
msgstr ""
@@ -2264,7 +2497,7 @@ msgid "Record Production Line"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:164
+#: code:addons/mrp/models/mrp_bom.py:166
#, python-format
msgid "Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!"
msgstr ""
@@ -2274,7 +2507,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_production__name
#: model:ir.model.fields,field_description:mrp.field_mrp_routing__code
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__name
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Reference"
msgstr ""
@@ -2289,18 +2521,20 @@ msgid "Reference of the document that generated this production order request."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_document__ir_attachment_id
-msgid "Related attachment"
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "Reference:"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_repair
-msgid "Repair"
+#: model:ir.model.fields,field_description:mrp.field_mrp_document__ir_attachment_id
+msgid "Related attachment"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
-msgid "Repair products and invoice the repair orders"
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:29
+#, python-format
+msgid "Report:"
msgstr ""
#. module: mrp
@@ -2314,12 +2548,18 @@ msgid "Requires Serial"
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
msgid "Reserved"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__resource_id
+msgid "Resource"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__res_field
msgid "Resource Field"
msgstr ""
@@ -2355,6 +2595,12 @@ msgid "Responsible"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_user_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_user_id
+msgid "Responsible User"
+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
@@ -2388,7 +2634,6 @@ msgstr ""
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
msgid "Routings"
msgstr ""
@@ -2400,19 +2645,14 @@ msgid "Routings define the successive operations that need to be\n"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
-msgid "Save"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
msgid "Schedule manufacturing orders earlier to avoid delays"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
-msgid "Schedule the maintenance of your equipment"
+#: 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 ""
#. module: mrp
@@ -2426,23 +2666,11 @@ msgid "Scheduled Date Start"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
-msgid "Scheduled Date by Month"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
-msgid "Scheduled Month"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:592
-#: code:addons/mrp/models/mrp_workorder.py:502
+#: code:addons/mrp/models/mrp_production.py:632
+#: code:addons/mrp/models/mrp_workorder.py:524
#: 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_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
#, python-format
msgid "Scrap"
msgstr ""
@@ -2464,7 +2692,6 @@ msgid "Scraps"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
msgid "Search"
msgstr ""
@@ -2475,17 +2702,12 @@ msgid "Search Bill Of Material"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Search Bill Of Material Components"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
msgid "Search Production"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Search Work Orders"
msgstr ""
@@ -2506,14 +2728,6 @@ msgid "Security days for each manufacturing operation."
msgstr ""
#. module: mrp
-#. openerp-web
-#: code:addons/mrp/static/src/xml/mrp.xml:7
-#: code:addons/mrp/static/src/xml/mrp.xml:8
-#, python-format
-msgid "Select"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom__sequence
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line__sequence
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__sequence
@@ -2541,12 +2755,6 @@ msgid "Settings"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:89
-#, python-format
-msgid "Should have a lot for the finished product"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__show_final_lots
msgid "Show Final Lots"
msgstr ""
@@ -2558,18 +2766,30 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:548
+#, python-format
+msgid "Some raw materials were produced for a lot without finished product. You can correct the following components by unlocking:\n"
+""
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production__origin
msgid "Source"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter__costs_hour
+msgid "Specify cost of work center per hour."
+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
msgid "Start Date"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Start Working"
msgstr ""
@@ -2591,11 +2811,20 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__state
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__state
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Status"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_production__activity_state
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__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: mrp
#: model:ir.model,name:mrp.model_stock_move
msgid "Stock Move"
msgstr ""
@@ -2691,13 +2920,13 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:76
-#: code:addons/mrp/models/mrp_bom.py:259
+#: code:addons/mrp/models/mrp_bom.py:262
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workcenter.py:156
+#: code:addons/mrp/models/mrp_workcenter.py:157
#, python-format
msgid "The capacity must be strictly positive."
msgstr ""
@@ -2743,9 +2972,9 @@ msgid "The operations for producing this BoM. When a routing is specified, the
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:94
+#: code:addons/mrp/wizard/mrp_product_produce.py:56
#, python-format
-msgid "The production order for '%s' has no quantity specified"
+msgid "The production order for '%s' has no quantity specified."
msgstr ""
#. module: mrp
@@ -2787,11 +3016,26 @@ msgid "This Year"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter__tz
+msgid "This field is used in order to define in which timezone the resources will work."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter__time_efficiency
msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes."
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "This is the cost based on the BoM of the product. It is computed by summing the costs of the components and operations needed to build the product."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
+msgid "This is the cost defined on the product."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_production__production_location_id
msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."
msgstr ""
@@ -2812,12 +3056,12 @@ msgid "Time Logs"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Time Tracking"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:423
+#: code:addons/mrp/models/mrp_workorder.py:445
#, python-format
msgid "Time Tracking: "
msgstr ""
@@ -2848,9 +3092,19 @@ msgid "Time in minutes. Is the time used in manual mode, or the first time suppo
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
+msgid "Time the currently logged user spent on this workorder."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__tz
+msgid "Timezone"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__qty_to_consume
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "To Consume"
msgstr ""
@@ -2866,7 +3120,7 @@ msgid "To Launch"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "To Produce"
msgstr ""
@@ -2882,6 +3136,8 @@ 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"
msgstr ""
@@ -2892,16 +3148,6 @@ msgid "Today Activities"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
-msgid "Total Cost"
-msgstr ""
-
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
-msgid "Total Cost of Components"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__workorder_late_count
msgid "Total Late Orders"
msgstr ""
@@ -2922,7 +3168,7 @@ msgid "Total Running Orders"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Total duration"
msgstr ""
@@ -2933,6 +3179,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce__product_tracking
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line__product_tracking
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__has_tracking
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__product_tracking
#: model:ir.model.fields,field_description:mrp.field_stock_move__needs_lots
@@ -2945,7 +3192,12 @@ msgid "Type"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.model.fields,field_description:mrp.field_stock_picking_type__code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Unblock"
msgstr ""
@@ -2975,11 +3227,6 @@ msgid "Unbuild Orders"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
-msgid "Unit Cost"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move__unit_factor
msgid "Unit Factor"
msgstr ""
@@ -2990,6 +3237,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__product_uom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__product_uom_id
#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
+#: model:ir.ui.view,arch_db:mrp.report_mrp_bom
msgid "Unit of Measure"
msgstr ""
@@ -3010,27 +3258,29 @@ msgid "Unlock the manufacturing order to correct what has been consumed or produ
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Unreserve"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_unread
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_unread
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_unread
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_unread
+msgid "Unread Messages"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Update"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom__message_unread_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_production__message_unread_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_unread_counter
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_unread_counter
+msgid "Unread Messages Counter"
msgstr ""
#. module: mrp
-#. openerp-web
-#: code:addons/mrp/static/src/xml/mrp.xml:7
-#, python-format
-msgid "Upload your file"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Unreserve"
msgstr ""
#. module: mrp
-#. openerp-web
-#: code:addons/mrp/static/src/xml/mrp.xml:6
-#, python-format
-msgid "Uploading..."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Update"
msgstr ""
#. module: mrp
@@ -3062,19 +3312,25 @@ msgid "User"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
msgid "Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts."
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_message__valid_until
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
msgid "Validity Date"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
-msgid "Variant"
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:21
+#, python-format
+msgid "Variant:"
msgstr ""
#. module: mrp
@@ -3083,6 +3339,11 @@ msgid "Variants"
msgstr ""
#. module: mrp
+#: selection:stock.picking.type,code:0
+msgid "Vendors"
+msgstr ""
+
+#. module: mrp
#: selection:mrp.document,priority:0
msgid "Very High"
msgstr ""
@@ -3111,7 +3372,7 @@ msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:147
+#: code:addons/mrp/static/src/js/mrp.js:38
#, python-format
msgid "Waiting Materials"
msgstr ""
@@ -3123,18 +3384,34 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:76
-#: code:addons/mrp/models/mrp_bom.py:259
-#: code:addons/mrp/wizard/mrp_product_produce.py:203
+#: code:addons/mrp/models/mrp_bom.py:262
+#: 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_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
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_document__website_url
msgid "Website URL"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom__website_message_ids
+#: model:ir.model.fields,help:mrp.field_mrp_production__website_message_ids
+#: model:ir.model.fields,help:mrp.field_mrp_unbuild__website_message_ids
+#: model:ir.model.fields,help:mrp.field_mrp_workorder__website_message_ids
+msgid "Website communication history"
+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."
msgstr ""
@@ -3153,7 +3430,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_tree_view
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Work Center"
msgstr ""
@@ -3209,7 +3486,7 @@ msgid "Work Centers allow you to create and manage manufacturing\n"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
msgid "Work Instruction"
msgstr ""
@@ -3223,18 +3500,6 @@ msgid "Work Order"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_message_action_main
-#: model:ir.ui.menu,name:mrp.mrp_message_menu
-msgid "Work Order Messages"
-msgstr ""
-
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Work Order Messages are used to warn users about any change in the product,\n"
-" process, etc. These messages will appear on the involved Work Orders."
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
msgid "Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
msgstr ""
@@ -3255,9 +3520,9 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_res_config_settings__module_mrp_workorder
#: model:ir.ui.menu,name:mrp.menu_mrp_work_order_report
#: model:ir.ui.menu,name:mrp.menu_mrp_workorder_todo
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_tree_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workorder_tree_view_inherit
#: model:ir.ui.view,arch_db:mrp.res_config_settings_view_form
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workorder_form_view_filter
msgid "Work Orders"
msgstr ""
@@ -3292,7 +3557,7 @@ msgid "Work Sheet"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:569
+#: code:addons/mrp/models/mrp_production.py:608
#, python-format
msgid "Work order %s is still running"
msgstr ""
@@ -3339,6 +3604,11 @@ msgid "Workcenter blocked, click to unblock."
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter__resource_calendar_id
+msgid "Working Hours"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
msgid "Working Time"
msgstr ""
@@ -3364,50 +3634,50 @@ 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:523
+#: code:addons/mrp/models/mrp_production.py:562
#, 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:249
+#: code:addons/mrp/models/mrp_workorder.py:250
#, python-format
msgid "You can not change the finished work order."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:555
+#: code:addons/mrp/models/mrp_production.py:594
#, 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:96
+#: code:addons/mrp/models/mrp_bom.py:98
#, python-format
msgid "You can not delete a Bill of Material with running manufacturing orders.\n"
"Please close or cancel it first."
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:202
+#: code:addons/mrp/wizard/mrp_product_produce.py:201
#, python-format
msgid "You can only process 1.0 %s of products with unique serial number."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_move.py:136
+#: code:addons/mrp/models/stock_move.py:143
#, python-format
msgid "You cannot cancel a manufacturing order if you have already consumed material. If you want to cancel this MO, please change the consumed quantities to 0."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/stock_move.py:202
+#: code:addons/mrp/models/stock_move.py:209
#, python-format
msgid "You cannot consume the same serial number twice. Please correct the serial numbers encoded."
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:129
+#: code:addons/mrp/wizard/mrp_product_produce.py:82
#, python-format
msgid "You cannot produce the same serial number twice."
msgstr ""
@@ -3419,9 +3689,9 @@ msgid "You cannot unbuild a undone manufacturing order."
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:46
+#: code:addons/mrp/wizard/change_production_qty.py:47
#, python-format
-msgid "You have already processed %d. Please input a quantity higher than %d "
+msgid "You have already processed %s. Please input a quantity higher than %s "
msgstr ""
#. module: mrp
@@ -3430,39 +3700,45 @@ 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:413
+#: code:addons/mrp/models/mrp_workorder.py:435
#, 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:409
+#: code:addons/mrp/models/mrp_workorder.py:431
#, 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:467
+#: code:addons/mrp/models/mrp_workorder.py:489
#, 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 ""
#. module: mrp
-#: code:addons/mrp/wizard/mrp_product_produce.py:125
+#: code:addons/mrp/wizard/mrp_product_produce.py:78
#, python-format
-msgid "You need to provide a lot for the finished product"
+msgid "You need to provide a lot for the finished product."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:323
+#: code:addons/mrp/models/mrp_unbuild.py:89
#, python-format
-msgid "You should provide a lot/serial number for a component"
+msgid "You should provide a lot number for the final product."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:300
+#: code:addons/mrp/models/mrp_workorder.py:336
#, python-format
-msgid "You should provide a lot/serial number for the final product"
+msgid "You should provide a lot/serial number for a component."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:313
+#, python-format
+msgid "You should provide a lot/serial number for the final product."
msgstr ""
#. module: mrp
@@ -3495,7 +3771,7 @@ msgid "last"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:614
+#: code:addons/mrp/models/mrp_production.py:654
#, python-format
msgid "manufacturing order"
msgstr ""
@@ -3506,9 +3782,12 @@ msgid "minute(s)"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: code:addons/mrp/report/mrp_report_bom_structure.py:199
+#: code:addons/mrp/report/mrp_report_bom_structure.py:209
+#: 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
+#, python-format
msgid "minutes"
msgstr ""
@@ -3518,18 +3797,27 @@ msgid "mrp.bom.line"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.production_message
-msgid "quantity has been updated."
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:4
+#, python-format
+msgid "print"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_mrp_bom_cost_report
-msgid "report.mrp.mrp_bom_cost_report"
+#. openerp-web
+#: code:addons/mrp/static/src/xml/mrp.xml:5
+#, python-format
+msgid "print unfolded"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.production_message
+msgid "quantity has been updated."
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_mrp_bom_structure_report
-msgid "report.mrp.mrp_bom_structure_report"
+#: model:ir.model,name:mrp.model_report_mrp_report_bom_structure
+msgid "report.mrp.report_bom_structure"
msgstr ""
#. module: mrp
diff --git a/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot b/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot
new file mode 100644
index 00000000000..441d620eff3
--- /dev/null
+++ b/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot
@@ -0,0 +1,49 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mrp_bom_cost
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.4\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"
+"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: mrp_bom_cost
+#: model:ir.actions.server,name:mrp_bom_cost.action_compute_price_bom_product
+#: model:ir.actions.server,name:mrp_bom_cost.action_compute_price_bom_template
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_product_ext_form_view2
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_product_view_form_normal_inherit_extended
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_variant_easy_edit_view_bom_inherit
+msgid "Compute Price from BoM"
+msgstr ""
+
+#. module: mrp_bom_cost
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_product_ext_form_view2
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_product_view_form_normal_inherit_extended
+#: model:ir.ui.view,arch_db:mrp_bom_cost.product_variant_easy_edit_view_bom_inherit
+msgid "Compute the price of the product using products and operations of related bill of materials, for manufactured products only."
+msgstr ""
+
+#. module: mrp_bom_cost
+#: model:ir.model,name:mrp_bom_cost.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: mrp_bom_cost
+#: model:ir.model,name:mrp_bom_cost.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: mrp_bom_cost
+#: code:addons/mrp_bom_cost/models/product.py:39
+#, python-format
+msgid "The inventory valuation of some products %s is automated. You can only update their cost from the product form."
+msgstr ""
+
diff --git a/addons/mrp_byproduct/i18n/mrp_byproduct.pot b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
index d406151d239..1cf5a4b07ac 100644
--- a/addons/mrp_byproduct/i18n/mrp_byproduct.pot
+++ b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -119,7 +119,7 @@ msgstr ""
#. module: mrp_byproduct
#: code:addons/mrp_byproduct/models/mrp_subproduct.py:32
#, python-format
-msgid "The Product Unit of Measure you chose has a different category than in the product form."
+msgid "The unit of measure you chose is in a different category than the product unit of measure."
msgstr ""
#. module: mrp_byproduct
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index f822045e08f..98073ab7c0a 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,37 @@ msgstr ""
"Plural-Forms: \n"
#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note__open
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Active"
msgstr ""
#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_mail_activity
+msgid "Activity"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_mail_activity_type
+msgid "Activity Type"
+msgstr ""
+
+#. module: note
#: model:ir.actions.act_window,help:note.action_note_note
msgid "Add a new personal note"
msgstr ""
@@ -32,6 +57,20 @@ msgid "Add a new tag"
msgstr ""
#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:14
+#, python-format
+msgid "Add a note"
+msgstr ""
+
+#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:6
+#, python-format
+msgid "Add new note"
+msgstr ""
+
+#. module: note
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Archive"
msgstr ""
@@ -42,6 +81,16 @@ msgid "By sticky note Category"
msgstr ""
#. module: note
+#: model:ir.model.fields,help:note.field_mail_activity_type__category
+msgid "Categories may trigger specific behavior like opening calendar view"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_mail_activity_type__category
+msgid "Category"
+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"
@@ -89,6 +138,21 @@ msgid "Folded by Default"
msgstr ""
#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: note
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Future Activities"
msgstr ""
@@ -106,6 +170,26 @@ msgid "ID"
msgstr ""
#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note____last_update
#: model:ir.model.fields,field_description:note.field_note_stage____last_update
#: model:ir.model.fields,field_description:note.field_note_tag____last_update
@@ -132,8 +216,23 @@ msgid "Late Activities"
msgstr ""
#. module: note
-#: model:note.stage,name:note.note_stage_03
-msgid "Later"
+#: selection:mail.activity.type,category:0
+msgid "Meeting"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.note_stage_01
+msgid "Meeting Minutes"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_ids
+msgid "Messages"
msgstr ""
#. module: note
@@ -147,6 +246,21 @@ msgid "New"
msgstr ""
#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: note
#: model:ir.model,name:note.model_note_note
#: model:ir.ui.view,arch_db:note.view_note_note_filter
#: model:ir.ui.view,arch_db:note.view_note_note_form
@@ -174,14 +288,51 @@ msgid "Note Tag"
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_04
+#: model:note.stage,name:note.note_stage_02
+#, python-format
msgid "Notes"
msgstr ""
#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,help:note.field_note_note__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: note
+#: selection:mail.activity.type,category:0
+msgid "Other"
+msgstr ""
+
+#. module: note
+#: selection:note.note,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note__user_id
#: model:ir.model.fields,field_description:note.field_note_stage__user_id
msgid "Owner"
@@ -193,6 +344,41 @@ msgid "Owner of the note stage"
msgstr ""
#. module: note
+#: selection:note.note,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_mail_activity__note_id
+msgid "Related Note"
+msgstr ""
+
+#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:23
+#, python-format
+msgid "Remember..."
+msgstr ""
+
+#. module: note
+#: selection:mail.activity.type,category:0
+#: model:mail.activity.type,name:note.mail_activity_data_reminder
+msgid "Reminder"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: note
+#. openerp-web
+#: code:addons/note/static/src/xml/systray.xml:25
+#, python-format
+msgid "SAVE"
+msgstr ""
+
+#. module: note
#: model:ir.model.fields,field_description:note.field_note_note__sequence
#: model:ir.model.fields,field_description:note.field_note_stage__sequence
msgid "Sequence"
@@ -237,6 +423,14 @@ msgid "Stages of Users"
msgstr ""
#. module: note
+#: model:ir.model.fields,help:note.field_note_note__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: note
#: model:ir.model.fields,field_description:note.field_note_tag__name
msgid "Tag Name"
msgstr ""
@@ -257,12 +451,10 @@ msgid "Tags"
msgstr ""
#. module: note
-#: model:note.stage,name:note.note_stage_02
-msgid "This Week"
-msgstr ""
-
-#. module: note
-#: model:note.stage,name:note.note_stage_01
+#. openerp-web
+#: code:addons/note/static/src/js/systray.js:90
+#: selection:note.note,activity_state:0
+#, python-format
msgid "Today"
msgstr ""
@@ -272,6 +464,21 @@ msgid "Today Activities"
msgstr ""
#. module: note
+#: model:note.stage,name:note.note_stage_03
+msgid "Todo"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: note
+#: model:ir.model.fields,field_description:note.field_note_note__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: note
#: model:ir.actions.act_window,help:note.action_note_note
msgid "Use notes to organize personal tasks or notes. All\n"
" notes are private; no one else will be able to see them. However\n"
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index 2f8a999887a..57871ba3c13 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_transaction__invoice_ids_nbr
+msgid "# of Invoices"
+msgstr ""
+
+#. module: payment
#: model:ir.ui.view,arch_db:payment.payment_confirmation_status
msgid "&amp;times;"
msgstr ""
@@ -56,32 +61,32 @@ msgid "<i class=\"fa fa-trash\"/> Delete"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:113
+#: code:addons/payment/models/payment_acquirer.py:124
#, python-format
msgid "<i>Cancel,</i> Your payment has been cancelled."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:109
+#: code:addons/payment/models/payment_acquirer.py:120
#, python-format
msgid "<i>Done,</i> Your online payment has been successfully processed. Thank you for your order."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:117
+#: code:addons/payment/models/payment_acquirer.py:128
#, python-format
msgid "<i>Error,</i> Please be aware that an error occurred during the transaction. The order has been confirmed but will not be paid. Do not hesitate to contact us if you have any questions on the status of your order."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:105
+#: code:addons/payment/models/payment_acquirer.py:116
#, python-format
msgid "<i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet."
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:351
+#: code:addons/payment/static/src/js/payment_form.js:352
#, python-format
msgid "<p>This card is currently linked to the following records:<p/>"
msgstr ""
@@ -159,6 +164,54 @@ msgid "<span><i>Pending</i>... The order will be validated after the payment.</s
msgstr ""
#. module: payment
+#: code:addons/payment/models/account_invoice.py:72
+#, python-format
+msgid "A journal must be specified of the acquirer %s."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_invoice.py:65
+#, python-format
+msgid "A payment acquirer is required to create a transaction."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_payment.py:55
+#, python-format
+msgid "A payment transaction already exists."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_payment.py:57
+#, python-format
+msgid "A token is required to create a new payment transaction."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:642
+#, python-format
+msgid "A transaction %s with %s has been initiated using %s credit card."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:648
+#, python-format
+msgid "A transaction %s with %s has been initiated."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_invoice.py:36
+#, python-format
+msgid "A transaction can't be linked to invoices having different currencies."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_invoice.py:41
+#, python-format
+msgid "A transaction can't be linked to invoices having different partners."
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_id
msgid "Acquirer"
msgstr ""
@@ -222,12 +275,17 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__amount
-#: model:ir.model.fields,help:payment.field_payment_transaction__amount
#: model:ir.ui.view,arch_db:payment.confirm
msgid "Amount"
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."
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__authorize_implemented
msgid "Authorize Mechanism Supported"
msgstr ""
@@ -244,6 +302,11 @@ msgid "Authorized"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_account_invoice__authorized_transaction_ids
+msgid "Authorized Transactions"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,post_msg:payment.payment_acquirer_custom
#: model:payment.acquirer,post_msg:payment.payment_acquirer_transfer
msgid "Bank Account"
@@ -277,7 +340,7 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:359
+#: code:addons/payment/static/src/js/payment_form.js:360
#, python-format
msgid "Cancel"
msgstr ""
@@ -294,13 +357,13 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:189
+#: code:addons/payment/static/src/js/payment_form.js:190
#, python-format
msgid "Cannot set-up the payment"
msgstr ""
#. module: payment
-#: code:addons/payment/controllers/portal.py:110
+#: code:addons/payment/controllers/portal.py:128
#, python-format
msgid "Cannot setup the payment."
msgstr ""
@@ -311,6 +374,7 @@ msgid "Capture Amount Manually"
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 "Capture Transaction"
msgstr ""
@@ -349,7 +413,7 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:358
+#: code:addons/payment/static/src/js/payment_form.js:359
#, python-format
msgid "Confirm Deletion"
msgstr ""
@@ -413,12 +477,8 @@ msgstr ""
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__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
-msgid "Created on"
-msgstr ""
-
-#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__create_date
-msgid "Creation Date"
+msgid "Created on"
msgstr ""
#. module: payment
@@ -501,18 +561,13 @@ msgid "Environment"
msgstr ""
#. module: payment
-#: selection:payment.transaction,state:0
-msgid "Error"
-msgstr ""
-
-#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__error_msg
msgid "Error Message"
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:423
+#: code:addons/payment/static/src/js/payment_form.js:430
#, python-format
msgid "Error: "
msgstr ""
@@ -548,6 +603,11 @@ msgid "Fixed international fees"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer__inbound_payment_method_ids
+msgid "For Incoming Payments"
+msgstr ""
+
+#. module: payment
#: selection:payment.transaction,type:0
msgid "Form"
msgstr ""
@@ -623,6 +683,35 @@ msgid "Internal reference of the TX"
msgstr ""
#. module: payment
+#: code:addons/payment/models/account_invoice.py:55
+#, python-format
+msgid "Invalid token found! Token acquirer %s != %s"
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/account_invoice.py:58
+#, python-format
+msgid "Invalid token found! Token partner %s != %s"
+msgstr ""
+
+#. module: payment
+#: model:ir.model,name:payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.transaction_form
+msgid "Invoice(s)"
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:801
+#: model:ir.model.fields,field_description:payment.field_payment_transaction__invoice_ids
+#, python-format
+msgid "Invoices"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_lang
msgid "Language"
msgstr ""
@@ -682,6 +771,13 @@ msgid "Manual Configuration"
msgstr ""
#. module: payment
+#: model:ir.model.fields,help:payment.field_payment_acquirer__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"
+"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. Enable this option from the settings."
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer__image_medium
msgid "Medium-sized image"
msgstr ""
@@ -733,7 +829,7 @@ msgid "Messages"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:389
+#: code:addons/payment/models/payment_acquirer.py:468
#, python-format
msgid "Missing partner reference when trying to create a new payment token"
msgstr ""
@@ -765,8 +861,8 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:200
-#: code:addons/payment/static/src/js/payment_form.js:309
+#: code:addons/payment/static/src/js/payment_form.js:201
+#: code:addons/payment/static/src/js/payment_form.js:310
#, python-format
msgid "No payment method selected"
msgstr ""
@@ -788,21 +884,45 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:427
+#: code:addons/payment/static/src/js/payment_form.js:434
#, python-format
msgid "Ok"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:754
+#: code:addons/payment/models/payment_acquirer.py:708
+#, python-format
+msgid "Only draft transaction can be authorized."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:699
+#, python-format
+msgid "Only draft transaction can be processed."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:745
+#, python-format
+msgid "Only draft/authorized transaction can be cancelled."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:717
+#, python-format
+msgid "Only draft/authorized transaction can be posted."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:972
#, python-format
-msgid "Only transactions in the Authorized status can be captured."
+msgid "Only transactions having the capture status can be captured."
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:761
+#: code:addons/payment/models/payment_acquirer.py:979
#, python-format
-msgid "Only transactions in the Authorized status can be voided."
+msgid "Only transactions having the capture status can be voided."
msgstr ""
#. module: payment
@@ -822,6 +942,7 @@ msgid "PayUmoney"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_transaction__payment_id
#: model:ir.ui.view,arch_db:payment.confirm
#: model:ir.ui.view,arch_db:payment.pay
msgid "Payment"
@@ -903,14 +1024,8 @@ msgid "Payment from Odoo"
msgstr ""
#. module: payment
-#: code:addons/payment/models/account_payment.py:59
-#, python-format
-msgid "Payment transaction failed (%s)"
-msgstr ""
-
-#. module: payment
-#: code:addons/payment/controllers/portal.py:129
-#: code:addons/payment/controllers/portal.py:133
+#: code:addons/payment/controllers/portal.py:150
+#: code:addons/payment/controllers/portal.py:154
#, python-format
msgid "Payment transaction failed."
msgstr ""
@@ -961,14 +1076,14 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:201
+#: code:addons/payment/static/src/js/payment_form.js:202
#, python-format
msgid "Please select a payment method."
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:310
+#: code:addons/payment/static/src/js/payment_form.js:311
#, python-format
msgid "Please select the option to add a new payment method."
msgstr ""
@@ -1014,18 +1129,13 @@ msgid "Reference"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_payment_transaction__acquirer_reference
-msgid "Reference of the TX as stored in the acquirer database"
+#: sql_constraint:payment.transaction:0
+msgid "Reference must be unique!"
msgstr ""
#. module: payment
-#: selection:payment.transaction,state:0
-msgid "Refunded"
-msgstr ""
-
-#. module: payment
-#: selection:payment.transaction,state:0
-msgid "Refunding"
+#: model:ir.model.fields,help:payment.field_payment_transaction__acquirer_reference
+msgid "Reference of the TX as stored in the acquirer database"
msgstr ""
#. module: payment
@@ -1073,11 +1183,11 @@ msgstr ""
#. openerp-web
#: code:addons/payment/static/src/js/payment_form.js:120
#: code:addons/payment/static/src/js/payment_form.js:135
-#: code:addons/payment/static/src/js/payment_form.js:174
-#: code:addons/payment/static/src/js/payment_form.js:180
-#: code:addons/payment/static/src/js/payment_form.js:286
-#: code:addons/payment/static/src/js/payment_form.js:333
-#: code:addons/payment/static/src/js/payment_form.js:368
+#: code:addons/payment/static/src/js/payment_form.js:175
+#: code:addons/payment/static/src/js/payment_form.js:181
+#: code:addons/payment/static/src/js/payment_form.js:287
+#: code:addons/payment/static/src/js/payment_form.js:334
+#: code:addons/payment/static/src/js/payment_form.js:369
#, python-format
msgid "Server Error"
msgstr ""
@@ -1089,7 +1199,7 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:301
+#: code:addons/payment/static/src/js/payment_form.js:302
#, python-format
msgid "Server error"
msgstr ""
@@ -1152,22 +1262,45 @@ msgid "Thanks Message"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:561
+#: code:addons/payment/models/payment_acquirer.py:821
#, python-format
msgid "The %s payment acquirers are not allowed to manual capture mode!"
msgstr ""
#. module: payment
-#: code:addons/payment/models/payment_acquirer.py:554
+#: code:addons/payment/models/payment_acquirer.py:645
+#, python-format
+msgid "The customer has selected %s to pay this document."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:662
#, python-format
-msgid "The payment transaction reference must be unique!"
+msgid "The transaction %s with %s for %s has been authorized. Waiting for capture..."
msgstr ""
#. module: payment
-#: code:addons/payment/models/account_payment.py:42
+#: code:addons/payment/models/payment_acquirer.py:667
#, python-format
-msgid "This feature is not available for payment acquirers set to the \"Authorize\" mode.\n"
-"Please use a token from another provider than %s."
+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
+#, python-format
+msgid "The transaction %s with %s for %s has been cancelled."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:664
+#, 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
+#, python-format
+msgid "The transaction %s with %s for %s is pending."
msgstr ""
#. module: payment
@@ -1197,6 +1330,11 @@ msgid "This template renders the acquirer button with all necessary values.\n"
msgstr ""
#. module: payment
+#: model:ir.model.fields,field_description:payment.field_account_invoice__transaction_ids
+msgid "Transactions"
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
msgid "Transfer information will be provided after choosing the payment aquirer."
msgstr ""
@@ -1207,7 +1345,7 @@ msgid "Type"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_transaction__date_validate
+#: model:ir.model.fields,field_description:payment.field_payment_transaction__date
msgid "Validation Date"
msgstr ""
@@ -1237,13 +1375,20 @@ msgid "Visible in Portal / Website"
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 "Void Transaction"
msgstr ""
#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:651
+#, python-format
+msgid "Waiting for payment confirmation..."
+msgstr ""
+
+#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:354
+#: code:addons/payment/static/src/js/payment_form.js:355
#, python-format
msgid "Warning!"
msgstr ""
@@ -1257,36 +1402,36 @@ msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:302
+#: code:addons/payment/static/src/js/payment_form.js:303
#, python-format
msgid "We are not able to add your payment method at the moment.</p>"
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:334
-#: code:addons/payment/static/src/js/payment_form.js:369
+#: code:addons/payment/static/src/js/payment_form.js:335
+#: code:addons/payment/static/src/js/payment_form.js:370
#, python-format
msgid "We are not able to delete your payment method at the moment."
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:175
+#: code:addons/payment/static/src/js/payment_form.js:176
#, python-format
msgid "We are not able to redirect you to the payment form."
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:181
+#: code:addons/payment/static/src/js/payment_form.js:182
#, python-format
-msgid "We are not able to redirect you to the payment form.<"
+msgid "We are not able to redirect you to the payment form. "
msgstr ""
#. module: payment
#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:190
+#: code:addons/payment/static/src/js/payment_form.js:191
#, python-format
msgid "We're unable to process your payment."
msgstr ""
@@ -1380,7 +1525,7 @@ msgstr ""
#. module: payment
#. openerp-web
#: code:addons/payment/static/src/js/payment_form.js:121
-#: code:addons/payment/static/src/js/payment_form.js:287
+#: code:addons/payment/static/src/js/payment_form.js:288
#, python-format
msgid "e.g. Your credit card details are wrong. Please verify."
msgstr ""
@@ -1420,3 +1565,8 @@ 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/payment_adyen/i18n/payment_adyen.pot b/addons/payment_adyen/i18n/payment_adyen.pot
index d22b1970f1e..ad6bd5383bb 100644
--- a/addons/payment_adyen/i18n/payment_adyen.pot
+++ b/addons/payment_adyen/i18n/payment_adyen.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,52 +16,82 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:186
+#: code:addons/payment_adyen/models/payment.py:187
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:184
+#: code:addons/payment_adyen/models/payment.py:185
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:234
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_adyen
+#: code:addons/payment_adyen/models/payment.py:229
#, python-format
msgid "Adyen: feedback error"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:196
+#: code:addons/payment_adyen/models/payment.py:197
#, python-format
msgid "Adyen: invalid merchantSig, received %s, computed %s"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:182
+#: code:addons/payment_adyen/models/payment.py:183
#, python-format
msgid "Adyen: received data for reference %s"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/payment.py:175
+#: code:addons/payment_adyen/models/payment.py:176
#, python-format
msgid "Adyen: received data with missing reference (%s) or missing pspReference (%s)"
msgstr ""
#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_adyen
#: model:ir.ui.view,arch_db:payment_adyen.acquirer_form_adyen
msgid "How to configure your Adyen account?"
msgstr ""
#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_adyen
#: model:ir.model.fields,field_description:payment_adyen.field_payment_acquirer__adyen_merchant_account
msgid "Merchant Account"
msgstr ""
#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_adyen
#: model:ir.model,name:payment_adyen.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -72,6 +102,21 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_adyen
+#: model:ir.model.fields,field_description:payment_adyen.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_adyen
#: model:ir.model.fields,field_description:payment_adyen.field_payment_acquirer__adyen_skin_code
msgid "Skin Code"
msgstr ""
@@ -81,3 +126,13 @@ msgstr ""
msgid "Skin HMAC Key"
msgstr ""
+#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_adyen
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
diff --git a/addons/payment_authorize/i18n/payment_authorize.pot b/addons/payment_authorize/i18n/payment_authorize.pot
index ac36187b6cb..c1a298fc33d 100644
--- a/addons/payment_authorize/i18n/payment_authorize.pot
+++ b/addons/payment_authorize/i18n/payment_authorize.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,17 +26,32 @@ msgid "API Transaction Key"
msgstr ""
#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_authorize
#: model:ir.model.fields,field_description:payment_authorize.field_payment_token__authorize_profile
msgid "Authorize.net Profile ID"
msgstr ""
#. module: payment_authorize
-#: code:addons/payment_authorize/models/payment.py:178
+#: code:addons/payment_authorize/models/payment.py:177
#, python-format
msgid "Authorize: received data with missing reference (%s) or trans_id (%s) or fingerprint (%s)"
msgstr ""
#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_authorize
#: model:ir.ui.view,arch_db:payment_authorize.authorize_s2s_form
msgid "CVC"
msgstr ""
@@ -68,6 +83,27 @@ msgid "If you don't have any account, please ask your salesperson to update your
msgstr ""
#. module: payment_authorize
+#: code:addons/payment_authorize/models/payment.py:261
+#, python-format
+msgid "Invalid token found: the Authorize profile is missing.Please make sure the token has a valid acquirer reference."
+msgstr ""
+
+#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_authorize
#: model:ir.model,name:payment_authorize.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -78,6 +114,11 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_authorize
#: code:addons/payment_authorize/controllers/main.py:63
#, python-format
msgid "Please complete your profile. "
@@ -90,6 +131,7 @@ msgid "Please sign in to complete your profile."
msgstr ""
#. module: payment_authorize
+#: model:ir.model.fields,field_description:payment_authorize.field_payment_acquirer__provider
#: model:ir.model.fields,field_description:payment_authorize.field_payment_token__provider
msgid "Provider"
msgstr ""
@@ -100,7 +142,17 @@ msgid "Save Cards"
msgstr ""
#. module: payment_authorize
-#: code:addons/payment_authorize/models/payment.py:383
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_authorize
+#: code:addons/payment_authorize/models/payment.py:365
#, python-format
msgid "The Customer Profile creation in Authorize.NET failed."
msgstr ""
@@ -122,6 +174,11 @@ msgid "This option allows customers to save their credit card as a payment token
msgstr ""
#. module: payment_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
+#. module: payment_authorize
#: model:ir.model,name:payment_authorize.model_payment_token
msgid "payment.token"
msgstr ""
diff --git a/addons/payment_buckaroo/i18n/payment_buckaroo.pot b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
index 13522acdeb2..d24b9d0dc31 100644
--- a/addons/payment_buckaroo/i18n/payment_buckaroo.pot
+++ b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,21 @@ msgid "; no order found"
msgstr ""
#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_buckaroo
#: code:addons/payment_buckaroo/models/payment.py:148
#, python-format
msgid "Buckaroo: invalid shasign, received %s, computed %s, for data %s"
@@ -46,6 +61,21 @@ msgid "Buckaroo: received data with missing reference (%s) or pay_id (%s) or sha
msgstr ""
#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_buckaroo
#: model:ir.model,name:payment_buckaroo.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -56,12 +86,37 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_buckaroo
+#: model:ir.model.fields,field_description:payment_buckaroo.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_buckaroo
#: model:ir.model.fields,field_description:payment_buckaroo.field_payment_acquirer__brq_secretkey
msgid "SecretKey"
msgstr ""
#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_buckaroo
#: model:ir.model.fields,field_description:payment_buckaroo.field_payment_acquirer__brq_websitekey
msgid "WebsiteKey"
msgstr ""
+#. module: payment_buckaroo
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
diff --git a/addons/payment_ogone/i18n/payment_ogone.pot b/addons/payment_ogone/i18n/payment_ogone.pot
index de9643ebc84..e24ee9213fa 100644
--- a/addons/payment_ogone/i18n/payment_ogone.pot
+++ b/addons/payment_ogone/i18n/payment_ogone.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,11 +38,26 @@ msgid "API User Password"
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_ogone
#: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer__ogone_alias_usage
msgid "Alias Usage"
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_ogone
#: model:ir.ui.view,arch_db:payment_ogone.ogone_s2s_form
msgid "CVC"
msgstr ""
@@ -73,6 +88,16 @@ msgid "If you want to use Ogone Aliases, this default Alias Usage will be presen
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_ogone
#: code:addons/payment_ogone/models/payment.py:249
#, python-format
msgid "Ogone: invalid shasign, received %s, computed %s, for data %s"
@@ -96,6 +121,11 @@ msgid "PSPID"
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_ogone
#: model:ir.model,name:payment_ogone.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -106,6 +136,16 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_ogone
+#: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_ogone
#: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer__ogone_shakey_in
msgid "SHA Key IN"
msgstr ""
@@ -116,6 +156,21 @@ msgid "SHA Key OUT"
msgstr ""
#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_ogone
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
+#. module: payment_ogone
#: model:ir.model,name:payment_ogone.model_payment_token
msgid "payment.token"
msgstr ""
diff --git a/addons/payment_paypal/i18n/payment_paypal.pot b/addons/payment_paypal/i18n/payment_paypal.pot
index 993a2d66a57..3fe1b242985 100644
--- a/addons/payment_paypal/i18n/payment_paypal.pot
+++ b/addons/payment_paypal/i18n/payment_paypal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,51 @@ msgid "Access Token Validity"
msgstr ""
#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_paypal
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_dom_fixed
+msgid "Fixed domestic fees"
+msgstr ""
+
+#. module: payment_paypal
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_int_fixed
+msgid "Fixed international fees"
+msgstr ""
+
+#. module: payment_paypal
#: model:ir.ui.view,arch_db:payment_paypal.acquirer_form_paypal
msgid "How to configure your paypal account?"
msgstr ""
#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_paypal
#: model:ir.model,name:payment_paypal.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -46,6 +86,11 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_paypal
#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__paypal_email_account
msgid "Paypal Email ID"
msgstr ""
@@ -72,6 +117,11 @@ msgid "Paypal: received data with missing reference (%s) or txn_id (%s)"
msgstr ""
#. module: payment_paypal
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_paypal
#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__paypal_api_password
msgid "Rest API Password"
msgstr ""
@@ -82,6 +132,16 @@ msgid "Rest API Username"
msgstr ""
#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_paypal
#: model:ir.model.fields,help:payment_paypal.field_payment_acquirer__paypal_seller_account
msgid "The Merchant ID is used to ensure communications coming from Paypal are valid and secured."
msgstr ""
@@ -101,3 +161,18 @@ msgstr ""
msgid "Use Rest API"
msgstr ""
+#. module: payment_paypal
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_dom_var
+msgid "Variable domestic fees (in percents)"
+msgstr ""
+
+#. module: payment_paypal
+#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_int_var
+msgid "Variable international fees (in percents)"
+msgstr ""
+
+#. module: payment_paypal
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
diff --git a/addons/payment_payumoney/i18n/payment_payumoney.pot b/addons/payment_payumoney/i18n/payment_payumoney.pot
index 8ce4f5d25d4..b4223cdac1f 100644
--- a/addons/payment_payumoney/i18n/payment_payumoney.pot
+++ b/addons/payment_payumoney/i18n/payment_payumoney.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,26 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_payumoney
#: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer__payumoney_merchant_key
msgid "Merchant Key"
msgstr ""
@@ -26,9 +46,13 @@ msgid "Merchant Salt"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment.py:146
-#, python-format
-msgid "PayUmoney: feedback error"
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
msgstr ""
#. module: payment_payumoney
@@ -65,3 +89,28 @@ msgstr ""
msgid "Payment Transaction"
msgstr ""
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_payumoney
+#: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_payumoney
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
diff --git a/addons/payment_sips/i18n/payment_sips.pot b/addons/payment_sips/i18n/payment_sips.pot
index 01477300f7c..6260ec9ac75 100644
--- a/addons/payment_sips/i18n/payment_sips.pot
+++ b/addons/payment_sips/i18n/payment_sips.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,25 +16,40 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:153
+#: code:addons/payment_sips/models/payment.py:164
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:151
+#: code:addons/payment_sips/models/payment.py:162
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:74
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_sips
+#: code:addons/payment_sips/models/payment.py:75
#, python-format
msgid "Currency not supported by Wordline"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:55
+#: code:addons/payment_sips/models/payment.py:56
#, python-format
msgid "Incorrect payment acquirer provider"
msgstr ""
@@ -45,11 +60,26 @@ msgid "Interface Version"
msgstr ""
#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_sips
#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_merchant_id
msgid "Merchant ID"
msgstr ""
#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_sips
#: model:ir.model,name:payment_sips.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -60,22 +90,42 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_sips
#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_prod_url
msgid "Production url"
msgstr ""
#. module: payment_sips
+#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_sips
#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_secret
msgid "Secret Key"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/payment.py:149
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_sips
+#: code:addons/payment_sips/models/payment.py:160
#, python-format
msgid "Sips: received data for reference %s"
msgstr ""
#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_sips
#: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_test_url
msgid "Test url"
msgstr ""
@@ -85,3 +135,8 @@ msgstr ""
msgid "Used for production only"
msgstr ""
+#. module: payment_sips
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
diff --git a/addons/payment_stripe/i18n/payment_stripe.pot b/addons/payment_stripe/i18n/payment_stripe.pot
index c6686ca1498..6e6c604169f 100644
--- a/addons/payment_stripe/i18n/payment_stripe.pot
+++ b/addons/payment_stripe/i18n/payment_stripe.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,6 +28,21 @@ msgid "A relative or absolute URL pointing to a square image of your brand or pr
msgstr ""
#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_stripe
#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
msgid "CVC"
msgstr ""
@@ -74,6 +89,21 @@ msgid "Just one more second, confirming your payment..."
msgstr ""
#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_stripe
#: model:ir.model,name:payment_stripe.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -91,12 +121,32 @@ msgid "Payment error"
msgstr ""
#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_stripe
#: code:addons/payment_stripe/models/payment.py:175
#, python-format
msgid "Perhaps the problem can be solved by double-checking your credit card details, or contacting your bank?"
msgstr ""
#. module: payment_stripe
+#: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_stripe
#: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer__stripe_publishable_key
msgid "Stripe Publishable Key"
msgstr ""
@@ -131,6 +181,11 @@ msgid "We're sorry to report that the transaction has failed."
msgstr ""
#. module: payment_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
+#. module: payment_stripe
#: model:ir.model,name:payment_stripe.model_payment_token
msgid "payment.token"
msgstr ""
diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_transfer/i18n/payment_transfer.pot
index 2611ddaf728..51eae76416e 100644
--- a/addons/payment_transfer/i18n/payment_transfer.pot
+++ b/addons/payment_transfer/i18n/payment_transfer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:70
+#: code:addons/payment_transfer/models/payment.py:83
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:68
+#: code:addons/payment_transfer/models/payment.py:81
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:28
+#: code:addons/payment_transfer/models/payment.py:41
#, python-format
msgid "<div>\n"
"<h3>Please use the following transfer details</h3>\n"
@@ -40,18 +40,48 @@ msgid "<div>\n"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:26
+#: selection:payment.acquirer,provider:0
+msgid "Adyen"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
+msgstr ""
+
+#. module: payment_transfer
+#: code:addons/payment_transfer/models/payment.py:39
#, python-format
msgid "Bank Account"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:26
+#: code:addons/payment_transfer/models/payment.py:39
#, python-format
msgid "Bank Accounts"
msgstr ""
#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Buckaroo"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Ogone"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
+#. module: payment_transfer
#: model:ir.model,name:payment_transfer.model_payment_acquirer
msgid "Payment Acquirer"
msgstr ""
@@ -62,7 +92,32 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment.py:66
+#: selection:payment.acquirer,provider:0
+msgid "Paypal"
+msgstr ""
+
+#. module: payment_transfer
+#: model:ir.model.fields,field_description:payment_transfer.field_payment_acquirer__provider
+msgid "Provider"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
+#. module: payment_transfer
+#: selection:payment.acquirer,provider:0
+msgid "Wire Transfer"
+msgstr ""
+
+#. module: payment_transfer
+#: code:addons/payment_transfer/models/payment.py:79
#, python-format
msgid "received data for reference %s"
msgstr ""
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 9d10e90337d..c5c9ae2695b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+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:866
-#: code:addons/point_of_sale/models/pos_order.py:875
+#: code:addons/point_of_sale/models/pos_order.py:880
+#: code:addons/point_of_sale/models/pos_order.py:889
#, python-format
msgid " REFUND"
msgstr ""
@@ -62,7 +62,7 @@ msgid "&nbsp;"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:83
+#: code:addons/point_of_sale/models/pos_order.py:85
#, 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.pos_config_view_form
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
msgid "<i class=\"fa fa-fw fa-arrow-right\"/>How to manage tax-included prices"
msgstr ""
@@ -229,14 +229,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2009
+#: code:addons/point_of_sale/static/src/js/screens.js:2012
#, 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:1258
+#: code:addons/point_of_sale/static/src/js/screens.js:1260
#, python-format
msgid "A Customer Name Is Required"
msgstr ""
@@ -289,8 +289,8 @@ msgid "ABC"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
-msgid "Accept payments with an integrated card reader"
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Accept payments with a credit card reader"
msgstr ""
#. module: point_of_sale
@@ -326,7 +326,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1859
+#: code:addons/point_of_sale/static/src/js/screens.js:1862
#, python-format
msgid "Add Tip"
msgstr ""
@@ -355,13 +355,23 @@ msgid "Address"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:250
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Advanced Currencies Setup"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:barcode.rule,type:0
+msgid "Alias"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_config.py:244
#, 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:256
+#: code:addons/point_of_sale/models/pos_config.py:250
#, 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 ""
@@ -382,12 +392,6 @@ msgid "Allow global discounts on orders"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config__group_sale_pricelist
-msgid "Allows to manage different prices based on rules per category of customers.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this product, etc."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment__amount
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "Amount"
@@ -422,7 +426,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2001
+#: code:addons/point_of_sale/static/src/js/screens.js:2004
#, python-format
msgid "Are you sure that the customer wants to pay"
msgstr ""
@@ -508,6 +512,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
#, python-format
msgid "Barcode"
msgstr ""
@@ -581,7 +586,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1990
+#: code:addons/point_of_sale/static/src/js/screens.js:1993
#, python-format
msgid "Cannot return change without a cash payment method"
msgstr ""
@@ -627,16 +632,12 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:16
+#: selection:barcode.rule,type:0
#, python-format
msgid "Cashier"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_catalog
-msgid "Catalog"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Categories"
msgstr ""
@@ -661,21 +662,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:104
+#: code:addons/point_of_sale/static/src/js/chrome.js:105
#, python-format
msgid "Change Cashier"
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:1205
#, python-format
msgid "Change Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1859
+#: code:addons/point_of_sale/static/src/js/screens.js:1862
#, python-format
msgid "Change Tip"
msgstr ""
@@ -702,8 +703,8 @@ msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_product_uom__is_pos_groupable
-#: model:ir.model.fields,help:point_of_sale.field_product_uom_categ__is_pos_groupable
+#: model:ir.model.fields,help:point_of_sale.field_uom_category__is_pos_groupable
+#: model:ir.model.fields,help:point_of_sale.field_uom_uom__is_pos_groupable
msgid "Check if you want to group products of this category in point of sale orders"
msgstr ""
@@ -724,7 +725,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2050
+#: code:addons/point_of_sale/static/src/js/screens.js:2053
#, python-format
msgid "Check your internet connection and try again."
msgstr ""
@@ -759,21 +760,22 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:15
+#: selection:barcode.rule,type:0
#, python-format
msgid "Client"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:462
+#: code:addons/point_of_sale/static/src/js/chrome.js:463
#, python-format
msgid "Client Screen Unsupported. Please upgrade the PosBox"
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
+#: code:addons/point_of_sale/static/src/js/chrome.js:825
+#: code:addons/point_of_sale/static/src/js/chrome.js:833
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
#, python-format
msgid "Close"
@@ -803,6 +805,11 @@ 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
@@ -827,7 +834,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:829
+#: code:addons/point_of_sale/static/src/js/chrome.js:830
#: code:addons/point_of_sale/static/src/xml/pos.xml:1059
#, python-format
msgid "Confirm"
@@ -835,7 +842,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:455
+#: code:addons/point_of_sale/static/src/js/chrome.js:456
#, python-format
msgid "Connected, Not Owned"
msgstr ""
@@ -864,7 +871,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1360
+#: code:addons/point_of_sale/static/src/js/screens.js:1363
#, python-format
msgid "Could Not Read Image"
msgstr ""
@@ -919,6 +926,21 @@ msgid "Creation Date"
msgstr ""
#. module: point_of_sale
+#: selection:barcode.rule,type:0
+msgid "Credit Card"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Credit Card Reader"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Currencies"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__currency_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__currency_id
msgid "Currency"
@@ -936,7 +958,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1870
+#: code:addons/point_of_sale/static/src/js/screens.js:1873
#: code:addons/point_of_sale/static/src/xml/pos.xml:145
#: 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
@@ -957,8 +979,8 @@ msgid "Customer Facing Display"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:545
-#: code:addons/point_of_sale/models/pos_order.py:596
+#: code:addons/point_of_sale/models/pos_order.py:561
+#: code:addons/point_of_sale/models/pos_order.py:612
#, python-format
msgid "Customer Invoice"
msgstr ""
@@ -969,6 +991,11 @@ msgid "Customer facing display content"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_customer
+msgid "Customers"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
msgid "Dashboard"
msgstr ""
@@ -1012,11 +1039,26 @@ msgid "Default Pricelist"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__sale_tax_id
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Default Sales Tax"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
msgid "Default company logo"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Default sales tax for products"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.actions.act_window,help:point_of_sale.product_pos_category_action
msgid "Define a new category"
msgstr ""
@@ -1040,7 +1082,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:263
+#: code:addons/point_of_sale/static/src/js/chrome.js:264
#, python-format
msgid "Delete Paid Orders ?"
msgstr ""
@@ -1054,21 +1096,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:273
+#: code:addons/point_of_sale/static/src/js/chrome.js:274
#, python-format
msgid "Delete Unpaid Orders ?"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1206
+#: code:addons/point_of_sale/static/src/js/screens.js:1208
#, python-format
msgid "Deselect Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:55
+#: code:addons/point_of_sale/static/src/js/chrome.js:56
#, python-format
msgid "Destroy Current Order ?"
msgstr ""
@@ -1097,7 +1139,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:460
+#: code:addons/point_of_sale/static/src/js/chrome.js:461
#, python-format
msgid "Disconnected"
msgstr ""
@@ -1124,6 +1166,7 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:14
+#: selection:barcode.rule,type:0
#, python-format
msgid "Discounted Product"
msgstr ""
@@ -1223,7 +1266,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1972
+#: code:addons/point_of_sale/static/src/js/screens.js:1975
#, python-format
msgid "Empty Order"
msgstr ""
@@ -1251,7 +1294,8 @@ msgid "Enables Payment Terminal integration."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config__iface_invoicing
+#: model:ir.model.fields,help:point_of_sale.field_pos_config__module_account_invoicing
+#: model:ir.model.fields,help:point_of_sale.field_pos_order__invoice_group
msgid "Enables invoice generation from the Point of Sale."
msgstr ""
@@ -1278,7 +1322,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1289
+#: code:addons/point_of_sale/static/src/js/screens.js:1292
#, python-format
msgid "Error: Could not Save Changes"
msgstr ""
@@ -1399,8 +1443,8 @@ msgid "Group Journal Items"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_product_uom__is_pos_groupable
-#: model:ir.model.fields,field_description:point_of_sale.field_product_uom_categ__is_pos_groupable
+#: model:ir.model.fields,field_description:point_of_sale.field_uom_category__is_pos_groupable
+#: model:ir.model.fields,field_description:point_of_sale.field_uom_uom__is_pos_groupable
msgid "Group Products in POS"
msgstr ""
@@ -1469,6 +1513,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 ""
@@ -1492,7 +1543,7 @@ msgid "In Progress"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:527
+#: code:addons/point_of_sale/models/pos_order.py:543
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
@@ -1516,15 +1567,11 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__module_pos_mercury
+#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__module_pos_mercury
msgid "Integrated Card Payments"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
-msgid "Integrated Card Reader"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.product_category_action
msgid "Internal Categories"
msgstr ""
@@ -1565,7 +1612,8 @@ msgid "Invoiced"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__iface_invoicing
+#: 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_order__invoice_group
msgid "Invoicing"
msgstr ""
@@ -1678,13 +1726,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:521
+#: code:addons/point_of_sale/static/src/js/models.js:532
#: code:addons/point_of_sale/static/src/xml/pos.xml:38
#, python-format
msgid "Loading"
msgstr ""
#. module: point_of_sale
+#: selection:barcode.rule,type:0
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__location_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__location_id
msgid "Location"
@@ -1703,13 +1752,18 @@ msgid "Login as a Manager"
msgstr ""
#. module: point_of_sale
+#: selection:barcode.rule,type:0
+msgid "Lot"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot__lot_name
msgid "Lot Name"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:2354
+#: code:addons/point_of_sale/static/src/js/models.js:2372
#, python-format
msgid "Lot/Serial Number(s) Required"
msgstr ""
@@ -1774,8 +1828,13 @@ msgid "Miscellaneous"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
-msgid "Month of order date"
+#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__pos_sales_price
+msgid "Multiple Product Prices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:res.config.settings,pos_pricelist_setting:0
+msgid "Multiple prices per product (e.g. customer segments, currencies)"
msgstr ""
#. module: point_of_sale
@@ -1826,13 +1885,13 @@ msgid "Next Order"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:1075
+#: code:addons/point_of_sale/models/pos_order.py:1090
#, python-format
msgid "No Taxes"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:140
+#: code:addons/point_of_sale/models/pos_order.py:143
#, python-format
msgid "No cash statement found for this session. Unable to record returned cash."
msgstr ""
@@ -1861,7 +1920,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2103
+#: code:addons/point_of_sale/static/src/js/screens.js:2106
#: code:addons/point_of_sale/static/src/xml/pos.xml:361
#, python-format
msgid "None"
@@ -1890,7 +1949,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:402
+#: code:addons/point_of_sale/static/src/js/chrome.js:403
#, python-format
msgid "Offline"
msgstr ""
@@ -1932,7 +1991,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1346
+#: code:addons/point_of_sale/static/src/js/screens.js:1349
#, python-format
msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
msgstr ""
@@ -2032,14 +2091,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:1929
-#: code:addons/point_of_sale/static/src/js/models.js:1969
+#: code:addons/point_of_sale/static/src/js/models.js:1947
+#: code:addons/point_of_sale/static/src/js/models.js:1987
#, python-format
msgid "Order "
msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__date_order
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
+#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Order Date"
msgstr ""
@@ -2064,12 +2125,6 @@ msgid "Order Lines"
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_report_pos_order_search
-msgid "Order Month"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__order_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot__order_id
@@ -2087,7 +2142,7 @@ msgid "Order Sequence Number"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:557
+#: code:addons/point_of_sale/models/pos_order.py:573
#, python-format
msgid "Order is not paid."
msgstr ""
@@ -2124,7 +2179,7 @@ msgid "POS Journals"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:348
+#: code:addons/point_of_sale/models/pos_config.py:343
#, python-format
msgid "POS Order %s"
msgstr ""
@@ -2150,12 +2205,17 @@ msgid "POS Orders lines"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_config_settings__pos_pricelist_setting
+msgid "POS Pricelists"
+msgstr ""
+
+#. module: point_of_sale
#: 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:357
+#: code:addons/point_of_sale/models/pos_config.py:352
#, python-format
msgid "POS order line %s"
msgstr ""
@@ -2171,6 +2231,11 @@ msgid "POS statement"
msgstr ""
#. module: point_of_sale
+#: selection:barcode.rule,type:0
+msgid "Package"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__amount_paid
#: selection:pos.order,state:0
#: selection:report.pos.order,state:0
@@ -2254,6 +2319,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__statement_ids
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Payments"
msgstr ""
@@ -2308,19 +2374,19 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2000
+#: code:addons/point_of_sale/static/src/js/screens.js:2003
#, python-format
msgid "Please Confirm Large Amount"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:342
+#: code:addons/point_of_sale/models/pos_order.py:345
#, 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:573
+#: code:addons/point_of_sale/models/pos_order.py:589
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
@@ -2334,7 +2400,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2041
+#: code:addons/point_of_sale/static/src/js/screens.js:2044
#, python-format
msgid "Please select the Customer"
msgstr ""
@@ -2363,10 +2429,12 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order__config_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session__config_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__config_id
+#: 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.product_template_form_view
-#: model:ir.ui.view,arch_db:point_of_sale.res_users_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
@@ -2528,14 +2596,20 @@ msgid "Price Unit"
msgstr ""
#. module: point_of_sale
+#: selection:res.config.settings,pos_pricelist_setting:0
+msgid "Price computed from formulas (discounts, margins, roundings)"
+msgstr ""
+
+#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:13
+#: selection:barcode.rule,type:0
#, python-format
msgid "Priced Product"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2191
+#: code:addons/point_of_sale/static/src/js/screens.js:2194
#: 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
@@ -2548,11 +2622,13 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_pricelist
#: 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
msgid "Pricelists"
msgstr ""
#. module: point_of_sale
#: 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
msgid "Pricing"
msgstr ""
@@ -2586,7 +2662,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:390
+#: code:addons/point_of_sale/static/src/js/chrome.js:391
#, python-format
msgid "Printer"
msgstr ""
@@ -2599,9 +2675,11 @@ msgid "Printing Error: "
msgstr ""
#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_product
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line__product_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot__product_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__product_id
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_catalog
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Product"
@@ -2614,7 +2692,7 @@ msgid "Product Category"
msgstr ""
#. module: point_of_sale
-#: 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
msgid "Product Prices"
msgstr ""
@@ -2635,12 +2713,12 @@ msgid "Product Template"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_product_uom
+#: model:ir.model,name:point_of_sale.model_uom_uom
msgid "Product Unit of Measure"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_product_uom_categ
+#: model:ir.model,name:point_of_sale.model_uom_category
msgid "Product UoM Categories"
msgstr ""
@@ -2651,7 +2729,7 @@ msgid "Product Variants"
msgstr ""
#. module: point_of_sale
-#: 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
msgid "Product prices on receipts"
msgstr ""
@@ -2778,7 +2856,7 @@ msgid "Resume"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:882
+#: code:addons/point_of_sale/models/pos_order.py:896
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
msgid "Return Products"
@@ -2836,6 +2914,7 @@ msgstr ""
#. module: point_of_sale
#: 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
msgid "Save"
msgstr ""
@@ -2846,7 +2925,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:398
+#: code:addons/point_of_sale/static/src/js/chrome.js:399
#, python-format
msgid "Scale"
msgstr ""
@@ -2872,7 +2951,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:381
+#: code:addons/point_of_sale/static/src/js/chrome.js:382
#, python-format
msgid "Scanner"
msgstr ""
@@ -2902,7 +2981,7 @@ msgid "Security PIN"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/res_users.py:15
+#: code:addons/point_of_sale/models/res_users.py:20
#, python-format
msgid "Security PIN can only contain digits"
msgstr ""
@@ -2923,25 +3002,30 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2179
+#: code:addons/point_of_sale/static/src/js/screens.js:2182
#, python-format
msgid "Select pricelist"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2114
+#: code:addons/point_of_sale/static/src/js/screens.js:2117
#, python-format
msgid "Select tax"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:247
+#: code:addons/point_of_sale/models/pos_order.py:250
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "Sell in several currencies"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category__sequence
msgid "Sequence"
msgstr ""
@@ -2967,13 +3051,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2054
+#: code:addons/point_of_sale/static/src/js/screens.js:2057
#, python-format
msgid "Server Error"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:460
+#: code:addons/point_of_sale/models/pos_config.py:456
#: 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
@@ -3012,7 +3096,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1201
+#: code:addons/point_of_sale/static/src/js/screens.js:1203
#, python-format
msgid "Set Customer"
msgstr ""
@@ -3035,6 +3119,11 @@ msgid "Set barcodes to scan products, customer cards, etc."
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 ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
msgid "Set shop-specific prices, seasonal discounts, etc."
msgstr ""
@@ -3047,6 +3136,8 @@ msgid "Set your customized advertisement here"
msgstr ""
#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_configuration
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_global_settings
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
msgid "Settings"
msgstr ""
@@ -3057,11 +3148,6 @@ msgid "Show checkout to customers with a remotely-connected screen."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__group_pricelist_item
-msgid "Show pricelists to customers"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:42
#, python-format
@@ -3220,8 +3306,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:374
-#: code:addons/point_of_sale/static/src/js/screens.js:2133
+#: code:addons/point_of_sale/models/pos_order.py:377
+#: code:addons/point_of_sale/static/src/js/screens.js:2136
#, python-format
msgid "Tax"
msgstr ""
@@ -3232,11 +3318,6 @@ 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
@@ -3255,13 +3336,13 @@ msgid "Tax Regime Selection value"
msgstr ""
#. module: point_of_sale
-#: selection:pos.config,iface_tax_included:0
-msgid "Tax-Excluded Prices"
+#: selection:res.company,iface_tax_included:0
+msgid "Tax-Excluded Price"
msgstr ""
#. module: point_of_sale
-#: selection:pos.config,iface_tax_included:0
-msgid "Tax-Included Prices"
+#: selection:res.company,iface_tax_included:0
+msgid "Tax-Included Price"
msgstr ""
#. module: point_of_sale
@@ -3270,6 +3351,7 @@ msgstr ""
#: model:ir.ui.menu,name:point_of_sale.menu_action_tax_form_open
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_view_form
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Taxes"
msgstr ""
@@ -3302,7 +3384,7 @@ msgid "Tendered"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:330
+#: code:addons/point_of_sale/models/pos_order.py:333
#, python-format
msgid "The POS order must have lines when calling this method"
msgstr ""
@@ -3316,44 +3398,38 @@ 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:243
+#: code:addons/point_of_sale/models/pos_config.py:242
#, python-format
-msgid "The company of a payment method is different than the one of point of sale"
+msgid "The default pricelist must be included in the available pricelists."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:233
-#, python-format
-msgid "The company of the sales journal is different than the one of point of sale"
+#: model:ir.model.fields,help:point_of_sale.field_pos_config__proxy_ip
+msgid "The hostname or ip address of the hardware proxy, Will be autodetected if left empty."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:228
+#: code:addons/point_of_sale/models/pos_config.py:232
#, python-format
-msgid "The company of the stock location is different than the one of point of sale"
+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
#, python-format
-msgid "The default pricelist must be included in the available pricelists."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config__proxy_ip
-msgid "The hostname or ip address of the hardware proxy, Will be autodetected if left empty."
+msgid "The invoice journal must be in the same currency as the Sales Journal or the company currency if that is not set."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:238
+#: code:addons/point_of_sale/models/pos_session.py:283
#, python-format
-msgid "The invoice journal and the point of sale must belong to the same company"
+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:254
+#: code:addons/point_of_sale/models/pos_config.py:237
#, 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."
+msgid "The method payments and the point of sale must belong to the same company."
msgstr ""
#. module: point_of_sale
@@ -3369,14 +3445,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2049
+#: code:addons/point_of_sale/static/src/js/screens.js:2052
#, 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:2060
+#: code:addons/point_of_sale/static/src/js/screens.js:2063
#, python-format
msgid "The order could not be sent to the server due to an unknown error"
msgstr ""
@@ -3409,7 +3485,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1361
+#: code:addons/point_of_sale/static/src/js/screens.js:1364
#, python-format
msgid "The provided file could not be read due to an unknown error"
msgstr ""
@@ -3425,8 +3501,14 @@ 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
+#, python-format
+msgid "The sales journal and the point of sale must belong to the same company."
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2055
+#: code:addons/point_of_sale/static/src/js/screens.js:2058
#, python-format
msgid "The server encountered an error while receiving your order."
msgstr ""
@@ -3437,14 +3519,20 @@ 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
+#, 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
-#: code:addons/point_of_sale/models/pos_session.py:283
-#, python-format
-msgid "The type of the journal for your payment method should be bank or cash "
+#: 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."
msgstr ""
#. module: point_of_sale
@@ -3460,8 +3548,13 @@ msgid "There are pending operations that could not be saved into the database, a
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "There are two ways to manage pricelists: 1) Multiple prices per product (e.g. quantity, shop-specific) : must be set in the Sales tab of the product detail form. 2) Price computed from formulas (discounts, margins, rounding) : must be set in the pricelist form."
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1991
+#: code:addons/point_of_sale/static/src/js/screens.js:1994
#, python-format
msgid "There is no cash payment method available in this point of sale to handle the change.\n"
"\n"
@@ -3475,25 +3568,30 @@ msgid "There is no cash register for this PoS Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:823
+#: code:addons/point_of_sale/models/pos_order.py:837
#, 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:821
+#: code:addons/point_of_sale/models/pos_order.py:835
#, 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:1973
+#: code:addons/point_of_sale/static/src/js/screens.js:1976
#, python-format
msgid "There must be at least one product in your order before it can be validated"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+msgid "This adds the choice of a currency on pricelists."
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_account_cashbox_line__default_pos_id
msgid "This cashbox line is used by default when opening or closing a balance for this point of sale"
msgstr ""
@@ -3519,7 +3617,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:581
+#: code:addons/point_of_sale/models/pos_order.py:597
#, 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 ""
@@ -3531,14 +3629,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:274
+#: code:addons/point_of_sale/static/src/js/chrome.js:275
#, python-format
msgid "This operation will destroy all unpaid orders in the browser. You will lose all the unsaved data and exit the point of sale. This operation cannot be undone."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:264
+#: code:addons/point_of_sale/static/src/js/chrome.js:265
#, python-format
msgid "This operation will permanently destroy all paid orders from the local storage. You will lose all the data. This operation cannot be undone."
msgstr ""
@@ -3559,7 +3657,12 @@ msgid "This sequence is automatically created by Odoo but you can change it to c
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:685
+#: model:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form
+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
#, 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 ""
@@ -3605,7 +3708,7 @@ msgid "To record new orders, start a new session."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:862
+#: code:addons/point_of_sale/models/pos_order.py:876
#, python-format
msgid "To return product(s), you need to open a session that will be used to register the refund."
msgstr ""
@@ -3674,12 +3777,17 @@ msgid "Total:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:394
+#: code:addons/point_of_sale/models/pos_order.py:397
#, python-format
msgid "Trade Receivables"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_barcode_rule__type
+msgid "Type"
+msgstr ""
+
+#. module: point_of_sale
#: code:addons/point_of_sale/models/pos_session.py:178
#, python-format
msgid "Unable to open the session. You have to assign a sales journal to your point of sale."
@@ -3691,6 +3799,11 @@ msgid "Unit Price"
msgstr ""
#. module: point_of_sale
+#: selection:barcode.rule,type:0
+msgid "Unit Product"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
#, python-format
@@ -3699,14 +3812,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2059
+#: code:addons/point_of_sale/static/src/js/screens.js:2062
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1345
+#: code:addons/point_of_sale/static/src/js/screens.js:1348
#, python-format
msgid "Unsupported File Format"
msgstr ""
@@ -3747,11 +3860,6 @@ msgid "Use in Point of Sale"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config__group_sale_pricelist
-msgid "Use pricelists to adapt your price per customers"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
#: model:res.groups,name:point_of_sale.group_pos_user
msgid "User"
@@ -3823,6 +3931,7 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/barcode_rule.py:12
+#: selection:barcode.rule,type:0
#, python-format
msgid "Weighted Product"
msgstr ""
@@ -3848,11 +3957,11 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
msgid "You can define another list of available currencies on the\n"
-" <i>Cash Registers</i> tab of the"
+" <i>Cash Registers</i> tab of the"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:517
+#: code:addons/point_of_sale/models/pos_order.py:533
#, python-format
msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
msgstr ""
@@ -3867,11 +3976,12 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/pos_session.py:151
#, python-format
-msgid "You cannot create two active sessions with the same responsible!"
+msgid "You cannot create two active sessions with the same responsible."
msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/product.py:21
+#: code:addons/point_of_sale/models/product.py:38
#, python-format
msgid "You cannot delete a product saleable in point of sale while a session is still opened."
msgstr ""
@@ -3889,7 +3999,7 @@ 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:837
+#: code:addons/point_of_sale/models/pos_order.py:851
#, python-format
msgid "You have to open at least one cashbox."
msgstr ""
@@ -3897,14 +4007,14 @@ msgstr ""
#. module: point_of_sale
#: code:addons/point_of_sale/models/pos_order.py:985
#, python-format
-msgid "You have to select a pricelist in the sale form !"
+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:971
+#: code:addons/point_of_sale/models/pos_order.py:999
#, python-format
-msgid "You have to select a pricelist in the sale form !\n"
-"Please set one before choosing a product."
+msgid "You have to select a pricelist in the sale form."
msgstr ""
#. module: point_of_sale
@@ -3933,7 +4043,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2042
+#: code:addons/point_of_sale/static/src/js/screens.js:2045
#, python-format
msgid "You need to select the customer before you can invoice an order."
msgstr ""
@@ -3946,14 +4056,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:56
+#: code:addons/point_of_sale/static/src/js/chrome.js:57
#, python-format
msgid "You will lose any data associated with the current order"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1283
+#: code:addons/point_of_sale/static/src/js/screens.js:1286
#, python-format
msgid "Your Internet connection is probably down."
msgstr ""
@@ -4056,7 +4166,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2005
+#: code:addons/point_of_sale/static/src/js/screens.js:2008
#, python-format
msgid "for an order of"
msgstr ""
@@ -4070,14 +4180,14 @@ msgid "kg"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:336
+#: code:addons/point_of_sale/models/pos_config.py:331
#, python-format
msgid "not used"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:293
+#: code:addons/point_of_sale/static/src/js/chrome.js:294
#: code:addons/point_of_sale/static/src/xml/pos.xml:1216
#, python-format
msgid "paid orders"
@@ -4109,8 +4219,13 @@ msgid "report.point_of_sale.report_saledetails"
msgstr ""
#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:145
+#: 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
#, python-format
@@ -4134,7 +4249,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:285
+#: code:addons/point_of_sale/static/src/js/chrome.js:286
#: code:addons/point_of_sale/static/src/xml/pos.xml:1217
#, python-format
msgid "unpaid orders"
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index 67a12d24e3d..39def6ec0e1 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,8 +48,16 @@ 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\"/>"
+msgstr ""
+
+#. module: portal
#: model:ir.ui.view,arch_db:portal.portal_searchbar
-msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>"
+msgid "<span id=\"search_label\" class=\"hidden-xs mr4\">Search</span><span class=\"caret\"/>"
msgstr ""
#. module: portal
@@ -73,6 +81,12 @@ msgid "Change"
msgstr ""
#. module: portal
+#: code:addons/portal/controllers/portal.py:219
+#, 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 ""
+
+#. module: portal
#: model:ir.ui.view,arch_db:portal.portal_my_details
msgid "City"
msgstr ""
@@ -103,6 +117,7 @@ msgid "Confirm\n"
msgstr ""
#. module: portal
+#: model:ir.model,name:portal.model_res_partner
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__partner_id
msgid "Contact"
msgstr ""
@@ -135,11 +150,7 @@ msgid "Created on"
msgstr ""
#. module: portal
-#: model:ir.model.fields,help:portal.field_account_invoice__portal_url
#: model:ir.model.fields,help:portal.field_portal_mixin__portal_url
-#: model:ir.model.fields,help:portal.field_project_project__portal_url
-#: model:ir.model.fields,help:portal.field_project_task__portal_url
-#: model:ir.model.fields,help:portal.field_sale_order__portal_url
msgid "Customer Portal URL"
msgstr ""
@@ -169,6 +180,11 @@ msgid "Email Thread"
msgstr ""
#. module: portal
+#: model:ir.model,name:portal.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_mixin__id
#: model:ir.model.fields,field_description:portal.field_portal_wizard__id
#: model:ir.model.fields,field_description:portal.field_portal_wizard_user__id
@@ -181,7 +197,7 @@ msgid "In Portal"
msgstr ""
#. module: portal
-#: code:addons/portal/controllers/portal.py:198
+#: code:addons/portal/controllers/portal.py:200
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
@@ -243,6 +259,11 @@ msgid "Next"
msgstr ""
#. module: portal
+#: model:ir.ui.view,arch_db:portal.portal_searchbar
+msgid "No title"
+msgstr ""
+
+#. module: portal
#. openerp-web
#: code:addons/portal/static/src/xml/portal_chatter.xml:38
#, python-format
@@ -262,11 +283,7 @@ msgid "Portal Access Management"
msgstr ""
#. module: portal
-#: model:ir.model.fields,field_description:portal.field_account_invoice__portal_url
#: model:ir.model.fields,field_description:portal.field_portal_mixin__portal_url
-#: model:ir.model.fields,field_description:portal.field_project_project__portal_url
-#: model:ir.model.fields,field_description:portal.field_project_task__portal_url
-#: model:ir.model.fields,field_description:portal.field_sale_order__portal_url
msgid "Portal Access URL"
msgstr ""
@@ -320,7 +337,7 @@ msgid "Some contacts have the same email as an existing portal user:"
msgstr ""
#. module: portal
-#: code:addons/portal/controllers/portal.py:217
+#: code:addons/portal/controllers/portal.py:223
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -379,133 +396,49 @@ msgstr ""
#. module: portal
#: model:ir.model.fields,field_description:portal.field_account_analytic_account__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_account_asset_asset__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_account_bank_statement__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_account_invoice__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_account_payment__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_account_voucher__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_blog_blog__website_message_ids
#: model:ir.model.fields,field_description:portal.field_calendar_event__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_crm_lead__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_crm_team__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_crossovered_budget__website_message_ids
#: model:ir.model.fields,field_description:portal.field_event_event__website_message_ids
#: model:ir.model.fields,field_description:portal.field_event_registration__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_event_track__website_message_ids
#: model:ir.model.fields,field_description:portal.field_fleet_vehicle__website_message_ids
#: model:ir.model.fields,field_description:portal.field_fleet_vehicle_log_contract__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_forum_forum__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_forum_tag__website_message_ids
#: model:ir.model.fields,field_description:portal.field_gamification_badge__website_message_ids
#: model:ir.model.fields,field_description:portal.field_gamification_challenge__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_hr_applicant__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_hr_contract__website_message_ids
#: 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_expense__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_hr_expense_sheet__website_message_ids
#: model:ir.model.fields,field_description:portal.field_hr_job__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_hr_leave__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_hr_leave_allocation__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_test__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mail_test_activity__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mail_test_full__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mail_test_simple__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mail_test_track__website_message_ids
#: model:ir.model.fields,field_description:portal.field_mail_thread__website_message_ids
#: model:ir.model.fields,field_description:portal.field_maintenance_equipment__website_message_ids
#: model:ir.model.fields,field_description:portal.field_maintenance_equipment_category__website_message_ids
#: model:ir.model.fields,field_description:portal.field_maintenance_request__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mrp_bom__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mrp_production__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mrp_unbuild__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_mrp_workorder__website_message_ids
#: model:ir.model.fields,field_description:portal.field_note_note__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_product_product__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_product_template__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_project_project__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_purchase_order__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_purchase_requisition__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_repair_order__website_message_ids
#: model:ir.model.fields,field_description:portal.field_res_partner__website_message_ids
#: model:ir.model.fields,field_description:portal.field_res_users__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_sale_order__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_slide_channel__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_slide_slide__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_stock_landed_cost__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_stock_picking__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_stock_picking_batch__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_stock_production_lot__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_survey_survey__website_message_ids
-#: model:ir.model.fields,field_description:portal.field_test_performance_mail__website_message_ids
msgid "Website Messages"
msgstr ""
#. module: portal
#: model:ir.model.fields,help:portal.field_account_analytic_account__website_message_ids
-#: model:ir.model.fields,help:portal.field_account_asset_asset__website_message_ids
-#: model:ir.model.fields,help:portal.field_account_bank_statement__website_message_ids
-#: model:ir.model.fields,help:portal.field_account_invoice__website_message_ids
-#: model:ir.model.fields,help:portal.field_account_payment__website_message_ids
-#: model:ir.model.fields,help:portal.field_account_voucher__website_message_ids
-#: model:ir.model.fields,help:portal.field_blog_blog__website_message_ids
#: model:ir.model.fields,help:portal.field_calendar_event__website_message_ids
-#: model:ir.model.fields,help:portal.field_crm_lead__website_message_ids
-#: model:ir.model.fields,help:portal.field_crm_team__website_message_ids
-#: model:ir.model.fields,help:portal.field_crossovered_budget__website_message_ids
#: model:ir.model.fields,help:portal.field_event_event__website_message_ids
#: model:ir.model.fields,help:portal.field_event_registration__website_message_ids
-#: model:ir.model.fields,help:portal.field_event_track__website_message_ids
#: model:ir.model.fields,help:portal.field_fleet_vehicle__website_message_ids
#: model:ir.model.fields,help:portal.field_fleet_vehicle_log_contract__website_message_ids
-#: model:ir.model.fields,help:portal.field_forum_forum__website_message_ids
-#: model:ir.model.fields,help:portal.field_forum_tag__website_message_ids
#: model:ir.model.fields,help:portal.field_gamification_badge__website_message_ids
#: model:ir.model.fields,help:portal.field_gamification_challenge__website_message_ids
-#: model:ir.model.fields,help:portal.field_hr_applicant__website_message_ids
-#: model:ir.model.fields,help:portal.field_hr_contract__website_message_ids
#: 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_expense__website_message_ids
-#: model:ir.model.fields,help:portal.field_hr_expense_sheet__website_message_ids
#: model:ir.model.fields,help:portal.field_hr_job__website_message_ids
-#: model:ir.model.fields,help:portal.field_hr_leave__website_message_ids
-#: model:ir.model.fields,help:portal.field_hr_leave_allocation__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_test__website_message_ids
-#: model:ir.model.fields,help:portal.field_mail_test_activity__website_message_ids
-#: model:ir.model.fields,help:portal.field_mail_test_full__website_message_ids
-#: model:ir.model.fields,help:portal.field_mail_test_simple__website_message_ids
-#: model:ir.model.fields,help:portal.field_mail_test_track__website_message_ids
#: model:ir.model.fields,help:portal.field_mail_thread__website_message_ids
#: model:ir.model.fields,help:portal.field_maintenance_equipment__website_message_ids
#: model:ir.model.fields,help:portal.field_maintenance_equipment_category__website_message_ids
#: model:ir.model.fields,help:portal.field_maintenance_request__website_message_ids
-#: model:ir.model.fields,help:portal.field_mrp_bom__website_message_ids
-#: model:ir.model.fields,help:portal.field_mrp_production__website_message_ids
-#: model:ir.model.fields,help:portal.field_mrp_unbuild__website_message_ids
-#: model:ir.model.fields,help:portal.field_mrp_workorder__website_message_ids
#: model:ir.model.fields,help:portal.field_note_note__website_message_ids
-#: model:ir.model.fields,help:portal.field_product_product__website_message_ids
-#: model:ir.model.fields,help:portal.field_product_template__website_message_ids
-#: model:ir.model.fields,help:portal.field_project_project__website_message_ids
-#: model:ir.model.fields,help:portal.field_purchase_order__website_message_ids
-#: model:ir.model.fields,help:portal.field_purchase_requisition__website_message_ids
-#: model:ir.model.fields,help:portal.field_repair_order__website_message_ids
#: model:ir.model.fields,help:portal.field_res_partner__website_message_ids
#: model:ir.model.fields,help:portal.field_res_users__website_message_ids
-#: model:ir.model.fields,help:portal.field_sale_order__website_message_ids
-#: model:ir.model.fields,help:portal.field_slide_channel__website_message_ids
-#: model:ir.model.fields,help:portal.field_slide_slide__website_message_ids
-#: model:ir.model.fields,help:portal.field_stock_landed_cost__website_message_ids
-#: model:ir.model.fields,help:portal.field_stock_picking__website_message_ids
-#: model:ir.model.fields,help:portal.field_stock_picking_batch__website_message_ids
-#: model:ir.model.fields,help:portal.field_stock_production_lot__website_message_ids
-#: model:ir.model.fields,help:portal.field_survey_survey__website_message_ids
-#: model:ir.model.fields,help:portal.field_test_performance_mail__website_message_ids
msgid "Website communication history"
msgstr ""
@@ -529,7 +462,7 @@ msgid "You must be"
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:176
+#: code:addons/portal/wizard/portal_wizard.py:175
#, python-format
msgid "You must have an email address in your User Preferences to send emails."
msgstr ""
diff --git a/addons/pos_mercury/i18n/pos_mercury.pot b/addons/pos_mercury/i18n/pos_mercury.pot
index d66c2bcefd7..3cd5cb5abae 100644
--- a/addons/pos_mercury/i18n/pos_mercury.pot
+++ b/addons/pos_mercury/i18n/pos_mercury.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,6 +51,11 @@ msgid "APPROVAL CODE:"
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Alias"
+msgstr ""
+
+#. module: pos_mercury
#: model:ir.model,name:pos_mercury.model_account_bank_statement_line
msgid "Bank Statement Line"
msgstr ""
@@ -90,6 +95,16 @@ msgid "Card Reader"
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Cashier"
+msgstr ""
+
+#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Client"
+msgstr ""
+
+#. module: pos_mercury
#: model:ir.actions.act_window,help:pos_mercury.action_configuration_form
msgid "Configure your card reader"
msgstr ""
@@ -114,7 +129,8 @@ msgid "Created on"
msgstr ""
#. module: pos_mercury
-#: code:addons/pos_mercury/models/pos_mercury.py:15
+#: code:addons/pos_mercury/models/pos_mercury.py:16
+#: selection:barcode.rule,type:0
#, python-format
msgid "Credit Card"
msgstr ""
@@ -127,6 +143,11 @@ msgid "Credit card refunds are not supported. Instead select your credit card pa
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Discounted Product"
+msgstr ""
+
+#. module: pos_mercury
#: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration__display_name
#: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_mercury_transaction__display_name
msgid "Display Name"
@@ -141,7 +162,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:650
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:651
#, python-format
msgid "Error"
msgstr ""
@@ -213,6 +234,16 @@ msgid "Last Updated on"
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Location"
+msgstr ""
+
+#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Lot"
+msgstr ""
+
+#. module: pos_mercury
#: model:ir.model.fields,field_description:pos_mercury.field_pos_mercury_configuration__merchant_id
msgid "Merchant ID"
msgstr ""
@@ -267,7 +298,7 @@ msgstr ""
#. module: pos_mercury
#: code:addons/pos_mercury/models/pos_mercury_transaction.py:21
#, python-format
-msgid "No opened point of sale session for user %s found"
+msgid "No opened point of sale session for user %s found."
msgstr ""
#. module: pos_mercury
@@ -287,21 +318,26 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
#: code:addons/pos_mercury/static/src/js/pos_mercury.js:423
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:576
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:577
#, python-format
msgid "Odoo error while processing transaction."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:651
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:652
#, python-format
msgid "One credit card swipe already pending."
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Package"
+msgstr ""
+
+#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:469
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:470
#, python-format
msgid "Partially approved"
msgstr ""
@@ -334,6 +370,11 @@ msgid "Point of Sale Orders"
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Priced Product"
+msgstr ""
+
+#. module: pos_mercury
#. openerp-web
#: code:addons/pos_mercury/static/src/js/pos_mercury.js:345
#, python-format
@@ -342,21 +383,21 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:548
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:549
#, python-format
msgid "Reversal failed, sending VoidSale..."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:590
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:591
#, python-format
msgid "Reversal succeeded"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:551
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:552
#, python-format
msgid "Sending reversal..."
msgstr ""
@@ -408,6 +449,16 @@ msgid "Transaction approved"
msgstr ""
#. module: pos_mercury
+#: model:ir.model.fields,field_description:pos_mercury.field_barcode_rule__type
+msgid "Type"
+msgstr ""
+
+#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Unit Product"
+msgstr ""
+
+#. module: pos_mercury
#: model:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
msgid "Using the Mercury integration in the Point Of Sale is easy: just press the\n"
" associated payment method. After that the amount can be adjusted (eg. for cashback)\n"
@@ -422,7 +473,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:598
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:599
#, python-format
msgid "VoidSale succeeded"
msgstr ""
@@ -441,6 +492,11 @@ msgid "We currently support the MagTek Dynamag card reader device. It can be con
msgstr ""
#. module: pos_mercury
+#: selection:barcode.rule,type:0
+msgid "Weighted Product"
+msgstr ""
+
+#. module: pos_mercury
#. openerp-web
#: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:50
#, python-format
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index af24285a3bd..a0748df806b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -287,6 +287,11 @@ msgid "If false, the table is deactivated and will not be available in the point
msgstr ""
#. module: pos_restaurant
+#: model:ir.model.fields,field_description:pos_restaurant.field_pos_config__module_pos_restaurant
+msgid "Is a Bar/Restaurant"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_floor____last_update
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_printer____last_update
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table____last_update
diff --git a/addons/pos_sale/i18n/pos_sale.pot b/addons/pos_sale/i18n/pos_sale.pot
index 1d3ec0c5a50..2253f137ed3 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,12 @@ msgid "All sales orders grouped by sales channels"
msgstr ""
#. module: pos_sale
-#: code:addons/pos_sale/models/crm_team.py:103
+#: model:ir.model.fields,field_description:pos_sale.field_crm_team__team_type
+msgid "Channel Type"
+msgstr ""
+
+#. module: pos_sale
+#: code:addons/pos_sale/models/crm_team.py:107
#, python-format
msgid "Dashboard"
msgstr ""
@@ -64,6 +69,7 @@ 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
msgid "Point of Sale"
msgstr ""
@@ -73,6 +79,7 @@ msgid "Point of Sales"
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 ""
@@ -85,7 +92,7 @@ msgid "Sales Channel"
msgstr ""
#. module: pos_sale
-#: code:addons/pos_sale/models/crm_team.py:115
+#: code:addons/pos_sale/models/crm_team.py:119
#, python-format
msgid "Sales: Untaxed Amount"
msgstr ""
@@ -111,12 +118,22 @@ msgid "Sessions Running"
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 ""
+
+#. 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."
msgstr ""
#. module: pos_sale
+#: selection:crm.team,team_type:0
+msgid "Website"
+msgstr ""
+
+#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
msgid "Week"
msgstr ""
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 27c4321586a..23538a33911 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:353
+#: code:addons/product/models/product_template.py:355
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -145,22 +145,29 @@ msgid "A stockable product is a product for which you manage stock. The \"Invent
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_needaction
+#: model:ir.model.fields,field_description:product.field_product_template__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist__active
#: model:ir.model.fields,field_description:product.field_product_product__active
#: model:ir.model.fields,field_description:product.field_product_template__active
-#: model:ir.model.fields,field_description:product.field_product_uom__active
#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
msgid "Active"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_form_action
-msgid "Add a new unit of measure"
+#: model:ir.model.fields,field_description:product.field_product_product__activity_ids
+#: model:ir.model.fields,field_description:product.field_product_template__activity_ids
+msgid "Activities"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
-msgid "Add a new unit of measure category"
+#: model:ir.model.fields,field_description:product.field_product_product__activity_state
+#: model:ir.model.fields,field_description:product.field_product_template__activity_state
+msgid "Activity State"
msgstr ""
#. module: product
@@ -289,16 +296,6 @@ msgid "Big-sized image"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom__factor_inv
-msgid "Bigger Ratio"
-msgstr ""
-
-#. module: product
-#: selection:product.uom,uom_type:0
-msgid "Bigger than the reference Unit of Measure"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.view_product_price_list
msgid "Calculate Product Price per Unit Based on Pricelist Version."
msgstr ""
@@ -329,11 +326,6 @@ msgid "Cancel"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom__category_id
-msgid "Category"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_category_form_view
msgid "Category name"
msgstr ""
@@ -414,17 +406,6 @@ msgid "Contained Quantity"
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_uom__category_id
-msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."
-msgstr ""
-
-#. module: product
-#: code:addons/product/models/product_uom.py:98
-#, python-format
-msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!."
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_price_history__cost
#: model:ir.model.fields,field_description:product.field_product_product__standard_price
#: model:ir.model.fields,field_description:product.field_product_template__standard_price
@@ -489,8 +470,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__create_uid
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__create_uid
#: model:ir.model.fields,field_description:product.field_product_template__create_uid
-#: model:ir.model.fields,field_description:product.field_product_uom__create_uid
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__create_uid
msgid "Created by"
msgstr ""
@@ -508,8 +487,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__create_date
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__create_date
#: model:ir.model.fields,field_description:product.field_product_template__create_date
-#: model:ir.model.fields,field_description:product.field_product_uom__create_date
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__create_date
msgid "Created on"
msgstr ""
@@ -533,11 +510,6 @@ msgid "Date"
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day(s)"
-msgstr ""
-
-#. module: product
#: code:addons/product/models/res_company.py:59
#, python-format
msgid "Default %(currency)s pricelist for %(company)s"
@@ -572,6 +544,11 @@ 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"
@@ -591,18 +568,11 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__display_name
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__display_name
#: model:ir.model.fields,field_description:product.field_product_template__display_name
-#: model:ir.model.fields,field_description:product.field_product_uom__display_name
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__display_name
#: model:ir.model.fields,field_description:product.field_report_product_report_pricelist__display_name
msgid "Display Name"
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen(s)"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item__date_end
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__date_end
msgid "End Date"
@@ -619,55 +589,48 @@ msgid "Ending valid for the pricelist item validation"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:56
-#, python-format
-msgid "Error ! You cannot create recursive categories."
-msgstr ""
-
-#. module: product
-#: code:addons/product/models/product_attribute.py:101
+#: code:addons/product/models/product.py:291
#, python-format
-msgid "Error ! You cannot use this attribute with the following value."
+msgid "Error! It is not allowed to choose more than one value for a given attribute."
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:288
-#, python-format
-msgid "Error! It is not allowed to choose more than one value for a given attribute."
+#: model:product.category,name:product.cat_expense
+msgid "Expenses"
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:427
-#, python-format
-msgid "Error! The minimum margin should be lower than the maximum margin."
+#: model:ir.model.fields,help:product.field_product_pricelist_item__name
+#: model:ir.model.fields,help:product.field_product_pricelist_item__price
+msgid "Explicit rule name for this pricelist line."
msgstr ""
#. module: product
-#: code:addons/product/models/product_pricelist.py:421
-#, python-format
-msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!"
+#: selection:product.pricelist.item,compute_price:0
+msgid "Fix Price"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:303
-#, python-format
-msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
+#: model:ir.model.fields,field_description:product.field_product_pricelist_item__fixed_price
+msgid "Fixed Price"
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_pricelist_item__name
-#: model:ir.model.fields,help:product.field_product_pricelist_item__price
-msgid "Explicit rule name for this pricelist line."
+#: model:ir.model.fields,field_description:product.field_product_product__message_follower_ids
+#: model:ir.model.fields,field_description:product.field_product_template__message_follower_ids
+msgid "Followers"
msgstr ""
#. module: product
-#: selection:product.pricelist.item,compute_price:0
-msgid "Fix Price"
+#: model:ir.model.fields,field_description:product.field_product_product__message_channel_ids
+#: model:ir.model.fields,field_description:product.field_product_template__message_channel_ids
+msgid "Followers (Channels)"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_pricelist_item__fixed_price
-msgid "Fixed Price"
+#: model:ir.model.fields,field_description:product.field_product_product__message_partner_ids
+#: model:ir.model.fields,field_description:product.field_product_template__message_partner_ids
+msgid "Followers (Partners)"
msgstr ""
#. module: product
@@ -720,21 +683,6 @@ msgid "Group By"
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_hour
-msgid "Hour(s)"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_uom__factor_inv
-msgid "How many times this Unit of Measure is bigger than the reference Unit of Measure in this category: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_uom__factor
-msgid "How much bigger or smaller this unit is compared to the reference Unit of Measure for this category: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute__id
#: model:ir.model.fields,field_description:product.field_product_attribute_line__id
#: model:ir.model.fields,field_description:product.field_product_attribute_price__id
@@ -748,13 +696,29 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__id
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__id
#: model:ir.model.fields,field_description:product.field_product_template__id
-#: model:ir.model.fields,field_description:product.field_product_uom__id
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__id
#: model:ir.model.fields,field_description:product.field_report_product_report_pricelist__id
msgid "ID"
msgstr ""
#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_unread
+#: model:ir.model.fields,help:product.field_product_template__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_needaction
+#: model:ir.model.fields,help:product.field_product_template__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_has_error
+#: model:ir.model.fields,help:product.field_product_template__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,help:product.field_product_supplierinfo__product_id
msgid "If not set, the vendor price will apply to all variants of this product."
msgstr ""
@@ -818,6 +782,12 @@ msgid "Inventory"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_is_follower
+#: model:ir.model.fields,field_description:product.field_product_template__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__is_product_variant
#: model:ir.model.fields,field_description:product.field_product_template__is_product_variant
msgid "Is a product variant"
@@ -842,8 +812,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product____last_update
#: model:ir.model.fields,field_description:product.field_product_supplierinfo____last_update
#: model:ir.model.fields,field_description:product.field_product_template____last_update
-#: model:ir.model.fields,field_description:product.field_product_uom____last_update
-#: model:ir.model.fields,field_description:product.field_product_uom_categ____last_update
#: model:ir.model.fields,field_description:product.field_report_product_report_pricelist____last_update
msgid "Last Modified on"
msgstr ""
@@ -862,8 +830,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__write_uid
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__write_uid
#: model:ir.model.fields,field_description:product.field_product_template__write_uid
-#: model:ir.model.fields,field_description:product.field_product_uom__write_uid
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__write_uid
msgid "Last Updated by"
msgstr ""
@@ -881,8 +847,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__write_date
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__write_date
#: model:ir.model.fields,field_description:product.field_product_template__write_date
-#: model:ir.model.fields,field_description:product.field_product_uom__write_date
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__write_date
msgid "Last Updated on"
msgstr ""
@@ -897,41 +861,24 @@ msgid "Lead time in days between the confirmation of the purchase order and the
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_category__parent_left
-msgid "Left Parent"
-msgstr ""
-
-#. module: product
-#: model:product.uom.categ,name:product.uom_categ_length
-msgid "Length / Distance"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute__attribute_line_ids
msgid "Lines"
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Liter(s)"
-msgstr ""
-
-#. module: product
-#: model:res.groups,name:product.group_uom
-msgid "Manage Multiple Units of Measure"
-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"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_res_users__has_group_stock_packaging
#: model:res.groups,name:product.group_stock_packaging
msgid "Manage Product Packaging"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_res_users__has_group_product_variant
#: model:res.groups,name:product.group_product_variant
msgid "Manage Product Variants"
msgstr ""
@@ -958,6 +905,18 @@ msgid "Medium-sized image of the product. It is automatically resized as a 128x1
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_has_error
+#: model:ir.model.fields,field_description:product.field_product_template__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_ids
+#: model:ir.model.fields,field_description:product.field_product_template__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Min. Margin"
msgstr ""
@@ -983,7 +942,6 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_pricelist_item__name
#: model:ir.model.fields,field_description:product.field_product_product__name
#: model:ir.model.fields,field_description:product.field_product_template__name
-#: model:ir.model.fields,field_description:product.field_product_uom_categ__name
msgid "Name"
msgstr ""
@@ -993,6 +951,54 @@ 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"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__activity_summary
+#: model:ir.model.fields,field_description:product.field_product_template__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__activity_type_id
+#: model:ir.model.fields,field_description:product.field_product_template__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_needaction_counter
+#: model:ir.model.fields,field_description:product.field_product_template__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__message_has_error_counter
+#: model:ir.model.fields,field_description:product.field_product_template__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_needaction_counter
+#: model:ir.model.fields,help:product.field_product_template__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_has_error_counter
+#: model:ir.model.fields,help:product.field_product_template__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__message_unread_counter
+#: model:ir.model.fields,help:product.field_product_template__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
msgid "Other Information"
msgstr ""
@@ -1004,6 +1010,12 @@ msgid "Other Pricelist"
msgstr ""
#. module: product
+#: selection:product.product,activity_state:0
+#: selection:product.template,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_packaging__name
msgid "Package Type"
msgstr ""
@@ -1023,6 +1035,11 @@ msgid "Parent Category"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_category__parent_path
+msgid "Parent Path"
+msgstr ""
+
+#. module: product
#: selection:product.pricelist.item,compute_price:0
msgid "Percentage (discount)"
msgstr ""
@@ -1033,6 +1050,12 @@ msgid "Percentage Price"
msgstr ""
#. module: product
+#: selection:product.product,activity_state:0
+#: selection:product.template,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: product
#: selection:res.config.settings,product_weight_in_lbs:0
msgid "Pound"
msgstr ""
@@ -1148,6 +1171,7 @@ msgid "Pricelists"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_res_users__has_group_product_pricelist
#: model:res.groups,name:product.group_product_pricelist
msgid "Pricelists On Product"
msgstr ""
@@ -1176,6 +1200,7 @@ msgstr ""
#: 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_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
@@ -1266,16 +1291,6 @@ msgid "Product Type"
msgstr ""
#. module: product
-#: model:ir.model,name:product.model_product_uom
-msgid "Product Unit of Measure"
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_product_uom_categ
-msgid "Product UoM Categories"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo__product_id
#: model:ir.ui.view,arch_db:product.product_normal_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
@@ -1324,7 +1339,7 @@ msgid "Products Price Search"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:454
+#: code:addons/product/models/product.py:464
#, python-format
msgid "Products: "
msgstr ""
@@ -1346,11 +1361,6 @@ msgid "Purchase"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_template_form_view
-msgid "Purchase Bills"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__description_purchase
#: model:ir.model.fields,field_description:product.field_product_template__description_purchase
msgid "Purchase Description"
@@ -1388,23 +1398,14 @@ msgid "Quantity-5"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom__factor
-msgid "Ratio"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__code
msgid "Reference"
msgstr ""
#. module: product
-#: selection:product.uom,uom_type:0
-msgid "Reference Unit of Measure for this category"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_category__parent_right
-msgid "Right Parent"
+#: model:ir.model.fields,field_description:product.field_product_product__activity_user_id
+#: model:ir.model.fields,field_description:product.field_product_template__activity_user_id
+msgid "Responsible User"
msgstr ""
#. module: product
@@ -1413,11 +1414,6 @@ msgid "Rounding Method"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom__rounding
-msgid "Rounding Precision"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__description_sale
#: model:ir.model.fields,field_description:product.field_product_template__description_sale
msgid "Sale Description"
@@ -1453,6 +1449,7 @@ msgid "Sales Price"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_res_users__has_group_sale_pricelist
#: model:res.groups,name:product.group_sale_pricelist
msgid "Sales Pricelists"
msgstr ""
@@ -1532,11 +1529,6 @@ msgid "Small-sized image of the product. It is automatically resized as a 64x64p
msgstr ""
#. module: product
-#: selection:product.uom,uom_type:0
-msgid "Smaller than the reference Unit of Measure"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item__categ_id
msgid "Specify a product category if this rule only applies to products belonging to this category or its children categories. Keep empty otherwise."
msgstr ""
@@ -1589,6 +1581,15 @@ msgid "Starting date for the pricelist item validation"
msgstr ""
#. module: product
+#: model:ir.model.fields,help:product.field_product_product__activity_state
+#: model:ir.model.fields,help:product.field_product_template__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: product
#: selection:product.template,type:0
msgid "Stockable Product"
msgstr ""
@@ -1605,13 +1606,9 @@ msgid "The computed price is expressed in the default Unit of Measure of the pro
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_uom__rounding
-msgid "The computed quantity will be a multiple of this value. Use 1.0 for a Unit of Measure that cannot be further split, such as a piece."
-msgstr ""
-
-#. module: product
-#: sql_constraint:product.uom:0
-msgid "The conversion ratio for a unit of measure cannot be 0!"
+#: code:addons/product/models/product_template.py:304
+#, python-format
+msgid "The default Unit of Measure and the purchase Unit of Measure must be in the same category."
msgstr ""
#. module: product
@@ -1625,12 +1622,18 @@ msgid "The minimal quantity to purchase from this vendor, expressed in the vendo
msgstr ""
#. module: product
+#: code:addons/product/models/product_pricelist.py:427
+#, python-format
+msgid "The minimum margin should be lower than the maximum margin."
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,help:product.field_product_category__product_count
msgid "The number of products under this category (Does not consider the children categories)"
msgstr ""
#. module: product
-#: code:addons/product/models/product_attribute.py:74
+#: code:addons/product/models/product_attribute.py:75
#, python-format
msgid "The operation cannot be completed:\n"
"You are trying to delete an attribute value with a reference on a product variant."
@@ -1642,11 +1645,6 @@ msgid "The price to purchase a product"
msgstr ""
#. module: product
-#: sql_constraint:product.uom:0
-msgid "The rounding precision must be greater than 0!"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_product__lst_price
msgid "The sale price is managed from the product template. Click on the 'Variant Prices' button to set the extra attribute prices."
msgstr ""
@@ -1694,6 +1692,11 @@ msgstr ""
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
+msgid "This note is only for internal purposes."
+msgstr ""
+
+#. module: product
+#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "This note will show up on sales orders & invoices."
msgstr ""
@@ -1714,61 +1717,37 @@ msgid "This vendor's product name will be used when printing a request for quota
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_template_search_view
-msgid "Today Activities"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom__uom_type
-msgid "Type"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_uom__active
-msgid "Uncheck the active field to disable a unit of measure without deleting it."
+#: selection:product.product,activity_state:0
+#: selection:product.template,activity_state:0
+msgid "Today"
msgstr ""
#. module: product
-#: model:product.uom.categ,name:product.product_uom_categ_unit
-msgid "Unit"
+#: model:ir.ui.view,arch_db:product.product_template_search_view
+msgid "Today Activities"
msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__uom_id
#: model:ir.model.fields,field_description:product.field_product_template__uom_id
-#: model:ir.model.fields,field_description:product.field_product_uom__name
msgid "Unit of Measure"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_unit
-msgid "Unit(s)"
-msgstr ""
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_uom_form_action
#: model:ir.model.fields,field_description:product.field_res_config_settings__group_uom
-#: model:ir.ui.view,arch_db:product.product_uom_form_view
-#: model:ir.ui.view,arch_db:product.product_uom_tree_view
msgid "Units of Measure"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_uom_categ_form_view
-msgid "Units of Measure categories"
+#: model:ir.model.fields,field_description:product.field_product_product__message_unread
+#: model:ir.model.fields,field_description:product.field_product_template__message_unread
+msgid "Unread Messages"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
-msgid "Units of measure belonging to the same category can be\n"
-" converted between each others. For example, in the category\n"
-" <i>'Time'</i>, you will have the following units of measure:\n"
-" Hours, Days."
+#: model:ir.model.fields,field_description:product.field_product_product__message_unread_counter
+#: model:ir.model.fields,field_description:product.field_product_template__message_unread_counter
+msgid "Unread Messages Counter"
msgstr ""
#. module: product
@@ -1777,6 +1756,11 @@ msgid "Use pricelists to adapt your price per customers"
msgstr ""
#. module: product
+#: model:ir.model,name:product.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
msgid "Validity"
msgstr ""
@@ -1846,6 +1830,11 @@ msgid "Vendor"
msgstr ""
#. module: product
+#: model:ir.ui.view,arch_db:product.product_template_form_view
+msgid "Vendor Bills"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
#: model:ir.ui.view,arch_db:product.product_supplierinfo_tree_view
msgid "Vendor Information"
@@ -1886,14 +1875,24 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_product__volume
#: model:ir.model.fields,field_description:product.field_product_template__volume
#: model:ir.ui.view,arch_db:product.product_template_form_view
-#: model:product.uom.categ,name:product.product_uom_categ_vol
msgid "Volume"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product__website_message_ids
+#: model:ir.model.fields,field_description:product.field_product_template__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: product
+#: model:ir.model.fields,help:product.field_product_product__website_message_ids
+#: model:ir.model.fields,help:product.field_product_template__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_product__weight
#: model:ir.model.fields,field_description:product.field_product_template__weight
-#: model:product.uom.categ,name:product.product_uom_categ_kgm
msgid "Weight"
msgstr ""
@@ -1925,13 +1924,20 @@ msgid "Weights"
msgstr ""
#. module: product
-#: model:product.uom.categ,name:product.uom_categ_wtime
-msgid "Working Time"
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid "You can assign pricelists to your customers or select one when creating a new sales quotation."
+msgstr ""
+
+#. module: product
+#: code:addons/product/models/product_pricelist.py:421
+#, python-format
+msgid "You cannot assign the Main Pricelist as Other Pricelist in PriceList Item"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action2
-msgid "You can assign pricelists to your customers or select one when creating a new sales quotation."
+#: code:addons/product/models/product.py:54
+#, python-format
+msgid "You cannot create recursive categories."
msgstr ""
#. module: product
@@ -1941,6 +1947,12 @@ msgid "You cannot define the decimal precision of 'Account' as greater than the
msgstr ""
#. module: product
+#: code:addons/product/models/product_attribute.py:102
+#, python-format
+msgid "You cannot use this attribute with the following value."
+msgstr ""
+
+#. module: product
#: code:addons/product/wizard/product_price_list.py:26
#, python-format
msgid "You have to set a logo or a layout for your company."
@@ -1953,12 +1965,6 @@ msgid "You have to set your reports's header and footer layout."
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_form_action
-msgid "You must define a conversion rate between several Units of\n"
-" Measure within the same category."
-msgstr ""
-
-#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
#: model:ir.actions.act_window,help:product.product_template_action
msgid "You must define a product for everything you purchase,\n"
@@ -1981,12 +1987,8 @@ msgid "You must define at least one product category in order to be able to crea
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_cm
-msgid "cm"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
+#: model:ir.ui.view,arch_db:product.product_supplierinfo_view_kanban
msgid "days"
msgstr ""
@@ -2011,63 +2013,8 @@ msgid "e.g. USD Retailers"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_uom_form_view
-msgid "e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
-
-#. module: product
-#: model:ir.ui.view,arch_db:product.product_uom_form_view
-msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_floz
-msgid "fl oz"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_foot
-msgid "foot(ft)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_gal
-msgid "gal(s)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_inch
-msgid "inch(es)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_kgm
-msgid "kg"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_km
-msgid "km"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_lb
-msgid "lb(s)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_mile
-msgid "mile(s)"
-msgstr ""
-
-#. module: product
-#: model:product.uom,name:product.product_uom_oz
-msgid "oz(s)"
-msgstr ""
-
-#. module: product
-#: code:addons/product/models/product.py:559
-#: code:addons/product/models/product_template.py:479
+#: code:addons/product/models/product.py:570
+#: code:addons/product/models/product_template.py:484
#, python-format
msgid "product"
msgstr ""
@@ -2093,11 +2040,6 @@ msgid "product.price.history"
msgstr ""
#. module: product
-#: model:product.uom,name:product.product_uom_qt
-msgid "qt"
-msgstr ""
-
-#. module: product
#: model:ir.model,name:product.model_report_product_report_pricelist
msgid "report.product.report_pricelist"
msgstr ""
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ae8e38c46ce..0c77361d406 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -114,83 +114,6 @@ msgid "\n"
msgstr ""
#. module: project
-#: model:mail.template,body_html:project.rating_project_request_email_template
-msgid "\n"
-"<div style=\"background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
-" % set access_token = object.rating_get_access_token()\n"
-" <table style=\"width:600px;margin:5px auto;\">\n"
-" <tbody>\n"
-" <tr><td>\n"
-" <a href=\"/\"><img src=\"/web/binary/company_logo\" style=\"vertical-align:baseline;max-width:100px;\" /></a>\n"
-" </td><td style=\"text-align:right;vertical-align:middle;\">\n"
-" Satisfaction Survey\n"
-" </td></tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
-" <tbody>\n"
-" <tr><td style=\"padding:15px 20px 10px 20px;\">\n"
-" <p>Hello,</p>\n"
-" <p>Please take a moment to rate our services related to the task \"<strong>${object.name}</strong>\"\n"
-" assigned to <strong>${object.rating_get_rated_partner_id().name}</strong>.</p>\n"
-" <p>We appreciate your feedback. It helps us to improve continuously.</p>\n"
-" </td></tr>\n"
-" <tr><td style=\"padding:10px 20px\">\n"
-" <table summary=\"o_mail_notification\" style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
-" <tr>\n"
-" <td style=\"text-align:center;\">\n"
-" <h2 style=\"font-weight:300;font-size:18px;\">\n"
-" Tell us how you feel about our service:\n"
-" </h2>\n"
-" <div style=\"text-color: #888888\">(click on one of these smileys)</div>\n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td style=\"padding:10px 10px;\">\n"
-" <table style=\"width:100%;text-align:center;\">\n"
-" <tr>\n"
-" <td>\n"
-" <a href=\"/rating/${access_token}/10\">\n"
-" <img alt=\"Satisfied\" src=\"/rating/static/src/img/rating_10.png\" title=\"Satisfied\"/>\n"
-" </a>\n"
-" </td>\n"
-" <td>\n"
-" <a href=\"/rating/${access_token}/5\">\n"
-" <img alt=\"Not satisfied\" src=\"/rating/static/src/img/rating_5.png\" title=\"Not satisfied\"/>\n"
-" </a>\n"
-" </td>\n"
-" <td>\n"
-" <a href=\"/rating/${access_token}/1\">\n"
-" <img alt=\"Highly Dissatisfied\" src=\"/rating/static/src/img/rating_1.png\" title=\"Highly Dissatisfied\"/>\n"
-" </a>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td></tr>\n"
-" <tr><td style=\"padding:15px 20px 10px 20px;\">${(object.user_id.signature or '')| safe}</td></tr>\n"
-" </tbody>\n"
-" </table>\n"
-" <table style=\"width:600px;margin:auto;text-align:center;font-size:12px;\">\n"
-" <tbody>\n"
-" <tr><td style=\"padding-top:10px;color:#afafaf;\">\n"
-" % if object.project_id.rating_status == 'stage':\n"
-" <p>This customer survey has been sent because your task has been moved to the stage <b>${object.stage_id.name}</b></p>\n"
-" % endif\n"
-" % if object.project_id.rating_status == 'periodic':\n"
-" <p>This customer survey is sent <b>${object.project_id.rating_status_period}</b> as long as the task is in the <b>${object.stage_id.name}</b> stage.</p>\n"
-" % endif\n"
-" <p>Email automatically sent by <a target=\"_blank\" href=\"https://www.odoo.com/page/project-management\" style=\"color:#875A7B;text-decoration:none;\">Odoo Project</a> for <a href=\"${object.project_id.company_id.website}\" style=\"color:#875A7B;text-decoration:none;\">${object.project_id.company_id.name}</a></p>\n"
-" </td></tr>\n"
-" </tbody>\n"
-" </table>\n"
-"</div>\n"
-""
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user__delay_endings_days
msgid "# Days to Deadline"
msgstr ""
@@ -218,24 +141,24 @@ msgstr ""
#. module: project
#: model:mail.template,subject:project.rating_project_request_email_template
-msgid "${object.project_id.company_id.name}: Service Rating Request"
+msgid "${object.project_id.company_id.name}: Satisfaction Survey"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
-msgid "% On tasks"
+msgid "% On"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:289
-#: code:addons/project/models/project.py:639
+#: code:addons/project/models/project.py:288
+#: code:addons/project/models/project.py:626
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
-msgid "(Un)archiving a project automatically (un)archives its tasks and issues. Do you want to proceed?"
+msgid "(Un)archiving a project automatically (un)archives its tasks. Do you want to proceed?"
msgstr ""
#. module: project
@@ -267,6 +190,79 @@ msgid "<b>Star tasks</b> to mark team priorities."
msgstr ""
#. module: project
+#: model:mail.template,body_html:project.rating_project_request_email_template
+msgid "<div>\n"
+" % set access_token = object.rating_get_access_token()\n"
+" % set partner = object.rating_get_partner_id()\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"width:100%; margin:0px auto;\">\n"
+" <tbody>\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" Hello ${partner.name},<br/>\n"
+" Please take a moment to rate our services related to the task \"<strong>${object.name}</strong>\"\n"
+" % if object.rating_get_rated_partner_id().name:\n"
+" assigned to <strong>${object.rating_get_rated_partner_id().name}</strong>.<br/>\n"
+" % else:\n"
+" .<br/>\n"
+" % endif\n"
+" </td></tr>\n"
+" <tr><td style=\"text-align: center;\">\n"
+" <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" summary=\"o_mail_notification\" style=\"width:100%; margin: 32px 0px 32px 0px;\">\n"
+" <tr><td style=\"font-size: 14px;\">\n"
+" <strong>Tell us how you feel about our service</strong><br/>\n"
+" <span style=\"text-color: #888888\">(click on one of these smileys)</span>\n"
+" </td></tr>\n"
+" <tr><td style=\"font-size: 14px;\">\n"
+" <table style=\"width:100%;text-align:center;\">\n"
+" <tr>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/10\">\n"
+" <img alt=\"Satisfied\" src=\"/rating/static/src/img/rating_10.png\" title=\"Satisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/5\">\n"
+" <img alt=\"Not satisfied\" src=\"/rating/static/src/img/rating_5.png\" title=\"Not satisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/1\">\n"
+" <img alt=\"Highly Dissatisfied\" src=\"/rating/static/src/img/rating_1.png\" title=\"Highly Dissatisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td></tr>\n"
+" </table>\n"
+" </td></tr>\n"
+" <tr><td valign=\"top\" style=\"font-size: 14px;\">\n"
+" We appreciate your feedback. It helps us to improve continuously.\n"
+" % if object.project_id.rating_status == 'stage':\n"
+" <br/><span style=\"margin: 0px 0px 0px 0px; font-size: 12px; opacity: 0.5; color: #454748;\">This customer survey has been sent because your task has been moved to the stage <b>${object.stage_id.name}</b></span>\n"
+" % endif\n"
+" % if object.project_id.rating_status == 'periodic':\n"
+" <br/><span style=\"margin: 0px 0px 0px 0px; font-size: 12px; opacity: 0.5; color: #454748;\">This customer survey is sent <b>${object.project_id.rating_status_period}</b> as long as the task is in the <b>${object.stage_id.name}</b> stage.</span>\n"
+" % endif\n"
+" </td></tr>\n"
+" </tbody>\n"
+" </table>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: project
+#: model:mail.template,body_html:project.mail_template_data_project_task
+msgid "<div>\n"
+" Dear ${object.partner_id.name or 'customer'},<br/>\n"
+" Thank you for your enquiry.<br/>\n"
+" If you have any questions, please let us know.\n"
+" <br/><br/>\n"
+" Thank you,\n"
+" <br/>\n"
+"</div>\n"
+" "
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.rating_index
msgid "<i class=\"fa fa-arrow-circle-right \"/> See the feedbacks"
msgstr ""
@@ -287,7 +283,7 @@ msgid "<i class=\"fa fa-smile-o\"/> No rating yet"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:126
+#: code:addons/project/models/project.py:122
#, 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"
@@ -297,7 +293,7 @@ msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:154
+#: code:addons/project/models/project.py:150
#, python-format
msgid "<p class=\"o_view_nocontent_smiling_face\">\n"
" Create a new project</p>"
@@ -336,7 +332,6 @@ msgid "<strong>Description</strong>"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.portal_my_project
#: model:ir.ui.view,arch_db:project.portal_my_task
msgid "<strong>Message and communication history</strong>"
msgstr ""
@@ -372,12 +367,28 @@ msgid "Accept Emails From"
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"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__active
#: model:ir.model.fields,field_description:project.field_project_task__active
msgid "Active"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,name:project.mail_activity_type_action_config_project_types
#: model:ir.ui.menu,name:project.project_menu_config_activity_type
msgid "Activity Types"
@@ -433,7 +444,7 @@ msgid "Aliased Model"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:89
+#: code:addons/project/controllers/portal.py:91
#, python-format
msgid "All"
msgstr ""
@@ -446,17 +457,6 @@ msgid "Analysis"
msgstr ""
#. module: project
-#: model:ir.model,name:project.model_account_analytic_account
-#: model:ir.model.fields,field_description:project.field_project_project__name
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__line_ids
-msgid "Analytic Lines"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "Archived"
@@ -469,12 +469,8 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user__date_start
-msgid "Assignation Date"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
-msgid "Assignation Month"
+msgid "Assignation Date"
msgstr ""
#. module: project
@@ -517,7 +513,7 @@ msgid "Attachment that don't come from message."
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:119
+#: code:addons/project/models/project.py:115
#: model:ir.ui.view,arch_db:project.portal_my_task
#, python-format
msgid "Attachments"
@@ -555,11 +551,6 @@ msgid "Bad"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__balance
-msgid "Balance"
-msgstr ""
-
-#. module: project
#: model:project.task.type,name:project.project_stage_data_1
msgid "Basic"
msgstr ""
@@ -618,11 +609,22 @@ msgid "Choose a Project Email"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_project__subtask_project_id
+#: model:ir.model.fields,help:project.field_project_task__subtask_project_id
+msgid "Choosing a sub-tasks project will both enable sub-tasks and set their default project (possibly the project itself)"
+msgstr ""
+
+#. module: project
#: constraint:project.task:0
msgid "Circular references are not permitted between tasks and sub-tasks"
msgstr ""
#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+msgid "Click <i>Create</i> to start a new task."
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/tour.js:63
#, python-format
@@ -665,12 +667,6 @@ msgid "Company"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_account_analytic_account__company_uom_id
-#: model:ir.model.fields,field_description:project.field_project_project__company_uom_id
-msgid "Company UOM"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,help:project.field_project_task__subtask_planned_hours
msgid "Computed using sum of hours planned of all subtasks created from main task. Usually these hours are less or equal to the Planned Hours (of main task)."
msgstr ""
@@ -704,11 +700,6 @@ msgid "Contact"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__analytic_account_id
-msgid "Contract/Analytic"
-msgstr ""
-
-#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:64
#, python-format
@@ -772,16 +763,6 @@ msgid "Created on"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.view_task_project_user_search
-msgid "Creation Date"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__credit
-msgid "Credit"
-msgstr ""
-
-#. module: project
#: model:ir.filters,name:project.filter_task_report_cumulative_flow
msgid "Cumulative Flow"
msgstr ""
@@ -802,7 +783,7 @@ msgid "Current stage of this task"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:956
+#: code:addons/project/models/project.py:940
#: 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
@@ -812,7 +793,8 @@ msgid "Customer"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:956
+#: code:addons/project/models/project.py:940
+#: code:addons/project/models/project.py:943
#, python-format
msgid "Customer Email"
msgstr ""
@@ -825,6 +807,12 @@ 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
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,name:project.rating_rating_action_project_report
#: model:ir.actions.act_window,name:project.rating_rating_action_task
#: model:ir.ui.menu,name:project.rating_rating_menu_project
@@ -873,11 +861,6 @@ msgid "Deadline"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__debit
-msgid "Debit"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__alias_defaults
msgid "Default Values"
msgstr ""
@@ -1021,7 +1004,7 @@ msgid "Ending Date"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:556
+#: code:addons/project/models/project.py:633
#, python-format
msgid "Error! You cannot create recursive hierarchy of task(s)."
msgstr ""
@@ -1088,6 +1071,24 @@ msgid "Followed by Me"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_follower_ids
+#: model:ir.model.fields,field_description:project.field_project_task__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_channel_ids
+#: model:ir.model.fields,field_description:project.field_project_task__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_partner_ids
+#: model:ir.model.fields,field_description:project.field_project_task__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_res_config_settings__module_project_forecast
msgid "Forecasts"
msgstr ""
@@ -1152,11 +1153,6 @@ msgid "Grey Kanban Label"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__group_id
-msgid "Group"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -1179,11 +1175,6 @@ msgid "Happy % on Task"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
-msgid "Here, you can create new tasks"
-msgstr ""
-
-#. module: project
#: selection:report.project.task.user,priority:0
msgid "High"
msgstr ""
@@ -1214,7 +1205,7 @@ msgid "How to get the customer's feedbacks?\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:866
+#: code:addons/project/models/project.py:867
#, python-format
msgid "I take it"
msgstr ""
@@ -1241,6 +1232,24 @@ msgid "Ideas"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_unread
+#: model:ir.model.fields,help:project.field_project_task__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_needaction
+#: model:ir.model.fields,help:project.field_project_task__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_has_error
+#: model:ir.model.fields,help:project.field_project_task__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,help:project.field_project_task_type__mail_template_id
msgid "If set an email will be sent to the customer when the task or issue reaches this step."
msgstr ""
@@ -1299,6 +1308,12 @@ msgid "Internal email associated with this project. Incoming emails are automati
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_is_follower
+#: model:ir.model.fields,field_description:project.field_project_task__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.project_tags_search_view
msgid "Issue Version"
msgstr ""
@@ -1360,7 +1375,7 @@ msgid "Last Modified on"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:86
+#: code:addons/project/controllers/portal.py:88
#: 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
@@ -1422,11 +1437,6 @@ msgid "Lets the company customize which Pad installation should be used to link
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project__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 ""
-
-#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:64
#, python-format
@@ -1470,6 +1480,18 @@ msgid "Members"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_has_error
+#: model:ir.model.fields,field_description:project.field_project_task__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_ids
+#: model:ir.model.fields,field_description:project.field_project_task__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "My Activities"
msgstr ""
@@ -1495,9 +1517,11 @@ msgid "My Tasks"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:33
+#: code:addons/project/controllers/portal.py:35
+#: 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
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
#, python-format
msgid "Name"
msgstr ""
@@ -1531,8 +1555,8 @@ msgid "New Projects"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:32
-#: code:addons/project/controllers/portal.py:83
+#: code:addons/project/controllers/portal.py:34
+#: code:addons/project/controllers/portal.py:85
#, python-format
msgid "Newest"
msgstr ""
@@ -1544,6 +1568,21 @@ msgid "Next Activities"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: project
#: code:addons/project/models/project.py:913
#, python-format
msgid "No Subject"
@@ -1571,6 +1610,12 @@ msgid "No scheduled activity at the moment"
msgstr ""
#. module: project
+#: code:addons/project/controllers/portal.py:101
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: project
#: selection:project.task,priority:0
#: selection:report.project.task.user,priority:0
msgid "Normal"
@@ -1582,6 +1627,12 @@ msgid "Notes"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_needaction_counter
+#: model:ir.model.fields,field_description:project.field_project_task__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user__working_days_open
msgid "Number of Working Days to Open the task"
msgstr ""
@@ -1597,13 +1648,37 @@ msgid "Number of documents attached"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_has_error_counter
+#: model:ir.model.fields,field_description:project.field_project_task__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_needaction_counter
+#: model:ir.model.fields,help:project.field_project_task__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_has_error_counter
+#: model:ir.model.fields,help:project.field_project_task__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,help:project.field_project_project__message_unread_counter
+#: model:ir.model.fields,help:project.field_project_task__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,help:project.action_view_task
msgid "Odoo's project management allows you to manage the pipeline of your tasks efficiently.<br>\n"
" You can track progress, discuss on tasks, attach documents, etc."
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:211
+#: code:addons/project/models/project.py:206
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "On invitation only"
@@ -1637,6 +1712,11 @@ msgid "Organize your activities (plan tasks, track issues, invoice timesheets) f
msgstr ""
#. module: project
+#: selection:project.task,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
msgid "Overpassed Tasks"
msgstr ""
@@ -1682,7 +1762,7 @@ msgid "Parent Record Thread ID"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:997
+#: code:addons/project/models/project.py:980
#: model:ir.model.fields,field_description:project.field_project_task__parent_id
#: model:ir.ui.view,arch_db:project.view_task_form2
#, python-format
@@ -1705,14 +1785,13 @@ msgid "Periodical Rating"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task__planned_hours
-msgid "Planned Hours"
+#: selection:project.task,activity_state:0
+msgid "Planned"
msgstr ""
#. module: project
-#: code:addons/project/models/analytic.py:25
-#, python-format
-msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
+#: model:ir.model.fields,field_description:project.field_project_task__planned_hours
+msgid "Planned Hours"
msgstr ""
#. module: project
@@ -1725,6 +1804,12 @@ 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
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_task__priority
#: model:ir.model.fields,field_description:project.field_report_project_task_user__priority
msgid "Priority"
@@ -1736,9 +1821,11 @@ msgid "Privacy"
msgstr ""
#. module: project
+#: code:addons/project/controllers/portal.py:102
#: 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.edit_project
#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
@@ -1746,6 +1833,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
+#, python-format
msgid "Project"
msgstr ""
@@ -1755,12 +1843,6 @@ msgid "Project -"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_account_analytic_account__project_count
-#: model:ir.model.fields,field_description:project.field_project_project__project_count
-msgid "Project Count"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__user_id
#: model:ir.model.fields,field_description:project.field_project_task__manager_id
#: model:ir.ui.view,arch_db:project.edit_project
@@ -1817,11 +1899,8 @@ msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.actions.act_window,name:project.open_view_project_all_config
-#: model:ir.model.fields,field_description:project.field_account_analytic_account__project_ids
-#: model:ir.model.fields,field_description:project.field_project_project__project_ids
#: model:ir.model.fields,field_description:project.field_project_task_type__project_ids
#: model:ir.ui.menu,name:project.menu_projects_config
-#: model:ir.ui.view,arch_db:project.analytic_account_inherited_form
#: model:ir.ui.view,arch_db:project.portal_layout
#: model:ir.ui.view,arch_db:project.portal_my_home
#: model:ir.ui.view,arch_db:project.portal_my_projects
@@ -1842,6 +1921,7 @@ msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.rating_rating_action_view_project_rating
+#: model:ir.model.fields,field_description:project.field_project_task__rating_ids
#: model:ir.ui.view,arch_db:project.view_task_form2
msgid "Rating"
msgstr ""
@@ -1857,11 +1937,31 @@ msgid "Rating Frequency"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__rating_last_feedback
+msgid "Rating Last Feedback"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__rating_last_image
+msgid "Rating Last Image"
+msgstr ""
+
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__rating_last_value
+msgid "Rating Last Value"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__rating_request_deadline
msgid "Rating Request Deadline"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__rating_count
+msgid "Rating count"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__portal_show_rating
msgid "Rating visible publicly"
msgstr ""
@@ -1877,7 +1977,7 @@ msgid "Ratings"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:412
+#: code:addons/project/models/project.py:398
#, python-format
msgid "Ratings of %s"
msgstr ""
@@ -1909,6 +2009,16 @@ msgid "Ready for next stage"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_task__rating_last_feedback
+msgid "Reason of the rating"
+msgstr ""
+
+#. module: project
+#: model:mail.template,subject:project.mail_template_data_project_task
+msgid "Reception of ${object.name}"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__alias_force_thread_id
msgid "Record Thread ID"
msgstr ""
@@ -1934,11 +2044,6 @@ msgid "Ref"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__code
-msgid "Reference"
-msgstr ""
-
-#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:45
#, python-format
@@ -1946,11 +2051,6 @@ msgid "Refused"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task__remaining_hours
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:74
#, python-format
@@ -1991,6 +2091,11 @@ msgid "Resources Allocation"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task__activity_user_id
+msgid "Responsible User"
+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 ""
@@ -2001,7 +2106,7 @@ msgid "Search"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:92
+#: code:addons/project/controllers/portal.py:94
#, python-format
msgid "Search <span class=\"nolabel\"> (in Content)</span>"
msgstr ""
@@ -2012,25 +2117,25 @@ msgid "Search Project"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:96
+#: code:addons/project/controllers/portal.py:98
#, python-format
msgid "Search in All"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:94
+#: code:addons/project/controllers/portal.py:96
#, python-format
msgid "Search in Customer"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:93
+#: code:addons/project/controllers/portal.py:95
#, python-format
msgid "Search in Messages"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:95
+#: code:addons/project/controllers/portal.py:97
#, python-format
msgid "Search in Stages"
msgstr ""
@@ -2103,7 +2208,7 @@ msgid "Split your tasks to organize your work into sub-milestones"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:85
+#: code:addons/project/controllers/portal.py:87
#: 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
@@ -2160,6 +2265,20 @@ msgid "Starting Date"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_task__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: project
+#: model:ir.model.fields,field_description:project.field_project_project__subtask_project_id
+#: model:ir.model.fields,field_description:project.field_project_task__subtask_project_id
+msgid "Sub-task Project"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_project_task__subtask_count
msgid "Sub-task count"
msgstr ""
@@ -2199,7 +2318,6 @@ msgstr ""
#. module: project
#: model:ir.model,name:project.model_project_task
-#: model:ir.ui.view,arch_db:project.portal_my_tasks
#: model:ir.ui.view,arch_db:project.view_task_form2
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -2207,9 +2325,9 @@ msgid "Task"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:632
+#: code:addons/project/models/project.py:618
#, python-format
-msgid "Task %s can not have a parent task and subtasks. Only one subtask level is allowed."
+msgid "Task %s cannot have several subtask levels."
msgstr ""
#. module: project
@@ -2218,11 +2336,6 @@ msgid "Task -"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project__task_needaction_count
-msgid "Task Activitie Count"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_project_project__tasks
msgid "Task Activities"
msgstr ""
@@ -2239,9 +2352,10 @@ msgid "Task Count"
msgstr ""
#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
#: model:mail.message.subtype,name:project.mt_project_task_new
#: model:mail.message.subtype,name:project.mt_task_new
-msgid "Task Opened"
+msgid "Task Created"
msgstr ""
#. module: project
@@ -2274,7 +2388,6 @@ msgid "Task Stage Changed"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task__name
#: model:ir.model.fields,field_description:project.field_report_project_task_user__name
msgid "Task Title"
msgstr ""
@@ -2290,11 +2403,6 @@ msgid "Task blocked"
msgstr ""
#. module: project
-#: model:mail.message.subtype,description:project.mt_task_new
-msgid "Task opened"
-msgstr ""
-
-#. module: project
#: model:mail.message.subtype,description:project.mt_task_ready
msgid "Task ready for Next Stage"
msgstr ""
@@ -2443,8 +2551,6 @@ msgid "This will create new project and redirect us to its tasks."
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_account_analytic_account__company_uom_id
-#: model:ir.model.fields,help:project.field_project_project__company_uom_id
#: 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
@@ -2453,11 +2559,6 @@ msgid "This will set the unit of measure used in projects and tasks.\n"
msgstr ""
#. module: project
-#: model:res.groups,name:project.group_time_work_estimation_tasks
-msgid "Time Estimation on Tasks"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Time Management"
msgstr ""
@@ -2468,17 +2569,13 @@ msgid "Time Scheduling"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_res_config_settings__module_hr_timesheet
-msgid "Timesheets"
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,help:project.field_project_project__resource_calendar_id
msgid "Timetable working hours to adjust the gantt diagram report"
msgstr ""
#. module: project
-#: code:addons/project/controllers/portal.py:84
+#: code:addons/project/controllers/portal.py:86
+#: model:ir.model.fields,field_description:project.field_project_task__name
#, python-format
msgid "Title"
msgstr ""
@@ -2491,8 +2588,15 @@ msgid "To Print"
msgstr ""
#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+msgid "To get things done, use activities and status on tasks.<br>\n"
+" Chat in real time or by email to collaborate efficiently."
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project_task_kanban_examples.js:51
+#: selection:project.task,activity_state:0
#, python-format
msgid "Today"
msgstr ""
@@ -2508,21 +2612,11 @@ msgid "Top 5 partner ratings of last 15 days."
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_task__remaining_hours
-msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
msgid "Track customer satisfaction on tasks"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.res_config_settings_view_form
-msgid "Track time spent on projects and tasks"
-msgstr ""
-
-#. module: project
#: selection:project.project,rating_status_period:0
msgid "Twice a Month"
msgstr ""
@@ -2534,12 +2628,20 @@ msgid "Unassigned"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_unread
+#: model:ir.model.fields,field_description:project.field_project_task__message_unread
#: model:ir.ui.view,arch_db:project.view_task_kanban
#: model:ir.ui.view,arch_db:project.view_task_search_form
msgid "Unread Messages"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__message_unread_counter
+#: model:ir.model.fields,field_description:project.field_project_task__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:72
#, python-format
@@ -2548,11 +2650,13 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_res_config_settings__group_project_rating
+#: model:ir.model.fields,field_description:project.field_res_users__has_group_project_rating
#: model:res.groups,name:project.group_project_rating
msgid "Use Rating on Project"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_res_users__has_group_subtask_project
#: model:res.groups,name:project.group_subtask_project
msgid "Use Subtasks"
msgstr ""
@@ -2585,14 +2689,19 @@ msgid "User Email"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:212
+#: model:ir.model,name:project.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: project
+#: code:addons/project/models/project.py:207
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by all employees"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:213
+#: code:addons/project/models/project.py:208
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by following customers"
@@ -2618,6 +2727,7 @@ msgid "Watchers Emails"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project__website_message_ids
#: model:ir.model.fields,field_description:project.field_project_task__website_message_ids
msgid "Website Messages"
msgstr ""
@@ -2630,6 +2740,7 @@ msgid "Website Redesign"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_project__website_message_ids
#: model:ir.model.fields,help:project.field_project_task__website_message_ids
msgid "Website communication history"
msgstr ""
@@ -2712,20 +2823,14 @@ msgid "You can also give a tooltip about the use of the stars available in the k
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
-msgid "You can now manage your tasks in order to get things done efficiently.<br>\n"
-" Track progress, discuss, attach documents, etc."
-msgstr ""
-
-#. module: project
-#: code:addons/project/models/project.py:77
+#: code:addons/project/models/project.py:87
#, python-format
-msgid "You cannot delete a project containing tasks. You can either delete all the project's tasks and then delete the project or simply deactivate the project."
+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 is up and running"
+msgid "Your Odoo Project application"
msgstr ""
#. module: project
@@ -2739,6 +2844,11 @@ msgid "e.g. Office Party"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.portal_my_tasks
+msgid "for project:"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.portal_project_rating_partner_stat
msgid "happy"
msgstr ""
@@ -2754,7 +2864,7 @@ msgid "res.config.settings"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:690
+#: code:addons/project/models/project.py:678
#, python-format
msgid "task"
msgstr ""
diff --git a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
index c14c593b535..c83fe793b2a 100644
--- a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
+++ b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,12 @@ msgid "Analytic Lines"
msgstr ""
#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
+#, python-format
+msgid "Both the internal project and task are required to generate timesheet for the leaves."
+msgstr ""
+
+#. module: project_timesheet_holidays
#: model:ir.model,name:project_timesheet_holidays.model_res_company
msgid "Companies"
msgstr ""
@@ -37,12 +43,6 @@ msgid "Default project value for timesheet generated from leave type."
msgstr ""
#. module: project_timesheet_holidays
-#: code:addons/project_timesheet_holidays/models/hr_holidays.py:38
-#, python-format
-msgid "For the leaves to generate timesheet, the internal project and task are requried."
-msgstr ""
-
-#. module: project_timesheet_holidays
#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_leave_type__timesheet_generate
msgid "Generate Timesheet"
msgstr ""
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index e56014d44e7..a8b9216d6cc 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,12 +72,6 @@ msgid "\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/stock.py:100
-#, python-format
-msgid " Buy"
-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"
@@ -116,6 +110,11 @@ msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Can
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>"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
msgid "<strong>Amount</strong>"
msgstr ""
@@ -219,11 +218,27 @@ msgid "A stockable product is a product for which you manage stock. The \"Invent
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_res_users__has_group_warning_purchase
#: model:res.groups,name:purchase.group_warning_purchase
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__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_account_invoice__purchase_id
msgid "Add Purchase Order"
msgstr ""
@@ -240,6 +255,11 @@ msgid "Allow to edit purchase orders"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__amount
+msgid "Amount"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__account_analytic_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__account_analytic_id
msgid "Analytic Account"
@@ -266,6 +286,11 @@ msgid "Associated Purchase Order. Filled in automatically when a PO is chosen on
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_account_invoice__vendor_bill_purchase_id
+msgid "Auto-Complete"
+msgstr ""
+
+#. module: purchase
#: model:ir.filters,name:purchase.filter_purchase_order_average_delivery_time
msgid "Average Delivery Time"
msgstr ""
@@ -311,6 +336,11 @@ msgid "Bills"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_bill_union
+msgid "Bills & Purchases"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Bills Received"
msgstr ""
@@ -322,18 +352,6 @@ msgid "Blocking Message"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/stock.py:94
-#: model:stock.location.route,name:purchase.route_warehouse0_buy
-#, python-format
-msgid "Buy"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_stock_warehouse__buy_pull_id
-msgid "Buy rule"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
msgid "By default, vendor prices can be set manually in the product detail form. If your vendors provide you with pricelist files, this option allows you to easily import them into the system from ‘Purchase > Vendor Pricelists’ menu."
msgstr ""
@@ -349,12 +367,6 @@ msgid "Calls for tenders are used when you want to generate requests for quotati
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/stock.py:97
-#, python-format
-msgid "Can't find any generic Buy route."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Cancel"
msgstr ""
@@ -368,7 +380,12 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:797
+#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
+msgid "Cancelled Purchase Order #"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:492
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -384,6 +401,7 @@ msgid "Companies"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__company_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order__company_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__company_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__company_id
@@ -397,7 +415,7 @@ msgid "Company Currency"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:330
+#: code:addons/purchase/models/purchase.py:270
#, python-format
msgid "Compose Email"
msgstr ""
@@ -464,11 +482,6 @@ msgid "Create a vendor bill"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_stock_move__created_purchase_line_id
-msgid "Created Purchase Order Line"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order__create_uid
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__create_uid
msgid "Created by"
@@ -481,6 +494,7 @@ msgid "Created on"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__currency_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order__currency_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__currency_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__currency_id
@@ -488,6 +502,11 @@ msgid "Currency"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__date
+msgid "Date"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_report__date_approve
msgid "Date Approved"
msgstr ""
@@ -513,21 +532,11 @@ msgid "Define your terms and conditions ..."
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__picking_type_id
-msgid "Deliver To"
-msgstr ""
-
-#. module: purchase
#: selection:res.config.settings,default_purchase_method:0
msgid "Delivered quantities"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Deliveries & Invoices"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_order__date_order
#: model:ir.model.fields,help:purchase.field_purchase_order_line__date_order
msgid "Depicts the date where the Quotation should be validated and converted into a purchase order."
@@ -544,11 +553,7 @@ msgid "Description for Vendors"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__default_location_dest_id_usage
-msgid "Destination Location Type"
-msgstr ""
-
-#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__display_name
#: model:ir.model.fields,field_description:purchase.field_purchase_order__display_name
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__display_name
#: model:ir.model.fields,field_description:purchase.field_purchase_report__display_name
@@ -566,11 +571,6 @@ msgid "Double validation amount"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__move_dest_ids
-msgid "Downstream Moves"
-msgstr ""
-
-#. module: purchase
#: selection:purchase.report,state:0
msgid "Draft RFQ"
msgstr ""
@@ -581,26 +581,6 @@ msgid "Drop Ship Address"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_res_config_settings__module_stock_dropshipping
-msgid "Dropshipping"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_account_invoice__purchase_id
-msgid "Encoding help. When selected, the associated purchase order lines are added to the vendor bill. Several PO can be selected."
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "Exception(s) occurred on the purchase order(s):"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "Exception(s):"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Expected Date"
msgstr ""
@@ -611,7 +591,7 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:617
+#: code:addons/purchase/models/purchase.py:474
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -624,6 +604,21 @@ msgid "Fiscal Position"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Future Activities"
msgstr ""
@@ -661,6 +656,7 @@ msgid "How to import"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__id
#: model:ir.model.fields,field_description:purchase.field_purchase_order__id
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__id
@@ -668,39 +664,34 @@ msgid "ID"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
-msgid "If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice."
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
-msgid "Import vendor pricelists"
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_unread
+msgid "If checked new messages require your attention."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:221
-#, python-format
-msgid "In order to delete a purchase order, you must cancel it first."
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_needaction
+msgid "If checked, new messages require your attention."
msgstr ""
#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
-msgid "Incoming Products"
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_has_error
+msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Incoming Shipments"
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
+msgid "If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice."
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__incoterm_id
-msgid "Incoterm"
+#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
+msgid "Import vendor pricelists"
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."
+#: code:addons/purchase/models/purchase.py:167
+#, python-format
+msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
#. module: purchase
@@ -724,13 +715,8 @@ msgid "Invoicing"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__is_shipped
-msgid "Is Shipped"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_res_config_settings__is_installed_sale
-msgid "Is the Sale Module Installed"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_is_follower
+msgid "Is Follower"
msgstr ""
#. module: purchase
@@ -739,6 +725,7 @@ msgid "It will be converted into a purchase order."
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union____last_update
#: model:ir.model.fields,field_description:purchase.field_purchase_order____last_update
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line____last_update
#: model:ir.model.fields,field_description:purchase.field_purchase_report____last_update
@@ -773,6 +760,11 @@ msgid "Levels of Approvals *"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,help:purchase.field_account_invoice__purchase_id
+msgid "Load the vendor bill based on selected purchase order. Several PO can be selected."
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Lock"
msgstr ""
@@ -791,15 +783,11 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
-msgid "Logistics"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
msgid "Make sure you only pay bills for which you received the goods you ordered"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_res_users__has_group_manage_vendor_price
#: model:res.groups,name:purchase.group_manage_vendor_price
msgid "Manage Vendor Price"
msgstr ""
@@ -825,11 +813,6 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "Manual actions may be needed."
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_company__po_lead
#: model:ir.model.fields,help:purchase.field_res_config_settings__po_lead
msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays."
@@ -837,11 +820,15 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_config_settings__use_po_lead
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays."
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner__purchase_warn_msg
#: model:ir.model.fields,field_description:purchase.field_res_users__purchase_warn_msg
msgid "Message for Purchase Order"
@@ -854,13 +841,13 @@ msgid "Message for Purchase Order Line"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_res_config_settings__po_double_validation_amount
-msgid "Minimum Amount"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_ids
+msgid "Messages"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_warehouse_orderpoint
-msgid "Minimum Inventory Rule"
+#: model:ir.model.fields,field_description:purchase.field_res_config_settings__po_double_validation_amount
+msgid "Minimum Amount"
msgstr ""
#. module: purchase
@@ -875,11 +862,6 @@ msgid "Monthly Purchases"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
-msgid "Move forward expected delivery dates by"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "My Activities"
msgstr ""
@@ -902,8 +884,18 @@ msgid "Newest"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "Next transfer(s) impacted:"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_type_id
+msgid "Next Activity Type"
msgstr ""
#. module: purchase
@@ -938,6 +930,31 @@ msgid "Nothing to Bill"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_purchase_order__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: purchase
#: selection:product.template,purchase_method:0
msgid "On ordered quantities"
msgstr ""
@@ -965,6 +982,7 @@ msgstr ""
#: model:ir.model.fields,field_description:purchase.field_purchase_report__date_order
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Order Date"
msgstr ""
@@ -974,11 +992,6 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
-msgid "Order Month"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order__name
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__order_id
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
@@ -991,11 +1004,6 @@ msgid "Order Status"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
-msgid "Order of Day"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.track_po_line_template
msgid "Ordered Quantity:"
msgstr ""
@@ -1006,17 +1014,22 @@ msgid "Ordered quantities"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__orderpoint_id
-msgid "Orderpoint"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Orders"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Other Information"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: purchase
#: model:mail.template,report_name:purchase.email_template_edi_purchase_done
msgid "PO_${(object.name or '').replace('/','_')}"
msgstr ""
@@ -1042,8 +1055,8 @@ msgid "Payment Terms"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__picking_count
-msgid "Picking count"
+#: selection:purchase.order,activity_state:0
+msgid "Planned"
msgstr ""
#. module: purchase
@@ -1064,16 +1077,6 @@ msgid "Print RFQ"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__group_id
-msgid "Procurement Group"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_procurement_rule
-msgid "Procurement Rule"
-msgstr ""
-
-#. module: purchase
#: model:ir.model,name:purchase.model_product_product
#: 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
@@ -1178,6 +1181,7 @@ msgstr ""
#: 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
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__purchase_order_id
#: model:ir.model.fields,field_description:purchase.field_res_partner__purchase_warn
#: model:ir.model.fields,field_description:purchase.field_res_users__purchase_warn
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_order
@@ -1193,6 +1197,11 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
+msgid "Purchase Order #"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document
msgid "Purchase Order Confirmation #"
msgstr ""
@@ -1212,7 +1221,6 @@ msgstr ""
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line__purchase_line_id
#: model:ir.model.fields,field_description:purchase.field_product_product__purchase_line_warn
#: model:ir.model.fields,field_description:purchase.field_product_template__purchase_line_warn
-#: model:ir.model.fields,field_description:purchase.field_stock_move__purchase_line_id
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_form2
msgid "Purchase Order Line"
@@ -1244,11 +1252,11 @@ msgstr ""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_form_action
#: model:ir.actions.act_window,name:purchase.purchase_order_action_generic
-#: model:ir.model.fields,field_description:purchase.field_stock_picking__purchase_id
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
#: model:ir.ui.view,arch_db:purchase.portal_my_home_menu_purchase
#: model:ir.ui.view,arch_db:purchase.portal_my_home_purchase
#: model:ir.ui.view,arch_db:purchase.portal_my_purchase_orders
+#: model:ir.ui.view,arch_db:purchase.view_purchase_bill_union_filter
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Purchase Orders"
@@ -1289,20 +1297,15 @@ msgid "Purchase orders that include lines not invoiced."
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_stock_warehouse__buy_to_resupply
-msgid "Purchase to resupply this warehouse"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_report__negociation
msgid "Purchase-Standard Price"
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
-#: model:ir.ui.view,arch_db:purchase.view_warehouse_orderpoint_purchase_form
msgid "Purchases"
msgstr ""
@@ -1370,12 +1373,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Re-Send RFQ by Email"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Receive Products"
+msgid "Re-Send by Email"
msgstr ""
#. module: purchase
@@ -1389,12 +1387,6 @@ msgid "Received Quantity:"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.purchase_open_picking
-#: model:ir.model.fields,field_description:purchase.field_purchase_order__picking_ids
-msgid "Receptions"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid "Record a new vendor bill"
msgstr ""
@@ -1405,12 +1397,19 @@ msgid "Record a vendor bill related to this purchase"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__name
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
+#: model:ir.ui.view,arch_db:purchase.view_purchase_bill_union_filter
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Reference"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_bill_union_tree
+msgid "Reference Document"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_report__product_uom
msgid "Reference Unit of Measure"
msgstr ""
@@ -1443,29 +1442,14 @@ msgid "Request for Quotation #"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
-msgid "Request your vendors to deliver to your customers"
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
msgid "Requests for Quotation"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_line__move_ids
-msgid "Reservation"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model,name:purchase.model_stock_return_picking
-msgid "Return Picking"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
-msgid "Schedule receivings earlier to avoid delays"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_user_id
+msgid "Responsible User"
msgstr ""
#. module: purchase
@@ -1481,11 +1465,21 @@ msgid "Search Purchase Order"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_bill_union_filter
+msgid "Search Reference Document"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_config_settings__use_po_lead
msgid "Security Lead Time for Purchase"
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 ""
+
+#. module: purchase
#: model:ir.model.fields,help:purchase.field_product_product__purchase_line_warn
#: model:ir.model.fields,help:purchase.field_product_template__purchase_line_warn
#: model:ir.model.fields,help:purchase.field_res_partner__purchase_warn
@@ -1500,7 +1494,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Send RFQ by Email"
+msgid "Send by Email"
msgstr ""
#. module: purchase
@@ -1525,13 +1519,13 @@ msgid "Settings"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Shipment"
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+msgid "Show all records which has next action date is before today"
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"
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__reference
+msgid "Source"
msgstr ""
#. module: purchase
@@ -1548,13 +1542,11 @@ msgid "Status"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_line_form2
-msgid "Stock Moves"
+#: model:ir.model.fields,help:purchase.field_purchase_order__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: purchase
@@ -1586,11 +1578,6 @@ msgid "Taxes:"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order__default_location_dest_id_usage
-msgid "Technical field used to display the Drop Ship Address"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order__notes
msgid "Terms and Conditions"
msgstr ""
@@ -1601,12 +1588,6 @@ msgid "The full URL to access the document through the website."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:702
-#, python-format
-msgid "The quantities on your purchase order indicate less than billed. You should ask for a refund. "
-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."
@@ -1620,12 +1601,6 @@ msgid "The request for quotation is the first step of the purchases flow. Once\n
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:931
-#, python-format
-msgid "There is no vendor associated to the product %s. Please define a vendor for this product."
-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."
msgstr ""
@@ -1637,11 +1612,6 @@ msgid "This account will be used to value price difference between purchase pric
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase
-msgid "This adds a dropshipping route to apply on products in order to request your vendors to deliver to your customers. A product to dropship will generate a purchase request for quotation once the sales order confirmed. This is a on-demand flow. The requested delivery address will be the customer delivery address and not your warehouse."
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "This changes the scheduled date of all order lines to the given date"
msgstr ""
@@ -1664,13 +1634,13 @@ msgid "This note will show up on purchase orders."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:216
+#: code:addons/purchase/models/account_invoice.py:154
#, python-format
msgid "This vendor bill has been created from: %s"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:230
+#: code:addons/purchase/models/account_invoice.py:168
#, python-format
msgid "This vendor bill has been modified from: %s"
msgstr ""
@@ -1681,11 +1651,6 @@ msgid "This vendor has no purchase order. Create a new RfQ"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order__picking_type_id
-msgid "This will determine operation type of incoming shipment"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
@@ -1693,6 +1658,11 @@ msgid "To Approve"
msgstr ""
#. module: purchase
+#: selection:purchase.order,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Today Activities"
msgstr ""
@@ -1722,20 +1692,9 @@ msgid "Total amount"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_picking
-msgid "Transfer"
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/models/purchase.py:386
+#: code:addons/purchase/models/purchase.py:326
#, python-format
-msgid "Unable to cancel purchase order %s as some receptions have already been done."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/models/purchase.py:389
-#, python-format
-msgid "Unable to cancel this purchase order. You must first cancel related vendor bills."
+msgid "Unable to cancel this purchase order. You must first cancel the related vendor bills."
msgstr ""
#. module: purchase
@@ -1759,11 +1718,17 @@ msgid "Unlock"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_unread
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Unread Messages"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
msgid "Untaxed"
msgstr ""
@@ -1792,11 +1757,17 @@ msgid "User"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_config_settings__company_currency_id
msgid "Utility field to express amount currency"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__partner_id
#: model:ir.model.fields,field_description:purchase.field_purchase_order__partner_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report__partner_id
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_search
@@ -1807,12 +1778,18 @@ msgid "Vendor"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__vendor_bill_id
+msgid "Vendor Bill"
+msgstr ""
+
+#. module: purchase
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: model:ir.actions.act_window,name:purchase.action_invoice_pending
#: model:ir.actions.act_window,name:purchase.purchase_open_invoice
#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_account_buttons
+#: model:ir.ui.view,arch_db:purchase.view_purchase_bill_union_filter
msgid "Vendor Bills"
msgstr ""
@@ -1853,20 +1830,14 @@ msgid "Waiting Bills"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_warehouse
-#: model:ir.model.fields,field_description:purchase.field_purchase_report__picking_type_id
-msgid "Warehouse"
-msgstr ""
-
-#. module: purchase
#: selection:product.template,purchase_line_warn:0
#: selection:res.partner,purchase_warn:0
msgid "Warning"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:284
-#: code:addons/purchase/models/purchase.py:868
+#: code:addons/purchase/models/purchase.py:229
+#: code:addons/purchase/models/purchase.py:557
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -1887,13 +1858,18 @@ msgid "Warnings"
msgstr ""
#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order__website_message_ids
+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_stock_warehouse__buy_to_resupply
-msgid "When products are bought, they can be delivered to this warehouse"
+#: model:ir.model.fields,help:purchase.field_purchase_order__website_message_ids
+msgid "Website communication history"
msgstr ""
#. module: purchase
@@ -1903,13 +1879,6 @@ msgid "You can control the invoice from your vendor according to\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:694
-#, python-format
-msgid "You cannot decrease the ordered quantity below the received quantity.\n"
-"Create a return first."
-msgstr ""
-
-#. module: purchase
#: model:ir.actions.act_window,help:purchase.product_product_action
msgid "You must define a product for everything you purchase,\n"
" whether it's a physical product, a consumable or services."
@@ -1922,27 +1891,6 @@ msgid "You must define a product for everything you purchase,\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:428
-#, python-format
-msgid "You must set a Vendor Location for this partner %s"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.res_config_settings_view_form_stock
-msgid "days"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "of"
-msgstr ""
-
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.exception_on_po
-msgid "ordered instead of"
-msgstr ""
-
-#. module: purchase
#: model:ir.model,name:purchase.model_res_config_settings
msgid "res.config.settings"
msgstr ""
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 95f66957b7a..1f9b66bc8b8 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -71,6 +71,11 @@ msgid "<strong>Vendor </strong>"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__date_end
msgid "Agreement Deadline"
msgstr ""
@@ -245,7 +250,7 @@ msgstr ""
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "End Month"
+msgid "End Date"
msgstr ""
#. module: purchase_requisition
@@ -254,6 +259,21 @@ msgid "Example of purchase agreements include call for tenders and blanket order
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
msgid "For a blanket order, you can record an agreement for a specifc period\n"
" (e.g. a year) and you order products within this agreement, benefiting\n"
@@ -273,6 +293,21 @@ msgid "ID"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
msgid "In a call for tenders, you can record the products you need to buy\n"
" and generate the creation of RfQs to vendors. Once the tenders have\n"
@@ -291,6 +326,11 @@ msgid "Information about a product vendor"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition____last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line____last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type____last_update
@@ -317,6 +357,16 @@ msgid "Lines"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
msgid "Multiple Requisitions"
msgstr ""
@@ -337,11 +387,36 @@ msgid "New Quotation"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__order_count
msgid "Number of Orders"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: purchase_requisition
#: selection:purchase.requisition,state:0
#: selection:purchase.requisition,state_blanket_order:0
msgid "Ongoing"
@@ -637,6 +712,16 @@ msgid "Unit Price"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: purchase_requisition
#: selection:purchase.requisition.type,line_copy:0
msgid "Use lines of agreement"
msgstr ""
@@ -668,6 +753,16 @@ msgid "Warning for %s"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: purchase_requisition
#: code:addons/purchase_requisition/models/purchase_requisition.py:177
#, python-format
msgid "You can only delete draft requisitions."
diff --git a/addons/purchase_stock/i18n/purchase_stock.pot b/addons/purchase_stock/i18n/purchase_stock.pot
new file mode 100644
index 00000000000..694dd82c60d
--- /dev/null
+++ b/addons/purchase_stock/i18n/purchase_stock.pot
@@ -0,0 +1,346 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * purchase_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.4\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"
+"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: purchase_stock
+#: code:addons/purchase_stock/models/stock.py:123
+#, python-format
+msgid " Buy"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_procurement_rule__action
+msgid "Action"
+msgstr ""
+
+#. module: purchase_stock
+#: code:addons/purchase_stock/models/stock.py:118
+#: selection:procurement.rule,action:0
+#: model:stock.location.route,name:purchase_stock.route_warehouse0_buy
+#, python-format
+msgid "Buy"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_warehouse__buy_pull_id
+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."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_move__created_purchase_line_id
+msgid "Created Purchase Order Line"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__picking_type_id
+msgid "Deliver To"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,help:purchase_stock.field_product_template__route_ids
+msgid "Depending on the modules installed, this will allow you to define the route of the product: whether it will be bought, manufactured, MTO/MTS,..."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__default_location_dest_id_usage
+msgid "Destination Location Type"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order_line__move_dest_ids
+msgid "Downstream Moves"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_res_config_settings__module_stock_dropshipping
+msgid "Dropshipping"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
+msgid "Exception(s) occurred on the purchase order(s):"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
+msgid "Exception(s):"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.menu,name:purchase_stock.menu_action_picking_tree_in_move
+msgid "Incoming Products"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.purchase_order_view_form_inherit
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__incoterm_id
+msgid "Incoterm"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,help:purchase_stock.field_purchase_order__incoterm_id
+msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__is_shipped
+msgid "Is Shipped"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_res_config_settings__is_installed_sale
+msgid "Is the Sale Module Installed"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_purchase
+msgid "Logistics"
+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
+msgid "Manufacture"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock
+msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_warehouse_orderpoint
+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 ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
+msgid "Next transfer(s) impacted:"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order_line__orderpoint_id
+msgid "Orderpoint"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__picking_count
+msgid "Picking count"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__group_id
+msgid "Procurement Group"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_procurement_rule
+msgid "Procurement Rule"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_purchase_order_line
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_move__purchase_line_id
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_stock_picking__purchase_id
+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"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_purchase_report
+msgid "Purchases Orders"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.purchase_order_view_form_inherit
+msgid "Receipt"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.purchase_order_view_form_inherit
+msgid "Receive Products"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.actions.act_window,name:purchase_stock.purchase_open_picking
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__picking_ids
+msgid "Receptions"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_purchase
+msgid "Request your vendors to deliver to your customers"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_order_line__move_ids
+msgid "Reservation"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,field_description:purchase_stock.field_product_template__route_ids
+msgid "Routes"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock
+msgid "Schedule receivings earlier to avoid delays"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.purchase_order_line_view_form_inherit
+msgid "Stock Moves"
+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
+#, 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
+#, python-format
+msgid "There is no vendor associated to the product %s. Please define a vendor for this product."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_purchase
+msgid "This adds a dropshipping route to apply on products in order to request your vendors to deliver to your customers. A product to dropship will generate a purchase request for quotation once the sales order confirmed. This is a on-demand flow. The requested delivery address will be the customer delivery address and not your warehouse."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,help:purchase_stock.field_purchase_order__picking_type_id
+msgid "This will determine operation type of incoming shipment"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: purchase_stock
+#: code:addons/purchase_stock/models/purchase.py:95
+#, python-format
+msgid "Unable to cancel purchase order %s as some receptions have already been done."
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model,name:purchase_stock.model_stock_warehouse
+#: model:ir.model.fields,field_description:purchase_stock.field_purchase_report__picking_type_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.model.fields,help:purchase_stock.field_stock_warehouse__buy_to_resupply
+msgid "When products are bought, they can be delivered to this warehouse"
+msgstr ""
+
+#. module: purchase_stock
+#: code:addons/purchase_stock/models/purchase.py:253
+#, 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
+#, python-format
+msgid "You must set a Vendor Location for this partner %s"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock
+msgid "days"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
+msgid "of"
+msgstr ""
+
+#. module: purchase_stock
+#: model:ir.ui.view,arch_db:purchase_stock.exception_on_po
+msgid "ordered instead of"
+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 d5e06b0f14d..1d95e3a2c6c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr ""
#. module: rating
#: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-msgid "Day"
+msgid "Date"
msgstr ""
#. module: rating
@@ -163,11 +163,6 @@ msgstr ""
#. module: rating
#: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-msgid "Month"
-msgstr ""
-
-#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_rating_view_search
msgid "My Ratings"
msgstr ""
@@ -225,9 +220,6 @@ msgstr ""
#. module: rating
#: model:ir.actions.act_window,name:rating.action_view_rating
#: model:ir.model,name:rating.model_rating_rating
-#: model:ir.model.fields,field_description:rating.field_mail_channel__rating_ids
-#: model:ir.model.fields,field_description:rating.field_product_template__rating_ids
-#: model:ir.model.fields,field_description:rating.field_project_task__rating_ids
#: model:ir.model.fields,field_description:rating.field_rating_mixin__rating_ids
#: model:ir.model.fields,field_description:rating.field_rating_rating__rating_text
#: model:ir.ui.view,arch_db:rating.rating_rating_view_form
@@ -243,25 +235,16 @@ msgid "Rating Average"
msgstr ""
#. module: rating
-#: model:ir.model.fields,field_description:rating.field_mail_channel__rating_last_feedback
-#: model:ir.model.fields,field_description:rating.field_product_template__rating_last_feedback
-#: model:ir.model.fields,field_description:rating.field_project_task__rating_last_feedback
#: model:ir.model.fields,field_description:rating.field_rating_mixin__rating_last_feedback
msgid "Rating Last Feedback"
msgstr ""
#. module: rating
-#: model:ir.model.fields,field_description:rating.field_mail_channel__rating_last_image
-#: model:ir.model.fields,field_description:rating.field_product_template__rating_last_image
-#: model:ir.model.fields,field_description:rating.field_project_task__rating_last_image
#: model:ir.model.fields,field_description:rating.field_rating_mixin__rating_last_image
msgid "Rating Last Image"
msgstr ""
#. module: rating
-#: model:ir.model.fields,field_description:rating.field_mail_channel__rating_last_value
-#: model:ir.model.fields,field_description:rating.field_product_template__rating_last_value
-#: model:ir.model.fields,field_description:rating.field_project_task__rating_last_value
#: model:ir.model.fields,field_description:rating.field_rating_mixin__rating_last_value
msgid "Rating Last Value"
msgstr ""
@@ -280,14 +263,10 @@ msgstr ""
#: model:ir.model.fields,field_description:rating.field_mail_compose_message__rating_value
#: model:ir.model.fields,field_description:rating.field_mail_mail__rating_value
#: model:ir.model.fields,field_description:rating.field_mail_message__rating_value
-#: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message__rating_value
msgid "Rating Value"
msgstr ""
#. module: rating
-#: model:ir.model.fields,field_description:rating.field_mail_channel__rating_count
-#: model:ir.model.fields,field_description:rating.field_product_template__rating_count
-#: model:ir.model.fields,field_description:rating.field_project_task__rating_count
#: model:ir.model.fields,field_description:rating.field_rating_mixin__rating_count
msgid "Rating count"
msgstr ""
@@ -308,9 +287,6 @@ msgid "Ratings"
msgstr ""
#. module: rating
-#: model:ir.model.fields,help:rating.field_mail_channel__rating_last_feedback
-#: model:ir.model.fields,help:rating.field_product_template__rating_last_feedback
-#: model:ir.model.fields,help:rating.field_project_task__rating_last_feedback
#: model:ir.model.fields,help:rating.field_rating_mixin__rating_last_feedback
#: model:ir.model.fields,help:rating.field_rating_rating__feedback
msgid "Reason of the rating"
@@ -325,7 +301,6 @@ msgstr ""
#: model:ir.model.fields,field_description:rating.field_mail_compose_message__rating_ids
#: model:ir.model.fields,field_description:rating.field_mail_mail__rating_ids
#: model:ir.model.fields,field_description:rating.field_mail_message__rating_ids
-#: model:ir.model.fields,field_description:rating.field_survey_mail_compose_message__rating_ids
msgid "Related ratings"
msgstr ""
@@ -387,11 +362,6 @@ msgid "Would be great if you can provide more information:"
msgstr ""
#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_rating_view_search
-msgid "Year"
-msgstr ""
-
-#. module: rating
#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
msgid "Your rating has been submitted."
msgstr ""
diff --git a/addons/repair/i18n/repair.pot b/addons/repair/i18n/repair.pot
index 9863ff640c5..cd5fdba38b6 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -114,6 +114,21 @@ msgid "<strong>Warranty:</strong>"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: repair
#: selection:repair.line,type:0
msgid "Add"
msgstr ""
@@ -139,12 +154,6 @@ msgid "Before Repair"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:230
-#, python-format
-msgid "Can only confirm draft repairs."
-msgstr ""
-
-#. module: repair
#: model:ir.ui.view,arch_db:repair.view_cancel_repair
#: model:ir.ui.view,arch_db:repair.view_make_invoice
msgid "Cancel"
@@ -169,7 +178,7 @@ msgid "Cancelled"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:242
+#: code:addons/repair/models/repair.py:244
#, python-format
msgid "Cannot cancel completed repairs."
msgstr ""
@@ -198,8 +207,8 @@ msgid "Confirmed"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:593
-#: code:addons/repair/models/repair.py:651
+#: code:addons/repair/models/repair.py:604
+#: code:addons/repair/models/repair.py:662
#, 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."
@@ -310,28 +319,33 @@ msgid "Fees"
msgstr ""
#. module: repair
-#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
-msgid "Future Activities"
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_follower_ids
+msgid "Followers"
msgstr ""
#. module: repair
-#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
-msgid "Group By"
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_channel_ids
+msgid "Followers (Channels)"
msgstr ""
#. module: repair
-#: model:ir.model.fields,field_description:repair.field_repair_order_make_invoice__group
-msgid "Group by partner invoice address"
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_partner_ids
+msgid "Followers (Partners)"
msgstr ""
#. module: repair
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
-msgid "Guarantee limit Month"
+msgid "Future Activities"
msgstr ""
#. module: repair
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
-msgid "Guarantee limit by Month"
+msgid "Group By"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order_make_invoice__group
+msgid "Group by partner invoice address"
msgstr ""
#. module: repair
@@ -350,6 +364,21 @@ msgid "ID"
msgstr ""
#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: repair
#: model:ir.actions.act_window,help:repair.action_repair_order_tree
msgid "In a repair order, you can detail the components you remove,\n"
" add or replace and record the time you spent on the different\n"
@@ -357,7 +386,7 @@ msgid "In a repair order, you can detail the components you remove,\n"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:208
+#: code:addons/repair/models/repair.py:210
#, python-format
msgid "Insufficient Quantity"
msgstr ""
@@ -405,7 +434,7 @@ msgid "Invoice and shipping address:"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:382
+#: code:addons/repair/models/repair.py:384
#, python-format
msgid "Invoice created"
msgstr ""
@@ -424,6 +453,11 @@ msgid "Invoicing Address"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_cancel____last_update
#: model:ir.model.fields,field_description:repair.field_repair_fee____last_update
#: model:ir.model.fields,field_description:repair.field_repair_line____last_update
@@ -460,6 +494,7 @@ msgstr ""
#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_order__location_id
+#: model:ir.model.fields,field_description:repair.field_stock_warn_insufficient_qty_repair__location_id
msgid "Location"
msgstr ""
@@ -475,6 +510,16 @@ msgid "Make Invoice"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_order__move_id
msgid "Move"
msgstr ""
@@ -490,41 +535,56 @@ msgid "My Activities"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: repair
#: selection:repair.order,invoice_method:0
msgid "No Invoice"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:584
-#: code:addons/repair/models/repair.py:642
+#: code:addons/repair/models/repair.py:307
#, python-format
-msgid "No Pricelist!"
+msgid "No account defined for partner \"%s\"."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:305
+#: code:addons/repair/models/repair.py:333
+#: code:addons/repair/models/repair.py:361
#, python-format
-msgid "No account defined for partner \"%s\"."
+msgid "No account defined for product \"%s\"."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:331
-#: code:addons/repair/models/repair.py:359
+#: code:addons/repair/models/repair.py:595
+#: code:addons/repair/models/repair.py:653
#, python-format
-msgid "No account defined for product \"%s\"."
+msgid "No pricelist found."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:352
+#: code:addons/repair/models/repair.py:354
#, python-format
-msgid "No product defined on Fees!"
+msgid "No product defined on fees."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:591
-#: code:addons/repair/models/repair.py:649
+#: code:addons/repair/models/repair.py:602
+#: code:addons/repair/models/repair.py:660
#, python-format
-msgid "No valid pricelist line found !"
+msgid "No valid pricelist line found."
msgstr ""
#. module: repair
@@ -533,12 +593,48 @@ msgid "Notes"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: repair
+#: code:addons/repair/models/repair.py:232
+#, python-format
+msgid "Only draft repairs can be confirmed."
+msgstr ""
+
+#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_order__fees_lines
#: model:ir.ui.view,arch_db:repair.view_repair_order_form
msgid "Operations"
msgstr ""
#. module: repair
+#: selection:repair.order,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
msgid "Partner"
msgstr ""
@@ -550,6 +646,11 @@ msgid "Parts"
msgstr ""
#. module: repair
+#: selection:repair.order,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.report_repairorder
msgid "Price"
msgstr ""
@@ -572,6 +673,7 @@ msgstr ""
#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_fee__product_id
#: model:ir.model.fields,field_description:repair.field_repair_line__product_id
+#: model:ir.model.fields,field_description:repair.field_stock_warn_insufficient_qty_repair__product_id
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
msgid "Product"
msgstr ""
@@ -599,6 +701,11 @@ msgid "Products repaired are all belonging to this lot"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_stock_warn_insufficient_qty_repair__quant_ids
+msgid "Quant"
+msgstr ""
+
+#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_fee__product_uom_qty
#: model:ir.model.fields,field_description:repair.field_repair_line__product_uom_qty
#: model:ir.ui.view,arch_db:repair.report_repairorder
@@ -698,30 +805,24 @@ msgid "Repair must be canceled in order to reset it to draft."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:401
+#: code:addons/repair/models/repair.py:403
#, python-format
msgid "Repair must be confirmed before starting reparation."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:429
+#: code:addons/repair/models/repair.py:431
#, python-format
msgid "Repair must be repaired in order to make the product moves."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:412
+#: code:addons/repair/models/repair.py:414
#, python-format
msgid "Repair must be under repair in order to end reparation."
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:244
-#, python-format
-msgid "Repair order is already invoiced."
-msgstr ""
-
-#. module: repair
#: code:addons/repair/wizard/repair_cancel.py:20
#, python-format
msgid "Repair order is not invoiced."
@@ -745,6 +846,11 @@ msgid "Repairs order"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
msgid "Search Repair Orders"
msgstr ""
@@ -760,7 +866,7 @@ msgid "Send Quotation"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:533
+#: code:addons/repair/models/repair.py:544
#, python-format
msgid "Serial number is required for operation line with product '%s'"
msgstr ""
@@ -793,6 +899,14 @@ msgid "Status"
msgstr ""
#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__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: repair
#: model:ir.model,name:repair.model_stock_move
msgid "Stock Move"
msgstr ""
@@ -817,14 +931,20 @@ msgid "Taxes"
msgstr ""
#. module: repair
+#: sql_constraint:repair.order:0
+msgid "The name of the Repair Order must be unique!"
+msgstr ""
+
+#. module: repair
#: code:addons/repair/models/repair.py:172
#, python-format
-msgid "The Product Unit of Measure you chose has a different category than in the product form."
+msgid "The product unit of measure you chose has a different category than the product unit of measure."
msgstr ""
#. module: repair
-#: sql_constraint:repair.order:0
-msgid "The name of the Repair Order must be unique!"
+#: code:addons/repair/models/repair.py:246
+#, python-format
+msgid "The repair order is already invoiced."
msgstr ""
#. module: repair
@@ -855,6 +975,11 @@ msgid "To be Invoiced"
msgstr ""
#. module: repair
+#: selection:repair.order,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
msgid "Today Activities"
msgstr ""
@@ -897,6 +1022,16 @@ msgid "Unit of Measure"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_order__amount_untaxed
msgid "Untaxed Amount"
msgstr ""
@@ -914,26 +1049,37 @@ msgstr ""
#. module: repair
#: model:ir.model.fields,field_description:repair.field_repair_order__guarantee_limit
+#: model:ir.ui.view,arch_db:repair.view_repair_order_form_filter
msgid "Warranty Expiration"
msgstr ""
#. module: repair
+#: model:ir.model.fields,field_description:repair.field_repair_order__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: repair
+#: model:ir.model.fields,help:repair.field_repair_order__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: repair
#: model:ir.ui.view,arch_db:repair.view_cancel_repair
msgid "Yes"
msgstr ""
#. module: repair
-#: code:addons/repair/models/repair.py:293
+#: code:addons/repair/models/repair.py:597
+#: code:addons/repair/models/repair.py:655
#, python-format
-msgid "You have to select a Partner Invoice Address in the repair form!"
+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:586
-#: code:addons/repair/models/repair.py:644
+#: code:addons/repair/models/repair.py:295
#, python-format
-msgid "You have to select a pricelist in the Repair form !\n"
-" Please set one before choosing a product."
+msgid "You have to select an invoice address in the repair form."
msgstr ""
#. module: repair
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index c18ba3a8cb1..6921879b685 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -276,10 +276,20 @@ msgstr ""
#. module: report_intrastat
#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
+msgid "Tax Amount"
+msgstr ""
+
+#. module: report_intrastat
+#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
msgid "Taxes"
msgstr ""
#. module: report_intrastat
+#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
+msgid "Taxes Amount"
+msgstr ""
+
+#. module: report_intrastat
#: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat__type
msgid "Type"
msgstr ""
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index d9781fd0712..7058efe3dc7 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: resource
-#: code:addons/resource/models/resource.py:725
+#: code:addons/resource/models/resource.py:489
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -27,6 +27,11 @@ msgid "Active"
msgstr ""
#. module: resource
+#: selection:resource.calendar.attendance,day_period:0
+msgid "Afternoon"
+msgstr ""
+
+#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar__hours_per_day
msgid "Average hour per day"
msgstr ""
@@ -47,8 +52,6 @@ msgid "Companies"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_hr_employee__company_id
-#: model:ir.model.fields,field_description:resource.field_mrp_workcenter__company_id
#: model:ir.model.fields,field_description:resource.field_resource_calendar__company_id
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__company_id
#: model:ir.model.fields,field_description:resource.field_resource_mixin__company_id
@@ -78,6 +81,11 @@ msgid "Created on"
msgstr ""
#. module: resource
+#: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__day_period
+msgid "Day Period"
+msgstr ""
+
+#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__dayofweek
msgid "Day of Week"
msgstr ""
@@ -89,8 +97,6 @@ msgid "Default Working Hours"
msgstr ""
#. module: resource
-#: model:ir.model.fields,help:resource.field_hr_employee__resource_calendar_id
-#: model:ir.model.fields,help:resource.field_mrp_workcenter__resource_calendar_id
#: model:ir.model.fields,help:resource.field_res_users__resource_calendar_id
#: model:ir.model.fields,help:resource.field_resource_mixin__resource_calendar_id
#: model:ir.model.fields,help:resource.field_resource_resource__calendar_id
@@ -125,24 +131,18 @@ msgid "End Date"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:756
-#, python-format
-msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
-
-#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Friday"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:79
+#: code:addons/resource/models/resource.py:166
#, python-format
msgid "Friday Evening"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:78
+#: code:addons/resource/models/resource.py:165
#, python-format
msgid "Friday Morning"
msgstr ""
@@ -223,15 +223,20 @@ msgid "Last Updated on"
msgstr ""
#. module: resource
-#: model:ir.model,name:resource.model_resource_calendar_leaves
-#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_form
-#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_tree
-msgid "Leave Detail"
+#: selection:resource.calendar.leaves,time_type:0
+msgid "Leave"
msgstr ""
#. module: resource
#: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search
-msgid "Leave Month"
+msgid "Leave Date"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_form
+#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_tree
+msgid "Leave Detail"
msgstr ""
#. module: resource
@@ -251,18 +256,23 @@ msgid "Monday"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:71
+#: code:addons/resource/models/resource.py:158
#, python-format
msgid "Monday Evening"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:70
+#: code:addons/resource/models/resource.py:157
#, python-format
msgid "Monday Morning"
msgstr ""
#. module: resource
+#: selection:resource.calendar.attendance,day_period:0
+msgid "Morning"
+msgstr ""
+
+#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar__name
#: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__name
#: model:ir.model.fields,field_description:resource.field_resource_resource__name
@@ -271,6 +281,11 @@ msgid "Name"
msgstr ""
#. module: resource
+#: selection:resource.calendar.leaves,time_type:0
+msgid "Other"
+msgstr ""
+
+#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__name
#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_form
#: model:ir.ui.view,arch_db:resource.resource_calendar_leave_tree
@@ -283,8 +298,6 @@ msgid "Related user name for the resource to manage its access."
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_hr_employee__resource_id
-#: model:ir.model.fields,field_description:resource.field_mrp_workcenter__resource_id
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__resource_id
#: model:ir.model.fields,field_description:resource.field_resource_mixin__resource_id
#: model:ir.model.fields,field_description:resource.field_resource_test__resource_id
@@ -369,8 +382,7 @@ msgid "Search Working Time"
msgstr ""
#. module: resource
-#: code:addons/resource/models/res_company.py:18
-#: code:addons/resource/models/res_company.py:23
+#: code:addons/resource/models/res_company.py:22
#, python-format
msgid "Standard 40 hours/week"
msgstr ""
@@ -382,7 +394,8 @@ msgstr ""
#. module: resource
#: model:ir.model.fields,help:resource.field_resource_calendar_attendance__hour_from
-msgid "Start and End time of working."
+msgid "Start and End time of working.\n"
+"A specific value of 24:00 is interpreted as 23:59:59.999999."
msgstr ""
#. module: resource
@@ -392,7 +405,7 @@ msgstr ""
#. module: resource
#: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search
-msgid "Starting Date of Leave by Month"
+msgid "Starting Date of Leave"
msgstr ""
#. module: resource
@@ -406,15 +419,23 @@ msgid "Test Resource Model"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:711
+#: code:addons/resource/models/resource.py:468
#, python-format
msgid "The efficiency factor cannot be equal to 0."
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:668
+#: code:addons/resource/models/resource.py:523
#, python-format
-msgid "The start-hour must be lower than end-hour."
+msgid "The start date of the leave must be earlier end date."
+msgstr ""
+
+#. module: resource
+#: model:ir.model.fields,help:resource.field_resource_calendar__tz
+#: model:ir.model.fields,help:resource.field_resource_mixin__tz
+#: model:ir.model.fields,help:resource.field_resource_resource__tz
+#: model:ir.model.fields,help:resource.field_resource_test__tz
+msgid "This field is used in order to define in which timezone the resources will work."
msgstr ""
#. module: resource
@@ -428,30 +449,33 @@ msgid "Thursday"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:77
+#: code:addons/resource/models/resource.py:164
#, python-format
msgid "Thursday Evening"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:76
+#: code:addons/resource/models/resource.py:163
#, python-format
msgid "Thursday Morning"
msgstr ""
#. module: resource
-#: sql_constraint:resource.resource:0
-msgid "Time efficiency must be strictly positive"
+#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__time_type
+msgid "Time Type"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__tz
-msgid "Timezone"
+#: sql_constraint:resource.resource:0
+msgid "Time efficiency must be strictly positive"
msgstr ""
#. module: resource
-#: model:ir.model.fields,help:resource.field_resource_calendar_leaves__tz
-msgid "Timezone used when encoding the leave. It is used to correctly localize leave hours when computing time intervals."
+#: model:ir.model.fields,field_description:resource.field_resource_calendar__tz
+#: model:ir.model.fields,field_description:resource.field_resource_mixin__tz
+#: model:ir.model.fields,field_description:resource.field_resource_resource__tz
+#: model:ir.model.fields,field_description:resource.field_resource_test__tz
+msgid "Timezone"
msgstr ""
#. module: resource
@@ -460,13 +484,13 @@ msgid "Tuesday"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:73
+#: code:addons/resource/models/resource.py:160
#, python-format
msgid "Tuesday Evening"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:72
+#: code:addons/resource/models/resource.py:159
#, python-format
msgid "Tuesday Morning"
msgstr ""
@@ -493,18 +517,23 @@ msgid "Wednesday"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:75
+#: code:addons/resource/models/resource.py:162
#, python-format
msgid "Wednesday Evening"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:74
+#: code:addons/resource/models/resource.py:161
#, python-format
msgid "Wednesday Morning"
msgstr ""
#. module: resource
+#: model:ir.model.fields,help:resource.field_resource_calendar_leaves__time_type
+msgid "Whether this should be computed as a holiday or as work time (eg: formation)"
+msgstr ""
+
+#. module: resource
#: model:ir.model,name:resource.model_resource_calendar_attendance
msgid "Work Detail"
msgstr ""
@@ -525,8 +554,6 @@ msgid "Work to"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_hr_employee__resource_calendar_id
-#: model:ir.model.fields,field_description:resource.field_mrp_workcenter__resource_calendar_id
#: model:ir.model.fields,field_description:resource.field_res_company__resource_calendar_ids
#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__calendar_id
#: model:ir.model.fields,field_description:resource.field_resource_mixin__resource_calendar_id
@@ -536,7 +563,7 @@ msgid "Working Hours"
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:65
+#: code:addons/resource/models/resource.py:152
#, python-format
msgid "Working Hours of %s"
msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index d37ad324536..3bec74b142b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "\n"
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
"% set pay_sign_name = object.get_portal_confirmation_action()\n"
-"% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name in ('pay', 'sign') and 'Accept and %s online' % pay_sign_name or 'View %s' % doc_name\n"
+"% set access_name = is_online and object.state in ('draft', 'sent') and pay_sign_name == 'pay' and 'Accept and pay online' or pay_sign_name == 'sign' and 'Accept and sign online' or 'View %s' % doc_name\n"
"% set access_url = is_online and object.get_mail_url() or ''\n"
"\n"
"% if object.partner_id.parent_id:\n"
@@ -120,11 +120,6 @@ msgid "<span class=\"hidden-xs\">Sales Order #</span>\n"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.portal_my_orders
-msgid "<span class=\"label label-danger\"><i class=\"fa fa-fw fa-warning\"/><span class=\"hidden-xs\"> Problem</span></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>"
msgstr ""
@@ -142,11 +137,6 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_orders
-msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Invoiced</span></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>"
msgstr ""
@@ -182,6 +172,12 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_order_page
+msgid "<strong>Discount</strong>"
+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>"
msgstr ""
@@ -277,6 +273,7 @@ msgid "A typical example is the pre-paid hours of service, \n"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_users__has_group_warning_sale
#: model:res.groups,name:sale.group_warning_sale
msgid "A warning can be set on a product or a customer (Sale)"
msgstr ""
@@ -307,6 +304,27 @@ msgid "Account used for deposits"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.mail_activity_type_action_config_sale
+#: model:ir.ui.menu,name:sale.sale_menu_config_activity_type
+msgid "Activity Types"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_layout_category__pagebreak
msgid "Add pagebreak"
msgstr ""
@@ -317,6 +335,12 @@ msgid "Add subtotal"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_account_invoice__comment
+msgid "Additional Information"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_users__has_group_delivery_invoice_address
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sales Orders"
msgstr ""
@@ -348,6 +372,7 @@ 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 ""
@@ -375,11 +400,6 @@ msgid "Analytic Account"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
-msgstr ""
-
-#. module: sale
#: selection:sale.order.line,qty_delivered_method:0
msgid "Analytic From Expenses"
msgstr ""
@@ -489,6 +509,11 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
+msgid "Compute shipping costs and ship with Easypost"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Compute shipping costs and ship with FedEx"
msgstr ""
@@ -536,6 +561,11 @@ msgid "Contact"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_crm_team__dashboard_graph_model
+msgid "Content"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_sale_coupon
msgid "Coupons & Promotions"
msgstr ""
@@ -600,6 +630,11 @@ msgid "Customer"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__auth_signup_uninvited
+msgid "Customer Account"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__group_sale_delivery_address
msgid "Customer Addresses"
msgstr ""
@@ -611,6 +646,11 @@ msgid "Customer Country"
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__portal_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__client_order_ref
msgid "Customer Reference"
msgstr ""
@@ -626,6 +666,11 @@ msgid "Customers"
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.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"
@@ -667,7 +712,7 @@ msgid "Delivered Manually"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:810
+#: code:addons/sale/models/sale.py:846
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Delivered Quantity"
@@ -743,6 +788,7 @@ msgid "Discount included in the price"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_users__has_group_discount_per_so_line
#: model:res.groups,name:sale.group_discount_per_so_line
msgid "Discount on lines"
msgstr ""
@@ -816,8 +862,8 @@ msgid "Draft Quotation"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order__validity_date
-msgid "Expiration Date"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_easypost
+msgid "Easypost Connector"
msgstr ""
#. module: sale
@@ -826,14 +872,14 @@ msgid "Extended Filters"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:793
+#: code:addons/sale/models/sale.py:829
#, python-format
msgid "Extra line with %s "
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_ir_model_fields
-msgid "Fields"
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_fedex
+msgid "FedEx Connector"
msgstr ""
#. module: sale
@@ -842,6 +888,26 @@ msgid "Fiscal Position"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: sale
+#: selection:res.config.settings,auth_signup_uninvited:0
+msgid "Free sign up (B2C)"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,help:sale.action_account_invoice_report_salesteam
msgid "From this report, you can have an overview of the amount invoiced to your customer. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
@@ -892,6 +958,21 @@ msgid "ID"
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "If the sale is locked, you can not modify it anymore. However, you will still be able to invoice or deliver."
msgstr ""
@@ -923,7 +1004,7 @@ msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/models/account_invoice.py:52
+#: code:addons/sale/models/account_invoice.py:55
#, python-format
msgid "Invoice %s paid"
msgstr ""
@@ -1010,7 +1091,7 @@ msgid "Invoiced"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:811
+#: code:addons/sale/models/sale.py:847
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Invoiced Quantity"
@@ -1022,6 +1103,7 @@ msgid "Invoiced This Month"
msgstr ""
#. module: sale
+#: selection:crm.team,dashboard_graph_model:0
#: model:ir.actions.act_window,name:sale.action_invoice_salesteams
#: model:ir.model.fields,field_description:sale.field_sale_order__invoice_ids
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
@@ -1082,6 +1164,11 @@ msgid "Invoicing and shipping address:"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__is_downpayment
msgid "Is a down payment"
msgstr ""
@@ -1102,7 +1189,7 @@ 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:830
+#: code:addons/sale/models/sale.py:866
#, python-format
msgid "It is forbidden to modify the following fields in a locked order:\n"
"%s"
@@ -1200,11 +1287,6 @@ msgid "Manually set quantities on order: Invoice based on the manually entered q
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order__validity_date
-msgid "Manually set the expiration date of your quotation (offer), or it will set the date automatically based on the template if online quotation is installed."
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_sale_margin
msgid "Margins"
msgstr ""
@@ -1215,6 +1297,11 @@ msgid "Material"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner__sale_warn_msg
#: model:ir.model.fields,field_description:sale.field_res_users__sale_warn_msg
msgid "Message for Sales Order"
@@ -1227,6 +1314,11 @@ msgid "Message for Sales Order Line"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line__qty_delivered_method
msgid "Method to update delivered qty"
msgstr ""
@@ -1278,6 +1370,21 @@ msgid "New Quotation"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: sale
#: selection:product.template,expense_policy:0
msgid "No"
msgstr ""
@@ -1310,11 +1417,31 @@ msgid "Nothing to Invoice"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,help:sale.field_sale_order_line__customer_lead
msgid "Number of days between the order confirmation and the shipping of the products to the customer"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_crm_team__quotations_count
msgid "Number of quotations to invoice"
msgstr ""
@@ -1325,8 +1452,17 @@ msgid "Number of sales to invoice"
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: sale
+#: selection:res.config.settings,auth_signup_uninvited:0
+msgid "On invitation (B2B)"
+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
@@ -1334,6 +1470,11 @@ msgid "Once the quotation is confirmed by the customer, it becomes a sales order
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid "Once the quotation is confirmed, it becomes a sales order.<br> You will be able to create an invoice and collect the payment."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__portal_confirmation
msgid "Online Signature & Payment"
msgstr ""
@@ -1379,6 +1520,7 @@ msgstr ""
#: model:ir.model.fields,field_description:sale.field_sale_order__date_order
#: 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
#, python-format
msgid "Order Date"
msgstr ""
@@ -1395,11 +1537,6 @@ msgid "Order Lines"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Order Month"
-msgstr ""
-
-#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_tree
msgid "Order Number"
msgstr ""
@@ -1418,6 +1555,11 @@ msgid "Order Status"
msgstr ""
#. module: sale
+#: model:mail.activity.type,name:sale.mail_act_sale_upsell
+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."
@@ -1440,7 +1582,7 @@ msgid "Ordered Qty"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:807
+#: code:addons/sale/models/sale.py:843
#: 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
@@ -1489,6 +1631,11 @@ msgid "Other Information"
msgstr ""
#. module: sale
+#: selection:sale.order,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.report,name:sale.action_report_pro_forma_invoice
msgid "PRO-FORMA Invoice"
msgstr ""
@@ -1514,25 +1661,36 @@ 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"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:354
+#: selection:crm.team,dashboard_graph_model:0
+msgid "Pipeline"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:380
#, python-format
msgid "Please define an accounting sales journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:1010
+#: code:addons/sale/models/sale.py:1046
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
-msgid "Price"
+#: model:ir.model.fields,field_description:sale.field_sale_order__portal_url
+msgid "Portal Access URL"
msgstr ""
#. module: sale
@@ -1606,6 +1764,7 @@ msgid "Pro-Forma Invoice"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_users__has_group_proforma_sales
#: model:res.groups,name:sale.group_proforma_sales
msgid "Pro-forma Invoices"
msgstr ""
@@ -1800,6 +1959,11 @@ 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"
@@ -1836,6 +2000,11 @@ msgid "Reporting"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_partner__sale_order_count
#: model:ir.model.fields,field_description:sale.field_res_users__sale_order_count
msgid "Sale Order Count"
@@ -1857,6 +2026,7 @@ msgid "Sale Warnings"
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
@@ -2138,11 +2308,6 @@ msgid "Settings"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "Setup default terms and conditions in your sales settings"
-msgstr ""
-
-#. module: sale
#: model:ir.ui.view,arch_db:sale.res_config_settings_view_form
msgid "Shipping"
msgstr ""
@@ -2158,11 +2323,13 @@ 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)"
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)"
msgstr ""
@@ -2233,6 +2400,14 @@ msgid "Status"
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__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: sale
#: selection:sale.order.line,qty_delivered_method:0
msgid "Stock Moves"
msgstr ""
@@ -2249,6 +2424,11 @@ msgid "Target of invoice revenue for the current month. This is the amount the s
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "Tax Amount"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_res_config_settings__sale_show_tax
msgid "Tax Display"
msgstr ""
@@ -2302,7 +2482,12 @@ msgid "Terms and conditions"
msgstr ""
#. module: sale
-#: code:addons/sale/models/analytic.py:110
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Terms and conditions... (note: you can setup default ones in the Configuration menu)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/analytic.py:111
#, python-format
msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses."
msgstr ""
@@ -2318,6 +2503,12 @@ msgid "The analytic account related to a sales order."
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.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 ""
@@ -2362,10 +2553,10 @@ msgid "There is no income account defined for this product: \"%s\". You may have
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:431
-#: code:addons/sale/models/sale.py:435
+#: code:addons/sale/models/sale.py:465
+#: code:addons/sale/models/sale.py:469
#, python-format
-msgid "There is no invoiceable line."
+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
@@ -2425,6 +2616,11 @@ msgid "To Invoice"
msgstr ""
#. module: sale
+#: selection:sale.order,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
msgid "Today Activities"
msgstr ""
@@ -2466,7 +2662,17 @@ msgid "Track Service"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:578
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_ups
+msgid "UPS Connector"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_usps
+msgid "USPS Connector"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:612
#, python-format
msgid "Uncategorized"
msgstr ""
@@ -2508,11 +2714,17 @@ msgid "Unlock"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_unread
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
msgid "Unread Messages"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order__amount_untaxed
msgid "Untaxed Amount"
msgstr ""
@@ -2523,6 +2735,12 @@ msgid "Untaxed Total"
msgstr ""
#. module: sale
+#: code:addons/sale/models/sale.py:311
+#, 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 ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale
msgid "Upselling"
msgstr ""
@@ -2534,11 +2752,21 @@ msgid "Upselling Opportunity"
msgstr ""
#. module: sale
+#: model:ir.model,name:sale.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.portal_my_quotations
msgid "Valid Until"
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.model.fields,field_description:sale.field_sale_report__volume
msgid "Volume"
msgstr ""
@@ -2550,7 +2778,7 @@ msgid "Warning"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:1098
+#: code:addons/sale/models/sale.py:1136
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -2567,6 +2795,16 @@ msgid "Warning when Selling this Product"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__advance_payment_method
msgid "What do you want to invoice?"
msgstr ""
@@ -2581,11 +2819,11 @@ msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:189
#, python-format
-msgid "You can not delete a sent quotation or a sales order! Try to cancel it before."
+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:1161
+#: code:addons/sale/models/sale.py:1197
#, 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."
@@ -2604,6 +2842,11 @@ msgid "Your Order has been confirmed."
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_config_settings__module_delivery_bpost
+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
msgid "close"
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 3960e9bc16c..44d03a63dc2 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,12 @@ msgid "<span class=\"o_stat_text\"> Quotation(s) </span>"
msgstr ""
#. module: sale_crm
+#: model:ir.model.fields,field_description:sale_crm.field_account_invoice__campaign_id
+#: model:ir.model.fields,field_description:sale_crm.field_sale_order__campaign_id
+msgid "Campaign"
+msgstr ""
+
+#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice
msgid "Invoice"
msgstr ""
@@ -51,6 +57,12 @@ msgid "Marketing"
msgstr ""
#. module: sale_crm
+#: model:ir.model.fields,field_description:sale_crm.field_account_invoice__medium_id
+#: model:ir.model.fields,field_description:sale_crm.field_sale_order__medium_id
+msgid "Medium"
+msgstr ""
+
+#. module: sale_crm
#: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
msgid "New Quotation"
msgstr ""
@@ -99,6 +111,12 @@ msgid "Sales Channel"
msgstr ""
#. module: sale_crm
+#: model:ir.model.fields,field_description:sale_crm.field_account_invoice__source_id
+#: model:ir.model.fields,field_description:sale_crm.field_sale_order__source_id
+msgid "Source"
+msgstr ""
+
+#. module: sale_crm
#: model:ir.model.fields,field_description:sale_crm.field_crm_lead__sale_amount_total
msgid "Sum of Orders"
msgstr ""
@@ -109,6 +127,24 @@ msgid "Tags"
msgstr ""
#. module: sale_crm
+#: model:ir.model.fields,help:sale_crm.field_account_invoice__campaign_id
+#: model:ir.model.fields,help:sale_crm.field_sale_order__campaign_id
+msgid "This is a name that helps you keep track of your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model.fields,help:sale_crm.field_account_invoice__medium_id
+#: model:ir.model.fields,help:sale_crm.field_sale_order__medium_id
+msgid "This is the method of delivery, e.g. Postcard, Email, or Banner Ad"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model.fields,help:sale_crm.field_account_invoice__source_id
+#: model:ir.model.fields,help:sale_crm.field_sale_order__source_id
+msgid "This is the source of the link, e.g. Search Engine, another domain, or name of email list"
+msgstr ""
+
+#. module: sale_crm
#: model:ir.model.fields,help:sale_crm.field_crm_lead__sale_amount_total
msgid "Untaxed Total of Confirmed Orders"
msgstr ""
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index e455f619554..16ddc916cd7 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,20 +21,13 @@ msgid "Commitment Date"
msgstr ""
#. module: sale_order_dates
-#: model:ir.model.fields,help:sale_order_dates.field_sale_order__requested_date
-msgid "Date by which the customer has requested the items to be delivered.\n"
-"When this Order gets confirmed, the Delivery Order's expected date will be computed based on this date and the Company's Security Delay.\n"
-"Leave this field empty if you want the Delivery Order to be processed as soon as possible. In that case the expected date will be computed using the default method: based on the Product Lead Times and the Company's Security Delay."
-msgstr ""
-
-#. module: sale_order_dates
-#: model:ir.model.fields,help:sale_order_dates.field_sale_order__commitment_date
-msgid "Date by which the products are sure to be delivered. This is a date that you can promise to the customer, based on the Product Lead Times."
+#: model:ir.model.fields,help:sale_order_dates.field_sale_order__effective_date
+msgid "Completion date of the first delivery order."
msgstr ""
#. module: sale_order_dates
-#: model:ir.model.fields,help:sale_order_dates.field_sale_order__effective_date
-msgid "Date on which the first Delivery Order was created."
+#: model:ir.model.fields,help:sale_order_dates.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_order_dates
@@ -43,19 +36,19 @@ msgid "Effective Date"
msgstr ""
#. module: sale_order_dates
-#: model:ir.model,name:sale_order_dates.model_sale_order
-msgid "Quotation"
+#: model:ir.model.fields,field_description:sale_order_dates.field_sale_order__expected_date
+msgid "Expected Date"
msgstr ""
#. module: sale_order_dates
-#: model:ir.model.fields,field_description:sale_order_dates.field_sale_order__requested_date
-msgid "Requested Date"
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Quotation"
msgstr ""
#. module: sale_order_dates
-#: code:addons/sale_order_dates/models/sale_order.py:57
+#: code:addons/sale_order_dates/models/sale_order.py:50
#, python-format
-msgid "Requested date is too soon!"
+msgid "Requested date is too soon."
msgstr ""
#. module: sale_order_dates
@@ -64,8 +57,13 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale_order_dates
-#: code:addons/sale_order_dates/models/sale_order.py:58
+#: code:addons/sale_order_dates/models/sale_order.py:51
#, 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_order_dates
+#: model:ir.model.fields,help:sale_order_dates.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 ""
+
diff --git a/addons/sale_payment/i18n/sale_payment.pot b/addons/sale_payment/i18n/sale_payment.pot
index 4de7c88da58..47e449d80e2 100644
--- a/addons/sale_payment/i18n/sale_payment.pot
+++ b/addons/sale_payment/i18n/sale_payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,36 +16,23 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.payment_confirmation_status
-msgid "&amp;times;"
+#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction__sale_order_ids_nbr
+msgid "# of Sales Orders"
msgstr ""
#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:125
-#, python-format
-msgid "<%s> transaction (%s) failed: <%s>"
-msgstr ""
-
-#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:132
-#, python-format
-msgid "<%s> transaction (%s) invalid state: %s"
-msgstr ""
-
-#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:140
-#, python-format
-msgid "<%s> transaction (%s) order confirmation failed: <%s>"
+#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
+msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
msgstr ""
#. module: sale_payment
#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
-msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
+msgid "<i class=\"fa fa-check-circle\"/> Done"
msgstr ""
#. module: sale_payment
#: model:ir.ui.view,arch_db:sale_payment.portal_my_orders_payment
-msgid "<i class=\"fa fa-check-circle\"/> Done"
+msgid "<i class=\"fa fa-info\"/> You have credits card registered, you can log-in to be able to use them."
msgstr ""
#. module: sale_payment
@@ -64,70 +51,70 @@ msgid "<strong>Transactions</strong>"
msgstr ""
#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:54
+#: code:addons/sale_payment/models/sale_order.py:72
#, python-format
-msgid "Amount Mismatch (%s)"
+msgid "A journal must be specified of the acquirer %s."
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_crm_team__pending_payment_transactions_amount
-msgid "Amount of pending transactions"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_crm_team__authorized_payment_transactions_amount
-msgid "Amount of transactions to capture"
+#: code:addons/sale_payment/models/sale_order.py:65
+#, python-format
+msgid "A payment acquirer is required to create a transaction."
msgstr ""
#. module: sale_payment
-#: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_authorized
-msgid "Authorized Payment Transactions"
+#: code:addons/sale_payment/models/sale_order.py:36
+#, python-format
+msgid "A transaction can't be linked to sales orders having different currencies."
msgstr ""
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
-msgid "Awaiting Payment"
+#: code:addons/sale_payment/models/sale_order.py:41
+#, python-format
+msgid "A transaction can't be linked to sales orders having different partners."
msgstr ""
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
-msgid "Awaiting Payments"
+#: model:ir.ui.view,arch_db:sale_payment.sale_order_view_form_inherit_sale_payment
+msgid "Are you sure you want to void the authorized transaction? This action can't be undone."
msgstr ""
#. module: sale_payment
-#: code:addons/sale_payment/controllers/payment.py:52
-#, python-format
-msgid "If we store your payment information on our server, subscription payments will be made automatically."
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order__authorized_transaction_ids
+msgid "Authorized Transactions"
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_sale_order__payment_tx_id
-msgid "Last Transaction"
+#: model:ir.ui.view,arch_db:sale_payment.sale_order_view_form_inherit_sale_payment
+msgid "Capture Transaction"
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_sale_order__payment_transaction_count
-msgid "Number of payment transactions"
+#: code:addons/sale_payment/controllers/payment.py:49
+#, python-format
+msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_crm_team__pending_payment_transactions_count
-msgid "Number of pending transactions"
+#: code:addons/sale_payment/models/sale_order.py:55
+#, python-format
+msgid "Invalid token found! Token acquirer %s != %s"
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_crm_team__authorized_payment_transactions_count
-msgid "Number of transactions to capture"
+#: code:addons/sale_payment/models/sale_order.py:58
+#, python-format
+msgid "Invalid token found! Token partner %s != %s"
msgstr ""
#. module: sale_payment
-#: code:addons/sale_payment/controllers/payment.py:49
+#: code:addons/sale_payment/controllers/payment.py:46
#, python-format
msgid "Pay"
msgstr ""
#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:201
+#: code:addons/sale_payment/models/payment.py:116
#, python-format
msgid "Pay Now"
msgstr ""
@@ -138,11 +125,6 @@ msgid "Pay with"
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_sale_order__payment_acquirer_id
-msgid "Payment Acquirer"
-msgstr ""
-
-#. module: sale_payment
#: model:ir.ui.view,arch_db:sale_payment.res_config_settings_view_form
msgid "Payment Acquirers"
msgstr ""
@@ -153,54 +135,20 @@ msgid "Payment Transaction"
msgstr ""
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
-msgid "Payment to Capture"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.crm_team_salesteams_view_kanban_inherit_website_portal_sale
-msgid "Payments to Capture"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.actions.act_window,name:sale_payment.payment_transaction_action_pending
-msgid "Pending Payment Transactions"
-msgstr ""
-
-#. module: sale_payment
#: model:ir.model,name:sale_payment.model_sale_order
msgid "Quotation"
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction__so_state
-msgid "Sale Order State"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.model,name:sale_payment.model_crm_team
-msgid "Sales Channel"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction__sale_order_id
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale_payment
-#: code:addons/sale_payment/models/payment.py:55
+#: code:addons/sale_payment/models/payment.py:88
+#: model:ir.ui.view,arch_db:sale_payment.transaction_form_inherit_sale_payment
#, python-format
-msgid "The sale order was not confirmed despite response from the acquirer (%s): SO amount is %r but acquirer replied with %r."
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
-msgid "There was an error processing your payment: impossible to validate order."
+msgid "Sales Order(s)"
msgstr ""
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
-msgid "There was an error processing your payment: invalid order state."
+#: model:ir.model.fields,field_description:sale_payment.field_payment_transaction__sale_order_ids
+msgid "Sales Orders"
msgstr ""
#. module: sale_payment
@@ -215,11 +163,6 @@ msgstr ""
#. module: sale_payment
#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
-msgid "There was an error processing your payment: transaction amount issue.<br/>"
-msgstr ""
-
-#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.portal_order_error
msgid "There was an error processing your payment: transaction failed.<br/>"
msgstr ""
@@ -234,13 +177,12 @@ msgid "There was en error processing your payment: invalid credit card ID."
msgstr ""
#. module: sale_payment
-#: model:ir.model.fields,field_description:sale_payment.field_sale_order__payment_tx_ids
-#: model:ir.ui.view,arch_db:sale_payment.sale_order_view_form
+#: model:ir.model.fields,field_description:sale_payment.field_sale_order__transaction_ids
msgid "Transactions"
msgstr ""
#. module: sale_payment
-#: model:ir.ui.view,arch_db:sale_payment.payment_confirmation_status
-msgid "Your payment has been authorized."
+#: model:ir.ui.view,arch_db:sale_payment.sale_order_view_form_inherit_sale_payment
+msgid "Void Transaction"
msgstr ""
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index ceae20a371a..ee51f39c6d4 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+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:247
+#: code:addons/sale_stock/models/sale_order.py:249
#, python-format
msgid "\n"
"There are %s %s available across all warehouses.\n"
@@ -67,18 +67,28 @@ msgid "<strong>Incoterms:</strong>"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,help:sale_stock.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"
+" - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+" - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+" - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+
+#. module: sale_stock
#: model:ir.ui.menu,name:sale_stock.menu_aftersale
msgid "After-Sale"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "Apply special routes from orders (e.g. dropshipping, MTO)"
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
msgstr ""
#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "By default Odoo computes the expected delivery date this way: order date + highest customer lead time of products. With this option, you can set a specific delivery date on orders rather than setting lead times on products."
+msgid "Apply special routes from orders (e.g. dropshipping, MTO)"
msgstr ""
#. module: sale_stock
@@ -112,6 +122,7 @@ msgid "Delivery Orders"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_res_users__has_group_display_incoterm
#: model:res.groups,name:sale_stock.group_display_incoterm
msgid "Display incoterms on Sales Order and related invoices"
msgstr ""
@@ -122,6 +133,7 @@ msgid "Display incoterms on orders &amp; invoices"
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"
msgstr ""
@@ -143,6 +155,11 @@ msgid "Exception(s):"
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,help:sale_stock.field_sale_order__picking_policy
+msgid "If you deliver all products at once, the delivery order will be scheduled based on the greatest product lead time. Otherwise, it will be based on the shortest."
+msgstr ""
+
+#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.exception_on_so
msgid "Impacted Transfer(s):"
msgstr ""
@@ -186,6 +203,16 @@ 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"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.exception_on_so
msgid "Manual actions may be needed."
msgstr ""
@@ -203,12 +230,17 @@ msgid "Margin of error for dates promised to customers. Products will be schedul
msgstr ""
#. module: sale_stock
+#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line__qty_delivered_method
+msgid "Method to update delivered qty"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_stock
msgid "Move forward expected delivery dates by"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:254
+#: code:addons/sale_stock/models/sale_order.py:256
#, python-format
msgid "Not enough inventory!"
msgstr ""
@@ -219,7 +251,7 @@ msgid "Order-Specific Routes"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:268
+#: code:addons/sale_stock/models/sale_order.py:270
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -340,11 +372,6 @@ msgid "Selectable on Sales Order Line"
msgstr ""
#. module: sale_stock
-#: model:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale
-msgid "Set a delivery date on orders"
-msgstr ""
-
-#. module: sale_stock
#: selection:res.config.settings,default_picking_policy:0
msgid "Ship all products at once"
msgstr ""
@@ -371,6 +398,7 @@ msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line__move_ids
+#: selection:sale.order.line,qty_delivered_method:0
msgid "Stock Moves"
msgstr ""
@@ -380,24 +408,39 @@ msgid "This allows to apply a special route on sales order lines (e.g. dropshipp
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:361
+#: 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."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/models/sale_order.py:363
#, python-format
msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
msgstr ""
#. module: sale_stock
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking
msgid "Transfer"
msgstr ""
#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order__warehouse_id
#: model:ir.model.fields,field_description:sale_stock.field_sale_report__warehouse_id
msgid "Warehouse"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:360
+#: code:addons/sale_stock/models/sale_order.py:362
#, python-format
msgid "Warning"
msgstr ""
@@ -413,20 +456,20 @@ msgid "When to start shipping"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:269
+#: code:addons/sale_stock/models/sale_order.py:271
#, 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:401
+#: code:addons/sale_stock/models/sale_order.py:403
#, 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:243
+#: code:addons/sale_stock/models/sale_order.py:245
#, python-format
msgid "You plan to sell %s %s but you only have %s %s available in %s warehouse."
msgstr ""
diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot
index 747c24f62b7..9d1ecb369bb 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,11 +41,67 @@ msgid "<span class=\"o_label\">Overview</span>"
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"
+" - Analytic From expenses: the quantity is the quantity sum from posted expenses\n"
+" - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n"
+" - Stock Moves: the quantity comes from confirmed pickings\n"
+""
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__amount_to_invoice
+msgid "Amount to invoice"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__analytic_account_id
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Analytic From Expenses"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__analytic_line_ids
+msgid "Analytic lines"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_task_assign_so_line_view_form
+msgid "Assign"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.actions.act_window,name:sale_timesheet.project_task_action_multi_assign_so_line
+msgid "Assign Sale Order Item"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_task_assign_sale
+msgid "Assign Sale Order line to tasks"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_task_assign_so_line_view_form
+msgid "Assign sale line to Tasks"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:235
+#, python-format
+msgid "Before"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
msgid "Billable Fixed"
msgstr ""
@@ -76,6 +132,11 @@ msgid "Billable time"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
+msgid "Billing"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.filters,name:sale_timesheet.timesheet_filter_billing
msgid "Billing Rate"
msgstr ""
@@ -87,17 +148,65 @@ msgid "By Billing Rate"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
-msgid "Cost"
+#: 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
+#: model:ir.ui.view,arch_db:sale_timesheet.project_task_assign_so_line_view_form
+msgid "Cancel"
msgstr ""
#. module: sale_timesheet
-#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_report_cost_revenue
-#: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_report_cost_revenue
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__sale_order_id
+msgid "Choose the Sales Order to invoice"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "Company"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.filters,name:sale_timesheet.ir_filter_project_profitability_report_costs_and_revenues
msgid "Costs and Revenues"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:331
+#: code:addons/sale_timesheet/controllers/main.py:338
+#: 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
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_create_sale_order_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 ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_create_invoice
+msgid "Create a Invoice from project"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_create_sale_order
+msgid "Create a SO from project"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:321
+#: model:ir.actions.act_window,name:sale_timesheet.project_project_action_multi_create_sale_order
+#, python-format
+msgid "Create a Sales Order"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:product.template,service_tracking:0
msgid "Create a new project but no task"
msgstr ""
@@ -113,18 +222,55 @@ msgid "Create a task in an existing project"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee__currency_id
+#: 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_task_assign_sale__create_uid
+msgid "Created by"
+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_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
msgid "Currency"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__partner_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__partner_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__partner_id
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "Customer"
+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_profitability_report__display_name
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:product.template,service_tracking:0
msgid "Don't create task"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_hr_employee
-msgid "Employee"
+#: code:addons/sale_timesheet/controllers/main.py:235
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_search
+msgid "Exact name"
msgstr ""
#. module: sale_timesheet
@@ -143,11 +289,34 @@ 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 ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__task_id
+msgid "Generated Task"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "Group By"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Hours"
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_profitability_report__id
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale__id
+msgid "ID"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_account_invoice
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line__timesheet_invoice_id
msgid "Invoice"
@@ -170,11 +339,61 @@ msgid "Invoiced"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:373
+#, python-format
+msgid "Invoices"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__is_service
msgid "Is a Service"
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_profitability_report____last_update
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_assign_sale____last_update
+msgid "Last Modified on"
+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_task_assign_sale__write_uid
+msgid "Last Updated by"
+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_task_assign_sale__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Manual"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:product.template,service_type:0
+msgid "Manually set quantities on order"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_template__service_type
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sales order validation and track the work hours."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__qty_delivered_method
+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 ""
@@ -185,6 +404,31 @@ msgid "Milestones (manually set quantities on order)"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "My Project"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:235
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:193
+#, 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
+#, python-format
+msgid "No Sales Order Line"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "No task found"
@@ -192,7 +436,6 @@ msgstr ""
#. module: sale_timesheet
#: selection:account.analytic.line,timesheet_invoice_type:0
-#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Non Billable"
msgstr ""
@@ -202,6 +445,13 @@ msgid "Non Billable Hours"
msgstr ""
#. module: sale_timesheet
+#. openerp-web
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:262
+#, python-format
+msgid "Non Billable Tasks"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Non billable"
msgstr ""
@@ -223,19 +473,49 @@ msgid "Ordered quantities"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__expense_cost
+msgid "Other Cost"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Other costs"
+msgstr ""
+
+#. module: sale_timesheet
#. openerp-web
-#: code:addons/sale_timesheet/models/project.py:45
-#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:28
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:29
+#: model:ir.actions.client,name:sale_timesheet.project_timesheet_action_client_timesheet_plan
#, python-format
msgid "Overview"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__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 ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_product_template
msgid "Product Template"
msgstr ""
#. module: sale_timesheet
+#: model:ir.filters,name:sale_timesheet.ir_filter_project_profitability_report_manager_and_product
+msgid "Product by Customer"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_fixed
#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_milestone
#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_time_based
@@ -248,15 +528,65 @@ msgid "Profitability"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_graph
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_pivot
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "Profitability Analysis"
+msgstr ""
+
+#. module: sale_timesheet
#: 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.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
msgid "Project"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__project_project_id
-msgid "Project associated to this sale"
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__company_id
+msgid "Project Company"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.actions.act_window,name:sale_timesheet.project_profitability_report_action
+#: model:ir.ui.menu,name:sale_timesheet.menu_project_profitability_analysis
+msgid "Project Costs and Revenues"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__currency_id
+msgid "Project Currency"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__user_id
+#: model:ir.ui.view,arch_db:sale_timesheet.project_profitability_report_view_search
+msgid "Project Manager"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_project_profitability_report
+msgid "Project Profitability Analysis"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product__project_template_id
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__project_template_id
+msgid "Project Template"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_sale_order_line__project_id
+msgid "Project generated by the sales order item"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_project_create_invoice__project_id
+#: model:ir.model.fields,help:sale_timesheet.field_project_create_sale_order__project_id
+msgid "Project to make billable"
msgstr ""
#. module: sale_timesheet
@@ -265,7 +595,7 @@ msgid "Project(s) Overview"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:108
+#: code:addons/sale_timesheet/models/sale_order.py:101
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__project_ids
#, python-format
msgid "Projects"
@@ -287,22 +617,55 @@ msgid "Rates"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Re-invoiced costs"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:235
+#, python-format
+msgid "Remaining"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line__timesheet_revenue
msgid "Revenue"
msgstr ""
#. module: sale_timesheet
+#: 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_line_id
+msgid "Sale Order Line"
+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 ""
#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_project_task_assign_sale__sale_line_id
+msgid "Sale order line to link to selected tasks"
+msgstr ""
+
+#. module: sale_timesheet
+#: 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"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__order_confirmation_date
+msgid "Sales Order Confirmation Date"
+msgstr ""
+
+#. module: sale_timesheet
#: 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
msgid "Sales Order Item"
msgstr ""
@@ -319,12 +682,44 @@ 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
+#, python-format
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.field_product_product__project_id
#: model:ir.model.fields,help:sale_timesheet.field_product_template__project_id
msgid "Select a non billable project on which tasks can be created. This setting must be set for each company."
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_product__project_template_id
+#: model:ir.model.fields,help:sale_timesheet.field_product_template__project_template_id
+msgid "Select a non billable project to be the skeleton of the new created project when selling the current product. Its stages and tasks will be duplicated."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_project_task_assign_sale__task_ids
+msgid "Select the tasks to assign to the Sale Order Items. You can only choose task (no sub tasks)."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
+msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.res_config_settings_view_form
+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
+msgid "Service"
+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"
@@ -346,13 +741,23 @@ msgid "Setup your time-based services"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/controllers/main.py:235
+#, python-format
+msgid "Sold"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:sale.order.line,qty_delivered_method:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_project_task
-#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_line__task_id
msgid "Task"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:258
+#: code:addons/sale_timesheet/models/sale_order.py:176
#, python-format
msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
msgstr ""
@@ -363,8 +768,9 @@ msgid "Task generated by the sales order item"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:113
-#: code:addons/sale_timesheet/controllers/main.py:145
+#: code:addons/sale_timesheet/controllers/main.py:354
+#: code:addons/sale_timesheet/controllers/main.py:405
+#: 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
#, python-format
@@ -377,9 +783,33 @@ msgid "Tasks associated to this sale"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:76
+#: 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."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/product.py:64
+#, python-format
+msgid "The product %s should not have a project nor a project template since it will not generate project."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/product.py:66
+#, python-format
+msgid "The product %s should not have a project template since it will generate a task in a global project."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:41
#, python-format
-msgid "The Sales order line should be one selling a service, and no coming from expense."
+msgid "The project is already linked to a sales order item."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/wizard/project_create_invoice.py:51
+#, python-format
+msgid "The selected Sales Order should contain something to invoice."
msgstr ""
#. module: sale_timesheet
@@ -388,12 +818,22 @@ msgid "There is no timesheet for now."
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_order.py:261
+#: model:ir.actions.act_window,help:sale_timesheet.project_profitability_report_action
+msgid "This report allows you to analyse the profitability of your projects: compare the amount to invoice, the ones already invoiced and the project cost (via timesheet cost of your employees)."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/sale_order.py:267
#, 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"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
msgid "Time by people"
msgstr ""
@@ -405,7 +845,7 @@ msgstr ""
#. module: sale_timesheet
#. openerp-web
-#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:143
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:171
#: model:ir.actions.act_window,name:sale_timesheet.action_timesheet_from_invoice
#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_from_plan
#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_plan_pivot
@@ -415,11 +855,16 @@ msgid "Timesheet"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee__timesheet_cost
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__timesheet_cost
msgid "Timesheet Cost"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__timesheet_unit_amount
+msgid "Timesheet Unit Amount"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__timesheet_count
msgid "Timesheet activities"
msgstr ""
@@ -430,13 +875,19 @@ msgid "Timesheet activities associated to this sale"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/controllers/main.py:105
-#: code:addons/sale_timesheet/controllers/main.py:134
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+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/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
#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
+#: selection:sale.order.line,qty_delivered_method:0
#, python-format
msgid "Timesheets"
msgstr ""
@@ -448,6 +899,11 @@ msgid "Timesheets of %s"
msgstr ""
#. module: sale_timesheet
+#: selection:product.template,service_type:0
+msgid "Timesheets on project (one fare per SO/Project)"
+msgstr ""
+
+#. module: sale_timesheet
#: selection:product.template,service_policy:0
msgid "Timesheets on tasks"
msgstr ""
@@ -458,19 +914,57 @@ msgid "To invoice"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/account.py:37
+#: 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, ...)"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_type
+msgid "Track Service"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_invoiced
+msgid "Untaxed Amount Invoiced"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_to_invoice
+msgid "Untaxed Amount To Invoice"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__expense_amount_untaxed_to_invoice
+msgid "Untaxed Amount to Re-invoiced"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__expense_amount_untaxed_invoiced
+msgid "Untaxed Re-invoiced Amount"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/account.py:29
#, 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/models/project.py:106
+#: code:addons/sale_timesheet/wizard/project_create_invoice.py:18
+#: code:addons/sale_timesheet/wizard/project_create_sale_order.py:18
+#, 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 this task."
+msgid "You cannot delete a task related to a sales order. You can only archive it."
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
-msgid "per hour"
+#: code:addons/sale_timesheet/models/project.py:93
+#, python-format
+msgid "You cannot link the order item %s - %s to this task because it is a re-invoiced expense."
msgstr ""
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index 89375a4472e..6d420a34b5c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgid "<span>View</span>"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team__active
msgid "Active"
msgstr ""
@@ -158,6 +163,21 @@ msgid "Follow this salesteam to automatically track the events associated to use
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
msgid "Graph"
msgstr ""
@@ -183,6 +203,21 @@ msgid "ID"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_has_error
+msgid "If checked, some messages have a delivery error."
+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"
@@ -199,6 +234,11 @@ msgid "Invoices"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team____last_update
msgid "Last Modified on"
msgstr ""
@@ -239,6 +279,16 @@ msgid "Manager"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: sales_team
#: selection:crm.team,dashboard_graph_group:0
msgid "Month"
msgstr ""
@@ -255,6 +305,31 @@ msgid "Not Defined"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
msgid "Pipeline"
msgstr ""
@@ -273,6 +348,7 @@ msgstr ""
#: selection:crm.team,dashboard_graph_model:0
#: model:crm.team,name:sales_team.team_sales_department
#: selection:crm.team,team_type:0
+#: model:ir.model.fields,field_description:sales_team.field_res_users__group_sales_team_user
msgid "Sales"
msgstr ""
@@ -390,6 +466,16 @@ msgid "Undefined graph model for Sales Channel: %s"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__message_unread_counter
+msgid "Unread Messages Counter"
+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"
@@ -407,6 +493,13 @@ msgid "User: Own Documents Only"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_res_users__group_sales_team_user
+msgid "User: Own Documents Only: the user will have access to his own data in the sales application.\n"
+"User: All Documents: the user will have access to all records of everyone in the sales application.\n"
+"Manager: the user will have an access to the sales configuration as well as statistic reports."
+msgstr ""
+
+#. module: sales_team
#: model:ir.model,name:sales_team.model_res_users
msgid "Users"
msgstr ""
@@ -418,6 +511,16 @@ msgid "Website"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: sales_team
#: selection:crm.team,dashboard_graph_group:0
msgid "Week"
msgstr ""
diff --git a/addons/social_media/i18n/social_media.pot b/addons/social_media/i18n/social_media.pot
index 56b1cb86064..5d903602b81 100644
--- a/addons/social_media/i18n/social_media.pot
+++ b/addons/social_media/i18n/social_media.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: social_media
+#: model:ir.model,name:social_media.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: social_media
#: model:ir.model.fields,field_description:social_media.field_res_company__social_facebook
msgid "Facebook Account"
msgstr ""
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 2927643de0e..10e96f8efda 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+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:332
+#: code:addons/stock/models/stock_move.py:343
#, python-format
msgid "\n"
"\n"
@@ -24,7 +24,7 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:333
+#: code:addons/stock/models/stock_move.py:344
#, python-format
msgid "\n"
"\n"
@@ -32,13 +32,13 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:320
+#: code:addons/stock/models/stock_move.py:331
#, python-format
msgid " (%s reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:323
+#: code:addons/stock/models/stock_move.py:334
#, python-format
msgid " (reserved)"
msgstr ""
@@ -59,7 +59,7 @@ msgid "#Products"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:482
+#: code:addons/stock/models/stock_warehouse.py:486
#, python-format
msgid "%s: Supply Product from %s"
msgstr ""
@@ -140,7 +140,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "<span><strong>Partner Address:</strong></span>"
+msgid "<span><strong>Vendor Address:</strong></span>"
msgstr ""
#. module: stock
@@ -154,13 +154,14 @@ msgid "<span>New</span>"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "<span>No reservation or quantity done yet.</span>"
+#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
+msgid "<span>View</span>"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
-msgid "<span>View</span>"
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "<strong>\n"
+" Product Barcode</strong>"
msgstr ""
#. module: stock
@@ -171,17 +172,17 @@ msgid "<strong>\n"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "<strong>Commitment Date</strong>"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Date</strong>"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "<strong>From</strong>"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Inventory</strong>"
msgstr ""
@@ -192,6 +193,11 @@ msgid "<strong>Location</strong>"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "<strong>Lot/Serial Number</strong>"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_warehouse_orderpoint_kanban
msgid "<strong>Max qty :</strong>"
msgstr ""
@@ -204,7 +210,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "<strong>Order (Origin)</strong>"
+msgid "<strong>Order</strong>"
msgstr ""
#. module: stock
@@ -215,6 +221,7 @@ 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
msgid "<strong>Product</strong>"
msgstr ""
@@ -231,6 +238,7 @@ 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
msgid "<strong>Quantity</strong>"
msgstr ""
@@ -250,18 +258,23 @@ msgid "<strong>The initial demand has been updated.</strong>"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "<strong>To</strong>"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Total Quantity</strong>"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:115
+#: code:addons/stock/models/stock_inventory.py:122
#, python-format
msgid "A Pack"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:94
+#: code:addons/stock/models/stock_move_line.py:87
#, python-format
msgid "A done move line should never have a reserved quantity."
msgstr ""
@@ -273,6 +286,7 @@ msgid "A serial number should only be linked to a single product."
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"
"A consumable product, on the other hand, is a product for which stock is not managed.\n"
@@ -281,6 +295,7 @@ msgid "A stockable product is a product for which you manage stock. The \"Invent
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_warning_stock
#: model:res.groups,name:stock.group_warning_stock
msgid "A warning can be set on a partner (Stock)"
msgstr ""
@@ -291,6 +306,12 @@ msgid "Action"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_needaction
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_needaction
+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
@@ -303,6 +324,16 @@ msgid "Active"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,help:stock.action_production_lot_form
msgid "Add a lot/serial number"
msgstr ""
@@ -355,6 +386,11 @@ msgid "Advanced: Apply Procurement Rules"
msgstr ""
#. module: stock
+#: selection:barcode.rule,type:0
+msgid "Alias"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "All"
msgstr ""
@@ -380,20 +416,24 @@ 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:105
+#: code:addons/stock/models/stock_inventory.py:112
#, python-format
msgid "All products"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "All products could not be reserved. Click on the \"Check Availability\" button to try to reserve products"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__returned_move_ids
msgid "All returned moves"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:86
-#, python-format
-msgid "An incoming date cannot be set to an untracked product."
+#: model:ir.model.fields,help:stock.field_stock_location__putaway_strategy_id
+msgid "Allows to suggest the exact location (shelf) where to store the product."
msgstr ""
#. module: stock
@@ -422,6 +462,11 @@ 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
@@ -506,6 +551,7 @@ msgid "Back Order of"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__backorder_ids
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "Back Orders"
msgstr ""
@@ -595,7 +641,7 @@ msgid "By Unique Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:625
+#: code:addons/stock/models/stock_move.py:655
#, python-format
msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order."
msgstr ""
@@ -641,13 +687,13 @@ msgid "Calendar View"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:428
+#: code:addons/stock/models/stock_warehouse.py:432
#, python-format
msgid "Can't find any customer or supplier location."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:477
+#: code:addons/stock/models/stock_warehouse.py:481
#, python-format
msgid "Can't find any generic Make To Order route."
msgstr ""
@@ -669,22 +715,33 @@ msgid "Cancel Inventory"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.inventory,state:0
#: selection:stock.move,state:0
+#: selection:stock.package_level,state:0
#: selection:stock.picking,state:0
msgid "Cancelled"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:268
+#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
+msgid "Cancelled Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_move.py:279
#, python-format
msgid "Cannot set the done quantity from this stock move, work directly with the move lines."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:482
-#, python-format
-msgid "Cannot unreserve a done move"
+#: selection:barcode.rule,type:0
+msgid "Cashier"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__product_uom_category_id
+msgid "Category"
msgstr ""
#. module: stock
@@ -760,6 +817,11 @@ msgid "Choose your date"
msgstr ""
#. module: stock
+#: selection:barcode.rule,type:0
+msgid "Client"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_incoterms__code
msgid "Code"
msgstr ""
@@ -794,8 +856,8 @@ msgid "Company"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking__date_done
-msgid "Completion Date of Transfer"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Completion Date"
msgstr ""
#. module: stock
@@ -810,6 +872,11 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
+msgid "Compute shipping costs and ship with Easypost"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Compute shipping costs and ship with FedEx"
msgstr ""
@@ -841,23 +908,24 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_warn_insufficient_qty_form_view
#: 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
msgid "Confirm"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
+#: selection:stock.package_level,state:0
msgid "Confirmed"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
-msgid "Confirmed Moves"
+#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_tracking_owner
+msgid "Consignment"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_tracking_owner
-msgid "Consignment"
+#: selection:product.template,type:0
+msgid "Consumable"
msgstr ""
#. module: stock
@@ -881,6 +949,11 @@ msgid "Content"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_product_replenish__product_uom_category_id
+msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__posx
msgid "Corridor (X)"
msgstr ""
@@ -932,7 +1005,7 @@ msgid "Create Backorder"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:759
+#: code:addons/stock/models/stock_picking.py:757
#, python-format
msgid "Create Backorder?"
msgstr ""
@@ -1009,6 +1082,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__create_uid
#: 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
@@ -1022,6 +1096,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_picking__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__create_uid
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__create_uid
@@ -1044,6 +1119,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__create_date
#: 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
@@ -1056,6 +1132,7 @@ msgstr ""
#: 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
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__create_date
#: model:ir.model.fields,field_description:stock.field_stock_picking__create_date
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__create_date
#: model:ir.model.fields,field_description:stock.field_stock_quant__create_date
@@ -1095,7 +1172,12 @@ msgid "Creation Date, usually the time of the order"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:433
+#: selection:barcode.rule,type:0
+msgid "Credit Card"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:437
#, python-format
msgid "Cross-Dock"
msgstr ""
@@ -1111,31 +1193,11 @@ msgid "Cumulative Quantity"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_destination_location_id
-msgid "Current Destination Location"
-msgstr ""
-
-#. module: stock
#: selection:stock.quantity.history,compute_at_date:0
msgid "Current Inventory"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_picking_id
-msgid "Current Picking"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_picking_move_line_ids
-msgid "Current Picking Move Line"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package__current_source_location_id
-msgid "Current Source Location"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,name:stock.location_open_quants
#: model:ir.ui.view,arch_db:stock.view_location_form
msgid "Current Stock"
@@ -1242,6 +1304,16 @@ msgid "Date Expected"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_product_replenish__date_planned
+msgid "Date at which the replenishment should take place."
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__date_done
+msgid "Date at which the transfer has been processed or cancelled."
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking__date_done
msgid "Date of Transfer"
msgstr ""
@@ -1338,11 +1410,6 @@ msgid "Define your locations to reflect your warehouse structure and\n"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_location__putaway_strategy_id
-msgid "Defines the default method used for suggesting the exact location (shelf) where to store the products. This method can be enforced at the product category level, and a fallback is made on the parent locations if none is set here."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location__removal_strategy_id
msgid "Defines the default method used for suggesting the exact location (shelf) where to take the products from, which lot etc. for this location. This method can be enforced at the product category level, and a fallback is made on the parent locations if none is set here."
msgstr ""
@@ -1359,7 +1426,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:332
+#: code:addons/stock/models/product.py:331
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1370,7 +1437,7 @@ msgid "Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:209
+#: code:addons/stock/models/stock_warehouse.py:213
#: model:stock.picking.type,name:stock.picking_type_out
#, python-format
msgid "Delivery Orders"
@@ -1492,7 +1559,7 @@ msgid "Destination route"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:460
+#: code:addons/stock/models/stock_move.py:471
#: model:ir.ui.view,arch_db:stock.view_picking_form
#, python-format
msgid "Detailed Operations"
@@ -1515,15 +1582,22 @@ 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
msgid "Discard"
msgstr ""
#. module: stock
+#: selection:barcode.rule,type:0
+msgid "Discounted Product"
+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_stock_backorder_confirmation__display_name
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__display_name
@@ -1538,6 +1612,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__display_name
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__display_name
#: model:ir.model.fields,field_description:stock.field_stock_picking__display_name
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__display_name
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__display_name
@@ -1558,12 +1633,14 @@ 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
#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.view_picking_form
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.move,state:0
+#: selection:stock.package_level,state:0
#: selection:stock.picking,state:0
#: selection:stock.scrap,state:0
msgid "Done"
@@ -1587,6 +1664,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.inventory,state:0
+#: selection:stock.package_level,state:0
#: selection:stock.picking,state:0
#: selection:stock.scrap,state:0
msgid "Draft"
@@ -1603,13 +1681,13 @@ msgid "EX WORKS"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking__entire_package_ids
-msgid "Entire Package"
+#: model:ir.model.fields,field_description:stock.field_res_config_settings__module_delivery_easypost
+msgid "Easypost Connector"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking__entire_package_detail_ids
-msgid "Entire Package Detail"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Effective Date"
msgstr ""
#. module: stock
@@ -1629,12 +1707,6 @@ msgid "Every stock operation in Odoo moves the products from one\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:422
-#, python-format
-msgid "Everything inside a package should be in the same location"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.exception_on_picking
msgid "Exception(s) occurred on the picking"
msgstr ""
@@ -1702,8 +1774,8 @@ msgid "Fixed"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_putaway
-msgid "Fixed Locations Per Categories"
+#: model:ir.model.fields,field_description:stock.field_product_putaway__product_location_ids
+msgid "Fixed Locations Per Product"
msgstr ""
#. module: stock
@@ -1717,6 +1789,24 @@ msgid "Fixed Procurement Group"
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"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_channel_ids
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_partner_ids
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_category__removal_strategy_id
msgid "Force Removal Strategy"
msgstr ""
@@ -1735,7 +1825,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:327
+#: code:addons/stock/models/product.py:326
#: 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
@@ -1744,10 +1834,10 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__location_id
+#: 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_move_tree
-#: model:ir.ui.view,arch_db:stock.view_quant_package_picking_tree
msgid "From"
msgstr ""
@@ -1772,31 +1862,31 @@ msgid "Future Activities"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:330
+#: code:addons/stock/models/product.py:329
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:335
+#: code:addons/stock/models/product.py:334
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:345
+#: code:addons/stock/models/product.py:344
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:340
+#: code:addons/stock/models/product.py:339
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:322
+#: code:addons/stock/models/product.py:321
#, python-format
msgid "Future Receipts"
msgstr ""
@@ -1871,6 +1961,16 @@ msgid "Has Scrap Moves"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__has_tracking
+msgid "Has Tracking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__product_has_variants
+msgid "Has variants"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__posz
msgid "Height (Z)"
msgstr ""
@@ -1887,6 +1987,7 @@ msgstr ""
#: 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_stock_backorder_confirmation__id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__id
@@ -1901,6 +2002,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_move__id
#: model:ir.model.fields,field_description:stock.field_stock_move_line__id
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__id
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__id
#: model:ir.model.fields,field_description:stock.field_stock_picking__id
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__id
@@ -1920,7 +2022,7 @@ msgid "ID"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:395
+#: code:addons/stock/models/stock_inventory.py:402
#, python-format
msgid "INV:"
msgstr ""
@@ -1937,9 +2039,21 @@ msgid "If a product is not at the right place, set the checked quantity to 0 and
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking__picking_type_entire_packs
-#: model:ir.model.fields,help:stock.field_stock_picking_type__show_entire_packs
-msgid "If checked, this shows the packs to be moved as a whole in the Operations tab all the time, even if there was no entire pack reserved."
+#: model:ir.model.fields,help:stock.field_stock_picking__message_unread
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__message_needaction
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__message_has_error
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_has_error
+msgid "If checked, some messages have a delivery error."
msgstr ""
#. module: stock
@@ -2011,6 +2125,14 @@ msgid "If this shipment was split, then this field links to the shipment which c
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move__picking_type_entire_packs
+#: model:ir.model.fields,help:stock.field_stock_move_line__picking_type_entire_packs
+#: model:ir.model.fields,help:stock.field_stock_picking__picking_type_entire_packs
+#: model:ir.model.fields,help:stock.field_stock_picking_type__show_entire_packs
+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
msgid "If unchecked, it will allow you to hide the rule without removing it."
msgstr ""
@@ -2022,12 +2144,13 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_immediate_transfer
+#: model:ir.model.fields,field_description:stock.field_stock_picking__immediate_transfer
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
msgid "Immediate Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:722
+#: code:addons/stock/models/stock_picking.py:720
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2043,11 +2166,6 @@ msgid "Immediately after sales order confirmation"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_line__in_entire_package
-msgid "In Entire Package"
-msgstr ""
-
-#. module: stock
#: selection:stock.inventory,state:0
msgid "In Progress"
msgstr ""
@@ -2162,7 +2280,7 @@ msgid "Internal Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:231
+#: code:addons/stock/models/stock_warehouse.py:235
#: model:stock.picking.type,name:stock.picking_type_internal
#, python-format
msgid "Internal Transfers"
@@ -2184,19 +2302,19 @@ msgid "Internal reference number in case it differs from the manufacturer's lot/
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:240
+#: code:addons/stock/models/product.py:250
#, python-format
msgid "Invalid domain left operand %s"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:242
+#: code:addons/stock/models/product.py:252
#, python-format
msgid "Invalid domain operator %s"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:244
+#: code:addons/stock/models/product.py:254
#, python-format
msgid "Invalid domain right operand %s"
msgstr ""
@@ -2233,7 +2351,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
-msgid "Inventories Month"
+msgid "Inventories Date"
msgstr ""
#. module: stock
@@ -2241,6 +2359,7 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.stock_picking_type_action
#: model:ir.actions.report,name:stock.action_report_inventory
#: model:ir.model,name:stock.model_stock_inventory
+#: 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.ui.menu,name:stock.menu_stock_root
@@ -2349,6 +2468,17 @@ msgid "Inventory of"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_is_follower
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__is_fresh_package
+msgid "Is Fresh Package"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__is_locked
#: model:ir.model.fields,field_description:stock.field_stock_move_line__is_locked
#: model:ir.model.fields,field_description:stock.field_stock_picking__is_locked
@@ -2356,11 +2486,6 @@ msgid "Is Locked"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package__is_processed
-msgid "Is Processed"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__return_location
msgid "Is a Return Location?"
msgstr ""
@@ -2382,13 +2507,13 @@ msgid "Is quantity done editable"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:258
+#: code:addons/stock/models/stock_quant.py:265
#, python-format
msgid "It is not possible to reserve more products of %s than you have in stock."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:260
+#: code:addons/stock/models/stock_quant.py:270
#, python-format
msgid "It is not possible to unreserve more products of %s than you have in stock."
msgstr ""
@@ -2413,6 +2538,7 @@ msgstr ""
#: 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_stock_backorder_confirmation____last_update
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty____last_update
@@ -2427,6 +2553,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer____last_update
+#: model:ir.model.fields,field_description:stock.field_stock_package_level____last_update
#: model:ir.model.fields,field_description:stock.field_stock_picking____last_update
#: model:ir.model.fields,field_description:stock.field_stock_picking_type____last_update
#: model:ir.model.fields,field_description:stock.field_stock_production_lot____last_update
@@ -2450,6 +2577,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__write_uid
#: 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
@@ -2463,6 +2591,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_picking__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__write_uid
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__write_uid
@@ -2485,6 +2614,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation__write_date
#: 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
@@ -2498,6 +2628,7 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__write_date
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__write_date
#: model:ir.model.fields,field_description:stock.field_stock_picking__write_date
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__write_date
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__write_date
@@ -2554,11 +2685,6 @@ msgid "Leave this field empty if this route is shared between all companies"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location__parent_left
-msgid "Left Parent"
-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"
@@ -2586,6 +2712,7 @@ msgstr ""
#. module: stock
#: code:addons/stock/models/barcode.py:12
+#: selection:barcode.rule,type:0
#: model:ir.model.fields,field_description:stock.field_product_product__location_id
#: model:ir.model.fields,field_description:stock.field_product_template__location_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__location_id
@@ -2596,9 +2723,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_scrap__location_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__location_id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty__location_id
-#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_repair__location_id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__location_id
-#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_unbuild__location_id
#: 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.stock_scrap_search_view
@@ -2663,6 +2788,7 @@ 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
@@ -2699,11 +2825,8 @@ msgstr ""
#: 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_delivery_document
#: 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_picking
-#: model:ir.ui.view,arch_db:stock.view_move_line_form
msgid "Lot/Serial Number"
msgstr ""
@@ -2732,7 +2855,7 @@ msgid "Lots/Serial Numbers"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:543
+#: code:addons/stock/models/stock_warehouse.py:547
#, python-format
msgid "MTO"
msgstr ""
@@ -2743,7 +2866,7 @@ msgid "MTO rule"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:475
+#: code:addons/stock/models/stock_warehouse.py:479
#: model:stock.location.route,name:stock.route_warehouse0_mto
#, python-format
msgid "Make To Order"
@@ -2755,31 +2878,37 @@ msgid "Make packages into a dedicated location, then bring them to the output lo
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"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_production_lot
#: model:res.groups,name:stock.group_production_lot
msgid "Manage Lots / Serial Numbers"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_stock_multi_locations
#: model:res.groups,name:stock.group_stock_multi_locations
msgid "Manage Multiple Stock Locations"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_stock_multi_warehouses
#: model:res.groups,name:stock.group_stock_multi_warehouses
msgid "Manage Multiple Warehouses"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_tracking_lot
#: model:res.groups,name:stock.group_tracking_lot
msgid "Manage Packages"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_users__has_group_adv_location
#: model:res.groups,name:stock.group_adv_location
msgid "Manage Push and Pull inventory flows"
msgstr ""
@@ -2840,12 +2969,24 @@ msgid "Maximum Quantity"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_has_error
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner__picking_warn_msg
#: model:ir.model.fields,field_description:stock.field_res_users__picking_warn_msg
msgid "Message for Stock Picking"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_ids
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_removal__method
msgid "Method"
msgstr ""
@@ -2888,6 +3029,7 @@ msgid "Most operations are prepared automatically by Odoo according\n"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__move_ids
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__move_id
msgid "Move"
msgstr ""
@@ -2898,6 +3040,8 @@ msgid "Move Detail"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move__picking_type_entire_packs
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_type_entire_packs
#: model:ir.model.fields,field_description:stock.field_stock_picking__picking_type_entire_packs
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__show_entire_packs
msgid "Move Entire Packages"
@@ -2910,7 +3054,7 @@ 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_quant_package__move_line_ids
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__move_line_ids
msgid "Move Line"
msgstr ""
@@ -2990,13 +3134,14 @@ msgstr ""
#: code:addons/stock/models/stock_scrap.py:68
#: code:addons/stock/models/stock_scrap.py:69
#: selection:stock.move,state:0
+#: selection:stock.package_level,state:0
#, python-format
msgid "New"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:175
-#: code:addons/stock/models/stock_picking.py:634
+#: code:addons/stock/models/stock_move_line.py:168
+#: code:addons/stock/models/stock_picking.py:612
#, python-format
msgid "New Move:"
msgstr ""
@@ -3012,6 +3157,21 @@ msgid "New Transfer"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.exception_on_picking
msgid "Next transfer(s) impacted:"
msgstr ""
@@ -3042,7 +3202,7 @@ msgid "No inventory found"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:400
+#: code:addons/stock/models/stock_move_line.py:402
#, python-format
msgid "No negative quantities allowed"
msgstr ""
@@ -3061,7 +3221,7 @@ msgstr ""
#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:58
#, python-format
-msgid "No products to return (only lines in Done state and not fully returned yet can be returned)!"
+msgid "No products to return (only lines in Done state and not fully returned yet can be returned)."
msgstr ""
#. module: stock
@@ -3090,12 +3250,18 @@ msgid "Notes"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:582
+#: code:addons/stock/models/stock_picking.py:563
#, python-format
msgid "Nothing to check the availability for."
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_rule__delay
msgid "Number of Days"
msgstr ""
@@ -3111,6 +3277,30 @@ 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"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__message_needaction_counter
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__message_has_error_counter
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,help:stock.field_stock_production_lot__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: stock
#: code:addons/stock/models/stock_picking.py:75
#, python-format
msgid "OK"
@@ -3136,31 +3326,31 @@ 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:113
+#: code:addons/stock/models/stock_inventory.py:120
#, python-format
msgid "One Lot/Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:111
+#: code:addons/stock/models/stock_inventory.py:118
#, python-format
msgid "One owner only"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:106
+#: code:addons/stock/models/stock_inventory.py:113
#, python-format
msgid "One product category"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:111
+#: code:addons/stock/models/stock_inventory.py:118
#, python-format
msgid "One product for a specific owner"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:107
+#: code:addons/stock/models/stock_inventory.py:114
#, python-format
msgid "One product only"
msgstr ""
@@ -3218,6 +3408,11 @@ msgid "Operations Types"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__move_line_ids_without_package
+msgid "Operations without package"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__partner_id
msgid "Optional address where goods are to be delivered, specifically used for allotment"
msgstr ""
@@ -3316,6 +3511,11 @@ msgid "Output Location"
msgstr ""
#. module: stock
+#: selection:stock.picking,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__overprocessed_product_name
msgid "Overprocessed Product Name"
msgstr ""
@@ -3354,7 +3554,7 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:337
+#: code:addons/stock/models/product.py:336
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -3367,7 +3567,7 @@ msgid "PRINT"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:216
+#: code:addons/stock/models/stock_warehouse.py:220
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__package_id
#, python-format
msgid "Pack"
@@ -3380,13 +3580,14 @@ 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
#: model:ir.model.fields,field_description:stock.field_stock_quant__package_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__package_id
#: 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.report_picking
#: model:ir.ui.view,arch_db:stock.view_quant_package_form
-#: model:ir.ui.view,arch_db:stock.view_quant_package_picking_tree
#: model:ir.ui.view,arch_db:stock.view_quant_package_tree
#, python-format
msgid "Package"
@@ -3408,6 +3609,18 @@ msgid "Package Content"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move__package_level_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_line__package_level_id
+#: model:ir.model.fields,field_description:stock.field_stock_picking__package_level_ids
+msgid "Package Level"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__package_level_ids_details
+msgid "Package Level Ids Details"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
msgid "Package Name"
msgstr ""
@@ -3491,6 +3704,11 @@ msgid "Parent Location"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_location__parent_path
+msgid "Parent Path"
+msgstr ""
+
+#. module: stock
#: selection:procurement.group,move_type:0
msgid "Partial"
msgstr ""
@@ -3519,7 +3737,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
-msgid "Physical Inventories by Month"
+msgid "Physical Inventories by Date"
msgstr ""
#. module: stock
@@ -3533,7 +3751,7 @@ msgid "Physical Packages"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:224
+#: code:addons/stock/models/stock_warehouse.py:228
#: 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
@@ -3541,13 +3759,13 @@ msgid "Pick"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:435
+#: code:addons/stock/models/stock_warehouse.py:439
#, python-format
msgid "Pick + Pack + Ship"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:434
+#: code:addons/stock/models/stock_warehouse.py:438
#, python-format
msgid "Pick + Ship"
msgstr ""
@@ -3559,6 +3777,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_overprocessed_transfer__picking_id
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__picking_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking__picking_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__picking_id
#: model:ir.ui.view,arch_db:stock.view_move_search
@@ -3616,24 +3835,23 @@ msgid "Pivot"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
-msgid "Planned Transfer"
+#: selection:stock.picking,activity_state:0
+msgid "Planned"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:693
-#, python-format
-msgid "Please add some lines to move"
+#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
+msgid "Planned Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1018
+#: code:addons/stock/models/stock_picking.py:690
#, python-format
-msgid "Please process some quantities to put in the pack first!"
+msgid "Please add some items to move."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:130
+#: code:addons/stock/wizard/stock_picking_return.py:131
#, python-format
msgid "Please specify at least one non-zero quantity."
msgstr ""
@@ -3649,11 +3867,21 @@ msgid "Preferred Packaging"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__route_ids
+msgid "Preferred Routes"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move__route_ids
msgid "Preferred route"
msgstr ""
#. module: stock
+#: selection:barcode.rule,type:0
+msgid "Priced Product"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Print"
msgstr ""
@@ -3750,15 +3978,17 @@ msgid "Produce Line"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:347
+#: code:addons/stock/models/product.py:346
#, python-format
msgid "Produced Qty"
msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_product_product
+#: model:ir.model.fields,field_description:stock.field_product_replenish__product_id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__product_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty__product_id
+#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat__product_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__product_id
#: model:ir.model.fields,field_description:stock.field_stock_move__product_id
#: model:ir.model.fields,field_description:stock.field_stock_move_line__product_id
@@ -3769,13 +3999,10 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_scrap__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_repair__product_id
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__product_id
-#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_unbuild__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_picking
#: 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.search_product_lot_filter
@@ -3785,7 +4012,7 @@ msgid "Product"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:178
+#: code:addons/stock/models/stock_location.py:190
#: 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
@@ -3838,11 +4065,18 @@ msgid "Product Template"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__product_tmpl_id
+msgid "Product Tmpl"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_template__type
#: model:ir.model.fields,field_description:stock.field_stock_move__product_type
msgid "Product Type"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_uom_uom
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__product_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint__product_uom
msgid "Product Unit of Measure"
@@ -3877,7 +4111,7 @@ msgid "Production Location"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:168
+#: code:addons/stock/models/stock_location.py:180
#: 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
@@ -3892,7 +4126,7 @@ msgid "Products"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:310
+#: code:addons/stock/models/product.py:309
#, python-format
msgid "Products: "
msgstr ""
@@ -3958,6 +4192,7 @@ msgid "Put your products in packs (e.g. parcels, boxes) and track them"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_fixed_putaway_strat_form
#: model:ir.ui.view,arch_db:stock.view_putaway
msgid "Putaway"
msgstr ""
@@ -3986,23 +4221,20 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location__quant_ids
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty__quant_ids
-#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_repair__quant_ids
#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_scrap__quant_ids
-#: model:ir.model.fields,field_description:stock.field_stock_warn_insufficient_qty_unbuild__quant_ids
msgid "Quant"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__quantity
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast__quantity
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__product_qty
#: model:ir.model.fields,field_description:stock.field_stock_quant__quantity
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__quantity
#: model:ir.model.fields,field_description:stock.field_stock_scrap__scrap_qty
#: model:ir.ui.view,arch_db:stock.report_package_barcode
-#: model:ir.ui.view,arch_db:stock.report_picking
#: 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_quant_package_form
msgid "Quantity"
msgstr ""
@@ -4045,7 +4277,7 @@ msgid "Quantity cannot be negative."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:624
+#: code:addons/stock/models/stock_move.py:654
#, python-format
msgid "Quantity decreased!"
msgstr ""
@@ -4141,25 +4373,25 @@ msgid "Receipt Route"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:432
+#: code:addons/stock/models/stock_warehouse.py:436
#, python-format
msgid "Receipt in 1 step"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:432
+#: code:addons/stock/models/stock_warehouse.py:436
#, python-format
msgid "Receipt in 2 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:433
+#: code:addons/stock/models/stock_warehouse.py:437
#, python-format
msgid "Receipt in 3 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:202
+#: code:addons/stock/models/stock_warehouse.py:206
#: model:stock.picking.type,name:stock.picking_type_in
#, python-format
msgid "Receipts"
@@ -4171,7 +4403,7 @@ msgid "Receive goods directly in stock (1 step)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:324
+#: code:addons/stock/models/product.py:323
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4219,6 +4451,7 @@ msgid "Register a product receipt"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_move_kandan
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Register lots, packs, location"
msgstr ""
@@ -4240,7 +4473,7 @@ msgid "Removal Strategy"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:115
+#: code:addons/stock/models/stock_quant.py:109
#, python-format
msgid "Removal strategy %s not implemented."
msgstr ""
@@ -4276,6 +4509,19 @@ msgid "Reordering Rules Search"
msgstr ""
#. module: stock
+#: model:ir.actions.act_window,name:stock.action_product_replenish
+#: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button
+#: model:ir.ui.view,arch_db:stock.product_product_view_form_easy_inherit_stock
+#: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button
+msgid "Replenish"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_product_replenish
+msgid "Replenish wizard"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.menu,name:stock.menu_warehouse_report
msgid "Reporting"
msgstr ""
@@ -4306,6 +4552,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.view_move_picking_form
#: model:ir.ui.view,arch_db:stock.view_picking_form
#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
+#: selection:stock.package_level,state:0
msgid "Reserved"
msgstr ""
@@ -4326,6 +4573,11 @@ msgid "Responsible"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__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"
msgstr ""
@@ -4357,13 +4609,13 @@ msgid "Return Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:101
+#: code:addons/stock/wizard/stock_picking_return.py:102
#, python-format
msgid "Return of %s"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_picking_return.py:151
+#: code:addons/stock/wizard/stock_picking_return.py:152
#, python-format
msgid "Returned Picking"
msgstr ""
@@ -4374,11 +4626,6 @@ msgid "Reverse Transfer"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_location__parent_right
-msgid "Right Parent"
-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.ui.view,arch_db:stock.stock_location_route_form_view
@@ -4443,6 +4690,7 @@ msgid "Scheduled"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_replenish__date_planned
#: model:ir.model.fields,field_description:stock.field_stock_picking__scheduled_date
msgid "Scheduled Date"
msgstr ""
@@ -4458,7 +4706,7 @@ msgid "Scheduled time for the first part of the shipment to be processed. Settin
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1031
+#: code:addons/stock/models/stock_picking.py:1043
#: 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
@@ -4533,7 +4781,7 @@ msgid "Search Stock Location Paths"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:108
+#: code:addons/stock/models/stock_inventory.py:115
#, python-format
msgid "Select products manually"
msgstr ""
@@ -4565,31 +4813,31 @@ msgid "Sequence"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:687
+#: code:addons/stock/models/stock_warehouse.py:698
#, python-format
msgid "Sequence in"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:691
+#: code:addons/stock/models/stock_warehouse.py:702
#, python-format
msgid "Sequence internal"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:688
+#: code:addons/stock/models/stock_warehouse.py:699
#, python-format
msgid "Sequence out"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:689
+#: code:addons/stock/models/stock_warehouse.py:700
#, python-format
msgid "Sequence packing"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:690
+#: code:addons/stock/models/stock_warehouse.py:701
#, python-format
msgid "Sequence picking"
msgstr ""
@@ -4600,6 +4848,11 @@ msgid "Served Warehouse"
msgstr ""
#. module: stock
+#: selection:product.template,type:0
+msgid "Service"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Set Putaway Strategies on Locations"
msgstr ""
@@ -4652,7 +4905,7 @@ msgid "Shelves (Y)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:434
+#: code:addons/stock/models/stock_warehouse.py:438
#, python-format
msgid "Ship Only"
msgstr ""
@@ -4699,6 +4952,12 @@ msgid "Show Detailed Operations"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__show_lots_m2o
+msgid "Show Lots M2O"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__show_lots_text
#: model:ir.model.fields,field_description:stock.field_stock_picking__show_lots_text
msgid "Show Lots Text"
msgstr ""
@@ -4750,6 +5009,7 @@ msgstr ""
#: 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
#: 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
msgid "Source Location"
msgstr ""
@@ -4806,6 +5066,11 @@ msgid "Start Inventory"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_package_level__state
+msgid "State"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory__state
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line__state
#: model:ir.model.fields,field_description:stock.field_stock_move__state
@@ -4820,6 +5085,14 @@ msgid "Status"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__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: stock
#: code:addons/stock/models/stock_warehouse.py:96
#: model:stock.location,name:stock.stock_location_stock
#, python-format
@@ -4922,6 +5195,11 @@ msgid "Stock Quantity History"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__move_ids_without_package
+msgid "Stock moves not in package"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Stock moves that are Available (Ready to process)"
msgstr ""
@@ -4942,6 +5220,11 @@ msgid "Stockable"
msgstr ""
#. module: stock
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_config_settings__group_stock_multi_locations
msgid "Storage Locations"
msgstr ""
@@ -5044,7 +5327,7 @@ msgid "The 'Manual Operation' value will create a stock move after the current o
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:829
+#: code:addons/stock/models/stock_picking.py:826
#, python-format
msgid "The backorder <a href=# data-oe-model=stock.picking data-oe-id=%d>%s</a> has been created."
msgstr ""
@@ -5077,7 +5360,7 @@ msgstr ""
#. module: stock
#: code:addons/stock/models/stock_warehouse.py:143
#, python-format
-msgid "The default resupply warehouse should be different than the warehouse itself!"
+msgid "The default resupply warehouse should be different than itself."
msgstr ""
#. module: stock
@@ -5144,19 +5427,45 @@ msgid "The push rule that created this stock move"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:275
+#: code:addons/stock/models/stock_move_line.py:371
+#, 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
#, 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 ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:144
-#: code:addons/stock/models/stock_inventory.py:146
-#: code:addons/stock/models/stock_inventory.py:148
-#: code:addons/stock/models/stock_inventory.py:150
+#: model:ir.ui.view,arch_db:stock.view_putaway
+msgid "The rules defined per product will be applied before the rules defined per product category."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:157
+#, 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
#, python-format
-msgid "The selected inventory options are not coherent."
+msgid "The selected lot number doesn't exist."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:155
+#, 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
+#, python-format
+msgid "The selected product doesn't belong to that owner.."
msgstr ""
#. module: stock
@@ -5190,11 +5499,6 @@ 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_stock_quant_package__packaging_id
-msgid "This field should be completed only if everything inside the package share the same product, otherwise it doesn't really makes sense."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,help:stock.field_procurement_rule__name
msgid "This field will fill the packing origin and the name of its moves"
msgstr ""
@@ -5236,7 +5540,7 @@ msgid "This is used to correct the product quantities you have in stock."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:85
+#: code:addons/stock/models/stock_location.py:83
#, python-format
msgid "This location's usage cannot be changed to view as it contains products."
msgstr ""
@@ -5279,11 +5583,6 @@ msgid "This rule can be applied when a move is confirmed that has this location
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-msgid "This shipment is a backorder of"
-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"
@@ -5314,21 +5613,11 @@ msgid "This user will be responsible of the next activities related to logistic
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking__entire_package_detail_ids
-msgid "Those are the entire packages of a picking shown in the view of detailed operations"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking__entire_package_ids
-msgid "Those are the entire packages of a picking shown in the view of operations"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_line__location_dest_id
+#: 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_move_tree
-#: model:ir.ui.view,arch_db:stock.view_quant_package_picking_tree
msgid "To"
msgstr ""
@@ -5352,6 +5641,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
+#: selection:stock.picking,activity_state:0
msgid "Today"
msgstr ""
@@ -5442,6 +5732,11 @@ msgid "Transit Locations"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_barcode_rule__type
+msgid "Type"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__picking_code
#: model:ir.model.fields,field_description:stock.field_stock_picking__picking_type_code
#: model:ir.model.fields,field_description:stock.field_stock_picking_type__code
@@ -5474,12 +5769,18 @@ msgid "Unit Price"
msgstr ""
#. module: stock
+#: selection:barcode.rule,type:0
+msgid "Unit Product"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move__product_uom
#: model:ir.model.fields,field_description:stock.field_stock_move_line__product_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot__product_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_quant__product_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line__uom_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap__product_uom_id
+#: model:ir.ui.view,arch_db:stock.package_level_form_view
#: model:ir.ui.view,arch_db:stock.stock_move_tree
#: model:ir.ui.view,arch_db:stock.view_inventory_form
#: model:ir.ui.view,arch_db:stock.view_move_line_form
@@ -5510,13 +5811,18 @@ msgid "Units of Measures"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:889
+#: model:ir.model.fields,field_description:stock.field_product_replenish__product_uom_id
+msgid "Unity of measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_picking.py:887
#, python-format
msgid "Unknow stream."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:325
+#: code:addons/stock/models/stock_quant.py:336
#, python-format
msgid "Unknown Pack"
msgstr ""
@@ -5542,12 +5848,24 @@ msgid "Unpack"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:342
+#: code:addons/stock/models/product.py:341
#, python-format
msgid "Unplanned Qty"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_unread
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__message_unread_counter
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Unreserve"
msgstr ""
@@ -5589,6 +5907,13 @@ msgid "Use Existing Lots/Serial Numbers"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_product_replenish
+msgid "Use this assistant to replenish your stock. \n"
+" Depending on your product configuration, launching a replenishment may trigger a request for quotation,\n"
+" a manufacturing order or a transfer."
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.res_config_settings_view_form
msgid "Use your own routes and putaway strategies"
msgstr ""
@@ -5604,6 +5929,11 @@ msgid "User"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Validate"
@@ -5670,6 +6000,7 @@ 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
msgid "Waiting"
msgstr ""
@@ -5685,7 +6016,6 @@ msgid "Waiting Another Operation"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.move,state:0
msgid "Waiting Availability"
msgstr ""
@@ -5703,6 +6033,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
#: 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
@@ -5738,7 +6069,7 @@ msgid "Warehouse to Propagate"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:713
+#: code:addons/stock/models/stock_warehouse.py:724
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -5753,8 +6084,8 @@ msgid "Warehouses"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:135
-#: code:addons/stock/models/stock_move_line.py:147
+#: code:addons/stock/models/stock_move_line.py:128
+#: code:addons/stock/models/stock_move_line.py:140
#: selection:res.partner,picking_warn:0
#, python-format
msgid "Warning"
@@ -5766,7 +6097,7 @@ msgid "Warning on the Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:303
+#: code:addons/stock/models/product.py:302
#, python-format
msgid "Warning!"
msgstr ""
@@ -5782,7 +6113,20 @@ msgid "Warnings for Stock"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking__website_message_ids
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking__website_message_ids
+#: model:ir.model.fields,help:stock.field_stock_production_lot__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: stock
#: code:addons/stock/models/barcode.py:11
+#: selection:barcode.rule,type:0
#, python-format
msgid "Weighted Product"
msgstr ""
@@ -5813,11 +6157,6 @@ msgid "When checked, the route will be selectable on the Product Category. It w
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_product_putaway__fixed_location_ids
-msgid "When the method is fixed, this location will be used to store the products"
-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 ""
@@ -5855,15 +6194,21 @@ msgid "Wizard"
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_production_lot.py:45
+#, python-format
+msgid "You are not allowed to change the product linked to a serial or lot number if some stock moves have already been created with that number. This would lead to inconsistencies in your stock."
+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 picking type"
+msgid "You are not allowed to create a lot for this operation type."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:649
+#: code:addons/stock/models/stock_move.py:679
#, 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)."
+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 ""
#. module: stock
@@ -5880,119 +6225,149 @@ msgid "You can delete lines to ignore some products."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:519
+#: code:addons/stock/models/product.py:521
#, 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:510
+#: 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:340
+#: code:addons/stock/models/stock_move_line.py:333
#, 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:153
+#: code:addons/stock/models/stock_move_line.py:146
#, python-format
-msgid "You can not enter negative quantities!"
+msgid "You can not enter negative quantities."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:381
+#: code:addons/stock/models/stock_inventory.py:388
#, python-format
msgid "You can only adjust stockable products."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1077
+#: code:addons/stock/models/stock_move.py:1152
#, python-format
msgid "You can only delete draft moves."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:146
+#: code:addons/stock/models/stock_move_line.py:139
#, 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:950
+#: code:addons/stock/models/stock_move.py:1016
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_location.py:94
+#, python-format
+msgid "You cannot change the location type or its use as a scrap location as there are products reserved in this location. Please unreserve the products first."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:605
+#, 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/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:369
+#: code:addons/stock/models/stock_inventory.py:104
+#, python-format
+msgid "You cannot delete a validated inventory adjustement."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:376
#, 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."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_inventory.py:159
+#: code:addons/stock/models/stock_move.py:1136
+#, 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
+#, 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
#, 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:1106
+#: code:addons/stock/models/stock_move.py:1183
#, 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:1102
+#: code:addons/stock/models/stock_move.py:1179
#, python-format
-msgid "You cannot split a move done"
+msgid "You cannot split a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:92
+#: code:addons/stock/models/stock_quant.py:86
#, python-format
msgid "You cannot take products from or deliver products to a location of type \"view\"."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:128
-#: code:addons/stock/models/stock_move_line.py:132
+#: code:addons/stock/models/stock_move.py:502
#, python-format
-msgid "You cannot use the same serial number twice. Please correct the serial numbers encoded."
+msgid "You cannot unreserve a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:716
+#: code:addons/stock/models/stock_move_line.py:121
+#: code:addons/stock/models/stock_move_line.py:125
#, python-format
-msgid "You cannot validate a transfer if you have not processed any quantity for %s."
+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:700
+#: code:addons/stock/models/stock_picking.py:698
#, 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
-#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "You do not have any products reserved for this picking. Please click the 'Reserve' button\n"
-" to check if products are available."
+#: 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:110
+#: code:addons/stock/wizard/stock_picking_return.py:111
#, python-format
-msgid "You have manually created product lines, please delete them to proceed"
+msgid "You have manually created product lines, please delete them to proceed."
msgstr ""
#. module: stock
@@ -6013,25 +6388,25 @@ msgid "You have processed more than what was initially\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:304
+#: code:addons/stock/models/product.py:303
#, 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:873
+#: code:addons/stock/models/stock_picking.py:871
#, 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:797
+#: code:addons/stock/models/stock_warehouse.py:808
#, python-format
-msgid "You have to select a product unit of measure in the same category than the default unit of measure of the product"
+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 ""
#. module: stock
-#: code:addons/stock/models/stock_location.py:96
+#: code:addons/stock/models/stock_location.py:109
#, python-format
msgid "You have to set a name for this location."
msgstr ""
@@ -6039,13 +6414,13 @@ msgstr ""
#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:46
#, python-format
-msgid "You may only return Done pickings"
+msgid "You may only return Done pickings."
msgstr ""
#. module: stock
#: code:addons/stock/wizard/stock_picking_return.py:37
#, python-format
-msgid "You may only return one picking at a time!"
+msgid "You may only return one picking at a time."
msgstr ""
#. module: stock
@@ -6055,32 +6430,26 @@ msgid "You must define a warehouse for the company: %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move_line.py:398
-#: code:addons/stock/models/stock_picking.py:714
+#: code:addons/stock/models/stock_picking.py:1029
#, python-format
-msgid "You need to supply a lot/serial number for %s."
+msgid "You must first set the quantity you will put in the pack."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:1061
+#: code:addons/stock/models/stock_move_line.py:400
+#: code:addons/stock/models/stock_picking.py:712
#, python-format
-msgid "You should not put the contents of a package in different locations."
+msgid "You need to supply a Lot/Serial number for product %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:371
-#: code:addons/stock/models/product.py:512
+#: code:addons/stock/models/product.py:370
+#: code:addons/stock/models/product.py:514
#, python-format
msgid "You still have some active reordering rules on this product. Please archive or delete them first."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:330
-#, python-format
-msgid "You try to move a product using a UoM that is not compatible with the UoM of the product moved. Please use an UoM in the same UoM category."
-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"
@@ -6156,6 +6525,11 @@ msgid "processed instead of"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_product_replenish
+msgid "product.replenish"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_report_stock_forecast
msgid "report.stock.forecast"
msgstr ""
@@ -6176,6 +6550,11 @@ msgid "stock.overprocessed.transfer"
msgstr ""
#. module: stock
+#: model:ir.model,name:stock.model_stock_package_level
+msgid "stock.package_level"
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_return_picking_line
msgid "stock.return.picking.line"
msgstr ""
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 97c6faebeb2..35a5907e0df 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -59,17 +59,18 @@ msgstr ""
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
+#: model:ir.ui.view,arch_db:stock_account.view_stock_quantity_history
msgid "Cancel"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:485
+#: code:addons/stock_account/models/stock.py:501
#, 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:487
+#: code:addons/stock_account/models/stock.py:503
#, 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 ""
@@ -87,7 +88,7 @@ msgid "Change Standard Price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/product.py:312
+#: code:addons/stock_account/models/product.py:405
#, python-format
msgid "Changing your cost method is an important change that will impact your inventory valuation. Are you sure you want to make that change?"
msgstr ""
@@ -98,7 +99,12 @@ msgid "Choose the accounting date at which you want to value the stock moves cre
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:556
+#: 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
#, python-format
msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation."
msgstr ""
@@ -142,11 +148,6 @@ msgid "Create a new product valuation"
msgstr ""
#. module: stock_account
-#: model:ir.actions.act_window,help:stock_account.stock_move_valuation_action
-msgid "Create a new stock movement"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price__create_uid
msgid "Created by"
msgstr ""
@@ -208,8 +209,6 @@ msgstr ""
#: 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.product_template_valuation_form_view
-#: model:ir.ui.view,arch_db:stock_account.product_valuation_form_view
#: model:ir.ui.view,arch_db:stock_account.view_category_property_form
msgid "Inventory Valuation"
msgstr ""
@@ -264,14 +263,9 @@ 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_move_tree_valuation
-msgid "Moves"
-msgstr ""
-
-#. module: stock_account
-#: code:addons/stock_account/models/product.py:130
+#: code:addons/stock_account/models/product.py:128
#, python-format
-msgid "No difference between standard price and new price!"
+msgid "No difference between the standard price and the new price."
msgstr ""
#. module: stock_account
@@ -301,7 +295,6 @@ msgstr ""
#. module: stock_account
#: model:ir.model,name:stock_account.model_product_product
-#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
msgid "Product"
msgstr ""
@@ -321,17 +314,19 @@ msgid "Product Valuation"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
-msgid "Qty"
+#: code:addons/stock_account/wizard/stock_quantity_history.py:24
+#, python-format
+msgid "Products"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
-msgid "Quantity on Hand"
+#: 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"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date
msgid "Reference"
msgstr ""
@@ -346,13 +341,13 @@ msgid "Remaining Value"
msgstr ""
#. module: stock_account
-#: model:ir.model,name:stock_account.model_stock_return_picking
-msgid "Return Picking"
+#: model:ir.ui.view,arch_db:stock_account.view_stock_quantity_history
+msgid "Retrieve the inventory valuation"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
-msgid "Set standard cost"
+#: model:ir.model,name:stock_account.model_stock_return_picking
+msgid "Return Picking"
msgstr ""
#. module: stock_account
@@ -362,7 +357,7 @@ msgid "Standard Price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/product.py:147
+#: code:addons/stock_account/models/product.py:146
#: code:addons/stock_account/models/product.py:152
#, python-format
msgid "Standard Price changed - %s"
@@ -385,6 +380,16 @@ msgid "Standard Price: The products are valued at their standard cost defined on
msgstr ""
#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_product_product__stock_fifo_manual_move_ids
+msgid "Stock Fifo Manual Move"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_product_product__stock_fifo_real_time_aml_ids
+msgid "Stock Fifo Real Time Aml"
+msgstr ""
+
+#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_stock_account_input_categ_id
#: model:ir.model.fields,field_description:stock_account.field_product_product__property_stock_account_input
#: model:ir.model.fields,field_description:stock_account.field_product_template__property_stock_account_input
@@ -407,11 +412,6 @@ msgid "Stock Move"
msgstr ""
#. module: stock_account
-#: model:ir.actions.act_window,name:stock_account.stock_move_valuation_action
-msgid "Stock Moves"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category__property_stock_account_output_categ_id
#: model:ir.model.fields,field_description:stock_account.field_product_product__property_stock_account_output
#: model:ir.model.fields,field_description:stock_account.field_product_template__property_stock_account_output
@@ -419,8 +419,13 @@ msgid "Stock Output Account"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
-#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+#: model:ir.model,name:stock_account.model_stock_quantity_history
+msgid "Stock Quantity History"
+msgstr ""
+
+#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date
+#: model:ir.ui.view,arch_db:stock_account.view_stock_product_tree2
#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
msgid "Stock Valuation"
msgstr ""
@@ -441,35 +446,30 @@ msgid "Stock Valuation Account (Outgoing)"
msgstr ""
#. module: stock_account
-#: model:ir.actions.server,name:stock_account.action_stock_account_valuation_report
-msgid "Stock Valuation Report"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model,name:stock_account.model_account_chart_template
msgid "Templates for Account Chart"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:511
+#: code:addons/stock_account/models/stock.py:527
#, 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:332
+#: code:addons/stock_account/models/stock.py:349
#, python-format
-msgid "The move lines are not in a consistent state: some are entering and other are leaving the company. "
+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:343
+#: code:addons/stock_account/models/stock.py:360
#, 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:341
+#: code:addons/stock_account/models/stock.py:358
#, python-format
msgid "The move lines are not in a consistent states: they do not share the same origin or destination company."
msgstr ""
@@ -481,22 +481,18 @@ msgid "To Refund (update SO/PO)"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.product_valuation_tree
-msgid "Total Value"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_stock_move__to_refund
#: model:ir.model.fields,help:stock_account.field_stock_return_picking_line__to_refund
msgid "Trigger a decrease of the delivered/received quantity in the associated Sale Order/Purchase Order"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation
+#: model:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date
msgid "Unit of Measure"
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
msgid "Update Cost"
msgstr ""
@@ -518,13 +514,25 @@ msgid "Valuation"
msgstr ""
#. module: stock_account
+#: model:ir.actions.act_window,name:stock_account.action_stock_inventory_valuation
+msgid "Valuation Report"
+msgstr ""
+
+#. module: stock_account
+#: code:addons/stock_account/models/product.py:246
+#, python-format
+msgid "Valuation at date"
+msgstr ""
+
+#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_product__stock_value
#: model:ir.model.fields,field_description:stock_account.field_stock_move__value
+#: model:ir.ui.view,arch_db:stock_account.view_stock_account_aml
msgid "Value"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/product.py:311
+#: code:addons/stock_account/models/product.py:404
#, python-format
msgid "Warning"
msgstr ""
@@ -562,14 +570,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:483
+#: code:addons/stock_account/models/stock.py:499
#, python-format
-msgid "You don't have any stock journal defined on your product category, check if you have installed a chart of accounts"
+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:132
-#: code:addons/stock_account/models/stock.py:489
+#: code:addons/stock_account/models/product.py:130
+#: code:addons/stock_account/models/stock.py:505
#, 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_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
index dd545ddb1aa..2e40f16b9c4 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:11+0000\n"
+"PO-Revision-Date: 2018-08-02 09:11+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:343
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:347
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:364
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:368
+#: 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
#, python-format
msgid " already out"
msgstr ""
@@ -35,6 +35,11 @@ msgid "Account Journal"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__additional_landed_cost
msgid "Additional Landed Cost"
msgstr ""
@@ -121,6 +126,7 @@ msgstr ""
#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__date
+#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_search
msgid "Date"
msgstr ""
@@ -176,6 +182,21 @@ msgid "Final Cost"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__former_cost
msgid "Former Cost"
msgstr ""
@@ -198,6 +219,21 @@ msgid "ID"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form
msgid "Information"
msgstr ""
@@ -208,6 +244,11 @@ msgid "Inventory Valuation"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_product_product__landed_cost_ok
#: model:ir.model.fields,field_description:stock_landed_costs.field_product_template__landed_cost_ok
msgid "Is a Landed Cost"
@@ -283,8 +324,13 @@ msgid "Last Updated on"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_search
-msgid "Month"
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_ids
+msgid "Messages"
msgstr ""
#. module: stock_landed_costs
@@ -307,6 +353,31 @@ msgid "No valuation adjustments lines. You should maybe recompute the landed cos
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: stock_landed_costs
#: code:addons/stock_landed_costs/models/stock_landed_cost.py:87
#, python-format
msgid "Only draft landed costs can be validated"
@@ -318,7 +389,7 @@ msgid "Pickings"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:310
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:312
#, python-format
msgid "Please configure Stock Expense Account for product: %s."
msgstr ""
@@ -394,7 +465,7 @@ msgid "Stock Valuation Adjustment Lines"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/models/stock_landed_cost.py:158
+#: 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"
msgstr ""
@@ -405,6 +476,16 @@ msgid "Total"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
msgid "Validate"
msgstr ""
@@ -427,6 +508,16 @@ msgid "Volume"
msgstr ""
#. module: stock_landed_costs
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: stock_landed_costs
+#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__weight
msgid "Weight"
msgstr ""
diff --git a/addons/stock_picking_batch/i18n/stock_picking_batch.pot b/addons/stock_picking_batch/i18n/stock_picking_batch.pot
index 34b52d76e51..355c8027815 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model,name:stock_picking_batch.model_stock_picking_to_batch
msgid "Add pickings to a batch picking"
msgstr ""
@@ -129,6 +134,21 @@ msgid "Draft"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
msgid "Group By"
msgstr ""
@@ -140,6 +160,21 @@ msgid "ID"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model,name:stock_picking_batch.model_stock_immediate_transfer
msgid "Immediate Transfer"
msgstr ""
@@ -156,6 +191,11 @@ msgid "In Progress"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch____last_update
#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_to_batch____last_update
msgid "Last Modified on"
@@ -179,6 +219,16 @@ msgid "List of picking associated to this batch"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__name
msgid "Name of the batch picking"
msgstr ""
@@ -190,6 +240,31 @@ msgid "Nothing to print."
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__user_id
msgid "Person responsible for this batch picking"
msgstr ""
@@ -244,7 +319,7 @@ msgstr ""
#. module: stock_picking_batch
#: code:addons/stock_picking_batch/models/stock_picking_batch.py:77
#, python-format
-msgid "Some products require lots/serial numbers, so you need to specify those first!"
+msgid "Some products require lots/serial numbers."
msgstr ""
#. module: stock_picking_batch
@@ -285,7 +360,27 @@ msgid "Transferred by"
msgstr ""
#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: stock_picking_batch
#: model:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter
msgid "User"
msgstr ""
+#. module: stock_picking_batch
+#: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: stock_picking_batch
+#: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index be032313f26..558a1b493f7 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -44,6 +44,11 @@ msgid "&amp;times;"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.403
+msgid "403: Forbidden"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.result
msgid "<b>Question </b>"
msgstr ""
@@ -163,7 +168,7 @@ msgstr ""
#. module: survey
#: code:addons/survey/models/survey.py:687
#, python-format
-msgid "A label must be attached to one and only one question"
+msgid "A label must be attached to only one question."
msgstr ""
#. module: survey
@@ -187,14 +192,18 @@ msgid "A problem has occured"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:806
-#, python-format
-msgid "A question cannot be unanswered and skipped"
+#: sql_constraint:survey.user_input:0
+msgid "A token must be unique!"
msgstr ""
#. module: survey
-#: sql_constraint:survey.user_input:0
-msgid "A token must be unique!"
+#: selection:survey.mail.compose.message,moderation_status:0
+msgid "Accepted"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_needaction
+msgid "Action Needed"
msgstr ""
#. module: survey
@@ -203,6 +212,26 @@ msgid "Active"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__active_domain
+msgid "Active domain"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__add_sign
+msgid "Add Sign"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Add a list of email of recipients (will not be converted into contacts). Separated by commas, semicolons or newline..."
msgstr ""
@@ -259,6 +288,11 @@ msgid "Answers"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__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: survey
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Archived"
msgstr ""
@@ -274,6 +308,21 @@ msgid "Attachments are linked to a document through model / res_id and to the me
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__author_id
+msgid "Author"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__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: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__author_avatar
+msgid "Author's avatar"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.back
msgid "Back to Survey"
msgstr ""
@@ -284,6 +333,16 @@ msgid "Cancel"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__channel_ids
+msgid "Channels"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__child_ids
+msgid "Child Messages"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Choices"
msgstr ""
@@ -323,6 +382,7 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_comments
+#: selection:survey.mail.compose.message,message_type:0
msgid "Comment"
msgstr ""
@@ -337,6 +397,11 @@ msgid "Comment Message"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "Company name"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_tree
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
#: selection:survey.user_input,state:0
@@ -349,6 +414,11 @@ msgid "Compose Email"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__composition_mode
+msgid "Composition mode"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.menu,name:survey.menu_surveys_configuration
msgid "Configuration"
msgstr ""
@@ -359,6 +429,11 @@ msgid "Constraints"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__body
+msgid "Contents"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Copy and paste the HTML code below to add this web link to any webpage."
msgstr ""
@@ -369,11 +444,21 @@ msgid "Copy, paste and share the web link below to your audience."
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "Copyright &amp;copy;"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line__date_create
msgid "Create Date"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "Create a"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label__create_uid
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__create_uid
#: model:ir.model.fields,field_description:survey.field_survey_page__create_uid
@@ -403,6 +488,12 @@ msgid "Creation Date"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__starred
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__date
#: selection:survey.question,type:0
#: selection:survey.user_input_line,answer_type:0
msgid "Date"
@@ -439,20 +530,25 @@ msgid "Delete"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_page__description
-#: model:ir.model.fields,field_description:survey.field_survey_question__description
-#: model:ir.model.fields,field_description:survey.field_survey_survey__description
-msgid "Description"
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__auto_delete
+msgid "Delete Emails"
msgstr ""
#. module: survey
-#: model:ir.ui.view,arch_db:survey.survey_kanban
-msgid "Design"
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__auto_delete_message
+msgid "Delete Message Copy"
msgstr ""
#. module: survey
-#: model:ir.ui.view,arch_db:survey.survey_form
-msgid "Design Survey"
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__auto_delete
+msgid "Delete sent emails (mass mailing only)"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_page__description
+#: model:ir.model.fields,field_description:survey.field_survey_question__description
+#: model:ir.model.fields,field_description:survey.field_survey_survey__description
+msgid "Description"
msgstr ""
#. module: survey
@@ -483,6 +579,11 @@ msgid "Display mode"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__auto_delete_message
+msgid "Do not keep a copy of the email in the document communication history (mass mailing only)"
+msgstr ""
+
+#. module: survey
#: model:survey.stage,name:survey.stage_draft
msgid "Draft"
msgstr ""
@@ -504,6 +605,7 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
+#: selection:survey.mail.compose.message,message_type:0
msgid "Email"
msgstr ""
@@ -513,6 +615,11 @@ msgid "Email Template"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__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: survey
#: model:ir.model,name:survey.model_survey_mail_compose_message
msgid "Email composition wizard for Survey"
msgstr ""
@@ -528,11 +635,31 @@ msgid "Existing contacts"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__starred_partner_ids
+msgid "Favorited By"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_stage__fold
msgid "Folded in kanban view"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Format"
msgstr ""
@@ -548,6 +675,11 @@ msgid "Free Text answer"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__email_from
+msgid "From"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_page_search
#: model:ir.ui.view,arch_db:survey.survey_question_search
#: model:ir.ui.view,arch_db:survey.survey_response_line_search
@@ -556,6 +688,12 @@ msgid "Group By"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__has_error
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__has_error
+msgid "Has error"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label__id
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__id
#: model:ir.model.fields,field_description:survey.field_survey_page__id
@@ -573,6 +711,21 @@ msgid "Identification token"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,help:survey.field_survey_survey__users_can_go_back
msgid "If checked, users can go back to previous pages."
msgstr ""
@@ -606,6 +759,11 @@ msgid "Incorrect Email Address: %s"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__parent_id
+msgid "Initial thread message."
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__validation_email
msgid "Input must be an email"
msgstr ""
@@ -616,6 +774,11 @@ msgid "Invitations sent"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__is_closed
msgid "Is closed"
msgstr ""
@@ -683,6 +846,11 @@ msgid "Late Activities"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__layout
+msgid "Layout"
+msgstr ""
+
+#. module: survey
#: selection:survey.user_input,type:0
msgid "Link"
msgstr ""
@@ -693,12 +861,27 @@ msgid "List of emails"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__is_log
+msgid "Log an Internal Note"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__auth_required
#: model:ir.ui.view,arch_db:survey.auth_required
msgid "Login required"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mail_activity_type_id
+msgid "Mail Activity Type"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mailing_list_ids
+msgid "Mailing List"
+msgstr ""
+
+#. module: survey
#: model:res.groups,name:survey.group_survey_manager
msgid "Manager"
msgstr ""
@@ -715,6 +898,21 @@ msgid "Manually"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mass_mailing_id
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mass_mailing_campaign_id
+msgid "Mass Mailing Campaign"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mass_mailing_name
+msgid "Mass Mailing Name"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Matrix"
msgstr ""
@@ -760,6 +958,41 @@ msgid "Maximum value"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.403
+msgid "Maybe you were looking for"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__record_name
+msgid "Message Record Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__message_type
+msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__message_id
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__message_id
+msgid "Message-Id"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__validation_min_date
msgid "Minimum Date"
msgstr ""
@@ -775,6 +1008,16 @@ msgid "Minimum value"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__moderator_id
+msgid "Moderated By"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__moderation_status
+msgid "Moderation Status"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Multiple Lines Text Box"
msgstr ""
@@ -805,11 +1048,42 @@ msgid "Name"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__record_name
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__needaction
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__needaction
+msgid "Need Action"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__need_moderation
+msgid "Need moderation"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
msgid "New"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.page
msgid "Next page"
msgstr ""
@@ -830,6 +1104,11 @@ msgid "No survey labels found"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__no_auto_thread
+msgid "No threading for answers"
+msgstr ""
+
+#. module: survey
#: model:ir.actions.act_window,help:survey.action_survey_user_input_line
msgid "No user input lines found"
msgstr ""
@@ -856,11 +1135,31 @@ msgid "Not started yet"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__notification_ids
+msgid "Notifications"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__notify
+msgid "Notify followers"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__notify
+msgid "Notify followers of the document (mass post only)"
+msgstr ""
+
+#. module: survey
#: selection:survey.user_input_line,answer_type:0
msgid "Number"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question__column_nb
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Number of columns"
@@ -872,6 +1171,21 @@ msgid "Number of completed surveys"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__tot_sent_survey
msgid "Number of sent surveys"
msgstr ""
@@ -882,6 +1196,11 @@ msgid "Number of started surveys"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,type:0
msgid "Numerical Value"
msgstr ""
@@ -897,6 +1216,11 @@ msgid "Occurence"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "Odoo"
+msgstr ""
+
+#. module: survey
#: selection:survey.question,matrix_subtype:0
msgid "One choice per row"
msgstr ""
@@ -908,6 +1232,16 @@ msgid "Options"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__mail_server_id
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: survey
+#: selection:survey.survey,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line__page_id
#: model:ir.ui.view,arch_db:survey.page
#: model:ir.ui.view,arch_db:survey.survey_page_search
@@ -935,6 +1269,11 @@ msgid "Pages"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__parent_id
+msgid "Parent Message"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
#: selection:survey.user_input,state:0
msgid "Partially completed"
@@ -952,12 +1291,27 @@ 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 ""
+
+#. module: survey
+#: selection:survey.mail.compose.message,moderation_status:0
+msgid "Pending Moderation"
+msgstr ""
+
+#. module: survey
#: model:survey.stage,name:survey.stage_permanent
msgid "Permanent"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:164
+#: selection:survey.survey,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_email_compose_message.py:162
#, python-format
msgid "Please enter at least one valid recipient."
msgstr ""
@@ -1056,6 +1410,46 @@ msgid "Radio Buttons"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__rating_value
+msgid "Rating Value"
+msgstr ""
+
+#. module: survey
+#: selection:survey.mail.compose.message,moderation_status:0
+msgid "Rejected"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__res_id
+msgid "Related Document ID"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__model
+msgid "Related Document Model"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__rating_ids
+msgid "Related ratings"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__reply_to
+msgid "Reply email address. Setting the reply_to bypasses the automatic thread creation."
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__reply_to
+msgid "Reply-To"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__result_url
msgid "Results link"
msgstr ""
@@ -1218,6 +1612,11 @@ msgid "Skipped"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__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: survey
#: model:ir.ui.view,arch_db:survey.page
msgid "Something went wrong while contacting survey server. <strong class=\"text-danger\">Your answers have probably not been recorded.</strong> Try refreshing."
msgstr ""
@@ -1234,6 +1633,11 @@ msgid "Stage"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__starred
+msgid "Starred"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_init
msgid "Start Survey"
msgstr ""
@@ -1249,6 +1653,19 @@ msgid "Status"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__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: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__subject
+msgid "Subject"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Subject..."
msgstr ""
@@ -1259,6 +1676,11 @@ msgid "Submit survey"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__subtype_id
+msgid "Subtype"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line__value_suggested
msgid "Suggested answer"
msgstr ""
@@ -1275,6 +1697,7 @@ msgstr ""
#. module: survey
#: model:ir.model,name:survey.model_survey_survey
+#: model:ir.model.fields,field_description:survey.field_res_users__group_survey_user
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__survey_id
#: model:ir.model.fields,field_description:survey.field_survey_page__survey_id
#: model:ir.model.fields,field_description:survey.field_survey_question__survey_id
@@ -1369,6 +1792,11 @@ msgid "Surveys"
msgstr ""
#. module: survey
+#: selection:survey.mail.compose.message,message_type:0
+msgid "System notification"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_kanban
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
msgid "Test"
@@ -1405,7 +1833,7 @@ msgid "Thanks Message"
msgstr ""
#. module: survey
-#: code:addons/survey/models/survey.py:819
+#: code:addons/survey/models/survey.py:818
#, python-format
msgid "The answer must be in the right type"
msgstr ""
@@ -1417,14 +1845,14 @@ msgid "The answer you entered has an invalid format."
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:139
+#: code:addons/survey/wizard/survey_email_compose_message.py:137
#, python-format
msgid "The content of the text don't contain '__URL__'. __URL__ is automaticaly converted into the special url of the survey."
msgstr ""
#. module: survey
-#: sql_constraint:survey.user_input:0
-msgid "The deadline cannot be in the past"
+#: model:ir.ui.view,arch_db:survey.403
+msgid "The page you were looking for could not be authorized."
msgstr ""
#. module: survey
@@ -1459,6 +1887,12 @@ msgid "This message will be displayed when survey is completed"
msgstr ""
#. module: survey
+#: code:addons/survey/models/survey.py:805
+#, python-format
+msgid "This question cannot be unanswered or skipped."
+msgstr ""
+
+#. module: survey
#: code:addons/survey/models/survey.py:488
#, python-format
msgid "This question requires an answer."
@@ -1486,11 +1920,27 @@ msgid "Title"
msgstr ""
#. module: survey
+#: selection:survey.survey,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Today Activities"
msgstr ""
#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__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: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__tracking_value_ids
+msgid "Tracking values"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__message_type
#: model:ir.ui.view,arch_db:survey.survey_question_search
msgid "Type"
msgstr ""
@@ -1511,11 +1961,27 @@ msgid "Types of answers"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
msgid "Upcoming Activities"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__use_active_domain
+msgid "Use active domain"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__template_id
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Use template"
msgstr ""
@@ -1564,6 +2030,11 @@ msgid "User responses"
msgstr ""
#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey__users_can_go_back
msgid "Users can go back"
msgstr ""
@@ -1599,6 +2070,21 @@ msgid "Vote"
msgstr ""
#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_survey__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_survey__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: survey
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message__is_log
+msgid "Whether the message is an internal note (comment mode only)"
+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\"/>"
@@ -1637,6 +2123,11 @@ msgid "ans"
msgstr ""
#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "free website"
+msgstr ""
+
+#. module: survey
#: model:ir.model,name:survey.model_ir_autovacuum
msgid "ir.autovacuum"
msgstr ""
@@ -1661,3 +2152,13 @@ msgstr ""
msgid "review your answers"
msgstr ""
+#. module: survey
+#: model:ir.ui.view,arch_db:survey.403
+msgid "this page"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.view,arch_db:survey.layout
+msgid "with"
+msgstr ""
+
diff --git a/addons/uom/i18n/uom.pot b/addons/uom/i18n/uom.pot
new file mode 100644
index 00000000000..f2aa3c2ddb7
--- /dev/null
+++ b/addons/uom/i18n/uom.pot
@@ -0,0 +1,376 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * uom
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~11.4\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"
+"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: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__active
+msgid "Active"
+msgstr ""
+
+#. module: uom
+#: model:ir.actions.act_window,help:uom.product_uom_form_action
+msgid "Add a new unit of measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.actions.act_window,help:uom.product_uom_categ_form_action
+msgid "Add a new unit of measure category"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__factor_inv
+msgid "Bigger Ratio"
+msgstr ""
+
+#. module: uom
+#: selection:uom.uom,uom_type:0
+msgid "Bigger than the reference Unit of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__category_id
+msgid "Category"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,help:uom.field_uom_uom__category_id
+msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."
+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"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__create_date
+#: model:ir.model.fields,field_description:uom.field_uom_uom__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__display_name
+#: model:ir.model.fields,field_description:uom.field_uom_uom__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_hour
+msgid "Hour(s)"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,help:uom.field_uom_uom__factor_inv
+msgid "How many times this Unit of Measure is bigger than the reference Unit of Measure in this category: 1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,help:uom.field_uom_uom__factor
+msgid "How much bigger or smaller this unit is compared to the reference Unit of Measure for this category: 1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__id
+#: model:ir.model.fields,field_description:uom.field_uom_uom__id
+msgid "ID"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category____last_update
+#: model:ir.model.fields,field_description:uom.field_uom_uom____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__write_uid
+#: model:ir.model.fields,field_description:uom.field_uom_uom__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__write_date
+#: model:ir.model.fields,field_description:uom.field_uom_uom__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: uom
+#: selection:uom.category,measure_type:0
+msgid "Length"
+msgstr ""
+
+#. module: uom
+#: model:uom.category,name:uom.uom_categ_length
+msgid "Length / Distance"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_res_users__has_group_uom
+#: model:res.groups,name:uom.group_uom
+msgid "Manage Multiple Units of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__name
+msgid "Name"
+msgstr ""
+
+#. module: uom
+#: model:ir.model,name:uom.model_uom_uom
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.model,name:uom.model_uom_category
+msgid "Product UoM Categories"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__factor
+msgid "Ratio"
+msgstr ""
+
+#. module: uom
+#: selection:uom.uom,uom_type:0
+msgid "Reference Unit of Measure for this category"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__rounding
+msgid "Rounding Precision"
+msgstr ""
+
+#. module: uom
+#: selection:uom.uom,uom_type:0
+msgid "Smaller than the reference Unit of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,help:uom.field_uom_uom__rounding
+msgid "The computed quantity will be a multiple of this value. Use 1.0 for a Unit of Measure that cannot be further split, such as a piece."
+msgstr ""
+
+#. module: uom
+#: sql_constraint:uom.uom:0
+msgid "The conversion ratio for a unit of measure cannot be 0!"
+msgstr ""
+
+#. module: uom
+#: sql_constraint:uom.uom:0
+msgid "The rounding precision must be greater than 0!"
+msgstr ""
+
+#. module: uom
+#: selection:uom.category,measure_type:0
+msgid "Time"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__uom_type
+msgid "Type"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_category__measure_type
+msgid "Type of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__measure_type
+msgid "Type of measurement category"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,help:uom.field_uom_uom__active
+msgid "Uncheck the active field to disable a unit of measure without deleting it."
+msgstr ""
+
+#. module: uom
+#: model:uom.category,name:uom.product_uom_categ_unit
+msgid "Unit"
+msgstr ""
+
+#. module: uom
+#: model:ir.model.fields,field_description:uom.field_uom_uom__name
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.actions.act_window,name:uom.product_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: uom
+#: selection:uom.category,measure_type:0
+msgid "Units"
+msgstr ""
+
+#. module: uom
+#: model:ir.actions.act_window,name:uom.product_uom_form_action
+#: model:ir.ui.view,arch_db:uom.product_uom_form_view
+#: model:ir.ui.view,arch_db:uom.product_uom_tree_view
+msgid "Units of Measure"
+msgstr ""
+
+#. module: uom
+#: model:ir.ui.view,arch_db:uom.product_uom_categ_form_view
+msgid "Units of Measure categories"
+msgstr ""
+
+#. module: uom
+#: model:ir.actions.act_window,help:uom.product_uom_categ_form_action
+msgid "Units of measure belonging to the same category can be\n"
+" converted between each others. For example, in the category\n"
+" <i>'Time'</i>, you will have the following units of measure:\n"
+" Hours, Days."
+msgstr ""
+
+#. module: uom
+#: code:addons/uom/models/uom_uom.py:86
+#, 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
+#, python-format
+msgid "UoM category %s should only have one reference unit of measure."
+msgstr ""
+
+#. module: uom
+#: model:ir.model,name:uom.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: uom
+#: selection:uom.category,measure_type:0
+#: model:uom.category,name:uom.product_uom_categ_vol
+msgid "Volume"
+msgstr ""
+
+#. module: uom
+#: selection:uom.category,measure_type:0
+#: model:uom.category,name:uom.product_uom_categ_kgm
+msgid "Weight"
+msgstr ""
+
+#. module: uom
+#: model:uom.category,name:uom.uom_categ_wtime
+msgid "Working Time"
+msgstr ""
+
+#. module: uom
+#: sql_constraint:uom.category:0
+msgid "You can have only one category per measurement type."
+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."
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_cm
+msgid "cm"
+msgstr ""
+
+#. module: uom
+#: model:ir.ui.view,arch_db:uom.product_uom_form_view
+msgid "e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+
+#. module: uom
+#: model:ir.ui.view,arch_db:uom.product_uom_form_view
+msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_floz
+msgid "fl oz"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_foot
+msgid "foot(ft)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_gal
+msgid "gal(s)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_inch
+msgid "inch(es)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_kgm
+msgid "kg"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_km
+msgid "km"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_lb
+msgid "lb(s)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_mile
+msgid "mile(s)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_oz
+msgid "oz(s)"
+msgstr ""
+
+#. module: uom
+#: model:uom.uom,name:uom.product_uom_qt
+msgid "qt"
+msgstr ""
+
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index 8a193754cd8..b5ce6c7784a 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,22 +24,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:498
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:520
#, python-format
msgid " [Me]"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:226
+#: code:addons/web/static/src/js/views/search/search_filters.js:231
#, python-format
msgid " and "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:565
-#: code:addons/web/static/src/js/chrome/search_view.js:204
+#: code:addons/web/static/src/js/views/search/search_inputs.js:567
+#: code:addons/web/static/src/js/views/search/search_view.js:206
#, python-format
msgid " or "
msgstr ""
@@ -47,29 +47,29 @@ 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:149
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:151
#, python-format
msgid " records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:627
+#: code:addons/web/static/src/xml/base.xml:648
#, python-format
msgid "# Code editor"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:107
-#: code:addons/web/static/src/js/chrome/search_filters.js:349
+#: code:addons/web/static/src/js/views/search/search_filters.js:112
+#: code:addons/web/static/src/js/views/search/search_filters.js:354
#, python-format
msgid "%(field)s %(operator)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:108
+#: code:addons/web/static/src/js/views/search/search_filters.js:113
#, python-format
msgid "%(field)s %(operator)s \"%(value)s\""
msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:387
+#: code:addons/web/static/src/js/fields/field_utils.js:399
#, 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:434
+#: code:addons/web/static/src/js/fields/field_utils.js:446
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:468
+#: code:addons/web/static/src/js/fields/field_utils.js:480
#, python-format
msgid "'%s' is not a correct float"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:546
+#: code:addons/web/static/src/js/fields/field_utils.js:558
#, python-format
msgid "'%s' is not a correct integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/field_utils.js:504
+#: code:addons/web/static/src/js/fields/field_utils.js:516
#, python-format
msgid "'%s' is not a correct monetary field"
msgstr ""
@@ -179,6 +179,14 @@ msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:498
+#: code:addons/web/static/src/xml/base.xml:527
+#, python-format
+msgid "(count)"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:77
#, python-format
msgid "(no string)"
@@ -210,6 +218,13 @@ msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/js/chrome/action_manager.js:557
+#, 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
#, 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."
@@ -217,14 +232,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:604
+#: code:addons/web/static/src/xml/base.xml:625
#, python-format
msgid "ALL"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:605
+#: code:addons/web/static/src/xml/base.xml:626
#, python-format
msgid "ANY"
msgstr ""
@@ -245,7 +260,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1328
+#: code:addons/web/static/src/xml/base.xml:1435
#, python-format
msgid "Access to all Enterprise Apps"
msgstr ""
@@ -266,248 +281,276 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1654
+#: code:addons/web/static/src/js/fields/basic_fields.js:1742
#, python-format
msgid "Activate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:228
+#: code:addons/web/static/src/xml/base.xml:232
#, python-format
msgid "Activate Assets Debugging"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1653
-#: code:addons/web/static/src/js/fields/basic_fields.js:1657
-#: code:addons/web/static/src/js/fields/basic_fields.js:1661
+#: 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
#, python-format
msgid "Active"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1319
-#: code:addons/web/static/src/xml/base.xml:1171
-#: code:addons/web/static/src/xml/kanban.xml:51
-#: code:addons/web/static/src/xml/kanban.xml:68
+#: 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
#, python-format
msgid "Add"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:993
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:82
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1077
#, python-format
msgid "Add Custom Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:997
+#: code:addons/web/static/src/xml/base.xml:1060
#, python-format
-msgid "Add a condition"
+msgid "Add Custom Group"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:44
+#: code:addons/web/static/src/xml/kanban.xml:48
#, python-format
-msgid "Add a new Column"
+msgid "Add a Column"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:524
+#: code:addons/web/static/src/xml/base.xml:1082
#, python-format
-msgid "Add an item"
+msgid "Add a condition"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1106
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:530
#, python-format
-msgid "Add custom group"
+msgid "Add a line"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:612
+#: code:addons/web/static/src/xml/base.xml:633
#, python-format
msgid "Add filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:672
+#: code:addons/web/static/src/xml/base.xml:693
#, python-format
msgid "Add new value"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1578
+#: code:addons/web/static/src/js/fields/basic_fields.js:1666
#, python-format
msgid "Add to Favorites"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:368
+#: code:addons/web/static/src/xml/base.xml:365
#, python-format
msgid "Add..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1346
+#: code:addons/web/static/src/js/fields/relational_fields.js:1387
#, python-format
msgid "Add: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:970
+#: code:addons/web/static/src/xml/base.xml:1091
#, python-format
msgid "Advanced Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:209
+#: code:addons/web/static/src/js/core/dialog.js:293
#, python-format
msgid "Alert"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:594
-#: code:addons/web/static/src/xml/base.xml:599
+#: code:addons/web/static/src/xml/base.xml:615
+#: code:addons/web/static/src/xml/base.xml:620
#, python-format
msgid "All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:378
-#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:351
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:402
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:397
#, python-format
msgid "All day"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:463
+#: code:addons/web/static/src/xml/base.xml:484
#, python-format
msgid "All users"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:145
+#: code:addons/web/static/src/xml/base.xml:149
#, python-format
msgid "An error occurred"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:192
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:193
#, 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:1333
+#: code:addons/web/static/src/xml/base.xml:1440
#, python-format
msgid "And more"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:595
-#: code:addons/web/static/src/xml/base.xml:600
+#: code:addons/web/static/src/xml/base.xml:616
+#: code:addons/web/static/src/xml/base.xml:621
#, python-format
msgid "Any"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:996
-#: code:addons/web/static/src/xml/base.xml:1117
+#: code:addons/web/static/src/xml/base.xml:1070
+#: code:addons/web/static/src/xml/base.xml:1080
#, python-format
msgid "Apply"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1658
-#: code:addons/web/static/src/js/views/list/list_controller.js:137
+#: code:addons/web/static/src/js/fields/basic_fields.js:1746
+#: code:addons/web/static/src/js/views/list/list_controller.js:148
#, python-format
msgid "Archive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1657
+#: code:addons/web/static/src/xml/kanban.xml:26
+#, python-format
+msgid "Archive All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1745
#, python-format
msgid "Archived"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:302
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:366
+#, python-format
+msgid "Are you sure that you want to archive all the records from this column?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/list/list_controller.js:150
+#, python-format
+msgid "Are you sure that you want to archive all the selected records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:304
#, python-format
msgid "Are you sure that you want to remove this column ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:261
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:263
#, python-format
msgid "Are you sure that you want to remove this filter?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:300
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:313
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:305
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:345
#, python-format
msgid "Are you sure you want to delete this record ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:341
+#: code:addons/web/static/src/xml/base.xml:338
#, python-format
msgid "Attachment :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1167
+#: code:addons/web/static/src/xml/base.xml:1274
#, python-format
msgid "Available fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:484
+#: code:addons/web/static/src/xml/base.xml:505
#, python-format
msgid "Bar Chart"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1480
+#: code:addons/web/controllers/main.py:1495
#, 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:1332
+#: code:addons/web/static/src/xml/base.xml:1439
#, python-format
msgid "Bugfixes guarantee"
msgstr ""
@@ -535,6 +578,13 @@ msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1103
+#, python-format
+msgid "CLEAR"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/js/views/calendar/calendar_view.js:22
#, python-format
msgid "Calendar"
@@ -542,41 +592,41 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_view.js:40
+#: code:addons/web/static/src/js/views/calendar/calendar_view.js:44
#, python-format
msgid "Calendar view has not defined 'date_start' attribute."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:223
-#: code:addons/web/static/src/js/core/dialog.js:275
+#: 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/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:203
+#: code:addons/web/static/src/js/services/crash_manager.js:204
#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:56
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:296
-#: code:addons/web/static/src/js/views/view_dialogs.js:356
-#: code:addons/web/static/src/xml/base.xml:175
+#: 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/xml/base.xml:179
#, python-format
msgid "Cancel"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:70
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:93
#, python-format
msgid "Cannot render chart with mode : "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/controllers/main.py:793
-#: code:addons/web/controllers/main.py:795
-#: code:addons/web/controllers/main.py:800
+#: 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/widgets/change_password.js:27
-#: code:addons/web/static/src/xml/base.xml:174
+#: code:addons/web/static/src/xml/base.xml:178
#, python-format
msgid "Change Password"
msgstr ""
@@ -590,26 +640,27 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:873
-#: code:addons/web/static/src/xml/base.xml:904
+#: 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
#, python-format
msgid "Clear"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:225
+#: code:addons/web/static/src/xml/base.xml:229
#, python-format
msgid "Clear Events"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1662
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:324
+#: code:addons/web/static/src/js/fields/basic_fields.js:1750
+#: 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:458
+#: code:addons/web/static/src/js/widgets/debug_manager.js:459
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:24
#, python-format
msgid "Close"
@@ -617,50 +668,50 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1661
+#: code:addons/web/static/src/js/fields/basic_fields.js:1749
#, python-format
msgid "Closed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:49
+#: code:addons/web/static/src/xml/kanban.xml:53
#, python-format
msgid "Column title"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:437
+#: code:addons/web/static/src/xml/base.xml:458
#, python-format
msgid "Condition:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:169
+#: code:addons/web/static/src/xml/base.xml:173
#, python-format
msgid "Confirm New Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:234
-#: code:addons/web/static/src/js/core/dialog.js:284
+#: code:addons/web/static/src/js/core/dialog.js:318
+#: code:addons/web/static/src/js/core/dialog.js:368
#, python-format
msgid "Confirmation"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:305
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:327
#, python-format
msgid "Connection lost"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:314
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:341
#, python-format
msgid "Connection restored"
msgstr ""
@@ -675,21 +726,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:132
+#: code:addons/web/static/src/js/services/crash_manager.js:133
#, python-format
msgid "Copied !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:143
+#: code:addons/web/static/src/xml/base.xml:147
#, python-format
msgid "Copy the full error to clipboard"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1226
+#: code:addons/web/static/src/js/fields/basic_fields.js:1214
#, python-format
msgid "Could not display the selected image."
msgstr ""
@@ -703,12 +754,12 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_view.js:44
-#: code:addons/web/static/src/js/views/graph/graph_view.js:57
-#: code:addons/web/static/src/js/views/pivot/pivot_view.js:45
-#: code:addons/web/static/src/js/views/pivot/pivot_view.js:56
-#: code:addons/web/static/src/xml/base.xml:480
-#: code:addons/web/static/src/xml/base.xml:509
+#: 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
#, python-format
msgid "Count"
msgstr ""
@@ -716,20 +767,19 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/fields/relational_fields.js:44
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:231
+#: 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/calendar/calendar_quick_create.js:80
-#: code:addons/web/static/src/js/views/kanban/kanban_controller.js:322
-#: code:addons/web/static/src/js/views/view_dialogs.js:362
-#: code:addons/web/static/src/xml/base.xml:379
-#: code:addons/web/static/src/xml/base.xml:399
+#: 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
#, python-format
msgid "Create"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:502
+#: code:addons/web/static/src/js/views/form/form_controller.js:606
#, python-format
msgid "Create "
msgstr ""
@@ -765,35 +815,41 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/fields/relational_fields.js:467
-#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:85
#, python-format
msgid "Create: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:346
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:245
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
#, python-format
msgid "Created by :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:300
+#: code:addons/web/static/src/xml/base.xml:297
#, python-format
msgid "Creation Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:296
+#: code:addons/web/static/src/xml/base.xml:293
#, python-format
msgid "Creation User:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:182
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:184
#, python-format
msgid "Custom Filter"
msgstr ""
@@ -805,32 +861,33 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:527
-#: code:addons/web/static/src/xml/web_calendar.xml:71
+#: 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
#, python-format
msgid "Day"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1654
+#: code:addons/web/static/src/js/fields/basic_fields.js:1742
#, python-format
msgid "Deactivate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:420
+#: code:addons/web/static/src/xml/base.xml:441
#, python-format
msgid "Default:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:311
-#: code:addons/web/static/src/js/views/form/form_controller.js:156
-#: code:addons/web/static/src/js/views/list/list_controller.js:147
-#: code:addons/web/static/src/xml/base.xml:1212
+#: 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/list/list_controller.js:162
+#: code:addons/web/static/src/xml/base.xml:1319
#: code:addons/web/static/src/xml/kanban.xml:23
#, python-format
msgid "Delete"
@@ -838,14 +895,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:357
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:514
+#, python-format
+msgid "Delete row "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:354
#, python-format
msgid "Delete this attachment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:951
+#: code:addons/web/static/src/xml/base.xml:1003
#, python-format
msgid "Delete this file"
msgstr ""
@@ -854,9 +918,9 @@ msgstr ""
#. openerp-web
#: code:addons/web/static/src/js/views/view_dialogs.js:111
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:31
-#: code:addons/web/static/src/xml/base.xml:386
-#: code:addons/web/static/src/xml/base.xml:409
-#: code:addons/web/static/src/xml/kanban.xml:70
+#: 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/report.xml:18
#, python-format
msgid "Discard"
@@ -871,14 +935,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:132
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:148
#, python-format
msgid "Do you really want to delete this filter from favorites ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1306
+#: code:addons/web/static/src/xml/base.xml:1413
#, python-format
msgid "Documentation"
msgstr ""
@@ -913,25 +977,25 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:515
+#: code:addons/web/static/src/xml/base.xml:536
#, python-format
msgid "Download xls"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_controller.js:162
+#: code:addons/web/static/src/js/views/form/form_controller.js:182
#, python-format
msgid "Duplicate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:305
+#: 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:395
-#: code:addons/web/static/src/xml/base.xml:872
-#: code:addons/web/static/src/xml/kanban.xml:69
+#: 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/report.xml:14
#, python-format
msgid "Edit"
@@ -939,77 +1003,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:235
+#: code:addons/web/static/src/xml/base.xml:239
#, python-format
msgid "Edit Action"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:273
-#, python-format
-msgid "Edit Calendar view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:315
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:317
#, python-format
msgid "Edit Column"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:580
+#: code:addons/web/static/src/xml/base.xml:601
#, python-format
msgid "Edit Domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:267
-#, python-format
-msgid "Edit Form view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:271
-#, python-format
-msgid "Edit Gantt view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:270
-#, python-format
-msgid "Edit Graph view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:269
-#, python-format
-msgid "Edit Kanban view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:268
-#, python-format
-msgid "Edit List view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:272
-#, python-format
-msgid "Edit Pivot view"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:277
+#: code:addons/web/static/src/xml/base.xml:274
#, python-format
msgid "Edit SearchView"
msgstr ""
@@ -1023,9 +1038,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:274
+#: code:addons/web/static/src/xml/base.xml:270
#, python-format
-msgid "Edit view, type:"
+msgid "Edit View:"
msgstr ""
#. module: web
@@ -1040,57 +1055,57 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:87
-#: code:addons/web/static/src/js/chrome/search_menus.js:94
-#: code:addons/web/static/src/js/services/crash_manager.js:135
+#: 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
#, python-format
msgid "Error"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:801
+#: code:addons/web/controllers/main.py:802
#, python-format
msgid "Error, password not changed !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:57
+#: code:addons/web/static/src/xml/kanban.xml:61
#, python-format
msgid "Esc to discard"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:507
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:529
#, python-format
msgid "Everybody's calendars"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_model.js:507
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:529
#, python-format
msgid "Everything"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:55
+#: code:addons/web/static/src/xml/kanban.xml:59
#, python-format
msgid "Examples"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:514
+#: code:addons/web/static/src/xml/base.xml:535
#, python-format
msgid "Expand all"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_controller.js:132
+#: code:addons/web/static/src/js/views/list/list_controller.js:143
#, python-format
msgid "Export"
msgstr ""
@@ -1104,7 +1119,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1160
+#: code:addons/web/static/src/xml/base.xml:1267
#, python-format
msgid "Export Formats :"
msgstr ""
@@ -1118,14 +1133,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1153
+#: code:addons/web/static/src/xml/base.xml:1260
#, python-format
msgid "Export Type :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1156
+#: code:addons/web/static/src/xml/base.xml:1263
#, python-format
msgid "Export all Data"
msgstr ""
@@ -1139,7 +1154,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/action_manager_act_window.js:499
+#: code:addons/web/static/src/xml/base.xml:1101
+#, python-format
+msgid "FILTER"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome/action_manager_act_window.js:532
#, python-format
msgid "Failed to evaluate search criterions"
msgstr ""
@@ -1153,7 +1175,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1122
+#: code:addons/web/static/src/xml/base.xml:1229
#, python-format
msgid "Favorites"
msgstr ""
@@ -1167,78 +1189,71 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:495
-#: code:addons/web/static/src/xml/base.xml:263
+#: code:addons/web/static/src/js/widgets/debug_manager.js:496
+#: code:addons/web/static/src/xml/base.xml:267
#, python-format
msgid "Fields View Get"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:284
+#: 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:1179
+#: code:addons/web/static/src/xml/base.xml:1286
#, python-format
msgid "Fields to export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1146
+#: code:addons/web/static/src/js/fields/basic_fields.js:1122
#, python-format
msgid "File Upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1126
+#: code:addons/web/static/src/js/fields/basic_fields.js:1102
#, python-format
msgid "File upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:563
+#: code:addons/web/static/src/js/views/search/search_inputs.js:565
#, python-format
msgid "Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:87
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:89
#, python-format
msgid "Filter name is required."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:507
+#: code:addons/web/static/src/js/views/search/search_inputs.js:507
#, python-format
msgid "Filter on: %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:94
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:96
#, python-format
msgid "Filter with same name already exists."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:989
-#, python-format
-msgid "Filters"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:513
+#: code:addons/web/static/src/xml/base.xml:534
#, python-format
msgid "Flip axis"
msgstr ""
@@ -1268,7 +1283,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1325
+#: code:addons/web/static/src/xml/base.xml:1432
#, python-format
msgid "Get this feature and much more with Odoo Enterprise!"
msgstr ""
@@ -1289,22 +1304,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_view.js:20
+#: code:addons/web/static/src/js/views/graph/graph_view.js:23
#, python-format
msgid "Graph"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:716
-#: code:addons/web/static/src/xml/base.xml:1101
+#: code:addons/web/static/src/js/views/search/search_inputs.js:738
#, python-format
msgid "Group By"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:691
+#: code:addons/web/static/src/js/views/search/search_inputs.js:712
#, python-format
msgid "Group by: %s"
msgstr ""
@@ -1316,64 +1330,99 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:822
+#: code:addons/web/static/src/xml/base.xml:850
#, python-format
msgid "Hide in Kanban"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:250
+#: code:addons/web/static/src/xml/base.xml:422
+#, python-format
+msgid "Hit DOWN to navigate to the list bellow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:429
+#, python-format
+msgid "Hit ENTER to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:421
+#, python-format
+msgid "Hit ENTER to CREATE"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:413
+#, python-format
+msgid "Hit ENTER to SAVE"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "Hit ESCAPE to DISCARD"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/core/dialog.js:334
#, python-format
msgid "I am sure about this."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:284
+#: code:addons/web/static/src/xml/base.xml:281
#, python-format
msgid "ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1226
+#: code:addons/web/static/src/js/fields/basic_fields.js:1214
#, python-format
msgid "Image"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1155
+#: code:addons/web/static/src/xml/base.xml:1262
#, python-format
msgid "Import-Compatible Export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1653
+#: code:addons/web/static/src/js/fields/basic_fields.js:1741
#, python-format
msgid "Inactive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:205
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:213
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:222
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:230
#, python-format
msgid "Invalid data"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:694
-#: code:addons/web/controllers/main.py:708
+#: code:addons/web/controllers/main.py:695
+#: code:addons/web/controllers/main.py:709
#, 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:578
+#: code:addons/web/static/src/xml/base.xml:599
#, python-format
msgid "Invalid domain"
msgstr ""
@@ -1381,28 +1430,28 @@ 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:709
+#: code:addons/web/static/src/xml/base.xml:730
#, python-format
msgid "Invalid field chain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:69
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:92
#, python-format
msgid "Invalid mode for chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:207
+#: code:addons/web/static/src/js/widgets/debug_manager.js:208
#, python-format
msgid "JS Mobile Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:196
+#: code:addons/web/static/src/js/widgets/debug_manager.js:197
#, python-format
msgid "JS Tests"
msgstr ""
@@ -1415,35 +1464,35 @@ msgid "Kanban"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:808
+#: code:addons/web/controllers/main.py:809
#, python-format
msgid "Languages"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:308
+#: code:addons/web/static/src/xml/base.xml:305
#, python-format
msgid "Latest Modification Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:304
+#: code:addons/web/static/src/xml/base.xml:301
#, python-format
msgid "Latest Modification by:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:230
+#: code:addons/web/static/src/xml/base.xml:234
#, python-format
msgid "Leave the Developer Tools"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:485
+#: code:addons/web/static/src/xml/base.xml:506
#, python-format
msgid "Line Chart"
msgstr ""
@@ -1457,7 +1506,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:37
+#: code:addons/web/static/src/xml/kanban.xml:41
#, python-format
msgid "Load more... ("
msgstr ""
@@ -1490,14 +1539,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1311
+#: code:addons/web/static/src/xml/base.xml:1418
#, python-format
msgid "Log out"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:456
+#: code:addons/web/static/src/js/views/search/search_inputs.js:456
#, python-format
msgid "M2O search fields do not currently handle multiple default values"
msgstr ""
@@ -1514,29 +1563,29 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:294
-#: code:addons/web/static/src/xml/base.xml:238
+#: code:addons/web/static/src/js/widgets/debug_manager.js:295
+#: code:addons/web/static/src/xml/base.xml:242
#, python-format
msgid "Manage Filters"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:611
+#: code:addons/web/static/src/xml/base.xml:632
#, python-format
msgid "Match"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:618
+#: code:addons/web/static/src/xml/base.xml:639
#, python-format
msgid "Match records with"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:616
+#: code:addons/web/static/src/xml/base.xml:637
#, python-format
msgid "Match records with the following rule:"
msgstr ""
@@ -1550,15 +1599,15 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:472
-#: code:addons/web/static/src/xml/base.xml:501
+#: code:addons/web/static/src/xml/base.xml:493
+#: code:addons/web/static/src/xml/base.xml:522
#, python-format
msgid "Measures"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:371
+#: code:addons/web/static/src/js/widgets/debug_manager.js:372
#, python-format
msgid "Metadata (%s)"
msgstr ""
@@ -1579,14 +1628,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1330
+#: code:addons/web/static/src/xml/base.xml:1437
#, python-format
msgid "Mobile support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:351
+#: code:addons/web/static/src/xml/base.xml:348
#, python-format
msgid "Modified by :"
msgstr ""
@@ -1601,16 +1650,17 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:529
-#: code:addons/web/static/src/xml/web_calendar.xml:73
+#: 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
#, python-format
msgid "Month"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form/form_renderer.js:316
-#: code:addons/web/static/src/xml/base.xml:855
+#: code:addons/web/static/src/js/views/form/form_renderer.js:364
+#: code:addons/web/static/src/xml/base.xml:878
#, python-format
msgid "More"
msgstr ""
@@ -1622,85 +1672,85 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1175
+#: code:addons/web/static/src/xml/base.xml:1282
#, python-format
msgid "Move Down"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1174
+#: code:addons/web/static/src/xml/base.xml:1281
#, python-format
msgid "Move Up"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1310
+#: code:addons/web/static/src/xml/base.xml:1417
#, python-format
msgid "My Odoo.com account"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:606
+#: code:addons/web/static/src/xml/base.xml:627
#, python-format
msgid "NONE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1229
+#: code:addons/web/static/src/xml/base.xml:1336
#, python-format
msgid "Name:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_model.js:567
+#: code:addons/web/static/src/js/views/basic/basic_model.js:582
#, python-format
msgid "New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:165
+#: code:addons/web/static/src/xml/base.xml:169
#, python-format
msgid "New Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1329
+#: code:addons/web/static/src/xml/base.xml:1436
#, python-format
msgid "New design"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:333
+#: code:addons/web/static/src/js/views/search/search_inputs.js:333
#, python-format
msgid "No"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:292
+#: code:addons/web/static/src/xml/base.xml:289
#, python-format
msgid "No Update:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:75
-#: code:addons/web/static/src/xml/base.xml:546
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:98
+#: code:addons/web/static/src/xml/base.xml:567
#, python-format
msgid "No data to display"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:355
+#: code:addons/web/static/src/js/widgets/debug_manager.js:356
#, python-format
msgid "No metadata available"
msgstr ""
@@ -1721,14 +1771,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:596
+#: code:addons/web/static/src/xml/base.xml:617
#, python-format
msgid "None"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:252
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:269
#, python-format
msgid "Not enough data points"
msgstr ""
@@ -1743,7 +1793,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:51
+#: code:addons/web/static/src/js/core/dialog.js:56
#, python-format
msgid "Odoo"
msgstr ""
@@ -1757,9 +1807,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:190
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:198
-#: code:addons/web/static/src/js/services/crash_manager.js:156
+#: 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
#, python-format
msgid "Odoo Client Error"
msgstr ""
@@ -1773,55 +1823,55 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:118
+#: code:addons/web/static/src/js/services/crash_manager.js:119
#, python-format
msgid "Odoo Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:58
+#: code:addons/web/static/src/js/services/crash_manager.js:59
#, python-format
msgid "Odoo Session Expired"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:108
-#: code:addons/web/static/src/js/services/crash_manager.js:197
+#: code:addons/web/static/src/js/services/crash_manager.js:109
+#: code:addons/web/static/src/js/services/crash_manager.js:198
#, python-format
msgid "Odoo Warning"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1670
+#: code:addons/web/static/src/js/fields/basic_fields.js:1758
#, python-format
msgid "Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/core/dialog.js:55
-#: code:addons/web/static/src/js/core/dialog.js:199
-#: code:addons/web/static/src/js/core/dialog.js:217
-#: code:addons/web/static/src/js/core/dialog.js:268
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:291
-#: code:addons/web/static/src/xml/base.xml:1202
+#: 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
#, python-format
msgid "Ok"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:161
+#: code:addons/web/static/src/xml/base.xml:165
#, python-format
msgid "Old Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1669
+#: code:addons/web/static/src/js/fields/basic_fields.js:1757
#, python-format
msgid "On"
msgstr ""
@@ -1835,41 +1885,41 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1916
+#: code:addons/web/static/src/js/fields/basic_fields.js:2004
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:493
+#: code:addons/web/controllers/main.py:494
#, 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:456
+#: code:addons/web/static/src/xml/base.xml:477
#, python-format
msgid "Only you"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1662
+#: code:addons/web/static/src/js/fields/basic_fields.js:1750
#, python-format
msgid "Open"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:212
+#: code:addons/web/static/src/xml/base.xml:216
#, python-format
msgid "Open Developer Tools"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:221
+#: code:addons/web/static/src/xml/base.xml:225
#, python-format
msgid "Open View"
msgstr ""
@@ -1877,9 +1927,9 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/fields/relational_fields.js:543
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:291
-#: code:addons/web/static/src/js/views/form/form_controller.js:502
-#: code:addons/web/static/src/js/views/form/form_controller.js:522
+#: 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
#, python-format
msgid "Open: "
msgstr ""
@@ -1910,21 +1960,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:486
+#: code:addons/web/static/src/xml/base.xml:507
#, python-format
msgid "Pie Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:214
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:231
#, 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:206
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:223
#, python-format
msgid "Pie chart cannot mix positive and negative numbers. Try to change your domain to only display positive results"
msgstr ""
@@ -1938,9 +1988,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_renderer.js:333
+#: code:addons/web/static/src/js/views/list/list_renderer.js:337
#, python-format
-msgid "Please click on the \"save\" button first"
+msgid "Please click on the \"save\" button first."
msgstr ""
#. module: web
@@ -1952,14 +2002,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1190
+#: 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:1189
+#: 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 ""
@@ -1980,14 +2030,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1285
+#: code:addons/web/static/src/xml/base.xml:1392
#, python-format
msgid "Please update translations of :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:146
+#: code:addons/web/static/src/xml/base.xml:150
#, python-format
msgid "Please use the copy button to report the error to your support service."
msgstr ""
@@ -2004,7 +2054,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1309
+#: code:addons/web/static/src/xml/base.xml:1416
#, python-format
msgid "Preferences"
msgstr ""
@@ -2029,14 +2079,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:530
+#: code:addons/web/static/src/xml/base.xml:551
#, python-format
msgid "Quarter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:229
+#: code:addons/web/static/src/xml/base.xml:233
#, python-format
msgid "Regenerate Assets Bundles"
msgstr ""
@@ -2057,21 +2107,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1172
+#: code:addons/web/static/src/xml/base.xml:1279
#, python-format
msgid "Remove"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1173
+#: code:addons/web/static/src/xml/base.xml:1280
#, python-format
msgid "Remove All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1578
+#: code:addons/web/static/src/js/fields/basic_fields.js:1666
#, python-format
msgid "Remove from Favorites"
msgstr ""
@@ -2092,32 +2142,39 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1658
+#: code:addons/web/static/src/js/fields/basic_fields.js:1746
#, python-format
msgid "Restore"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:220
+#: code:addons/web/static/src/xml/base.xml:224
#, python-format
msgid "Run JS Mobile Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:219
+#: code:addons/web/static/src/xml/base.xml:223
#, python-format
msgid "Run JS Tests"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1107
+#, 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/widgets/domain_selector_dialog.js:28
-#: code:addons/web/static/src/xml/base.xml:383
-#: code:addons/web/static/src/xml/base.xml:405
-#: code:addons/web/static/src/xml/base.xml:1140
+#: 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/report.xml:17
#, python-format
msgid "Save"
@@ -2132,58 +2189,58 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1291
+#: code:addons/web/static/src/js/fields/basic_fields.js:1276
#, python-format
msgid "Save As..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1202
+#: code:addons/web/static/src/xml/base.xml:1309
#, python-format
msgid "Save as:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1128
+#: code:addons/web/static/src/xml/base.xml:1235
#, python-format
msgid "Save current search"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:459
+#: code:addons/web/static/src/js/widgets/debug_manager.js:460
#, python-format
msgid "Save default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1179
+#: code:addons/web/static/src/xml/base.xml:1286
#, python-format
msgid "Save fields list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1205
+#: code:addons/web/static/src/xml/base.xml:1312
#, python-format
msgid "Saved exports:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:361
+#: code:addons/web/static/src/js/views/search/search_inputs.js:361
#, python-format
msgid "Search %(field)s at: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:194
-#: code:addons/web/static/src/js/chrome/search_inputs.js:213
-#: code:addons/web/static/src/js/chrome/search_inputs.js:402
+#: 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
#, python-format
msgid "Search %(field)s for: %(value)s"
msgstr ""
@@ -2197,7 +2254,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:972
+#: code:addons/web/static/src/xml/base.xml:1112
#, python-format
msgid "Search..."
msgstr ""
@@ -2211,16 +2268,18 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:150
+#: code:addons/web/static/src/xml/base.xml:154
#, python-format
msgid "See details"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/view_dialogs.js:369
-#: code:addons/web/static/src/xml/base.xml:902
-#: code:addons/web/static/src/xml/base.xml:903
+#: 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
#, python-format
msgid "Select"
msgstr ""
@@ -2232,7 +2291,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:582
+#: code:addons/web/static/src/xml/base.xml:603
#, python-format
msgid "Select a model to add a filter."
msgstr ""
@@ -2246,7 +2305,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:2341
+#: code:addons/web/static/src/js/fields/basic_fields.js:2429
#, python-format
msgid "Selected records"
msgstr ""
@@ -2260,21 +2319,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:456
+#: code:addons/web/static/src/js/widgets/debug_manager.js:457
#, python-format
msgid "Set Default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:258
+#: code:addons/web/static/src/xml/base.xml:262
#, python-format
msgid "Set Defaults"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1137
+#: code:addons/web/static/src/xml/base.xml:1244
#, python-format
msgid "Share with all users"
msgstr ""
@@ -2294,7 +2353,7 @@ msgid "Size:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1119
+#: code:addons/web/controllers/main.py:1134
#, python-format
msgid "Something horrible happened"
msgstr ""
@@ -2322,28 +2381,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/web_calendar.xml:80
+#: code:addons/web/static/src/xml/web_calendar.xml:88
#, python-format
msgid "Summary:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1307
+#: code:addons/web/static/src/xml/base.xml:1414
#, python-format
msgid "Support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1671
+#: code:addons/web/static/src/js/fields/basic_fields.js:1759
#, python-format
msgid "Switch Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1672
+#: code:addons/web/static/src/js/fields/basic_fields.js:1760
#, python-format
msgid "Switch On"
msgstr ""
@@ -2371,7 +2430,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:239
+#: code:addons/web/static/src/xml/base.xml:243
#, python-format
msgid "Technical Translation"
msgstr ""
@@ -2399,26 +2458,27 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1291
+#: code:addons/web/static/src/js/fields/basic_fields.js:1276
#, python-format
msgid "The field is empty, there's nothing to save !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/basic/basic_controller.js:392
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:395
+#: code:addons/web/static/src/js/widgets/attach_document.js:65
#, python-format
msgid "The following fields are invalid:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:795
+#: code:addons/web/controllers/main.py:796
#, python-format
msgid "The new password and its confirmation must be identical."
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:800
+#: code:addons/web/controllers/main.py:801
#, python-format
msgid "The old password you provided is incorrect, your password was not changed."
msgstr ""
@@ -2432,27 +2492,27 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1125
+#: code:addons/web/static/src/js/fields/basic_fields.js:1101
#, 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:1410
+#: code:addons/web/static/src/js/fields/relational_fields.js:1451
#, 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:1455
+#: code:addons/web/controllers/main.py:1470
#, 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:1146
+#: code:addons/web/static/src/js/fields/basic_fields.js:1122
#, python-format
msgid "There was a problem while uploading your file"
msgstr ""
@@ -2466,7 +2526,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_menus.js:260
+#: code:addons/web/static/src/js/views/search/favorites_menu.js:262
#, python-format
msgid "This filter is global and will be removed for everybody if you continue."
msgstr ""
@@ -2483,7 +2543,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1146
+#: code:addons/web/static/src/xml/base.xml:1253
#, 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."
@@ -2493,34 +2553,34 @@ msgstr ""
#. openerp-web
#: code:addons/web/static/src/js/fields/special_fields.js:94
#, python-format
-msgid "Timezone Mismatch : The timezone of your browser doesn't match the selected one. The time in Odoo is displayed according to your field timezone."
+msgid "Timezone Mismatch : The timezone of your browser doesn't match the selected one. The time in Odoo is displayed according to the timezone set on your user's preferences."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/web_calendar.xml:67
+#: code:addons/web/static/src/xml/web_calendar.xml:68
#, python-format
msgid "Today"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:228
#, python-format
msgid "Toggle Timelines"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:453
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:562
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:473
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:589
#, python-format
msgid "Total"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:200
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:201
#, python-format
msgid "Traceback:"
msgstr ""
@@ -2534,7 +2594,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:548
+#: code:addons/web/static/src/xml/base.xml:569
#, 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."
@@ -2542,14 +2602,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_renderer.js:76
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:99
#, 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:306
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:328
#, python-format
msgid "Trying to reconnect..."
msgstr ""
@@ -2570,27 +2630,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list/list_controller.js:141
+#: code:addons/web/static/src/js/views/list/list_controller.js:156
#, python-format
msgid "Unarchive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph/graph_model.js:178
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:72
-#: code:addons/web/static/src/js/views/kanban/kanban_column.js:75
-#: code:addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js:147
-#: code:addons/web/static/src/js/views/list/list_renderer.js:424
-#: code:addons/web/static/src/js/views/list/list_renderer.js:427
-#: code:addons/web/static/src/js/views/pivot/pivot_model.js:688
+#: code:addons/web/static/src/xml/kanban.xml:27
+#, python-format
+msgid "Unarchive All"
+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/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
#, python-format
msgid "Undefined"
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:192
#, python-format
msgid "Unknown CORS error"
msgstr ""
@@ -2604,14 +2672,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/_deprecated/data.js:738
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:513
+#, python-format
+msgid "Unlink row "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/_deprecated/data.js:739
#, python-format
msgid "Unnamed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot/pivot_view.js:93
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:99
#, python-format
msgid "Untitled"
msgstr ""
@@ -2625,37 +2700,39 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1331
+#: code:addons/web/static/src/xml/base.xml:1438
#, python-format
msgid "Upgrade to future versions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:902
+#: code:addons/web/static/src/xml/base.xml:928
+#: code:addons/web/static/src/xml/base.xml:959
#, python-format
msgid "Upload your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/relational_fields.js:1569
+#: code:addons/web/static/src/js/fields/relational_fields.js:1611
#, python-format
msgid "Uploading Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:875
-#: code:addons/web/static/src/xml/base.xml:906
-#: code:addons/web/static/src/xml/base.xml:961
+#: 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
#, python-format
msgid "Uploading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1134
+#: code:addons/web/static/src/xml/base.xml:1241
#, python-format
msgid "Use by default"
msgstr ""
@@ -2669,30 +2746,38 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:237
+#: code:addons/web/static/src/xml/base.xml:241
#, python-format
msgid "View Fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:260
+#: code:addons/web/static/src/xml/base.xml:264
#, 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/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:333
+#: code:addons/web/static/src/js/views/list/list_renderer.js:337
#, python-format
msgid "Warning"
msgstr ""
#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/widgets/attach_document.js:87
+#, python-format
+msgid "Warning : You have to save first before attaching a file."
+msgstr ""
+
+#. module: web
#: model:ir.ui.view,arch_db:web.benchmark_suite
msgid "Web Benchmarks"
msgstr ""
@@ -2715,21 +2800,15 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:528
-#: code:addons/web/static/src/xml/web_calendar.xml:72
+#: 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
#, python-format
msgid "Week"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:358
-#, python-format
-msgid "Week "
-msgstr ""
-
-#. module: web
-#. openerp-web
#: code:addons/web/static/src/js/widgets/rainbow_man.js:43
#, python-format
msgid "Well Done!"
@@ -2743,35 +2822,36 @@ msgid "Widget:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:490
+#: code:addons/web/controllers/main.py:491
#, python-format
msgid "Wrong login/password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/fields/basic_fields.js:1916
+#: code:addons/web/static/src/js/fields/basic_fields.js:2004
#, python-format
msgid "Wrong value entered!"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:288
+#: code:addons/web/static/src/xml/base.xml:285
#, python-format
msgid "XML ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:531
+#: code:addons/web/static/src/js/views/search/filters_menu.js:54
+#: code:addons/web/static/src/xml/base.xml:552
#, python-format
msgid "Year"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:332
+#: code:addons/web/static/src/js/views/search/search_inputs.js:332
#: code:addons/web/static/src/xml/base.xml:49
#, python-format
msgid "Yes"
@@ -2779,7 +2859,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/abstract_web_client.js:315
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:342
#, python-format
msgid "You are back online"
msgstr ""
@@ -2799,7 +2879,7 @@ msgid "You cannot follow relations for this field chain construction"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:793
+#: code:addons/web/controllers/main.py:794
#, python-format
msgid "You cannot leave any password empty."
msgstr ""
@@ -2827,7 +2907,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/services/crash_manager.js:58
+#: code:addons/web/static/src/js/services/crash_manager.js:59
#, python-format
msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
@@ -2883,7 +2963,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:611
+#: code:addons/web/static/src/xml/base.xml:632
#, python-format
msgid "all records"
msgstr ""
@@ -2902,7 +2982,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:163
+#: code:addons/web/static/src/js/views/search/search_filters.js:168
#: code:addons/web/static/src/js/widgets/domain_selector.js:23
#, python-format
msgid "contains"
@@ -2917,23 +2997,23 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:164
+#: code:addons/web/static/src/js/views/search/search_filters.js:169
#, python-format
msgid "doesn't contain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:270
-#: code:addons/web/static/src/js/chrome/search_filters.js:299
+#: code:addons/web/static/src/js/views/search/search_filters.js:275
+#: code:addons/web/static/src/js/views/search/search_filters.js:304
#, python-format
msgid "greater than"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:272
-#: code:addons/web/static/src/js/chrome/search_filters.js:301
+#: code:addons/web/static/src/js/views/search/search_filters.js:277
+#: code:addons/web/static/src/js/views/search/search_filters.js:306
#, python-format
msgid "greater than or equal to"
msgstr ""
@@ -2952,55 +3032,55 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:291
-#: code:addons/web/static/src/js/chrome/search_filters.js:326
+#: 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:699
+#: code:addons/web/static/src/xml/base.xml:720
#, python-format
msgid "is"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:183
+#: code:addons/web/static/src/js/views/search/search_filters.js:188
#, python-format
msgid "is after"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:184
+#: code:addons/web/static/src/js/views/search/search_filters.js:189
#, python-format
msgid "is before"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:185
+#: code:addons/web/static/src/js/views/search/search_filters.js:190
#, python-format
msgid "is between"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:165
-#: code:addons/web/static/src/js/chrome/search_filters.js:181
-#: code:addons/web/static/src/js/chrome/search_filters.js:268
-#: code:addons/web/static/src/js/chrome/search_filters.js:297
+#: code:addons/web/static/src/js/views/search/search_filters.js:170
+#: code:addons/web/static/src/js/views/search/search_filters.js:186
+#: code:addons/web/static/src/js/views/search/search_filters.js:273
+#: code:addons/web/static/src/js/views/search/search_filters.js:302
#, python-format
msgid "is equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:345
+#: code:addons/web/static/src/js/views/search/search_filters.js:350
#, python-format
msgid "is false"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:327
+#: code:addons/web/static/src/js/views/search/search_filters.js:332
#: code:addons/web/static/src/js/widgets/domain_selector.js:848
#, python-format
msgid "is not"
@@ -3015,21 +3095,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:166
-#: code:addons/web/static/src/js/chrome/search_filters.js:182
-#: code:addons/web/static/src/js/chrome/search_filters.js:269
-#: code:addons/web/static/src/js/chrome/search_filters.js:298
+#: code:addons/web/static/src/js/views/search/search_filters.js:171
+#: code:addons/web/static/src/js/views/search/search_filters.js:187
+#: code:addons/web/static/src/js/views/search/search_filters.js:274
+#: code:addons/web/static/src/js/views/search/search_filters.js:303
#, python-format
msgid "is not equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:168
-#: code:addons/web/static/src/js/chrome/search_filters.js:187
-#: code:addons/web/static/src/js/chrome/search_filters.js:275
-#: code:addons/web/static/src/js/chrome/search_filters.js:304
-#: code:addons/web/static/src/js/chrome/search_filters.js:329
+#: code:addons/web/static/src/js/views/search/search_filters.js:173
+#: code:addons/web/static/src/js/views/search/search_filters.js:192
+#: code:addons/web/static/src/js/views/search/search_filters.js:280
+#: code:addons/web/static/src/js/views/search/search_filters.js:309
+#: code:addons/web/static/src/js/views/search/search_filters.js:334
#: code:addons/web/static/src/js/widgets/domain_selector.js:37
#, python-format
msgid "is not set"
@@ -3037,11 +3117,11 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:167
-#: code:addons/web/static/src/js/chrome/search_filters.js:186
-#: code:addons/web/static/src/js/chrome/search_filters.js:274
-#: code:addons/web/static/src/js/chrome/search_filters.js:303
-#: code:addons/web/static/src/js/chrome/search_filters.js:328
+#: code:addons/web/static/src/js/views/search/search_filters.js:172
+#: code:addons/web/static/src/js/views/search/search_filters.js:191
+#: code:addons/web/static/src/js/views/search/search_filters.js:279
+#: code:addons/web/static/src/js/views/search/search_filters.js:308
+#: code:addons/web/static/src/js/views/search/search_filters.js:333
#: code:addons/web/static/src/js/widgets/domain_selector.js:36
#, python-format
msgid "is set"
@@ -3049,7 +3129,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:344
+#: code:addons/web/static/src/js/views/search/search_filters.js:349
#, python-format
msgid "is true"
msgstr ""
@@ -3063,8 +3143,8 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:271
-#: code:addons/web/static/src/js/chrome/search_filters.js:300
+#: code:addons/web/static/src/js/views/search/search_filters.js:276
+#: code:addons/web/static/src/js/views/search/search_filters.js:305
#, python-format
msgid "less than"
msgstr ""
@@ -3078,29 +3158,29 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_filters.js:273
-#: code:addons/web/static/src/js/chrome/search_filters.js:302
+#: code:addons/web/static/src/js/views/search/search_filters.js:278
+#: code:addons/web/static/src/js/views/search/search_filters.js:307
#, python-format
msgid "less than or equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:701
+#: code:addons/web/static/src/xml/base.xml:722
#, python-format
msgid "not"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:232
+#: code:addons/web/static/src/js/views/search/search_inputs.js:232
#, python-format
msgid "not a valid integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/chrome/search_inputs.js:247
+#: code:addons/web/static/src/js/views/search/search_inputs.js:247
#, python-format
msgid "not a valid number"
msgstr ""
@@ -3121,22 +3201,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:620
+#: code:addons/web/static/src/xml/base.xml:641
#, python-format
msgid "of the following rules:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:635
+#: code:addons/web/static/src/xml/base.xml:656
#, python-format
msgid "of:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:692
-#: code:addons/web/static/src/xml/base.xml:1069
+#: code:addons/web/static/src/xml/base.xml:713
+#: code:addons/web/static/src/xml/base.xml:1196
#, python-format
msgid "or"
msgstr ""
@@ -3150,21 +3230,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:576
+#: code:addons/web/static/src/xml/base.xml:597
#, python-format
msgid "record(s)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/kanban.xml:37
+#: code:addons/web/static/src/xml/kanban.xml:41
#, python-format
msgid "remaining)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:701
+#: code:addons/web/static/src/xml/base.xml:722
#, python-format
msgid "set"
msgstr ""
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index a739e22e56a..c32a8e0ef6b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ 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:963
#, python-format
msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
msgstr ""
@@ -80,7 +80,7 @@ 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:1015
#, python-format
msgid "Action"
msgstr ""
@@ -106,21 +106,21 @@ 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:997
#, python-format
msgid "Align center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:965
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:996
#, python-format
msgid "Align left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:967
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:998
#, python-format
msgid "Align right"
msgstr ""
@@ -139,7 +139,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:315
+#: code:addons/web_editor/static/src/xml/editor.xml:318
+#, python-format
+msgid "Aspect Ratio"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:357
#, python-format
msgid "Assign a focal point that will always be visible"
msgstr ""
@@ -158,7 +165,7 @@ 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:1004
#: code:addons/web_editor/static/src/xml/snippets.xml:28
#, python-format
msgid "Background Color"
@@ -173,35 +180,35 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:354
+#: code:addons/web_editor/static/src/xml/editor.xml:396
#, python-format
msgid "Background height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:364
+#: code:addons/web_editor/static/src/xml/editor.xml:406
#, python-format
msgid "Background position"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:386
+#: code:addons/web_editor/static/src/xml/editor.xml:428
#, python-format
msgid "Background repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:342
+#: code:addons/web_editor/static/src/xml/editor.xml:384
#, python-format
msgid "Background size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:345
+#: code:addons/web_editor/static/src/xml/editor.xml:387
#, python-format
msgid "Background width"
msgstr ""
@@ -218,14 +225,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:203
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:255
#, python-format
msgid "Block"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:893
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:924
#, python-format
msgid "Bold"
msgstr ""
@@ -253,8 +260,9 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:982
+#: 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
#, python-format
msgid "Close"
@@ -262,14 +270,14 @@ 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:975
#, python-format
msgid "Code"
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:990
#, python-format
msgid "Code View"
msgstr ""
@@ -283,7 +291,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:201
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:253
#, python-format
msgid "Column"
msgstr ""
@@ -297,7 +305,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:310
+#: code:addons/web_editor/static/src/xml/editor.xml:352
#, python-format
msgid "Contain"
msgstr ""
@@ -318,7 +326,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:351
#, python-format
msgid "Cover"
msgstr ""
@@ -335,7 +343,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:311
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:161
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1602
+#, python-format
+msgid "Crop Image"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:353
#, python-format
msgid "Custom"
msgstr ""
@@ -361,14 +377,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/summernote.js:2010
+#: code:addons/web_editor/static/src/js/editor/summernote.js:2008
#, python-format
msgid "Default"
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:429
#, python-format
msgid "Define if/how the background image will be repeated"
msgstr ""
@@ -380,7 +396,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:166
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:171
#, python-format
msgid "Description"
msgstr ""
@@ -396,6 +412,7 @@ msgstr ""
#. openerp-web
#: code:addons/web_editor/static/src/js/editor/snippets.options.js:954
#: 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/xml/editor.xml:12
#: code:addons/web_editor/static/src/xml/editor.xml:137
#, python-format
@@ -416,21 +433,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:986
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1017
#, python-format
msgid "Document Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:870
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:901
#, python-format
msgid "Double-click to edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:913
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:944
#, python-format
msgid "Drag an image here"
msgstr ""
@@ -452,7 +469,7 @@ 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:922
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
#, python-format
msgid "Edit"
msgstr ""
@@ -478,49 +495,63 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:905
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:936
#, python-format
msgid "File / Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:910
+#: code:addons/web_editor/static/src/xml/editor.xml:335
+#, python-format
+msgid "Flip Horizontal"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:336
+#, python-format
+msgid "Flip Vertical"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:941
#, python-format
msgid "Float Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:912
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:943
#, python-format
msgid "Float None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:911
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:942
#, python-format
msgid "Float Right"
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:1005
#, python-format
msgid "Font Color"
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:932
#, python-format
msgid "Font Family"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:902
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:933
#, python-format
msgid "Font Size"
msgstr ""
@@ -534,7 +565,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:958
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1588
+#, python-format
+msgid "Free"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:989
#, python-format
msgid "Full Screen"
msgstr ""
@@ -576,49 +614,49 @@ 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:976
#, python-format
msgid "Header 1"
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:977
#, python-format
msgid "Header 2"
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:978
#, python-format
msgid "Header 3"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:948
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:979
#, python-format
msgid "Header 4"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:949
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:980
#, python-format
msgid "Header 5"
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:981
#, python-format
msgid "Header 6"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:957
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:988
#, python-format
msgid "Help"
msgstr ""
@@ -667,7 +705,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:367
+#: code:addons/web_editor/static/src/xml/editor.xml:409
#, python-format
msgid "Horizontal"
msgstr ""
@@ -693,6 +731,13 @@ msgstr ""
#. module: web_editor
#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:309
+#, python-format
+msgid "If you want to crop it, please first download it from the original source and upload it in Odoo."
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:50
#, python-format
msgid "Image"
@@ -700,7 +745,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:915
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:946
#, python-format
msgid "Image URL"
msgstr ""
@@ -717,7 +762,7 @@ msgstr ""
#. openerp-web
#: code:addons/web_editor/static/src/xml/ace.xml:23
#, python-format
-msgid "Include All LESS Files"
+msgid "Include All SCSS Files"
msgstr ""
#. module: web_editor
@@ -729,7 +774,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:964
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:995
#, python-format
msgid "Indent"
msgstr ""
@@ -741,28 +786,28 @@ 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:969
#, python-format
msgid "Insert Horizontal Rule"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:906
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:937
#, python-format
msgid "Insert Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:920
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:951
#, python-format
msgid "Insert Link"
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:961
#, python-format
msgid "Insert Video"
msgstr ""
@@ -776,41 +821,34 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1048
+#: code:addons/web_editor/static/src/js/editor/snippets.editor.js:1058
#, python-format
msgid "Install"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:894
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:925
#, python-format
msgid "Italic"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:968
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:999
#, python-format
msgid "Justify full"
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:1012
#, python-format
msgid "Keyboard shortcuts"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/ace.xml:11
-#, python-format
-msgid "LESS (CSS)"
-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
#, python-format
@@ -834,21 +872,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/ace.js:364
-#, python-format
-msgid "Less file: %s"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:900
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:931
#, python-format
msgid "Line Height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:919
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:950
#, python-format
msgid "Link"
msgstr ""
@@ -862,7 +893,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1310
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1340
#, python-format
msgid "Link to"
msgstr ""
@@ -884,7 +915,7 @@ 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:1003
#, python-format
msgid "More Color"
msgstr ""
@@ -903,7 +934,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:389
+#: code:addons/web_editor/static/src/xml/editor.xml:431
#, python-format
msgid "No repeat"
msgstr ""
@@ -918,7 +949,7 @@ 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:973
#, python-format
msgid "Normal"
msgstr ""
@@ -940,7 +971,7 @@ 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:956
#: code:addons/web_editor/static/src/xml/editor.xml:286
#, python-format
msgid "Open in new window"
@@ -955,14 +986,14 @@ 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:985
#, python-format
msgid "Ordered list"
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:994
#, python-format
msgid "Outdent"
msgstr ""
@@ -976,14 +1007,14 @@ 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:993
#, python-format
msgid "Paragraph"
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:1016
#, python-format
msgid "Paragraph formatting"
msgstr ""
@@ -1017,28 +1048,28 @@ 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:974
#, python-format
msgid "Quote"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.js:309
+#: code:addons/web_editor/static/src/js/editor/rte.js:326
#, python-format
msgid "Readonly field"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:971
+#: 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:990
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1021
#, python-format
msgid "Redo"
msgstr ""
@@ -1059,49 +1090,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:899
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:930
#, python-format
msgid "Remove Font Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:916
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:947
#, python-format
msgid "Remove Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:329
+#: code:addons/web_editor/static/src/xml/editor.xml:371
#, python-format
msgid "Repeat"
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:432
#, python-format
msgid "Repeat both"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:391
+#: code:addons/web_editor/static/src/xml/editor.xml:433
#, python-format
msgid "Repeat x"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:392
+#: code:addons/web_editor/static/src/xml/editor.xml:434
#, python-format
msgid "Repeat y"
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:1008
#: code:addons/web_editor/static/src/xml/ace.xml:36
#, python-format
msgid "Reset"
@@ -1109,7 +1140,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:978
+#: code:addons/web_editor/static/src/xml/editor.xml:339
+#, 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 ""
@@ -1123,28 +1161,57 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:907
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:938
#, python-format
msgid "Resize Full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:908
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:939
#, python-format
msgid "Resize Half"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:909
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:940
#, python-format
msgid "Resize Quarter"
msgstr ""
#. module: web_editor
#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:331
+#, python-format
+msgid "Rotate Left"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:332
+#, python-format
+msgid "Rotate Right"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/ace.xml:11
+#, python-format
+msgid "SCSS (CSS)"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/widgets/ace.js:364
+#, python-format
+msgid "SCSS file: %s"
+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/xml/editor.xml:13
#, python-format
@@ -1174,7 +1241,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1084
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1114
#, python-format
msgid "Select a Media"
msgstr ""
@@ -1188,7 +1255,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:914
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:945
#, python-format
msgid "Select from files"
msgstr ""
@@ -1202,21 +1269,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:365
+#: code:addons/web_editor/static/src/xml/editor.xml:407
#, 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:976
+#: 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:343
+#: code:addons/web_editor/static/src/xml/editor.xml:385
#, python-format
msgid "Sets the width and height of the background image in percent of the parent element."
msgstr ""
@@ -1252,21 +1319,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:896
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:927
#, python-format
msgid "Strikethrough"
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:972
#, python-format
msgid "Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:897
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:928
#, python-format
msgid "Subscript"
msgstr ""
@@ -1278,14 +1345,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:898
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:929
#, python-format
msgid "Superscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:935
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966
#, python-format
msgid "Table"
msgstr ""
@@ -1299,14 +1366,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:983
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1014
#, python-format
msgid "Text formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:923
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:954
#, python-format
msgid "Text to display"
msgstr ""
@@ -1321,14 +1388,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/widgets/widgets.js:1018
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1048
#, 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:1012
+#: code:addons/web_editor/static/src/js/widgets/widgets.js:1042
#, python-format
msgid "The provided url is not valid"
msgstr ""
@@ -1364,7 +1431,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:924
+#: code:addons/web_editor/static/src/xml/editor.xml:307
+#, 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
+#, 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
#, python-format
msgid "To what URL should this link go?"
msgstr ""
@@ -1399,7 +1480,7 @@ 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:1006
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Transparent"
@@ -1414,14 +1495,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:895
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:926
#, python-format
msgid "Underline"
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:1020
#, python-format
msgid "Undo"
msgstr ""
@@ -1435,14 +1516,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:921
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:952
#, python-format
msgid "Unlink"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:953
+#: code:addons/web_editor/static/src/js/editor/rte.summernote.js:984
#, python-format
msgid "Unordered list"
msgstr ""
@@ -1463,14 +1544,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:376
+#: code:addons/web_editor/static/src/xml/editor.xml:418
#, python-format
msgid "Vertical"
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:959
#: code:addons/web_editor/static/src/xml/editor.xml:53
#, python-format
msgid "Video"
@@ -1478,14 +1559,14 @@ 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:960
#, python-format
msgid "Video Link"
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:962
#, python-format
msgid "Video URL?"
msgstr ""
@@ -1559,6 +1640,20 @@ msgstr ""
#. module: web_editor
#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:327
+#, python-format
+msgid "Zoom In"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:328
+#, python-format
+msgid "Zoom Out"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:198
#, python-format
msgid "and"
@@ -1566,10 +1661,10 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:348
-#: code:addons/web_editor/static/src/xml/editor.xml:357
-#: code:addons/web_editor/static/src/xml/editor.xml:370
-#: code:addons/web_editor/static/src/xml/editor.xml:379
+#: 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
#, python-format
msgid "auto"
msgstr ""
diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index 368ec50b9cf..0be3f875864 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+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:109
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:116
#, python-format
msgid "(Community Edition)"
msgstr ""
@@ -30,28 +30,28 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:125
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:132
#, python-format
msgid "Activate the developer mode"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:127
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:134
#, 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:57
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:67
#, python-format
msgid "Active User"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:58
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:68
#, python-format
msgid "Active Users"
msgstr ""
@@ -72,7 +72,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:123
#, python-format
msgid "Copyright © 2004-2016"
msgstr ""
@@ -85,35 +85,35 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:129
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:136
#, python-format
msgid "Deactivate the developer mode"
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:77
#, python-format
-msgid "Enter e-mail addresses (one per line)"
+msgid "Enter e-mail addresses"
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:123
#, python-format
msgid "GNU LGPL Licensed"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:140
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:147
#, 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:93
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:100
#, python-format
msgid "Help us spread the word: Share Odoo's awesomeness with your friends!"
msgstr ""
@@ -134,28 +134,28 @@ 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:78
#, python-format
msgid "Invite"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:66
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:76
#, python-format
msgid "Invite new users:"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:161
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:168
#, python-format
msgid "Load a Translation"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:62
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:72
#, python-format
msgid "Manage access rights"
msgstr ""
@@ -169,69 +169,83 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:108
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:115
#, python-format
msgid "Odoo"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:139
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:146
#, python-format
msgid "Odoo Enterprise"
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:123
#, python-format
msgid "Odoo S.A."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:74
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:82
#, python-format
msgid "Pending invitations:"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:110
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:55
#, python-format
-msgid "Please provide valid email addresses"
+msgid "Remove Email"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:163
#, 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:178
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:185
#, python-format
msgid "Set Up"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:173
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:180
#, 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:91
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:98
#, python-format
msgid "Share the Love"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:114
+#, 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
+#, 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
#, python-format
msgid "Theme store"
@@ -239,26 +253,29 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:152
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:159
#, python-format
msgid "Translations"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:143
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
#, python-format
msgid "Upgrade Now"
msgstr ""
#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:174
#: model:ir.model,name:web_settings_dashboard.model_res_users
+#, python-format
msgid "Users"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:80
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:88
#, python-format
msgid "more"
msgstr ""
diff --git a/addons/web_tour/i18n/web_tour.pot b/addons/web_tour/i18n/web_tour.pot
index 07145cc5106..4196de52a90 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,9 +17,9 @@ msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:504
+#: code:addons/web_tour/static/src/js/tour_manager.js:371
#, python-format
-msgid "Click the <i>Home icon</i> to navigate across apps."
+msgid "Click on the <i>Home icon</i> to navigate across apps."
msgstr ""
#. module: web_tour
@@ -75,7 +75,7 @@ msgstr ""
#. module: web_tour
#. openerp-web
-#: code:addons/web_tour/static/src/js/tour_manager.js:208
+#: code:addons/web_tour/static/src/js/tour_manager.js:75
#, python-format
msgid "Skip tour"
msgstr ""
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index e6b98d719ec..a48f609d910 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+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:931
+#: code:addons/website/static/src/js/editor/snippets.options.js:1009
#, python-format
msgid " Add Images"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:237
-#: code:addons/website/models/website.py:306
+#: code:addons/website/models/website.py:241
+#: code:addons/website/models/website.py:310
#, python-format
msgid "%s (id:%s)"
msgstr ""
@@ -65,9 +65,9 @@ msgid "' did not match any pages."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:727
-#: code:addons/website/models/website.py:729
-#: code:addons/website/models/website.py:747
+#: code:addons/website/models/website.py:737
+#: code:addons/website/models/website.py:739
+#: code:addons/website/models/website.py:757
#, python-format
msgid "(copy)"
msgstr ""
@@ -80,12 +80,6 @@ msgid "(could be used in"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
-msgid ",\n"
-" the #1"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.show_website_info
msgid ",\n"
" updated:"
@@ -231,6 +225,11 @@ msgid "<i class=\"fa fa-clock-o\"/>Slideshow speed"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-columns\"/>Number of columns"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-diamond\"/> Feature"
msgstr ""
@@ -387,14 +386,6 @@ msgid "<span class=\"o_add_images\" style=\"cursor: pointer;\"><i class=\"fa fa-
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "<span/>\n"
" <span class=\"css_publish\">Unpublished</span>\n"
@@ -423,6 +414,11 @@ msgid "<span>Contact Us Now</span>\n"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.layout_footer_copyright
+msgid "<span>Copyright &amp;copy;</span>"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_share
msgid "<span>Share</span>"
msgstr ""
@@ -492,7 +488,7 @@ msgstr ""
#. module: website
#: 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_default
+#: model:ir.ui.view,arch_db:website.footer_custom
#: model:website.page,arch_db:website.aboutus_page
msgid "About us"
msgstr ""
@@ -541,7 +537,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/new_content.js:49
+#: code:addons/website/static/src/js/menu/new_content.js:50
#, python-format
msgid "Add page in menu"
msgstr ""
@@ -769,7 +765,7 @@ msgid "Confirmation"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_default
+#: model:ir.ui.view,arch_db:website.footer_custom
msgid "Connect with us"
msgstr ""
@@ -788,7 +784,7 @@ 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.footer_default
+#: 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_comparisons
@@ -821,20 +817,15 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:439
+#: code:addons/website/static/src/js/menu/content.js:424
#: code:addons/website/static/src/xml/website.xml:26
#, python-format
msgid "Continue"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
-msgid "Copyright &amp;copy;"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:362
+#: code:addons/website/static/src/js/menu/content.js:366
#, python-format
msgid "Create Menu"
msgstr ""
@@ -845,6 +836,11 @@ msgid "Create Page"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.brand_promotion
+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 ""
@@ -871,6 +867,11 @@ msgid "Created on"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_config_settings__auth_signup_uninvited
+msgid "Customer Account"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Customize"
msgstr ""
@@ -888,6 +889,13 @@ msgid "Customize any block through this menu. Try to change the background of th
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"
@@ -933,6 +941,7 @@ 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
#, python-format
msgid "Delete Page"
@@ -1055,7 +1064,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:468
+#: code:addons/website/static/src/js/menu/content.js:453
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Edit Menu"
@@ -1124,13 +1133,6 @@ msgid "Events"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:61
-#, python-format
-msgid "Existing Page, URL or Email"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "Expert"
msgstr ""
@@ -1142,6 +1144,7 @@ msgid "Explain the benefits you offer. Don't write about products or\n"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_ir_actions_server__xml_id
#: model:ir.model.fields,field_description:website.field_website_page__xml_id
msgid "External ID"
msgstr ""
@@ -1158,7 +1161,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/editor/snippets.options.js:415
+#: code:addons/website/static/src/js/editor/snippets.options.js:493
#, python-format
msgid "Facebook Page"
msgstr ""
@@ -1194,11 +1197,6 @@ msgid "Feature Two"
msgstr ""
#. module: website
-#: model:ir.model,name:website.model_ir_model_fields
-msgid "Fields"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.s_features
msgid "First Feature"
msgstr ""
@@ -1239,6 +1237,11 @@ 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)"
+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 ""
@@ -1291,7 +1294,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:92
+#: code:addons/website/static/src/xml/website.backend.xml:93
#, python-format
msgid "Go to Website"
msgstr ""
@@ -1376,6 +1379,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.menu_search
+#: model:ir.ui.view,arch_db:website.view_redirect_search
msgid "Group By"
msgstr ""
@@ -1414,8 +1418,15 @@ msgid "Hide this page from search results"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.contentMenu.xml:54
+#, python-format
+msgid "Hint: Simply type '#' to create a container menu"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.500
-#: model:ir.ui.view,arch_db:website.footer_default
+#: model:ir.ui.view,arch_db:website.footer_custom
#: model:website.menu,name:website.menu_homepage
msgid "Home"
msgstr ""
@@ -1427,7 +1438,6 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_website_page__is_homepage
#: model:ir.ui.view,arch_db:website.403
#: model:ir.ui.view,arch_db:website.404
-#: model:ir.ui.view,arch_db:website.footer_custom
#, python-format
msgid "Homepage"
msgstr ""
@@ -1459,6 +1469,11 @@ msgid "ID"
msgstr ""
#. module: website
+#: model:ir.model.fields,help:website.field_ir_actions_server__xml_id
+msgid "ID of the action if defined in a XML file"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,help:website.field_website_page__xml_id
msgid "ID of the view defined in xml file"
msgstr ""
@@ -1624,7 +1639,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:66
+#: code:addons/website/static/src/xml/website.backend.xml:67
#, python-format
msgid "Last Month"
msgstr ""
@@ -1647,14 +1662,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:65
+#: code:addons/website/static/src/xml/website.backend.xml:66
#, python-format
msgid "Last Week"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.backend.xml:67
+#: code:addons/website/static/src/xml/website.backend.xml:68
#, python-format
msgid "Last Year"
msgstr ""
@@ -1689,13 +1704,6 @@ msgid "Limited customization"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:55
-#, python-format
-msgid "Link"
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_res_config_settings__module_website_links
msgid "Link Trackers"
msgstr ""
@@ -1781,7 +1789,7 @@ msgid "Meet the Executive Team"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:245
+#: code:addons/website/models/website.py:249
#: model:ir.model.fields,field_description:website.field_website_menu__name
#, python-format
msgid "Menu"
@@ -1789,13 +1797,13 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:376
+#: code:addons/website/static/src/js/menu/content.js:380
#, python-format
msgid "Menu Label"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:247
+#: code:addons/website/models/website.py:251
#: model:ir.ui.menu,name:website.menu_website_menu_list
#, python-format
msgid "Menus"
@@ -1838,7 +1846,6 @@ msgid "Model Data"
msgstr ""
#. module: website
-#: model:ir.model,name:website.model_ir_model
#: model:ir.model.fields,field_description:website.field_website_page__model_ids
msgid "Models"
msgstr ""
@@ -1872,12 +1879,12 @@ msgstr ""
#. module: website
#: selection:website.redirect,type:0
-msgid "Moved permanently"
+msgid "Moved permanently (301)"
msgstr ""
#. module: website
#: selection:website.redirect,type:0
-msgid "Moved temporarily"
+msgid "Moved temporarily (302)"
msgstr ""
#. module: website
@@ -1901,8 +1908,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/new_content.js:41
-#: code:addons/website/static/src/xml/website.contentMenu.xml:58
+#: code:addons/website/static/src/js/menu/new_content.js:42
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "New Page"
@@ -1967,7 +1973,7 @@ msgid "Number of languages"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
+#: model:ir.ui.view,arch_db:website.brand_promotion
msgid "Odoo"
msgstr ""
@@ -2025,6 +2031,11 @@ msgid "On Website"
msgstr ""
#. module: website
+#: selection:res.config.settings,auth_signup_uninvited:0
+msgid "On invitation (B2B)"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,help:website.field_website_page__mode
msgid "Only applies if this view inherits from an other one (inherit_id is not False/Null).\n"
"\n"
@@ -2044,11 +2055,6 @@ msgid "Open Source ERP"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
-msgid "Open Source eCommerce"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Optimize SEO"
msgstr ""
@@ -2076,7 +2082,7 @@ msgid "Our Offers"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_default
+#: model:ir.ui.view,arch_db:website.footer_custom
msgid "Our Products &amp; Services"
msgstr ""
@@ -2101,14 +2107,14 @@ msgid "Our products are designed for small to medium size companies willing to o
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_default
+#: model:ir.ui.view,arch_db:website.footer_custom
msgid "Our products are designed for small to medium size companies willing to optimize\n"
-" their performance."
+" their performance."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:210
-#: code:addons/website/models/website.py:279
+#: code:addons/website/models/website.py:214
+#: code:addons/website/models/website.py:283
#: 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
@@ -2117,13 +2123,13 @@ msgid "Page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:217
+#: code:addons/website/models/website.py:221
#, python-format
msgid "Page <b>%s</b> contains a link to this page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:286
+#: code:addons/website/models/website.py:290
#, python-format
msgid "Page <b>%s</b> is calling this file"
msgstr ""
@@ -2142,7 +2148,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:59
+#: code:addons/website/static/src/js/menu/content.js:67
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Page Properties"
@@ -2150,7 +2156,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/new_content.js:42
+#: code:addons/website/static/src/js/menu/new_content.js:43
#: code:addons/website/static/src/xml/website.seo.xml:14
#, python-format
msgid "Page Title"
@@ -2166,8 +2172,8 @@ msgid "Page URL"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:212
-#: code:addons/website/models/website.py:281
+#: code:addons/website/models/website.py:216
+#: code:addons/website/models/website.py:285
#: model:ir.ui.menu,name:website.menu_website_pages_list
#, python-format
msgid "Pages"
@@ -2180,18 +2186,13 @@ msgid "Panels are a great tool to compare offers or to emphasize on\n"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_website_menu__parent_left
-msgid "Parent Left"
-msgstr ""
-
-#. module: website
#: model:ir.model.fields,field_description:website.field_website_menu__parent_id
msgid "Parent Menu"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_website_menu__parent_right
-msgid "Parent Right"
+#: model:ir.model.fields,field_description:website.field_website_menu__parent_path
+msgid "Parent Path"
msgstr ""
#. module: website
@@ -2212,11 +2213,6 @@ msgid "Please install a theme in order to customize your website."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
-msgid "Powered by"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.kanban_contain
msgid "Prev"
msgstr ""
@@ -2317,6 +2313,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_redirect__type
+#: model:ir.ui.view,arch_db:website.view_redirect_search
msgid "Redirection Type"
msgstr ""
@@ -2397,6 +2394,11 @@ msgid "Search Menus"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.view_redirect_search
+msgid "Search Redirect"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.website_search_box
msgid "Search..."
msgstr ""
@@ -2418,7 +2420,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:438
+#: code:addons/website/static/src/js/menu/content.js:423
#, python-format
msgid "Select a Menu"
msgstr ""
@@ -2515,13 +2517,13 @@ msgid "Social Media"
msgstr ""
#. module: website
-#: code:addons/website/controllers/main.py:218
+#: code:addons/website/controllers/main.py:219
#, python-format
msgid "Sort by Name"
msgstr ""
#. module: website
-#: code:addons/website/controllers/main.py:217
+#: code:addons/website/controllers/main.py:218
#, python-format
msgid "Sort by Url"
msgstr ""
@@ -2551,21 +2553,6 @@ msgid "Stay on this page"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_custom
-msgid "Subtitle"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.footer_custom
-msgid "Subtitle 2"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.footer_custom
-msgid "Subtitle 3"
-msgstr ""
-
-#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:58
#, python-format
@@ -2600,20 +2587,20 @@ msgid "Tell what's the value for the<br/>customer for this feature."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:229
-#: code:addons/website/models/website.py:299
+#: code:addons/website/models/website.py:233
+#: code:addons/website/models/website.py:303
#, python-format
msgid "Template"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:235
+#: code:addons/website/models/website.py:239
#, python-format
msgid "Template <b>%s (id:%s)</b> contains a link to this page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:305
+#: code:addons/website/models/website.py:309
#, python-format
msgid "Template <b>%s (id:%s)</b> is calling this file"
msgstr ""
@@ -2624,8 +2611,8 @@ msgid "Template fallback"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:231
-#: code:addons/website/models/website.py:301
+#: code:addons/website/models/website.py:235
+#: code:addons/website/models/website.py:305
#, python-format
msgid "Templates"
msgstr ""
@@ -2646,19 +2633,6 @@ msgid "The following error was raised in the website controller"
msgstr ""
#. module: website
-#: model:ir.model.fields,help:website.field_blog_post__website_url
-#: model:ir.model.fields,help:website.field_delivery_carrier__website_url
-#: model:ir.model.fields,help:website.field_event_event__website_url
-#: model:ir.model.fields,help:website.field_event_track__website_url
-#: model:ir.model.fields,help:website.field_hr_employee__website_url
-#: model:ir.model.fields,help:website.field_hr_job__website_url
-#: model:ir.model.fields,help:website.field_im_livechat_channel__website_url
-#: model:ir.model.fields,help:website.field_product_template__website_url
-#: model:ir.model.fields,help:website.field_res_partner__website_url
-#: model:ir.model.fields,help:website.field_res_partner_grade__website_url
-#: model:ir.model.fields,help:website.field_res_partner_tag__website_url
-#: model:ir.model.fields,help:website.field_slide_channel__website_url
-#: model:ir.model.fields,help:website.field_slide_slide__website_url
#: model:ir.model.fields,help:website.field_website_page__website_url
#: model:ir.model.fields,help:website.field_website_published_mixin__website_url
msgid "The full URL to access the document through the website."
@@ -2733,7 +2707,7 @@ msgid "This page does not exist, but you can create it as you are administrator
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:250
+#: code:addons/website/models/website.py:254
#, python-format
msgid "This page is in the menu <b>%s</b>"
msgstr ""
@@ -2765,7 +2739,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/menu/content.js:433
+#: code:addons/website/static/src/js/menu/content.js:418
#: model:website.menu,name:website.main_menu
#, python-format
msgid "Top Menu"
@@ -2906,6 +2880,11 @@ msgid "User-agent: *\n"
msgstr ""
#. module: website
+#: model:ir.model,name:website.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Very Fast"
msgstr ""
@@ -2946,15 +2925,6 @@ msgid "Views which inherit from this one"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_blog_post__website_published
-#: model:ir.model.fields,field_description:website.field_event_track__website_published
-#: model:ir.model.fields,field_description:website.field_hr_employee__website_published
-#: model:ir.model.fields,field_description:website.field_hr_job__website_published
-#: model:ir.model.fields,field_description:website.field_im_livechat_channel__website_published
-#: model:ir.model.fields,field_description:website.field_product_template__website_published
-#: model:ir.model.fields,field_description:website.field_res_partner__website_published
-#: model:ir.model.fields,field_description:website.field_slide_channel__website_published
-#: model:ir.model.fields,field_description:website.field_slide_slide__website_published
#: 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"
@@ -2977,10 +2947,10 @@ msgid "We are a team of passionate people whose goal is to improve everyone's\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_default
+#: model:ir.ui.view,arch_db:website.footer_custom
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
@@ -3021,6 +2991,11 @@ msgid "Website Domain"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_res_users__group_website_user
+msgid "Website Editor"
+msgstr ""
+
+#. module: website
#: model:ir.model.fields,field_description:website.field_website__favicon
msgid "Website Favicon"
msgstr ""
@@ -3101,20 +3076,7 @@ msgid "Website Title"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_blog_post__website_url
-#: model:ir.model.fields,field_description:website.field_delivery_carrier__website_url
-#: model:ir.model.fields,field_description:website.field_event_event__website_url
-#: model:ir.model.fields,field_description:website.field_event_track__website_url
-#: model:ir.model.fields,field_description:website.field_hr_employee__website_url
-#: model:ir.model.fields,field_description:website.field_hr_job__website_url
-#: model:ir.model.fields,field_description:website.field_im_livechat_channel__website_url
#: model:ir.model.fields,field_description:website.field_ir_attachment__website_url
-#: model:ir.model.fields,field_description:website.field_product_template__website_url
-#: model:ir.model.fields,field_description:website.field_res_partner__website_url
-#: model:ir.model.fields,field_description:website.field_res_partner_grade__website_url
-#: model:ir.model.fields,field_description:website.field_res_partner_tag__website_url
-#: model:ir.model.fields,field_description:website.field_slide_channel__website_url
-#: model:ir.model.fields,field_description:website.field_slide_slide__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
msgid "Website URL"
@@ -3138,66 +3100,21 @@ msgid "Website menu"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_blog_blog__website_meta_description
-#: model:ir.model.fields,field_description:website.field_blog_post__website_meta_description
-#: model:ir.model.fields,field_description:website.field_blog_tag__website_meta_description
-#: model:ir.model.fields,field_description:website.field_event_event__website_meta_description
-#: model:ir.model.fields,field_description:website.field_event_track__website_meta_description
-#: model:ir.model.fields,field_description:website.field_forum_documentation_toc__website_meta_description
-#: model:ir.model.fields,field_description:website.field_forum_forum__website_meta_description
-#: model:ir.model.fields,field_description:website.field_forum_post__website_meta_description
-#: model:ir.model.fields,field_description:website.field_forum_tag__website_meta_description
-#: model:ir.model.fields,field_description:website.field_hr_job__website_meta_description
#: model:ir.model.fields,field_description:website.field_ir_ui_view__website_meta_description
-#: model:ir.model.fields,field_description:website.field_product_public_category__website_meta_description
-#: model:ir.model.fields,field_description:website.field_product_template__website_meta_description
-#: model:ir.model.fields,field_description:website.field_res_partner__website_meta_description
-#: model:ir.model.fields,field_description:website.field_slide_channel__website_meta_description
-#: model:ir.model.fields,field_description:website.field_slide_slide__website_meta_description
#: model:ir.model.fields,field_description:website.field_website_page__website_meta_description
#: model:ir.model.fields,field_description:website.field_website_seo_metadata__website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_blog_blog__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_blog_post__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_blog_tag__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_event_event__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_event_track__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_forum_documentation_toc__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_forum_forum__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_forum_post__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_forum_tag__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_hr_job__website_meta_keywords
#: model:ir.model.fields,field_description:website.field_ir_ui_view__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_product_public_category__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_product_template__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_res_partner__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_slide_channel__website_meta_keywords
-#: model:ir.model.fields,field_description:website.field_slide_slide__website_meta_keywords
#: model:ir.model.fields,field_description:website.field_website_page__website_meta_keywords
#: model:ir.model.fields,field_description:website.field_website_seo_metadata__website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_blog_blog__website_meta_title
-#: model:ir.model.fields,field_description:website.field_blog_post__website_meta_title
-#: model:ir.model.fields,field_description:website.field_blog_tag__website_meta_title
-#: model:ir.model.fields,field_description:website.field_event_event__website_meta_title
-#: model:ir.model.fields,field_description:website.field_event_track__website_meta_title
-#: model:ir.model.fields,field_description:website.field_forum_documentation_toc__website_meta_title
-#: model:ir.model.fields,field_description:website.field_forum_forum__website_meta_title
-#: model:ir.model.fields,field_description:website.field_forum_post__website_meta_title
-#: model:ir.model.fields,field_description:website.field_forum_tag__website_meta_title
-#: model:ir.model.fields,field_description:website.field_hr_job__website_meta_title
#: model:ir.model.fields,field_description:website.field_ir_ui_view__website_meta_title
-#: model:ir.model.fields,field_description:website.field_product_public_category__website_meta_title
-#: model:ir.model.fields,field_description:website.field_product_template__website_meta_title
-#: model:ir.model.fields,field_description:website.field_res_partner__website_meta_title
-#: model:ir.model.fields,field_description:website.field_slide_channel__website_meta_title
-#: model:ir.model.fields,field_description:website.field_slide_slide__website_meta_title
#: model:ir.model.fields,field_description:website.field_website_page__website_meta_title
#: model:ir.model.fields,field_description:website.field_website_seo_metadata__website_meta_title
msgid "Website meta title"
@@ -3282,6 +3199,13 @@ msgstr ""
#. module: website
#. openerp-web
+#: code:addons/website/static/src/js/menu/seo.js:543
+#, 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
#, python-format
msgid "You need to log in to your Google Account before:"
@@ -3368,6 +3292,11 @@ msgid "found(s)"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.brand_promotion
+msgid "free website"
+msgstr ""
+
+#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:28
#, python-format
@@ -3483,6 +3412,11 @@ msgid "website.published.mixin"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.brand_promotion
+msgid "with"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.500
msgid "yes"
msgstr ""
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index dce06e38b5a..6ab77d996ae 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,6 +79,12 @@ msgid "Access post"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_needaction
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__active
#: model:ir.model.fields,field_description:website_blog.field_blog_post__active
msgid "Active"
@@ -182,8 +188,12 @@ msgid "Blog Tag"
msgstr ""
#. module: website_blog
+#: model:ir.model,name:website_blog.model_blog_tag_category
+msgid "Blog Tag Category"
+msgstr ""
+
+#. module: website_blog
#: model:ir.actions.act_window,name:website_blog.action_tags
-#: model:ir.ui.menu,name:website_blog.menu_blog_tag
msgid "Blog Tags"
msgstr ""
@@ -201,6 +211,11 @@ msgid "Blue"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag__category_id
+msgid "Category"
+msgstr ""
+
+#. module: website_blog
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:29
#: model:ir.ui.view,arch_db:website_blog.website_blog
@@ -254,6 +269,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__create_uid
#: model:ir.model.fields,field_description:website_blog.field_blog_post__create_uid
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__create_uid
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__create_uid
msgid "Created by"
msgstr ""
@@ -261,6 +277,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__create_date
#: model:ir.model.fields,field_description:website_blog.field_blog_post__create_date
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__create_date
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__create_date
msgid "Created on"
msgstr ""
@@ -268,6 +285,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__display_name
#: model:ir.model.fields,field_description:website_blog.field_blog_post__display_name
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__display_name
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__display_name
msgid "Display Name"
msgstr ""
@@ -287,6 +305,24 @@ msgid "Filter Intensity"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_follower_ids
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_channel_ids
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_partner_ids
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Full Screen"
msgstr ""
@@ -315,15 +351,40 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__id
#: model:ir.model.fields,field_description:website_blog.field_blog_post__id
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__id
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__id
msgid "ID"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__message_unread
+#: model:ir.model.fields,help:website_blog.field_blog_post__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__message_needaction
+#: model:ir.model.fields,help:website_blog.field_blog_post__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__message_has_error
+#: model:ir.model.fields,help:website_blog.field_blog_post__message_has_error
+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__write_uid
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Last Contributor"
@@ -333,12 +394,14 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog____last_update
#: model:ir.model.fields,field_description:website_blog.field_blog_post____last_update
#: model:ir.model.fields,field_description:website_blog.field_blog_tag____last_update
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category____last_update
msgid "Last Modified on"
msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__write_uid
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__write_uid
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__write_uid
msgid "Last Updated by"
msgstr ""
@@ -346,6 +409,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_blog.field_blog_blog__write_date
#: model:ir.model.fields,field_description:website_blog.field_blog_post__write_date
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__write_date
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__write_date
msgid "Last Updated on"
msgstr ""
@@ -365,12 +429,25 @@ msgid "Medium"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_has_error
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_ids
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Mid screen"
msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_tag__name
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag_category__name
msgid "Name"
msgstr ""
@@ -388,11 +465,6 @@ msgid "New Blog Post"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.header_footer_custom
-msgid "News"
-msgstr ""
-
-#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "No Cover"
msgstr ""
@@ -418,6 +490,36 @@ msgid "None"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_has_error_counter
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__message_needaction_counter
+#: model:ir.model.fields,help:website_blog.field_blog_post__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__message_has_error_counter
+#: model:ir.model.fields,help:website_blog.field_blog_post__message_has_error_counter
+msgid "Number of messages with delivery error"
+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"
+msgstr ""
+
+#. module: website_blog
#. openerp-web
#: code:addons/website_blog/static/src/js/website.tour.blog.js:63
#, python-format
@@ -425,6 +527,11 @@ msgid "Once you have reviewed the content on mobile, close the preview."
msgstr ""
#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_tags
+msgid "Others"
+msgstr ""
+
+#. module: website_blog
#: model:blog.blog,name:website_blog.blog_blog_1
msgid "Our Blog"
msgstr ""
@@ -516,7 +623,7 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/models/website_blog.py:123
+#: code:addons/website_blog/models/website_blog.py:137
#: code:addons/website_blog/static/src/js/website.tour.blog.js:52
#, python-format
msgid "Start writing here..."
@@ -544,6 +651,22 @@ msgid "Subtitle"
msgstr ""
#. module: website_blog
+#: model:ir.ui.menu,name:website_blog.menu_website_blog_tag_category
+#: model:ir.ui.view,arch_db:website_blog.blog_tag_category_tree
+msgid "Tag Categories"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.actions.act_window,name:website_blog.action_tag_category
+msgid "Tag Category"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_tag_category_form
+msgid "Tag Category Form"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_tag_form
msgid "Tag Form"
msgstr ""
@@ -554,12 +677,19 @@ msgid "Tag List"
msgstr ""
#. module: website_blog
+#: sql_constraint:blog.tag.category:0
+msgid "Tag category already exists !"
+msgstr ""
+
+#. module: website_blog
#: sql_constraint:blog.tag:0
msgid "Tag name already exists !"
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.view,arch_db:website_blog.opt_blog_rc_tags
msgid "Tags"
msgstr ""
@@ -585,6 +715,11 @@ msgid "The blog post will be visible for your visitors as of this date on the we
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_post__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.latest_blogs
msgid "This page is great to improve your <strong>Search Engine Optimization</strong>;\n"
" You can review titles, keywords and descriptions of all blogs at once."
@@ -601,6 +736,18 @@ msgid "Unpublished"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_unread
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_unread_counter
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_short
msgid "Untitled Post"
msgstr ""
@@ -618,6 +765,11 @@ msgid "Used in:"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_blog
#: model:ir.model,name:website_blog.model_website
msgid "Website"
msgstr ""
@@ -628,16 +780,44 @@ msgid "Website Blogs"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_message_ids
#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_message_ids
msgid "Website Messages"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_blog_blog__website_message_ids
#: model:ir.model.fields,help:website_blog.field_blog_post__website_message_ids
msgid "Website communication history"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_meta_description
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_meta_description
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_meta_keywords
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_meta_keywords
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog__website_meta_title
+#: model:ir.model.fields,field_description:website_blog.field_blog_post__website_meta_title
+#: model:ir.model.fields,field_description:website_blog.field_blog_tag__website_meta_title
+msgid "Website meta title"
+msgstr ""
+
+#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "White"
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 3b8aab324a5..e60adfb496b 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -161,12 +161,8 @@ msgstr ""
#. module: website_crm_partner_assign
#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign__date_assign
-msgid "Assign Date"
-msgstr ""
-
-#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
-msgid "Assign Month"
+msgid "Assign Date"
msgstr ""
#. module: website_crm_partner_assign
@@ -675,6 +671,7 @@ msgid "Max Probability"
msgstr ""
#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
msgid "Medium"
msgstr ""
@@ -753,11 +750,6 @@ msgid "No result found"
msgstr ""
#. module: website_crm_partner_assign
-#: selection:crm.lead.report.assign,priority:0
-msgid "Normal"
-msgstr ""
-
-#. module: website_crm_partner_assign
#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_report_assign__delay_close
msgid "Number of Days to close the case"
msgstr ""
@@ -939,8 +931,8 @@ msgstr ""
#. module: website_crm_partner_assign
#: model:ir.ui.menu,name:website_crm_partner_assign.crm_menu_resellers
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.footer_custom
#: model:ir.ui.view,arch_db:website_crm_partner_assign.layout
+#: model:website.menu,name:website_crm_partner_assign.menu_resellers
msgid "Resellers"
msgstr ""
@@ -1041,6 +1033,11 @@ msgid "The Forward Email Template is not in the database"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_res_partner_grade__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
msgid "There are no leads."
msgstr ""
@@ -1104,6 +1101,11 @@ msgid "Visible in Website"
msgstr ""
#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
msgid "What is the next action? When? What is the expected revenue?"
msgstr ""
diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot
index 16467a12a58..fa580622438 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -114,7 +114,6 @@ msgstr ""
#. module: website_customer
#: model:ir.ui.view,arch_db:website_customer.details
-#: model:ir.ui.view,arch_db:website_customer.footer_custom
#: model:ir.ui.view,arch_db:website_customer.index
msgid "Our References"
msgstr ""
@@ -136,6 +135,7 @@ msgstr ""
#. module: website_customer
#: model:ir.ui.view,arch_db:website_customer.references_block
+#: model:website.menu,name:website_customer.menu_customers
msgid "References"
msgstr ""
@@ -160,6 +160,11 @@ msgid "Search"
msgstr ""
#. module: website_customer
+#: model:ir.model.fields,help:website_customer.field_res_partner_tag__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_customer
#: model:ir.ui.view,arch_db:website_customer.index
msgid "Trusted by millions worldwide"
msgstr ""
@@ -178,6 +183,11 @@ msgid "Website Tags"
msgstr ""
#. module: website_customer
+#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_customer
#: model:ir.model.fields,field_description:website_customer.field_res_partner__website_tag_ids
#: model:ir.model.fields,field_description:website_customer.field_res_users__website_tag_ids
msgid "Website tags"
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 063f65249a3..2c2facd3f8c 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,12 @@ msgid "(Free)"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.brand_promotion
+msgid ".\n"
+" Try the"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
msgid "<b>End of Registration</b>"
msgstr ""
@@ -57,6 +63,16 @@ 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"
+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"
+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>"
@@ -143,13 +159,13 @@ msgid "<strong>Use this tag:</strong>"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:100
+#: code:addons/website_event/controllers/main.py:101
#, python-format
msgid "All Categories"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:107
+#: code:addons/website_event/controllers/main.py:108
#, python-format
msgid "All Countries"
msgstr ""
@@ -315,7 +331,6 @@ msgid "Event unpublished"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.header_footer_custom
#: model:website.menu,name:website_event.menu_events
msgid "Events"
msgstr ""
@@ -342,7 +357,7 @@ msgid "Find out what people see and say about this event,\n"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:54
+#: code:addons/website_event/models/event.py:73
#, python-format
msgid "Introduction"
msgstr ""
@@ -353,7 +368,7 @@ msgid "Is Participating"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:55
+#: code:addons/website_event/models/event.py:74
#, python-format
msgid "Location"
msgstr ""
@@ -370,7 +385,7 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/controllers/main.py:187
+#: code:addons/website_event/controllers/main.py:191
#: 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
@@ -378,30 +393,41 @@ msgid "New Event"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:38
+#: code:addons/website_event/controllers/main.py:40
#, python-format
msgid "Next Events"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:47
+#: code:addons/website_event/controllers/main.py:49
#, python-format
msgid "Next Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:55
+#: code:addons/website_event/controllers/main.py:57
#, python-format
msgid "Next month"
msgstr ""
#. module: website_event
+#: code:addons/website_event/models/event.py:152
+#, python-format
+msgid "No date has been specified for the event, no file will be generated."
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.index
msgid "No event found"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:59
+#: model:ir.ui.view,arch_db:website_event.brand_promotion
+msgid "Odoo"
+msgstr ""
+
+#. module: website_event
+#: code:addons/website_event/controllers/main.py:61
#, python-format
msgid "Old Events"
msgstr ""
@@ -455,6 +481,18 @@ msgid "Photos of Past Events"
msgstr ""
#. module: website_event
+#. openerp-web
+#: code:addons/website_event/static/src/js/website_event.js:55
+#, python-format
+msgid "Please select at least one ticket."
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.brand_promotion
+msgid "Powered by"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.ticket
msgid "Price"
msgstr ""
@@ -475,7 +513,7 @@ msgid "Reference"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:56
+#: code:addons/website_event/models/event.py:75
#, python-format
msgid "Register"
msgstr ""
@@ -516,13 +554,18 @@ msgid "Sorry, the requested event is not available anymore."
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:43
+#: model:ir.model.fields,help:website_event.field_event_event__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_event
+#: code:addons/website_event/controllers/main.py:45
#, python-format
msgid "This Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:51
+#: code:addons/website_event/controllers/main.py:53
#, python-format
msgid "This month"
msgstr ""
@@ -533,7 +576,7 @@ msgid "Ticket Type #"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:39
+#: code:addons/website_event/controllers/main.py:41
#, python-format
msgid "Today"
msgstr ""
@@ -569,6 +612,26 @@ msgid "Website Menu"
msgstr ""
#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event__website_meta_title
+msgid "Website meta title"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "When"
msgstr ""
@@ -591,6 +654,11 @@ msgid "Your registration"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.brand_promotion
+msgid "open source website builder"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_details
msgid "to"
msgstr ""
diff --git a/addons/website_event_questions/i18n/website_event_questions.pot b/addons/website_event_questions/i18n/website_event_questions.pot
index 2c0206e2698..ce0346a48fd 100644
--- a/addons/website_event_questions/i18n/website_event_questions.pot
+++ b/addons/website_event_questions/i18n/website_event_questions.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -151,7 +151,7 @@ msgstr ""
#. module: website_event_questions
#: code:addons/website_event_questions/models/event.py:78
#, python-format
-msgid "Question should belong to either event category or event but not both"
+msgid "Question cannot belong to both the event category and itself."
msgstr ""
#. module: website_event_questions
diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot
index b7ee12c3f35..3a8864f8fed 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgid "<span>left</span>"
msgstr ""
#. module: website_event_sale
+#: model:ir.model.fields,field_description:website_event_sale.field_product_product__event_ticket_ids
+msgid "Event Tickets"
+msgstr ""
+
+#. module: website_event_sale
#: model:ir.ui.view,arch_db:website_event_sale.index
msgid "Only"
msgstr ""
@@ -46,7 +51,7 @@ msgid "Quotation"
msgstr ""
#. module: website_event_sale
-#: code:addons/website_event_sale/controllers/main.py:56
+#: code:addons/website_event_sale/controllers/main.py:59
#, python-format
msgid "Registration"
msgstr ""
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index 76d02fdb0e2..5db1634c3e0 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,19 +19,17 @@ msgstr ""
#: model:mail.template,body_html:website_event_track.mail_template_data_track_confirmation
msgid "<?xml version=\"1.0\"?>\n"
"<div>\n"
-" <p>\n"
-" Dear <t t-esc=\"object.partner_name\"/>\n"
-" </p><p>\n"
-" We are pleased to inform you that your proposal ${object.name} has been accepted and confirmed for the event ${object.event_id.name}.\n"
-" </p><p>\n"
-" You will find more details here:\n"
-" <div style=\"margin-top: 16px;\">\n"
-" <a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\">\n"
-" View Event\n"
-" </a>\n"
-" </div>\n"
-" </p>\n"
-" <p>Sincerely,</p>\n"
+" Dear ${object.partner_name or ''}<br/>\n"
+" We are pleased to inform you that your proposal ${object.name} has been accepted and confirmed for the event ${object.event_id.name}.\n"
+" <br/>\n"
+" You will find more details here:\n"
+" <div style=\"margin: 16px 0px 16px 0px;\">\n"
+" <a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 16px 8px 16px; font-size: 14px; color: #FFFFFF; text-decoration: none !important; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\">\n"
+" View Event\n"
+" </a>\n"
+" </div>\n"
+" <br/><br/>\n"
+" Thank you,\n"
"</div>\n"
" "
msgstr ""
@@ -119,11 +117,26 @@ msgid "Accepted Stage"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__active
msgid "Active"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.actions.act_window,help:website_event_track.event_track_stage_action
msgid "Add a new stage in the task pipeline"
msgstr ""
@@ -386,6 +399,21 @@ msgid "Folded in Kanban"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Future Activities"
msgstr ""
@@ -432,6 +460,21 @@ msgid "ID"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,help:website_event_track.field_event_track_stage__mail_template_id
msgid "If set an email will be sent to the customer when the track reaches this step."
msgstr ""
@@ -447,6 +490,11 @@ msgid "Introduction"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__kanban_state
msgid "Kanban State"
msgstr ""
@@ -526,6 +574,16 @@ msgid "Menu Type"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "My Activities"
msgstr ""
@@ -546,16 +604,66 @@ msgid "New track proposal"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.tracks
msgid "No tracks found!"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_sponsor
msgid "Our Sponsors"
msgstr ""
#. module: website_event_track
+#: selection:event.track,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: website_event_track
+#: selection:event.track,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.track_view
msgid "Practical Info"
msgstr ""
@@ -614,6 +722,11 @@ msgid "Responsible"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track__location_id
#: model:ir.model.fields,field_description:website_event_track.field_event_track_location__name
msgid "Room"
@@ -653,7 +766,7 @@ msgid "Speaker Biography"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event_track.py:159
+#: code:addons/website_event_track/models/event_track.py:164
#: model:ir.model.fields,field_description:website_event_track.field_event_track__partner_email
#, python-format
msgid "Speaker Email"
@@ -670,7 +783,7 @@ msgid "Speaker Phone"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event_track.py:179
+#: code:addons/website_event_track/models/event_track.py:184
#, python-format
msgid "Speakers"
msgstr ""
@@ -724,6 +837,14 @@ msgid "Stage Name"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__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: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "Submission Agreement"
msgstr ""
@@ -782,6 +903,11 @@ msgid "Thank you for your proposal."
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "This event does not accept proposals."
msgstr ""
@@ -803,6 +929,11 @@ msgid "Title"
msgstr ""
#. module: website_event_track
+#: selection:event.track,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Today Activities"
msgstr ""
@@ -911,11 +1042,17 @@ msgid "Tracks on Website"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_unread
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Unread Messages"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_social
msgid "Use this tag:"
msgstr ""
@@ -926,6 +1063,11 @@ msgid "View Track"
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "We require speakers to accept an agreement in which they commit to:"
msgstr ""
@@ -947,6 +1089,36 @@ msgid "We will evaluate your proposition and get back to you shortly."
msgstr ""
#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,help:website_event_track.field_event_track__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.model.fields,field_description:website_event_track.field_event_track__website_meta_title
+msgid "Website meta title"
+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 1cebd6f0c7b..7eeda007081 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,20 +17,20 @@ msgstr ""
#. module: website_form
#. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:226
+#: code:addons/website_form/static/src/js/website_form.js:230
#, python-format
msgid "'%s' is not a correct date"
msgstr ""
#. module: website_form
#. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:221
+#: code:addons/website_form/static/src/js/website_form.js:225
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
#. module: website_form
-#: code:addons/website_form/controllers/main.py:228
+#: code:addons/website_form/controllers/main.py:229
#, python-format
msgid "<p>Attached files : </p>"
msgstr ""
@@ -69,6 +69,7 @@ msgid "Enable the form builder feature for this model."
msgstr ""
#. module: website_form
+#: model:ir.model.fields,help:website_form.field_res_config_settings__website_form_enable_metadata
#: model:ir.model.fields,help:website_form.field_website__website_form_enable_metadata
msgid "Enable writing metadata on form submit."
msgstr ""
@@ -124,12 +125,23 @@ msgid "The form has been sent successfully."
msgstr ""
#. module: website_form
+#: model:ir.ui.view,arch_db:website_form.res_config_settings_view_form
+msgid "Track metadata (IP, User Agent, ...) on your Website Forms"
+msgstr ""
+
+#. module: website_form
#: model:ir.model,name:website_form.model_website
msgid "Website"
msgstr ""
#. module: website_form
+#: model:ir.model.fields,field_description:website_form.field_res_config_settings__website_form_enable_metadata
#: model:ir.model.fields,field_description:website_form.field_website__website_form_enable_metadata
msgid "Write metadata"
msgstr ""
+#. module: website_form
+#: model:ir.model,name:website_form.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index 05d072ee837..e8cb342fe75 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -362,6 +362,13 @@ msgid "Accepting an answer"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_needaction
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_needaction
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: website_forum
#: selection:forum.post,state:0
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__active
#: model:ir.model.fields,field_description:website_forum.field_forum_post__active
@@ -403,12 +410,7 @@ msgid "Allow Bump"
msgstr ""
#. module: website_forum
-#: 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:506
+#: code:addons/website_forum/models/forum.py:511
#: model:mail.message.subtype,description:website_forum.mt_answer_edit
#: model:mail.message.subtype,name:website_forum.mt_answer_edit
#, python-format
@@ -494,6 +496,11 @@ msgid "Answers"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_gamification_challenge__category
+msgid "Appears in"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.forum_view_search
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
msgid "Archived"
@@ -592,14 +599,15 @@ msgid "Back to"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:333
-#: code:addons/website_forum/controllers/main.py:335
-#: code:addons/website_forum/controllers/main.py:404
+#: code:addons/website_forum/controllers/main.py:336
+#: code:addons/website_forum/controllers/main.py:338
+#: code:addons/website_forum/controllers/main.py:407
#, python-format
msgid "Bad Request"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_res_users__badge_ids
#: model:ir.ui.view,arch_db:website_forum.badge
#: model:ir.ui.view,arch_db:website_forum.header
#: model:ir.ui.view,arch_db:website_forum.user_detail_full
@@ -853,6 +861,7 @@ msgstr ""
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.display_post_answer
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
#: model:ir.ui.view,arch_db:website_forum.moderation_display_post_answer
msgid "Comments"
msgstr ""
@@ -927,6 +936,7 @@ msgstr ""
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__create_date
+#: model:ir.model.fields,field_description:website_forum.field_res_users__create_date
msgid "Create Date"
msgstr ""
@@ -991,6 +1001,11 @@ msgid "Default Post"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_gamification_challenge__category
+msgid "Define the visibility of the challenge through menus"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_answers
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Delete"
@@ -1250,6 +1265,27 @@ msgid "Followed Questions"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_follower_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_follower_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_channel_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_channel_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_partner_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_partner_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
msgid "For example, if you ask an interesting question or give a helpful answer, your\n"
" input will be upvoted. On the other hand if the answer is misleading - it will\n"
@@ -1269,7 +1305,6 @@ msgstr ""
#: 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
-#: model:website.menu,name:website_forum.menu_questions
msgid "Forum"
msgstr ""
@@ -1315,8 +1350,8 @@ 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.view,arch_db:website_forum.header_footer_custom
#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_list
+#: model:website.menu,name:website_forum.menu_website_forums
msgid "Forums"
msgstr ""
@@ -1427,6 +1462,11 @@ msgid "How to create a physical inventory at an anterior date?, How is the 'rema
msgstr ""
#. module: website_forum
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__id
#: model:ir.model.fields,field_description:website_forum.field_forum_post__id
#: model:ir.model.fields,field_description:website_forum.field_forum_post_reason__id
@@ -1436,6 +1476,27 @@ msgid "ID"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_unread
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_unread
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_needaction
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_needaction
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_has_error
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_has_error
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,help:website_forum.field_forum_forum__karma_dofollow
msgid "If the author has not enough karma, a nofollow attribute is added to links"
msgstr ""
@@ -1487,6 +1548,13 @@ msgid "Is Favourite"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_is_follower
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_is_follower
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post__has_validated_answer
msgid "Is answered"
msgstr ""
@@ -1502,6 +1570,13 @@ 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
+#, python-format
+msgid "It is not allowed to vote for its own post."
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_res_users__karma
#: model:ir.ui.view,arch_db:website_forum.user_detail_full
msgid "Karma"
@@ -1609,6 +1684,20 @@ msgid "Mark as offensive"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_has_error
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_has_error
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_moderate
msgid "Moderate posts"
msgstr ""
@@ -1714,25 +1803,17 @@ msgid "Nice Question"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_dofollow
-msgid "Nofollow links"
-msgstr ""
-
-#. module: website_forum
-#: code:addons/website_forum/models/forum.py:875
-#: code:addons/website_forum/models/forum.py:895
-#, python-format
-msgid "Not allowed to vote for its own post"
+#: model:ir.ui.view,arch_db:website_forum.forum_all
+msgid "No forum post yet."
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:939
-#, python-format
-msgid "Not enough karma to create a new Tag"
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_dofollow
+msgid "Nofollow links"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:496
+#: code:addons/website_forum/models/forum.py:501
#, python-format
msgid "Not enough karma to retag."
msgstr ""
@@ -1744,6 +1825,13 @@ msgid "Notable Question"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_tag__posts_count
msgid "Number of Posts"
msgstr ""
@@ -1759,16 +1847,44 @@ msgid "Number of answers"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_has_error_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_has_error_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__count_flagged_posts
msgid "Number of flagged posts"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_needaction_counter
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_needaction_counter
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_has_error_counter
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_has_error_counter
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__count_posts_waiting_validation
msgid "Number of posts waiting for validation"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,help:website_forum.field_forum_post__message_unread_counter
+#: model:ir.model.fields,help:website_forum.field_forum_tag__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: website_forum
#: selection:forum.post,state:0
#: model:ir.ui.view,arch_db:website_forum.moderation_queue
msgid "Offensive"
@@ -1924,9 +2040,9 @@ msgid "Posted 100 comments"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:433
+#: code:addons/website_forum/models/forum.py:438
#, python-format
-msgid "Posting answer on a [Deleted] or [Closed] question is not possible"
+msgid "Posting answer on a [Deleted] or [Closed] question is not possible."
msgstr ""
#. module: website_forum
@@ -1969,11 +2085,6 @@ msgid "Put your question here."
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.header_footer_custom
-msgid "Q&amp;amp;A"
-msgstr ""
-
-#. module: website_forum
#: 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
@@ -1981,7 +2092,7 @@ msgid "Question"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:509
+#: code:addons/website_forum/models/forum.py:514
#: model:mail.message.subtype,description:website_forum.mt_question_edit
#: model:mail.message.subtype,name:website_forum.mt_question_edit
#, python-format
@@ -2019,7 +2130,7 @@ msgid "Question set as favorite by 5 users"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:335
+#: code:addons/website_forum/controllers/main.py:338
#, python-format
msgid "Question should not be empty."
msgstr ""
@@ -2058,7 +2169,7 @@ msgid "Questions"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:527
+#: code:addons/website_forum/models/forum.py:532
#, python-format
msgid "Re: %s"
msgstr ""
@@ -2207,6 +2318,11 @@ msgid "Set a clear, explicit and concise question title\n"
msgstr ""
#. module: website_forum
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "Share"
msgstr ""
@@ -2244,21 +2360,21 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:100
+#: code:addons/website_forum/static/src/js/website_forum.js:101
#, python-format
msgid "Sorry you must be logged to flag a post"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:149
+#: code:addons/website_forum/static/src/js/website_forum.js:150
#, python-format
msgid "Sorry you must be logged to vote"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:199
+#: code:addons/website_forum/static/src/js/website_forum.js:200
#, python-format
msgid "Sorry, anonymous users cannot choose correct answer."
msgstr ""
@@ -2270,7 +2386,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:144
+#: code:addons/website_forum/static/src/js/website_forum.js:145
#, python-format
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
@@ -2429,15 +2545,20 @@ msgid "This forum does not allow %s"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.header
+msgid "This forum has been archived."
+msgstr ""
+
+#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:110
+#: code:addons/website_forum/static/src/js/website_forum.js:111
#, python-format
msgid "This post can not be flagged"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:105
+#: code:addons/website_forum/static/src/js/website_forum.js:106
#, python-format
msgid "This post is already flagged"
msgstr ""
@@ -2469,8 +2590,8 @@ msgid "Title must not be empty"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:333
-#: code:addons/website_forum/controllers/main.py:404
+#: code:addons/website_forum/controllers/main.py:336
+#: code:addons/website_forum/controllers/main.py:407
#, python-format
msgid "Title should not be empty."
msgstr ""
@@ -2532,6 +2653,20 @@ msgid "Unlink own comments"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_unread
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_unread
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_unread_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__message_unread_counter
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.edit_profile
msgid "Update"
msgstr ""
@@ -2606,6 +2741,11 @@ msgid "View Your Badges"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
+msgid "Views"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model,name:website_forum.model_forum_post_vote
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__vote
msgid "Vote"
@@ -2644,16 +2784,46 @@ msgid "Website"
msgstr ""
#. module: website_forum
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_message_ids
#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_message_ids
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_message_ids
msgid "Website Messages"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,help:website_forum.field_forum_forum__website_message_ids
#: model:ir.model.fields,help:website_forum.field_forum_post__website_message_ids
+#: model:ir.model.fields,help:website_forum.field_forum_tag__website_message_ids
msgid "Website communication history"
msgstr ""
#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_meta_description
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_meta_description
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_meta_keywords
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_meta_keywords
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_meta_title
+#: model:ir.model.fields,field_description:website_forum.field_forum_post__website_meta_title
+#: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_meta_title
+msgid "Website meta title"
+msgstr ""
+
+#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum__welcome_message
msgid "Welcome Message"
msgstr ""
@@ -2704,11 +2874,23 @@ 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
+#, python-format
+msgid "You cannot create recursive forum posts."
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_answer
msgid "You cannot post an empty answer"
msgstr ""
#. module: website_forum
+#: code:addons/website_forum/models/forum.py:946
+#, python-format
+msgid "You don't have enough karma to create a new Tag."
+msgstr ""
+
+#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
msgid "You should only ask practical, answerable questions based\n"
" on actual problems that you face. Chatty, open-ended\n"
diff --git a/addons/website_forum_doc/i18n/website_forum_doc.pot b/addons/website_forum_doc/i18n/website_forum_doc.pot
index 25b3c2471fc..2b35874c8ef 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -87,7 +87,6 @@ msgstr ""
#. module: website_forum_doc
#: model:ir.actions.act_url,name:website_forum_doc.action_open_documentation
#: model:ir.actions.act_window,name:website_forum_doc.action_documentation_toc
-#: model:ir.ui.view,arch_db:website_forum_doc.header_footer_custom
#: model:website.menu,name:website_forum_doc.menu_questions
msgid "Documentation"
msgstr ""
@@ -126,12 +125,6 @@ msgid "Edit Post"
msgstr ""
#. module: website_forum_doc
-#: code:addons/website_forum_doc/models/forum_documentation_toc.py:38
-#, python-format
-msgid "Error ! You cannot create recursive categories."
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "Explain how to configure Odoo"
msgstr ""
@@ -206,11 +199,6 @@ msgid "Last Updated on"
msgstr ""
#. module: website_forum_doc
-#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__parent_left
-msgid "Left Parent"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__name
msgid "Name"
msgstr ""
@@ -226,6 +214,11 @@ msgid "No business benefit"
msgstr ""
#. module: website_forum_doc
+#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__parent_path
+msgid "Parent Path"
+msgstr ""
+
+#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__parent_id
msgid "Parent Table Of Content"
msgstr ""
@@ -286,11 +279,6 @@ msgid "Review"
msgstr ""
#. module: website_forum_doc
-#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__parent_right
-msgid "Right Parent"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "Samples"
msgstr ""
@@ -352,6 +340,21 @@ msgid "To be promoted in the official documentation the question\n"
msgstr ""
#. module: website_forum_doc
+#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_forum_doc
+#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_forum_doc
+#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc__website_meta_title
+msgid "Website meta title"
+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 ""
@@ -362,6 +365,12 @@ msgid "What's the available stock field?"
msgstr ""
#. module: website_forum_doc
+#: code:addons/website_forum_doc/models/forum_documentation_toc.py:36
+#, python-format
+msgid "You cannot create recursive categories."
+msgstr ""
+
+#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "cancel"
msgstr ""
diff --git a/addons/website_hr/i18n/website_hr.pot b/addons/website_hr/i18n/website_hr.pot
index c9bbb18dcdc..670c618f556 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,22 @@ msgid "Public Info"
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"
+msgstr ""
+
+#. module: website_hr
#: model:ir.actions.act_url,name:website_hr.action_open_website
msgid "Website About"
msgstr ""
+#. module: website_hr
+#: model:ir.model.fields,field_description:website_hr.field_hr_employee__website_url
+msgid "Website URL"
+msgstr ""
+
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index cd5da5fc37a..918e074654a 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -267,7 +267,6 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.detail
-#: model:ir.ui.view,arch_db:website_hr_recruitment.job_footer_custom
#: model:website.menu,name:website_hr_recruitment.menu_jobs
msgid "Jobs"
msgstr ""
@@ -430,6 +429,11 @@ msgid "The founder’s story"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,help:website_hr_recruitment.field_hr_job__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Tuesday Dinners, Monthly Lunch Mixers, Monthly Happy Hour, Annual day event"
msgstr ""
@@ -455,6 +459,11 @@ msgid "Variability of the Job:"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.hr_job_website_inherit
msgid "Website Editor"
msgstr ""
@@ -465,11 +474,31 @@ msgid "Website Recruitment Form"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_description
msgid "Website description"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_meta_title
+msgid "Website meta title"
+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_livechat/i18n/website_livechat.pot b/addons/website_livechat/i18n/website_livechat.pot
index d86546e45ba..e681d742d73 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,11 @@ msgid "Live Chat"
msgstr ""
#. module: website_livechat
+#: model:website.menu,name:website_livechat.menu_livechat
+msgid "Live Support"
+msgstr ""
+
+#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.res_config_settings_view_form
msgid "Live chat channel of your website"
msgstr ""
@@ -46,11 +51,6 @@ msgid "Livechat Channel"
msgstr ""
#. module: website_livechat
-#: model:ir.ui.view,arch_db:website_livechat.header_footer_custom
-msgid "Livechat Support"
-msgstr ""
-
-#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.channel_list_page
msgid "Livechat Support Channels"
msgstr ""
@@ -71,6 +71,11 @@ msgid "The Team"
msgstr ""
#. module: website_livechat
+#: model:ir.model.fields,help:website_livechat.field_im_livechat_channel__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.channel_list_page
msgid "There is no public livechat channel to show."
msgstr ""
@@ -81,6 +86,11 @@ msgid "This is no rating for this channel for now."
msgstr ""
#. module: website_livechat
+#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_livechat
#: model:ir.model,name:website_livechat.model_website
msgid "Website"
msgstr ""
@@ -96,6 +106,11 @@ msgid "Website Live Chat Channel"
msgstr ""
#. module: website_livechat
+#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_livechat
#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel__website_description
msgid "Website description"
msgstr ""
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index c99d86d72f7..d514a8884aa 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -117,11 +117,17 @@ msgid "Type Here ..."
msgstr ""
#. module: website_mass_mailing
+#: model:ir.model.fields,field_description:website_mass_mailing.field_res_users__has_group_website_popup_on_exit
#: model:res.groups,name:website_mass_mailing.group_website_popup_on_exit
msgid "Use subscription pop up on the website"
msgstr ""
#. module: website_mass_mailing
+#: model:ir.model,name:website_mass_mailing.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: website_mass_mailing
#: model:ir.model.fields,field_description:website_mass_mailing.field_res_config_settings__group_website_popup_on_exit
msgid "Website Popup"
msgstr ""
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 89dcb39a013..b5534f7029e 100644
--- a/addons/website_quote/i18n/website_quote.pot
+++ b/addons/website_quote/i18n/website_quote.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -87,17 +87,23 @@ msgid "&amp;times;"
msgstr ""
#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.brand_promotion
+msgid ",\n"
+" an awesome"
+msgstr ""
+
+#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_template
msgid ":\n"
-" this content will appear on the quotation only if this\n"
-" product is put on the quote."
+" this content will appear on the quotation only if this\n"
+" product is put on the quote."
msgstr ""
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_template
msgid ":\n"
-" this content will appear on the quotation only if this\n"
-" product is used in the quote."
+" this content will appear on the quotation only if this\n"
+" product is used in the quote."
msgstr ""
#. module: website_quote
@@ -158,11 +164,6 @@ msgid "<span>with payment terms: </span>"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
-msgid "<strong>Expiration Date:</strong>"
-msgstr ""
-
-#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.pricing
msgid "<strong>Subtotal:</strong>"
msgstr ""
@@ -374,11 +375,6 @@ msgid "Expiration Date:"
msgstr ""
#. module: website_quote
-#: model:ir.model,name:website_quote.model_ir_model_fields
-msgid "Fields"
-msgstr ""
-
-#. module: website_quote
#: model:ir.model.fields,help:website_quote.field_sale_quote_line__sequence
msgid "Gives the sequence order when displaying a list of sale quote lines."
msgstr ""
@@ -424,7 +420,7 @@ msgid "If unchecked, it will allow you to hide the quotation template without re
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:188
+#: code:addons/website_quote/controllers/main.py:202
#, python-format
msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
@@ -486,6 +482,11 @@ msgid "Number of days for the validity date computation of the quotation"
msgstr ""
#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.brand_promotion
+msgid "Odoo"
+msgstr ""
+
+#. module: website_quote
#: selection:sale.order,require_payment:0
#: selection:sale.quote.template,require_payment:0
msgid "Online Payment"
@@ -498,6 +499,11 @@ msgid "Online Signature"
msgstr ""
#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.brand_promotion
+msgid "Open Source CRM"
+msgstr ""
+
+#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option__website_description
msgid "Option Description"
msgstr ""
@@ -530,7 +536,7 @@ msgid "Our Service"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:186
+#: code:addons/website_quote/controllers/main.py:199
#, python-format
msgid "Pay & Confirm"
msgstr ""
@@ -551,6 +557,11 @@ msgid "Payment Terms:"
msgstr ""
#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.brand_promotion
+msgid "Powered by"
+msgstr ""
+
+#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
msgid "Preview"
msgstr ""
@@ -662,7 +673,7 @@ msgid "Quotation expires after"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:50
+#: code:addons/website_quote/controllers/main.py:52
#, python-format
msgid "Quotation viewed by customer"
msgstr ""
@@ -872,7 +883,7 @@ msgid "You can <strong>set a description per product</strong>. Odoo will\n"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:143
+#: code:addons/website_quote/controllers/main.py:145
#, python-format
msgid "You cannot add options to a confirmed order."
msgstr ""
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index 0344c486e26..98077edd586 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:12+0000\n"
+"PO-Revision-Date: 2018-08-02 09:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,16 +17,18 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "&amp;nbsp;"
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "&amp; Shipping"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.cart_lines
-msgid "/shop/cart"
+#: model:ir.ui.view,arch_db:website_sale.brand_promotion
+msgid ",\n"
+" the #1"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
msgid "/shop/payment"
msgstr ""
@@ -73,9 +75,14 @@ msgid "<?xml version=\"1.0\"?>\n"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
-msgid "<br/>\n"
-" <strong>Payment Status:</strong>"
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "<b>Shipping: </b>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
+msgid "<b>Your order: </b>"
msgstr ""
#. module: website_sale
@@ -89,6 +96,11 @@ msgid "<i class=\"fa fa-check\"/> Ship to this address"
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"
msgstr ""
@@ -119,74 +131,54 @@ msgid "<small class=\"text-muted pull-right\">Source: https://termsfeed.com/blog
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.cart_lines
-msgid "<small><i class=\"fa fa-trash-o\"/> Remove</small>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.total
-msgid "<span class=\"col-xs-6 text-right h4 mt0\">Total:</span>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.total
-msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Taxes may be updated after providing shipping address\"> Taxes:</span>"
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "<span class=\"\">Process Checkout</span>\n"
+" <span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.total
-msgid "<span class=\"col-xs-6 text-right text-muted\">Subtotal:</span>"
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "<span class=\"\">Process Checkout</span>\n"
+" <span class=\"fa fa-chevron-right\"/>"
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>"
+" <span class=\"sr-only\">Previous</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.cart
+msgid "<span class=\"fa fa-chevron-left\"/>\n"
+" <span class=\"\">Continue Shopping</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.continue_shopping
-msgid "<span class=\"fa fa-long-arrow-left\"/>\n"
-" <span class=\"hidden-xs\">Continue Shopping</span>\n"
-" <span class=\"visible-xs-inline\">Continue</span>"
+#: model:ir.ui.view,arch_db:website_sale.cart
+msgid "<span class=\"fa fa-chevron-left\"/>\n"
+" Continue<span class=\"hidden-xs\"> Shopping</span>"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
-msgid "<span class=\"fa fa-long-arrow-left\"/> Back"
+msgid "<span class=\"fa fa-chevron-left\"/> Back"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "<span class=\"fa fa-long-arrow-left\"/> Previous"
+msgid "<span class=\"fa fa-chevron-left\"/> Previous"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "<span class=\"fa fa-long-arrow-left\"/> Return to Cart"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.cart
-msgid "<span class=\"hidden-xs\">Process Checkout</span>\n"
-" <span class=\"visible-xs-inline\">Checkout</span>\n"
-" <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "<span> &amp; Shipping</span>"
+msgid "<span class=\"fa fa-chevron-left\"/> Return to Cart"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "<span>Billing</span>"
+#: 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>"
msgstr ""
#. module: website_sale
@@ -196,7 +188,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.address
-msgid "<span>Next </span><span class=\"fa fa-long-arrow-right\"/>"
+msgid "<span>Next </span><span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -205,8 +197,8 @@ msgid "<span>Order</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "<span>Review Order</span>"
+#: model:ir.ui.view,arch_db:website_sale.short_cart_summary
+msgid "<span>Process Checkout</span>"
msgstr ""
#. module: website_sale
@@ -222,21 +214,12 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "<strong>Order Details:</strong>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
-msgid "<strong>Payment Acquirer:</strong>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "<strong>Payment Information:</strong>"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
+#: model:ir.ui.view,arch_db:website_sale.total
msgid "<strong>Total:</strong>"
msgstr ""
@@ -326,6 +309,11 @@ msgid "Add to Cart"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "Address"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.option_collapse_products_categories
#: model:ir.ui.view,arch_db:website_sale.products_categories
msgid "All Products"
@@ -419,8 +407,9 @@ msgid "Best Sellers"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.bill_to
-msgid "Bill To:"
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "Billing"
msgstr ""
#. module: website_sale
@@ -559,6 +548,11 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Compute shipping cost and ship with Easypost"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Compute shipping costs and ship with DHL"
msgstr ""
@@ -589,17 +583,17 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Confirm <span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
msgid "Confirm Order"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Confirm Order <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Confirm Order <span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -615,11 +609,6 @@ msgid "Confirmation Email"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Confirmation<span class=\"chevron\"/>"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
msgid "Confirmed Orders"
msgstr ""
@@ -728,12 +717,22 @@ 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_template__website_description
+msgid "Description for the website"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_product__website_sequence
#: model:ir.model.fields,help:website_sale.field_product_template__website_sequence
msgid "Determine the display order in the Website E-commerce"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_website_sale_digital
+msgid "Digital Content"
+msgstr ""
+
+#. module: website_sale
#: 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
@@ -742,11 +741,6 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
-msgid "Display an images carousel on product pages"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Display crossed-out public prices"
msgstr ""
@@ -763,6 +757,16 @@ 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"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Easypost"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:32
#, python-format
@@ -819,12 +823,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info_option
-msgid "Extra Info<span class=\"chevron\"/>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Extra Step"
+msgid "Extra Info"
msgstr ""
#. module: website_sale
@@ -833,11 +832,6 @@ msgid "FedEx"
msgstr ""
#. module: website_sale
-#: model:ir.model,name:website_sale.model_ir_model_fields
-msgid "Fields"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
msgid "From Website"
msgstr ""
@@ -855,8 +849,13 @@ msgid "Generate the invoice automatically when the order is confirmed"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Generate the invoice automatically when the payment is received"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Give us your feedback..."
+msgid "Give us your feedback"
msgstr ""
#. module: website_sale
@@ -880,11 +879,6 @@ msgid "HTTP routing"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.reduction_code
-msgid "Have a promo code? Fill in this field and apply."
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_attribute_value__html_color
msgid "Here you can set a specific HTML color index (e.g. #ff0000) to display the color on the website if the attibute type is 'Color'."
msgstr ""
@@ -900,6 +894,11 @@ msgid "I agree to the"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.reduction_code
+msgid "I have a promo code"
+msgstr ""
+
+#. module: website_sale
#: 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
@@ -940,7 +939,7 @@ msgid "Installs the \"Website Delivery Information\" application"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:514
+#: code:addons/website_sale/controllers/main.py:528
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
@@ -963,13 +962,18 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
+msgid "Invoicing Policy"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Issue invoices to customers"
msgstr ""
#. module: website_sale
#: code:addons/website_sale/models/sale_order.py:157
#, python-format
-msgid "It is forbidden to modify a sales order which is not in draft status"
+msgid "It is forbidden to modify a sales order which is not in draft status."
msgstr ""
#. module: website_sale
@@ -1054,11 +1058,6 @@ msgid "Manage promotion &amp; coupon programs"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sale_order_view_form
-msgid "Mark as Paid"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category__image_medium
msgid "Medium-sized image"
msgstr ""
@@ -1069,11 +1068,6 @@ 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_res_config_settings__group_website_multiimage
-msgid "Multi-Images"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/js/website_sale.js:15
#, python-format
@@ -1099,7 +1093,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/controllers/main.py:970
+#: code:addons/website_sale/controllers/main.py:994
#: 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
@@ -1108,7 +1102,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Next <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Next <span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -1123,6 +1117,11 @@ msgid "No product defined."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.products
+msgid "No results found for \""
+msgstr ""
+
+#. module: website_sale
#: selection:res.config.settings,sale_delivery_settings:0
msgid "No shipping management on website"
msgstr ""
@@ -1133,11 +1132,6 @@ msgid "None website"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Now to Follow Your Order"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_crm_team__abandoned_carts_count
msgid "Number of Abandoned Carts"
msgstr ""
@@ -1150,6 +1144,11 @@ msgid "OK"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.brand_promotion
+msgid "Odoo"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Once activated, discounted prices can be applied from Pricelists setup form (Discount policy field)."
msgstr ""
@@ -1173,6 +1172,11 @@ msgid "Only Services"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.brand_promotion
+msgid "Open Source eCommerce"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:68
#, python-format
@@ -1200,6 +1204,11 @@ msgid "Order Lines to be displayed on the website. They should not be used for c
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.short_cart_summary
+msgid "Order Total"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:67
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:68
@@ -1243,7 +1252,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Pay Now <span class=\"fa fa-long-arrow-right\"/>"
+msgid "Pay Now <span class=\"fa fa-chevron-right\"/>"
msgstr ""
#. module: website_sale
@@ -1257,8 +1266,8 @@ msgid "Payment Acquirers"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
-msgid "Payment Information"
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_icons
+msgid "Payment Icons"
msgstr ""
#. module: website_sale
@@ -1267,14 +1276,8 @@ msgid "Payment Transaction"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info_option
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Payment<span class=\"chevron\"/>"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.actions.act_window,name:website_sale.payment_transaction_action_payments_to_capture
-msgid "Payments To Capture"
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_transactions
+msgid "Payment Transactions"
msgstr ""
#. module: website_sale
@@ -1295,6 +1298,11 @@ msgid "Please proceed your current cart."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.brand_promotion
+msgid "Powered by"
+msgstr ""
+
+#. module: website_sale
#: code:addons/website_sale/controllers/backend.py:108
#, python-format
msgid "Previous Month"
@@ -1314,7 +1322,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_lines
-#: model:ir.ui.view,arch_db:website_sale.payment
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
msgid "Price"
msgstr ""
@@ -1351,8 +1359,7 @@ msgstr ""
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:109
#: 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.confirmation
-#: model:ir.ui.view,arch_db:website_sale.payment
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
#, python-format
msgid "Product"
msgstr ""
@@ -1470,8 +1477,7 @@ msgstr ""
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:110
#: model:ir.ui.view,arch_db:website_sale.cart_lines
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-#: model:ir.ui.view,arch_db:website_sale.payment
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
#, python-format
msgid "Quantity"
msgstr ""
@@ -1488,31 +1494,37 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__rating_ids
+#: model:ir.model.fields,field_description:website_sale.field_product_template__rating_ids
msgid "Rating"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__rating_last_feedback
+#: model:ir.model.fields,field_description:website_sale.field_product_template__rating_last_feedback
msgid "Rating Last Feedback"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__rating_last_image
+#: model:ir.model.fields,field_description:website_sale.field_product_template__rating_last_image
msgid "Rating Last Image"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__rating_last_value
+#: model:ir.model.fields,field_description:website_sale.field_product_template__rating_last_value
msgid "Rating Last Value"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__rating_count
+#: model:ir.model.fields,field_description:website_sale.field_product_template__rating_count
msgid "Rating count"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_product__rating_last_feedback
+#: model:ir.model.fields,help:website_sale.field_product_template__rating_last_feedback
msgid "Reason of the rating"
msgstr ""
@@ -1537,6 +1549,11 @@ msgid "Return to the product list."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "Review Order"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "Rounding Method"
msgstr ""
@@ -1591,6 +1608,11 @@ msgid "Salesperson"
msgstr ""
#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_tokens
+msgid "Saved Payment Data"
+msgstr ""
+
+#. module: website_sale
#: selection:product.attribute,type:0
msgid "Select"
msgstr ""
@@ -1660,8 +1682,9 @@ msgid "Set product attributes (e.g. color, size) to sell variants"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.bill_to
-msgid "Ship To:"
+#: 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>"
msgstr ""
#. module: website_sale
@@ -1708,16 +1731,6 @@ msgid "Shop - Select Payment Acquirer"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.cart
-msgid "Shopping Cart"
-msgstr ""
-
-#. module: website_sale
-#: model:res.groups,name:website_sale.group_website_multi_image
-msgid "Show multi image on eCommerce"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "Sign Up"
msgstr ""
@@ -1758,7 +1771,7 @@ msgid "Sold"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:532
+#: code:addons/website_sale/controllers/main.py:546
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -1806,12 +1819,7 @@ msgid "Styles"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Subtotal"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
+#: model:ir.ui.view,arch_db:website_sale.total
msgid "Subtotal:"
msgstr ""
@@ -1842,7 +1850,7 @@ msgid "Taxes"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
+#: model:ir.ui.view,arch_db:website_sale.total
msgid "Taxes:"
msgstr ""
@@ -1863,10 +1871,18 @@ 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."
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."
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.res_config_settings_view_form
msgid "The mode selected here applies as invoicing policy of any new product created but not of products already existing."
msgstr ""
@@ -1922,6 +1938,11 @@ msgid "This is your current cart."
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.products_item
+msgid "This product is unpublished."
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.coupon_form
msgid "This promo code is not available"
msgstr ""
@@ -1932,11 +1953,6 @@ 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.report_shop_saleorder_document
-msgid "Total"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_popover
msgid "True"
msgstr ""
@@ -1957,11 +1973,6 @@ msgid "USPS"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Unit Price"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:7
#: model:ir.actions.act_window,name:website_sale.action_unpaid_orders_ecommerce
@@ -1972,6 +1983,11 @@ msgid "Unpaid Orders"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.products_item
+msgid "Unpublished"
+msgstr ""
+
+#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75
#, python-format
@@ -1992,6 +2008,7 @@ 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"
msgstr ""
@@ -2025,21 +2042,28 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_url
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_url
msgid "Website URL"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_meta_description
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__website_meta_description
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_meta_keywords
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__website_meta_keywords
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product__website_meta_title
+#: model:ir.model.fields,field_description:website_sale.field_product_public_category__website_meta_title
+#: model:ir.model.fields,field_description:website_sale.field_product_template__website_meta_title
msgid "Website meta title"
msgstr ""
@@ -2093,11 +2117,6 @@ msgid "You don't have any order to invoice from the website"
msgstr ""
#. module: website_sale
-#: model:ir.actions.act_window,help:website_sale.payment_transaction_action_payments_to_capture
-msgid "You don't have any payments to capture from the website."
-msgstr ""
-
-#. module: website_sale
#: model:mail.template,subject:website_sale.mail_template_sale_cart_recovery
msgid "You left items in your cart."
msgstr ""
@@ -2128,6 +2147,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_lines
#: model:ir.ui.view,arch_db:website_sale.cart_popover
+#: model:ir.ui.view,arch_db:website_sale.cart_summary
msgid "Your cart is empty!"
msgstr ""
@@ -2230,6 +2250,11 @@ msgid "terms &amp; conditions"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+msgid "to follow your order."
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_pricelist__website_id
msgid "website"
msgstr ""
diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
index d3d9a364e75..249151f8745 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,28 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/controllers/main.py:50
-#, python-format
-msgid "%s does not ship to your address, please choose another one.\n"
-"(Error: %s)"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
-msgid "<i class=\"fa fa-arrow-right\" aria-hidden=\"true\"/> Add delivery methods"
-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>"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
-msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Delivery will be updated after choosing a new delivery method\"> Delivery:</span>"
-msgstr ""
-
-#. module: website_sale_delivery
#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier__website_description
msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note"
msgstr ""
@@ -74,6 +57,16 @@ msgid "Delivery Methods"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
+msgid "Delivery will be updated after choosing a new delivery method"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.cart_delivery
+msgid "Delivery:"
+msgstr ""
+
+#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery
msgid "Description"
msgstr ""
@@ -90,6 +83,11 @@ msgstr ""
#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
+msgid "Easypost Delivery Methods"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
msgid "FedEx Delivery Methods"
msgstr ""
@@ -109,15 +107,19 @@ msgid "Has delivery"
msgstr ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/controllers/main.py:42
+#: 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."
msgstr ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/controllers/main.py:49
-#, python-format
-msgid "Ouch, you cannot choose this carrier!"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_sale_order__website_order_line
+msgid "Order Lines displayed on Website"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_sale_order__website_order_line
+msgid "Order Lines to be displayed on the website. They should not be used for computation purpose."
msgstr ""
#. module: website_sale_delivery
@@ -131,7 +133,7 @@ msgid "Quotation"
msgstr ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/controllers/main.py:41
+#: code:addons/website_sale_delivery/controllers/main.py:43
#, python-format
msgid "Sorry, we are unable to ship your order"
msgstr ""
@@ -142,6 +144,11 @@ msgid "The amount without tax."
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier__website_url
+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
msgid "Tracking:"
msgstr ""
@@ -157,6 +164,11 @@ msgid "Visible in Website"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.res_config_settings_view_form
msgid "bpost Delivery Methods"
msgstr ""
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index 0beb0c10ef4..eb39fffdfa7 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.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\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-02 09:56+0000\n"
+"PO-Revision-Date: 2018-08-02 09:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -196,7 +196,7 @@ msgid "<i class=\"fa fa-thumbs-up\"/> Likes"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:105
+#: code:addons/website_slides/models/slides.py:107
#, python-format
msgid "<p>This channel is private and its content is restricted to some users.</p>"
msgstr ""
@@ -262,6 +262,12 @@ msgid "API Key"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_needaction
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
msgid "Actions"
msgstr ""
@@ -375,14 +381,14 @@ msgid "Content Preview"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:255
+#: code:addons/website_slides/controllers/main.py:256
#, python-format
msgid "Could not fetch data from url. Document or access right not available.\n"
"Here is the received response: %s"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:323
+#: code:addons/website_slides/models/slides.py:325
#, python-format
msgid "Could not fetch data from url. Document or access right not available:\n"
"%s"
@@ -570,13 +576,31 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/controllers/main.py:265
+#: code:addons/website_slides/controllers/main.py:266
#: code:addons/website_slides/static/src/js/slides_upload.js:89
#, python-format
msgid "File is too big. File size cannot exceed 25MB"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_follower_ids
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_channel_ids
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_channel_ids
+msgid "Followers (Channels)"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_partner_ids
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__can_see_full
msgid "Full Access"
msgstr ""
@@ -626,6 +650,24 @@ msgid "ID"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_unread
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_unread
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_needaction
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_has_error
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide__image
msgid "Image"
msgstr ""
@@ -641,7 +683,7 @@ msgid "Infographics"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:287
+#: code:addons/website_slides/controllers/main.py:288
#, python-format
msgid "Internal server error, please try again later or contact administrator.\n"
"Here is the error message: %s"
@@ -655,6 +697,12 @@ msgid "Invalid file type. Please select pdf or image file"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_is_follower
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_is_follower
+msgid "Is Follower"
+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
@@ -698,11 +746,23 @@ msgid "Medium"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_has_error
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,help:website_slides.field_slide_channel__access_error_msg
msgid "Message to display when not accessible due to access rights"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_ids
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide__mime_type
msgid "Mime-type"
msgstr ""
@@ -765,6 +825,12 @@ msgid "No presentation published yet."
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category__nbr_documents
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__nbr_documents
msgid "Number of Documents"
@@ -789,6 +855,30 @@ msgid "Number of Videos"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_has_error_counter
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_has_error_counter
+msgid "Number of error"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_needaction_counter
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_has_error_counter
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,help:website_slides.field_slide_slide__message_unread_counter
+msgid "Number of unread messages"
+msgstr ""
+
+#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/xml/website_slides.xml:28
#, python-format
@@ -813,14 +903,14 @@ msgid "Please <a href=\"/web?redirect=%s\">login</a> to vote this slide"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:326
-#: code:addons/website_slides/models/slides.py:546
+#: code:addons/website_slides/models/slides.py:328
+#: code:addons/website_slides/models/slides.py:551
#, python-format
msgid "Please enter valid Youtube or Google Doc URL"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:247
+#: code:addons/website_slides/controllers/main.py:248
#, python-format
msgid "Please enter valid youtube or google doc url"
msgstr ""
@@ -838,7 +928,6 @@ msgid "Presentation Published"
msgstr ""
#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_footer
#: model:ir.ui.view,arch_db:website_slides.slides_channel_header
#: model:website.menu,name:website_slides.website_menu_slides
msgid "Presentations"
@@ -1034,6 +1123,12 @@ msgid "The document type will be set automatically based on the document URL and
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__website_url
+#: model:ir.model.fields,help:website_slides.field_slide_slide__website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_slides
#: sql_constraint:slide.slide:0
msgid "The slide name must be unique within a channel"
msgstr ""
@@ -1051,7 +1146,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:251
+#: code:addons/website_slides/controllers/main.py:252
#, python-format
msgid "This video already exists in this channel <a target=\"_blank\" href=\"/slides/slide/%s\">click here to view it </a>"
msgstr ""
@@ -1104,7 +1199,7 @@ msgid "Uncategorized presentation"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:535
+#: code:addons/website_slides/models/slides.py:540
#, python-format
msgid "Unknown document"
msgstr ""
@@ -1115,6 +1210,18 @@ msgid "Unpublished"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_unread
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_unread
+msgid "Unread Messages"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_unread_counter
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr ""
+
+#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel__upload_group_ids
msgid "Upload Groups"
msgstr ""
@@ -1176,6 +1283,12 @@ msgid "Visibility"
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"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
msgid "Waiting for validation"
msgstr ""
@@ -1186,6 +1299,42 @@ msgid "Website"
msgstr ""
#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_message_ids
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_url
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,help:website_slides.field_slide_channel__website_message_ids
+#: model:ir.model.fields,help:website_slides.field_slide_slide__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_meta_description
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_meta_keywords
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_meta_title
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_meta_title
+msgid "Website meta title"
+msgstr ""
+
+#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/js/slides_upload.js:114
#, python-format
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index 63cd8c07736..b3bef180d8a 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server saas~11.2\n"
+"Project-Id-Version: Odoo Server saas~11.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-22 14:03+0000\n"
-"PO-Revision-Date: 2018-03-22 14:03+0000\n"
+"POT-Creation-Date: 2018-08-02 10:02+0000\n"
+"PO-Revision-Date: 2018-08-02 10:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,16 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_website_sale_dashboard_with_margin
+msgid "\n"
+"\n"
+"Adds the average margin of your online sales to the statistics displayed in\n"
+"the Website application new dashboard view.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_pos_reprint
msgid "\n"
"\n"
@@ -173,6 +183,18 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_website_sale_dashboard
+msgid "\n"
+"\n"
+"This module adds a new dashboard view in the Website application.\n"
+"This new type of view contains some basic statistics, a graph, and\n"
+"a pivot subview that allow you to get a quick overview of your online sales.\n"
+"It also provides new tools to analyse your data\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_pos_restaurant
msgid "\n"
"\n"
@@ -424,6 +446,14 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_l10n_mx_edi_customs
+#: model:ir.module.module,summary:base.module_l10n_mx_edi_landing
+msgid "\n"
+" Generate Electronic Invoice with Customs Number\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_account_sepa
msgid "\n"
" Generate payment orders as recommended by the SEPA norm, thanks to pain.001 messages. Supported pain version (countries) are pain.001.001.03 (generic), pain.001.001.03.ch.02 (Switzerland) and pain.001.003.03 (Germany). The generated XML file can then be uploaded to your bank.\n"
@@ -491,6 +521,14 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_im_support
+msgid "\n"
+" This module allows employee users to communicate with livechat operators\n"
+" of another database on which a counterpart addon is installed.\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_account_sepa_direct_debit
msgid "\n"
" This module enables the generation of SEPA Direct Debit (SDD)-compliant XML files (consistent\n"
@@ -630,6 +668,17 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_account_lock
+msgid "\n"
+" Make the lock date irreversible:\n"
+"\n"
+" * You cannot define stricter conditions on advisors than on users. Then, the lock date on advisor must be set before the lock date for users.\n"
+" * You cannot lock a period that is not finished yet. Then, the lock date for advisors must be set before the last day of the previous month.\n"
+" * The new lock date for advisors must be set after the previous lock date.\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_hr_timesheet_attendance
msgid "\n"
" Module linking the attendance module to the timesheet app.\n"
@@ -659,13 +708,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_project_forecast_sale
-msgid "\n"
-"* Automatically enables forecasting on projects created from sales orders\n"
-" "
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_timesheet_grid
msgid "\n"
"* Timesheet submission and validation\n"
@@ -846,20 +888,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_sale_order_dates
-msgid "\n"
-"Add additional date information to the sales order.\n"
-"===================================================\n"
-"\n"
-"You can add the following additional dates to a sales order:\n"
-"------------------------------------------------------------\n"
-" * Requested Date (will be used as the expected date on pickings)\n"
-" * Commitment Date\n"
-" * Effective Date\n"
-""
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_hr_contract
msgid "\n"
"Add all information on the employee form to manage contracts.\n"
@@ -970,6 +998,16 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_mrp_bom_cost
+msgid "\n"
+"Allows to compute the cost of the product based on its BoM,\n"
+"using the costs of its components and work center operations.\n"
+"It adds a button on the product itself but also an action in the list view of the products.\n"
+"If the automated inventory valuation is active, the necessary accounting entries will be created.\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_sale_timesheet
msgid "\n"
"Allows to sell timesheets in your sales order\n"
@@ -1233,6 +1271,17 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_mail_enterprise
+msgid "\n"
+"Bridge module for mail and enterprise\n"
+"=====================================\n"
+"\n"
+"Display a preview of the last chatter attachment in the form view for large\n"
+"screen devices.\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_website_rating
msgid "\n"
"Bridge module for rating on website stuff.\n"
@@ -1358,6 +1407,18 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_project_timesheet_forecast
+msgid "\n"
+"Compare timesheets and forecasts\n"
+"================================\n"
+"\n"
+"Better plan your futur forecasts by observing the number of hours pressed\n"
+"on old forecasts.\n"
+"\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_decimal_precision
msgid "\n"
"Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases.\n"
@@ -1385,10 +1446,20 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_website_survey
+msgid "\n"
+"Create beautiful surveys and display them on your website\n"
+"=========================================================\n"
+"\n"
+"Use the styling and layout of your website for your surveys.\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_survey
msgid "\n"
-"Create beautiful web surveys and visualize answers\n"
-"==================================================\n"
+"Create beautiful surveys and visualize answers\n"
+"==============================================\n"
"\n"
"It depends on the answers or reviews of some questions by different users. A\n"
"survey may have multiple pages. Each page may contain multiple questions and\n"
@@ -1600,37 +1671,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_auth_crypt
-msgid "\n"
-"Encrypted passwords\n"
-"===================\n"
-"\n"
-"Replaces the default password storage with a strong cryptographic\n"
-"hash.\n"
-"\n"
-"The key derivation function currently used is RSA Security LLC's\n"
-"industry-standard ``PKDF2``, in combination with ``SHA512``.\n"
-"This includes salting and key stretching with several thousands\n"
-"rounds.\n"
-"\n"
-"All passwords are encrypted as soon as the module is installed.\n"
-"This may take a few minutes if there are thousands of users.\n"
-"\n"
-"Past versions of encrypted passwords will be automatically upgraded\n"
-"to the current scheme whenever a user authenticates\n"
-"(``auth_crypt`` was previously using the weaker ``md5crypt`` key\n"
-"derivation function).\n"
-"\n"
-"Note: Installing this module permanently prevents user password\n"
-"recovery and cannot be undone. It is thus recommended to enable\n"
-"some password reset mechanism for users, such as the one provided\n"
-"by the ``auth_signup`` module (signup for new users does not\n"
-"necessarily have to be enabled).\n"
-"\n"
-""
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_base_address_extended
msgid "\n"
"Extended Addresses Management\n"
@@ -1985,6 +2025,15 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid "\n"
+"Manage delivery dates from sales orders.\n"
+"===================================================\n"
+" This option introduces extra fields in the sales order to easily schedule product deliveries on your own: expected date, commitment date, effective date.\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_stock_dropshipping
msgid "\n"
"Manage drop shipping orders\n"
@@ -2399,6 +2448,17 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_web_dashboard
+msgid "\n"
+"Odoo Dashboard View.\n"
+"========================\n"
+"\n"
+"This module defines the Dashboard view, a new type of reporting view. This view\n"
+"can embed graph and/or pivot views, and displays aggregate values.\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_website_sale_options
msgid "\n"
"Odoo E-Commerce\n"
@@ -2702,15 +2762,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_product_extended
-msgid "\n"
-"Product extension. This module adds:\n"
-" * Computes standard price from the BoM of the product with a button on the product variant based\n"
-" on the materials in the BoM and the work centers. It can create the necessary accounting entries when necessary.\n"
-""
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_http_routing
msgid "\n"
"Proposes advanced routing options not available in web or base to keep\n"
@@ -3159,6 +3210,14 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_uom
+msgid "\n"
+"This is the base module for managing Units of measure.\n"
+"========================================================================\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_product
msgid "\n"
"This is the base module for managing products and pricelists in Odoo.\n"
@@ -3481,31 +3540,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_barcodes
-msgid "\n"
-"This module adds support for barcode scanning and parsing.\n"
-"\n"
-"Scanning\n"
-"--------\n"
-"Use a USB scanner (that mimics keyboard inputs) in order to work with barcodes in Odoo.\n"
-"The scanner must be configured to use no prefix and a carriage return or tab as suffix.\n"
-"The delay between each character input must be less than or equal to 50 milliseconds.\n"
-"Most barcode scanners will work out of the box.\n"
-"However, make sure the scanner uses the same keyboard layout as the device it's plugged in.\n"
-"Either by setting the device's keyboard layout to US QWERTY (default value for most readers)\n"
-"or by changing the scanner's keyboard layout (check the manual).\n"
-"\n"
-"Parsing\n"
-"-------\n"
-"The barcodes are interpreted using the rules defined by a nomenclature.\n"
-"It provides the following features:\n"
-"- Patterns to identify barcodes containing a numerical value (e.g. weight, price)\n"
-"- Definition of barcode aliases that allow to identify the same product with different barcodes\n"
-"- Support for encodings EAN-13, EAN-8 and UPC-A\n"
-""
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_event_barcode
msgid "\n"
"This module adds support for barcodes scanning to the Event management system.\n"
@@ -3552,33 +3586,6 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_account_budget
-msgid "\n"
-"This module allows accountants to manage analytic and crossovered budgets.\n"
-"==========================================================================\n"
-"\n"
-"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers\n"
-"can set the planned amount on each Analytic Account.\n"
-"\n"
-"The accountant has the possibility to see the total of amount planned for each\n"
-"Budget in order to ensure the total planned is not greater/lower than what he\n"
-"planned for this Budget. Each list of record can also be switched to a graphical\n"
-"view of it.\n"
-"\n"
-"Three reports are available:\n"
-"----------------------------\n"
-" 1. The first is available from a list of Budgets. It gives the spreading, for\n"
-" these Budgets, of the Analytic Accounts.\n"
-"\n"
-" 2. The second is a summary of the previous one, it only gives the spreading,\n"
-" for the selected Budgets, of the Analytic Accounts.\n"
-"\n"
-" 3. The last one is available from the Analytic Chart of Accounts. It gives\n"
-" the spreading, for the selected Analytic Accounts of Budgets.\n"
-""
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_base_automation
msgid "\n"
"This module allows to implement action rules for any object.\n"
@@ -3970,6 +3977,14 @@ msgid "\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_account_budget
+msgid "\n"
+"Use budgets to compare actual with expected revenues and costs\n"
+"--------------------------------------------------------------\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_sales_team
msgid "\n"
"Using this application you can manage Sales Channels with CRM and/or Sales\n"
@@ -4155,7 +4170,7 @@ msgid "\n"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:1048
+#: code:addons/base/models/ir_ui_view.py:1077
#, python-format
msgid " - %r in %s=%r"
msgstr ""
@@ -4240,10 +4255,10 @@ msgstr ""
#. module: base
#: code:addons/base/models/ir_filters.py:38
-#: code:addons/base/models/res_partner.py:324
-#: code:addons/base/models/res_users.py:146
-#: code:addons/base/models/res_users.py:410
-#: code:addons/base/models/res_users.py:412
+#: code:addons/base/models/res_partner.py:333
+#: code:addons/base/models/res_users.py:135
+#: code:addons/base/models/res_users.py:491
+#: code:addons/base/models/res_users.py:493
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -4259,7 +4274,7 @@ msgid "%y - Year without century [00,99].\""
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1406
+#: code:addons/base/models/ir_model.py:1436
#, python-format
msgid "'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id"
msgstr ""
@@ -4567,6 +4582,11 @@ msgid "<strong>Seq</strong>"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.view_users_form
+msgid "<strong>The contact linked to this user is still active</strong>"
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_base_module_upgrade
msgid "<strong>This operation will permanently erase all data currently stored by the modules!</strong>"
msgstr ""
@@ -4607,12 +4627,288 @@ msgid "<u><strong>Views</strong></u>"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_barcodes
+msgid "==============================\n"
+"Barcodes module documentation\n"
+"==============================\n"
+"\n"
+"This module brings barcode encoding logic and client-side barcode scanning utilities.\n"
+"\n"
+"\n"
+"Barcodes encoding\n"
+"==============================\n"
+"\n"
+"The Barcodes module defines barcode nomenclatures whose rules identify specific type \n"
+"of items e.g. products, locations. It contains the following features:\n"
+"\n"
+"- Patterns to identify barcodes containing a numerical value (e.g. weight, price)\n"
+"- Definitin of barcode aliases that allow to identify the same product with different barcodes\n"
+"- Unlimited barcode patterns and definitions,\n"
+"- Support for encodings EAN-13, EAN-8 and UPC-A\n"
+"\n"
+"Barcode encodings\n"
+"-----------------\n"
+"\n"
+"A barcode is an arbitrary long sequence of ASCII characters. An EAN-13 barcode is a 13 digit\n"
+"barcode, whose 13th digit is the checksum. \n"
+"\n"
+"Simple barcodes and rules\n"
+"-------------------------\n"
+"\n"
+"The default nomenclature assumes an EAN-13 encoding for product barcodes. It defines a rule \n"
+"for Unit Products whose encoding is EAN-13, and whose pattern is '.', i.e. any barcode \n"
+"matches this pattern. Scanning the barcode of a product, say '5410013101703', matches this rule. \n"
+"The scanned item is thus identified as a Unit Product, and is retrieved from the product table.\n"
+"\n"
+"Note: the special character '.' in patterns is matched by any character. To explicitely specify \n"
+"the '.' character in a pattern, escape it with '\\'. The '\\' character has to be escaped as well\n"
+"('\\\\') to be explicitely specified.\n"
+"\n"
+"Let us now suppose that we identify other items with barcodes, say stock locations. We define a\n"
+"new rule in the nomenclature with the corresponding type (in our example, the type is 'Location'),\n"
+"and whose pattern is e.g. '414.', that is, any location barcode starts with '414'. Scanning a barcode\n"
+"location, say '41401', matches this Location rule, and the corresponding location is retrieved from\n"
+"the location table.\n"
+"\n"
+"Note: Rules have a sequence field which indicates the order the rules are evaluated (ASC). In our \n"
+"previous examples, the Unit Product rule should have a larger sequence that then Location rule, \n"
+"because we want the latter one to be evaluated first.\n"
+"\n"
+"Barcodes with numerical content\n"
+"--------------------------------\n"
+"\n"
+"Barcodes may encode numerical content, which is decoded by the barcodes module. To that purpose,\n"
+"one have to define a new rule for barcodes with numerical content (e.g. barcodes for Weighted \n"
+"Products). The numerical content in a pattern is specified between braces (special characters '{' and \n"
+"'}'). The content of the braces must be a sequence of 'N's (representing the whole part of the numerical \n"
+"content) followed by a sequence of 'D's (representing the decimal part of the numerical content). \n"
+"For instance, let us define a new rule for Weighted Products whose pattern is '21.....{NNDDD}.'. Since\n"
+"we assume EAN-13 encoding for product barcodes, the encoding of this rule should be EAN-13 as well.\n"
+"\n"
+"Let us now assume that we want to write a barcode for a given Weighted Product, say oranges. We first \n"
+"have to define in product oranges a barcode that will match the Weighted Product rule. This barcode \n"
+"must start with '21' and be a correct EAN-13 barcode (i.e. the 13th digit must be a correct checksum). \n"
+"Moreover, all the numerical content must be set to a '0'. For instance, let us set the barcode to \n"
+"'2100001000004'. \n"
+"\n"
+"We now want to write a barcode for 2.75kg of oranges. This barcode should be '2100001027506' (the \n"
+"numerical content of this barcode is '02750', and the correct checksum is '6'). When scanned, this \n"
+"barcode matches the Weighted Product rule (since is starts with '21'). The numerical content is extracted, \n"
+"and replaced by a sequence of '0's. The correct checksum is then computed for the obtained barcode \n"
+"('2100001000004') and the corresponding product (oranges) is retrieved from product table.\n"
+"\n"
+"Note: the special characters '{' and '}' in patterns are used to identify numerical content. To \n"
+"explicitely specify '{' or '}' in a pattern, they must be escaped.\n"
+"\n"
+"\n"
+"Strict EAN-13 field of barcode nomenclatures\n"
+"--------------------------------------------\n"
+"\n"
+"Many barcode scanners strip the leading zero when scanning EAN-13 barcodes. Barcode nomenclatures\n"
+"have a boolean field \"Use strict EAN13\". If False, when trying to match a scanned barcode with\n"
+"a rule whose encoding is EAN-13, if the barcode is of length 12 and, by prepending it by a 0,\n"
+"the last digit is the correct checksum, we automatically prepend the barcode by 0 and try to\n"
+"find a match with this new barcode. If \"Use strict EAN13\" is set to True, we look for a pattern\n"
+"matching the original, 12-digit long, barcode.\n"
+"\n"
+"\n"
+"\n"
+"Barcodes scanning\n"
+"==============================\n"
+"\n"
+"Scanning\n"
+"--------\n"
+"\n"
+"Use a USB scanner (that mimics keyboard inputs) in order to work with barcodes in Odoo.\n"
+"The scanner must be configured to use no prefix and a carriage return or tab as suffix.\n"
+"The delay between each character input must be less than or equal to 50 milliseconds.\n"
+"Most barcode scanners will work out of the box.\n"
+"However, make sure the scanner uses the same keyboard layout as the device it's plugged in.\n"
+"Either by setting the device's keyboard layout to US QWERTY (default value for most readers)\n"
+"or by changing the scanner's keyboard layout (check the manual).\n"
+"\n"
+"\n"
+"Barcode events\n"
+"------------------------------\n"
+"\n"
+"When the module barcodes is installed, it instanciate a singleton of the javascript class BarcodeEvents.\n"
+"The purpose of this component is to listen to keypresses to detect barcodes, then dispatch those barcodes\n"
+"on core.bus inside a 'barcode_event'.\n"
+"All keypress events are buffered until there is no more keypress during 50ms or a carriage return / tab is\n"
+"inputted (because most barcode scanners use this as a suffix).\n"
+"If the buffered keys looks like a barcode, an event is triggered :\n"
+"core.bus.trigger('barcode_scanned', barcode);\n"
+"Otherwise, the keypresses are 'resent'. However, for security reasons, a keypress event programmatically\n"
+"crafted doesn't trigger native browser behaviors. For this reason, BarcodeEvents doesn't intercept keypresses\n"
+"whose target is an editable element (eg. input) or when ctrl/cmd/alt is pushed.\n"
+"To catch keypresses targetting an editable element, it must have the attribute barcode_events=\"true\".\n"
+"\n"
+"\n"
+"Barcode handlers\n"
+"------------------------------\n"
+"\n"
+"To keep the web client consistent, components that want to listen to barcode events should include BarcodeHandlerMixin.\n"
+"It requires method on_barcode_scanned(barcode) to be implemented and exposes methods start_listening and stop_listening\n"
+"As long as it is the descendant of a View managed by a ViewManager is only listens while the view is attached.\n"
+"\n"
+"\n"
+"Form view barcode handler\n"
+"------------------------------\n"
+"\n"
+"It is possible for a form view to listen to barcode events, handle them client side and/or server-side.\n"
+"When the barcode is handled server-side, it works like an onchange. The relevant model must include the\n"
+"BarcodeEventsMixin and redefine method on_barcode_scanned. This method receives the barcode scanned and\n"
+"the `self` is a pseudo-record representing the content of the form view, just like in @api.onchange methods.\n"
+"Barcodes prefixed with 'O-CMD' or 'O-BTN' are reserved for special features and are never passed to on_barcode_scanned.\n"
+"The form view barcode handler can be extended to add client-side handling. Please refer to the (hopefully\n"
+"well enough) documented file for more informations.\n"
+"\n"
+"\n"
+"Button barcode handler\n"
+"------------------------------\n"
+"\n"
+"Add an attribute 'barcode_trigger' to a button to be able to trigger it by scanning a barcode. Example :\n"
+"<button name=\"validate\" type=\"object\" barcode_trigger=\"validate\"/> will be triggered when a barcode containing\n"
+"\"O-BTN.validate\" is scanned.\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx_edi_landing
+msgid "==========================================\n"
+"Odoo Mexico Localization for Stock/Landing\n"
+"==========================================\n"
+"\n"
+"This module extends the functionality of Mexican localization to support\n"
+"customs numbers related with landed costs when you generate the electronic\n"
+"invoice.\n"
+"\n"
+"Usage\n"
+"=====\n"
+"\n"
+"To use this module, you need to:\n"
+"\n"
+"* Generate a new purchase order for a product from abroad. Landed costs are\n"
+" only possible for products configured with 'automated' valuation with\n"
+" 'FIFO' costing method. The costing method is configured in the product\n"
+" category.\n"
+"\n"
+".. figure:: static/description/purchase_order_new.png\n"
+"\n"
+"* Receive the product of the purchase order\n"
+"\n"
+".. figure:: static/description/picking_done_purchase.png\n"
+"\n"
+"* Go to Inventory -> Inventory control -> Landed Cost\n"
+"\n"
+"* Create a new landed cost indicating the picking of the purchase order\n"
+" and the number of the customs information (pedimento). Landed costs are\n"
+" only possible for products configured in real time valuation with real\n"
+" price costing method. The costing method is configured on the product\n"
+" category\n"
+"\n"
+".. figure:: static/description/landed_cost_picking.png\n"
+"\n"
+"* Start by creating specific products to indicate your various Landed\n"
+" Costs, such as freight, insurance or custom duties.\n"
+"\n"
+" Go to Inventory -> Configuration -> Landed Cost types. Landed costs are\n"
+" only possible for products configured in real time valuation with real\n"
+" price costing method. The costing method is configured on the product\n"
+" category.\n"
+"\n"
+".. figure:: static/description/product_landed_cost.png\n"
+"\n"
+"* Click the Compute button to see how the landed costs will be split across\n"
+" the picking lines.\n"
+"\n"
+".. figure:: static/description/compute_landed_cost.png\n"
+"\n"
+"* To confirm the landed costs attribution, click on the Validate button.\n"
+"\n"
+".. figure:: static/description/validate_landed_cost.png\n"
+"\n"
+"* Create a sales order for the product purchased from abroad\n"
+"\n"
+".. figure:: static/description/sale_order_new.png\n"
+"\n"
+"* Delivery the product related to the sales order\n"
+"\n"
+".. figure:: static/description/picking_done_sale.png\n"
+"\n"
+"* Create and validate a new invoice associated with the sales order\n"
+"\n"
+".. figure:: static/description/validate_invoice_customs.png\n"
+"\n"
+"* The customs information is found in the lines of the invoice associated\n"
+" with each product.\n"
+"\n"
+".. figure:: static/description/invoice_custom_pedimento.png\n"
+"\n"
+"* Check the electronic invoice associated with the product where the node\n"
+" of the customs information is displayed\n"
+"\n"
+".. figure:: static/description/invoice_custom_xml.png\n"
+""
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx_edi_customs
+msgid "=======================================================\n"
+"Odoo Mexico Localization for Invoice with Custom Number\n"
+"=======================================================\n"
+"\n"
+"This module extends the functionality of Mexican localization to support customs numbers when you generate the electronic invoice.\n"
+"\n"
+"Usage\n"
+"=====\n"
+"\n"
+"To use this module, you need to:\n"
+"\n"
+"- Create a customer invoice normally.\n"
+"- Add the personalized number related to the customs information, separated by commas, \n"
+" if there are several numbers for each line of the invoice associated with a product.\n"
+"\n"
+" For example, given the number of petition **16 52 3XXX 8000988**.\n"
+"\n"
+" The number of the corresponding request to import the good must be registered, which is integrated from left to right in the following way:\n"
+"\n"
+" Last 2 digits of the validation year followed by two spaces, 2 digits of the customs office followed by two spaces, 4 digits of the number of the patent followed by two spaces, \n"
+" 1 digit corresponding to the last digit of the current year, except that it is of a consolidated motion, initiated in the immediately preceding year or of the original motion \n"
+" for a rectification, followed by 6 digits of the progressive numbering by customs.\n"
+"\n"
+" +------------+------------+---------+-----------+--------+------------+-----------------------+\n"
+" | Validation | | Customs | | Patent | | Exercise and Quantity |\n"
+" +============+============+=========+===========+========+============+=======================+\n"
+" | 16 | Two Spaces | 52 | Two Space | 3XXX | Two Spaces | 8000988 |\n"
+" +------------+------------+---------+-----------+--------+------------+-----------------------+\n"
+"\n"
+" With the previous value in the patent of our petition. These values must coincide with the SAT catalog in such a way that:\n"
+"\n"
+" * Validation: The year of validation. The value of positions one and two must be smaller or same as the last two digits of the year of the current date and must be greater or same as the last two digits of the year of the current date minus ten.\n"
+"\n"
+" * Customs: Code of customs clearance agent. Positions five and six must correspond to a key from the catalog of Customs (catCFDI: c_Aduana)\n"
+"\n"
+" * Patent: Positions nine through twelve must correspond to a patent number of the catalog of customs patents (catCFDI: c_PatenteAduanal)\n"
+"\n"
+" * Exercise: Last digit of the current year, unless it is of a consolidated motion, initiated in the immediately previous year or of the original motion for a rectification)\n"
+"\n"
+" * Quantity: The value of the last six digits must be between the minimum value 1 and the value maximum of consecutive numbers in the catalog quantity column catCFDI: c_NumPedimentoAduana that correspond to those used by customs in that year.\n"
+"\n"
+"- Validate the invoice\n"
+"\n"
+"For more information in the `SAT page <http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/cfdv33.pdf>`_. Page 70.\n"
+"For more information in the SAT documentation\n"
+""
+msgstr ""
+
+#. module: base
#: model:res.partner.industry,full_name:base.res_partner_industry_A
msgid "A AGRICULTURE, FORESTRY AND FISHING"
msgstr ""
#. module: base
-#: code:addons/models.py:2753
+#: code:addons/models.py:2852
#, python-format
msgid "A document was modified since you last viewed it (%s:%d)"
msgstr ""
@@ -4674,7 +4970,7 @@ msgid "A module with dummy methods."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_qweb_fields.py:385
+#: code:addons/base/models/ir_qweb_fields.py:404
#, python-format
msgid "A unit must be provided to duration widgets"
msgstr ""
@@ -4740,11 +5036,6 @@ msgid "Abbreviation"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_bank__acc_type
-msgid "Acc Type"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_res_company__user_ids
msgid "Accepted Users"
msgstr ""
@@ -4782,7 +5073,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:base.view_model_form
#: model:ir.ui.view,arch_db:base.view_rule_form
#: model:ir.ui.view,arch_db:base.view_users_form
-#: model:ir.ui.view,arch_db:base.view_users_simple_form
#: model:ir.ui.view,arch_db:base.view_view_form
#: model:res.groups,name:base.group_erp_manager
msgid "Access Rights"
@@ -4794,6 +5084,12 @@ msgid "Access Token"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__has_group_private_addresses
+#: model:res.groups,name:base.group_private_addresses
+msgid "Access to Private Addresses"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_default
msgid "Account Analytic Defaults"
msgstr ""
@@ -4819,6 +5115,11 @@ msgid "Account Holder"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__acc_holder_name
+msgid "Account Holder Name"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_res_company__account_no
msgid "Account No."
msgstr ""
@@ -4854,6 +5155,11 @@ msgid "Account and Payment Link and Portal"
msgstr ""
#. module: base
+#: model:ir.model.fields,help:base.field_res_partner_bank__acc_holder_name
+msgid "Account holder name, in case it is different than the name of the Account Holder"
+msgstr ""
+
+#. module: base
#: model:ir.module.category,name:base.module_category_accounting
msgid "Accounting"
msgstr ""
@@ -4864,6 +5170,11 @@ msgid "Accounting & Finance"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_accounting_andamp;_finance
+msgid "Accounting &amp; Finance"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_account
msgid "Accounting - MRP"
msgstr ""
@@ -4991,11 +5302,6 @@ msgid "Actions"
msgstr ""
#. module: base
-#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
-msgid "Activate more currencies"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_cron__active
#: model:ir.model.fields,field_description:base.field_ir_filters__active
#: model:ir.model.fields,field_description:base.field_ir_mail_server__active
@@ -5069,6 +5375,7 @@ msgid "Add twitter scroller snippet in website builder"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_partner_address_form
#: model:ir.ui.view,arch_db:base.view_partner_form
@@ -5160,6 +5467,7 @@ msgid "Adds support for authentication by LDAP server.\n"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__group_administration_user
#: model:ir.module.category,name:base.module_category_administration
msgid "Administration"
msgstr ""
@@ -5175,9 +5483,9 @@ msgid "Administrative divisions of a country. E.g. Fed. State, Departement, Cant
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:912
-#: code:addons/base/models/ir_model.py:1024
-#: code:addons/base/models/ir_model.py:1522
+#: code:addons/base/models/ir_model.py:942
+#: code:addons/base/models/ir_model.py:1054
+#: code:addons/base/models/ir_model.py:1552
#, python-format
msgid "Administrator access is required to uninstall a module"
msgstr ""
@@ -5246,7 +5554,7 @@ msgid "All"
msgstr ""
#. module: base
-#: code:addons/base/wizard/base_partner_merge.py:273
+#: code:addons/base/wizard/base_partner_merge.py:278
#, python-format
msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
msgstr ""
@@ -5386,9 +5694,7 @@ msgid "Application"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:759
-#: model:ir.ui.view,arch_db:base.user_groups_view
-#, python-format
+#: model:ir.ui.view,arch_db:base.view_users_form
msgid "Application Accesses"
msgstr ""
@@ -5403,7 +5709,7 @@ msgid "Apply"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:633
+#: code:addons/base/models/ir_module.py:625
#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
#: model:ir.ui.view,arch_db:base.view_base_module_upgrade_install
#, python-format
@@ -5683,7 +5989,7 @@ msgid "Automatic Merge Wizard"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:730
+#: code:addons/base/models/ir_module.py:722
#, python-format
msgid "Automatic install of downloaded Apps is currently disabled."
msgstr ""
@@ -5769,7 +6075,7 @@ msgid "Background"
msgstr ""
#. module: base
-#: code:addons/translate.py:1066
+#: code:addons/translate.py:1070
#, python-format
msgid "Bad file format: %s"
msgstr ""
@@ -5800,6 +6106,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
#: model:ir.model,name:base.model_res_partner_bank
#: model:ir.model.fields,field_description:base.field_res_company__bank_ids
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_partner_bank_search
#: model:ir.ui.view,arch_db:base.view_partner_bank_tree
msgid "Bank Accounts"
@@ -5823,7 +6130,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_res_partner_bank__acc_type
-msgid "Bank account type, inferred from account number"
+msgid "Bank account type: Normal or IBAN. Inferred from the bank account number."
msgstr ""
#. module: base
@@ -5856,6 +6163,16 @@ msgid "Barcode Scanner Hardware Driver"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_barcodes_mobile
+msgid "Barcode in Mobile"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_barcodes_mobile
+msgid "Barcode scan in Mobile"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_barcodes
msgid "Barcodes"
msgstr ""
@@ -5881,7 +6198,7 @@ msgstr ""
#. module: base
#: code:addons/base/models/res_lang.py:240
#, python-format
-msgid "Base Language 'en_US' can not be deleted!"
+msgid "Base Language 'en_US' can not be deleted."
msgstr ""
#. module: base
@@ -5933,6 +6250,11 @@ msgid "Basic 2D Grid view for odoo"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_web_cohort
+msgid "Basic Cohort view for odoo"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,summary:base.module_quality
msgid "Basic Feature for Quality"
msgstr ""
@@ -5958,7 +6280,7 @@ msgid "Before Amount"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:997
+#: code:addons/base/models/res_users.py:930
#, python-format
msgid "Before clicking on 'Change Password', you have to write a new password."
msgstr ""
@@ -6182,7 +6504,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_budget
-msgid "Budgets Management"
+msgid "Budget Management"
msgstr ""
#. module: base
@@ -6280,13 +6602,13 @@ msgid "Can not create Many-To-One records indirectly, import the field separatel
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:616
+#: code:addons/base/models/ir_module.py:608
#, python-format
msgid "Can not upgrade module '%s'. It is not installed."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:669
+#: code:addons/base/models/ir_model.py:693
#, python-format
msgid "Can only rename one field at a time!"
msgstr ""
@@ -6345,21 +6667,27 @@ msgid "Cancel Upgrade"
msgstr ""
#. module: base
-#: code:addons/base/models/res_config.py:385
+#: code:addons/models.py:1981
#, python-format
-msgid "Cannot duplicate configuration!"
+msgid "Cannot aggregate field %r."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:569
+#: code:addons/base/models/res_lang.py:228
#, python-format
-msgid "Cannot rename/delete fields that are still present in views:"
+msgid "Cannot deactivate a language that is currently used by users."
msgstr ""
#. module: base
-#: code:addons/base/models/res_lang.py:228
+#: code:addons/base/models/res_config.py:385
#, python-format
-msgid "Cannot unactivate a language that is currently used by users."
+msgid "Cannot duplicate configuration!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_model.py:593
+#, python-format
+msgid "Cannot rename/delete fields that are still present in views:"
msgstr ""
#. module: base
@@ -6425,19 +6753,19 @@ msgid "Change the way addresses are displayed in reports"
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:337
+#: code:addons/base/models/res_partner.py:347
#, python-format
msgid "Changing the company of a contact should only be done if it was never correctly set. If an existing contact starts working for a new company then a new contact should be created under that new company. You can use the \"Discard\" button to abandon this change."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:656
+#: code:addons/base/models/ir_model.py:680
#, python-format
msgid "Changing the model of a field is forbidden!"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:659
+#: code:addons/base/models/ir_model.py:683
#, python-format
msgid "Changing the type of a field is not yet supported. Please drop it and create it again!"
msgstr ""
@@ -6574,7 +6902,7 @@ msgid "China - Standard CoA"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions_report.py:683
+#: code:addons/base/models/ir_actions_report.py:690
#, python-format
msgid "Choose Your Document Layout"
msgstr ""
@@ -6602,6 +6930,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_res_company__city
#: model:ir.model.fields,field_description:base.field_res_partner__city
#: model:ir.model.fields,field_description:base.field_res_users__city
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_partner_address_form
#: model:ir.ui.view,arch_db:base.view_partner_form
@@ -6666,6 +6995,17 @@ msgid "Code to compute the value of the field.\n"
msgstr ""
#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Cohort"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_cohort
+msgid "Cohort View"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_pad
msgid "Collaborative Pads"
msgstr ""
@@ -6847,6 +7187,11 @@ msgid "Compare timesheets and forecast for your projects"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_project_timesheet_forecast
+msgid "Compare timesheets and forecasts"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_res_partner__contact_address
#: model:ir.model.fields,field_description:base.field_res_users__contact_address
msgid "Complete Address"
@@ -6868,6 +7213,11 @@ msgid "Compute"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_website_sale_taxcloud_delivery
+msgid "Compute taxes with TaxCloud after online delivery computation."
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_model_form
msgid "Computed fields are defined with the fields\n"
" <strong>Dependencies</strong> and <strong>Compute</strong>."
@@ -6945,14 +7295,14 @@ msgid "Connection Security"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:164
+#: code:addons/base/models/ir_mail_server.py:187
#, python-format
msgid "Connection Test Failed! Here is what we got instead:\n"
" %s"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:172
+#: code:addons/base/models/ir_mail_server.py:195
#, python-format
msgid "Connection Test Succeeded! Everything seems properly set up!"
msgstr ""
@@ -6991,6 +7341,7 @@ msgid "Contact / Address"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__has_group_partner_manager
#: model:res.groups,name:base.group_partner_manager
msgid "Contact Creation"
msgstr ""
@@ -7067,6 +7418,11 @@ msgid "Context dictionary as Python expression, empty by default (Default: {})"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_hr_contract
+msgid "Contracts"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_ir_module_module__contributors
msgid "Contributors"
msgstr ""
@@ -7097,7 +7453,7 @@ msgid "Costa Rica - Accounting"
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:621
+#: code:addons/base/models/res_partner.py:636
#, python-format
msgid "Couldn't create contact without email address!"
msgstr ""
@@ -7120,6 +7476,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_res_country_state__country_id
#: model:ir.model.fields,field_description:base.field_res_partner__country_id
#: model:ir.model.fields,field_description:base.field_res_users__country_id
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_country_tree
#: model:ir.ui.view,arch_db:base.view_partner_address_form
@@ -7463,8 +7820,9 @@ msgid "Creation"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.ir_logging_search_view
#: model:ir.ui.view,arch_db:base.view_attachment_search
-msgid "Creation Month"
+msgid "Creation Date"
msgstr ""
#. module: base
@@ -7625,7 +7983,7 @@ msgid "Custom Shortcuts"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:374
+#: code:addons/base/models/ir_model.py:391
#, python-format
msgid "Custom fields must have a name that starts with 'x_' !"
msgstr ""
@@ -7708,6 +8066,12 @@ msgid "DLE 26 110 x 220 mm"
msgstr ""
#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Dashboard"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_board
#: model:ir.ui.menu,name:base.menu_board_root
#: model:ir.ui.menu,name:base.menu_reporting_dashboard
@@ -7755,7 +8119,7 @@ msgid "Database Structure"
msgstr ""
#. module: base
-#: code:addons/models.py:2676
+#: code:addons/models.py:2775
#, python-format
msgid "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a type incoherence in a previous request"
msgstr ""
@@ -7786,16 +8150,6 @@ msgid "DateTime"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_sale_order_dates
-msgid "Dates on Sales Order"
-msgstr ""
-
-#. module: base
-#: model:ir.ui.view,arch_db:base.ir_logging_search_view
-msgid "Day"
-msgstr ""
-
-#. module: base
#: model:ir.ui.view,arch_db:base.sequence_view
msgid "Day of the Week (0:Monday): %(weekday)s"
msgstr ""
@@ -7921,6 +8275,11 @@ msgid "Delivery Costs"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_order_dates
+msgid "Delivery Dates on Sales Order"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_ir_module_module__demo
msgid "Demo Data"
msgstr ""
@@ -8228,13 +8587,18 @@ msgid "Document Management"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_website_sign
+msgid "Document Signatures"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_res_company__external_report_layout
msgid "Document Template"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1179
-#: code:addons/base/models/ir_model.py:1182
+#: code:addons/base/models/ir_model.py:1209
+#: code:addons/base/models/ir_model.py:1212
#, python-format
msgid "Document model"
msgstr ""
@@ -8300,7 +8664,7 @@ msgid "Duplicating a company is not allowed. Please create a new company instead
msgstr ""
#. module: base
-#: code:addons/base/models/ir_qweb_fields.py:382
+#: code:addons/base/models/ir_qweb_fields.py:401
#, python-format
msgid "Durations can't be negative"
msgstr ""
@@ -8311,6 +8675,27 @@ msgid "E WATER SUPPLY;SEWERAGE,WASTE MANAGEMENT AND REMEDIATION ACTIVITIES"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx_edi_external_trade
+msgid "EDI External Trade Complement for Mexico"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx_edi_payment
+msgid "EDI Payment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx_edi_payment
+msgid "EDI Payment\n"
+"===========\n"
+"\n"
+"This payment module for Mexican Localization allows satisfying the SAT indication\n"
+"which established that a payment complement can be emitted ten (10) days after,\n"
+"of the same month, when was received.\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_mx_edi
msgid "EDI for Mexico"
msgstr ""
@@ -8336,6 +8721,11 @@ msgid "Easily create and customize your applications"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery_easypost
+msgid "Easypost Shipping"
+msgstr ""
+
+#. module: base
#: model:res.country,name:base.ec
msgid "Ecuador"
msgstr ""
@@ -8391,6 +8781,14 @@ msgid "Electronic Accounting for Mexico and Fiscal Reports\n"
"- Save the generated xml in order to make available an history of Fiscal declared documents.\n"
"- Unit tests to increase the coverage of this module and avoid regressions in the future.\n"
"\n"
+"Notes:\n"
+"------\n"
+"\n"
+" - In the taxes could be set the account `Base Tax Received Account` that is the\n"
+" account that will be set on lines created in cash basis journal entry and\n"
+" used to keep track of the tax base amount, this account is not considered in\n"
+" the Mexican reports.\n"
+"\n"
"Configuration\n"
"=============\n"
"\n"
@@ -8408,7 +8806,8 @@ msgid "Electronic Accounting for Mexico and Fiscal Reports\n"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:641
+#: code:addons/base/models/ir_ui_view.py:589
+#: code:addons/base/models/ir_ui_view.py:670
#, python-format
msgid "Element '%s' cannot be located in parent view"
msgstr ""
@@ -8435,6 +8834,7 @@ msgid "Email Gateway"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_mass_mailing
#: model:ir.module.module,shortdesc:base.module_mass_mailing
msgid "Email Marketing"
msgstr ""
@@ -8447,7 +8847,6 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_res_partner__employee
#: model:ir.model.fields,field_description:base.field_res_users__employee
-#: model:res.groups,name:base.group_user
msgid "Employee"
msgstr ""
@@ -8468,12 +8867,11 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_employee_form
-#: model:ir.module.category,name:base.module_category_human_resources
msgid "Employees"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:430
+#: code:addons/base/models/ir_model.py:447
#, python-format
msgid "Empty dependency in %r"
msgstr ""
@@ -8518,44 +8916,26 @@ msgid "Eritrea"
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:86
-#, python-format
-msgid "Error ! You can not create recursive tags."
-msgstr ""
-
-#. module: base
-#: code:addons/base/models/res_company.py:234
-#, python-format
-msgid "Error ! You cannot create recursive companies."
-msgstr ""
-
-#. module: base
-#: code:addons/base/models/report_paperformat.py:68
-#, python-format
-msgid "Error ! You cannot select a format AND specific page width/height."
-msgstr ""
-
-#. module: base
-#: code:addons/base/models/ir_ui_view.py:491
+#: code:addons/base/models/ir_ui_view.py:496
#, python-format
msgid "Error context:\n"
"View `%(view_name)s`"
msgstr ""
#. module: base
-#: code:addons/models.py:974
+#: code:addons/models.py:1036
#, python-format
msgid "Error details:"
msgstr ""
#. module: base
-#: code:addons/models.py:987
+#: code:addons/models.py:1049
#, python-format
msgid "Error while validating constraint"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_menu.py:76
+#: code:addons/base/models/ir_ui_menu.py:75
#, python-format
msgid "Error! You cannot create recursive menus."
msgstr ""
@@ -8802,6 +9182,161 @@ msgid "External Key/Identifier that can be used for data integration with third-
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_l10n_mx_edi_external_trade
+msgid "External Trade Complement for the Mexican localization"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx_edi_external_trade
+msgid "External Trade Complement for the Mexican localization\n"
+"=======================================================\n"
+"\n"
+"This module adds the External Trade Complement to CFDI version 3.3, in which\n"
+"was added the customs information of the products, it specifies the emitter\n"
+"and receiver address, and also data related to export laws.\n"
+"\n"
+"This complement is required for all invoices where goods are exported and the\n"
+"landing code is \"A1\"\n"
+"\n"
+"The following fields were added in order to comply with complement structure\n"
+"defined by the SAT.\n"
+"\n"
+"- In the invoice:\n"
+"\n"
+" - **Need external trade?**: This field is used to indicate that in the CFDI\n"
+" document that will be generated, must be added the external trade\n"
+" complement. By default take this value from the partner, but could be\n"
+" changed here if is one exception. If this field is actived, then will be\n"
+" showed the next fields:\n"
+"\n"
+" - **Incoterm**: It is used for the attribute *incoterm* in the External Trade\n"
+" node, is required, and must contain a value from the SAT catalog_ to\n"
+" incoterms.\n"
+"\n"
+" - **Certificate Source**: If the document to be generated is a\n"
+" Certificate of Origin, must be registered the certificate of\n"
+" origin folio or the fiscal folio in CFDI with which the issuance of the\n"
+" certificate of origin was paid. If this field is empty, indicate that\n"
+" this document not funge as Certificate of Origin.\n"
+"\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/InvoiceET.png\n"
+"\n"
+"- In the product:\n"
+"\n"
+" - **Tariff Fraction**: This field is used to store the tariff fraction\n"
+" that corresponds to the product to be sold, this have loaded the SAT\n"
+" catalog \"c_FraccionArancelaria_\". If one record is not found is because\n"
+" only was loaded the current records.\n"
+"\n"
+" - **UMT Customs**: Field used to specify the key of the applicable unit\n"
+" of measure for the quantity expressed in the goods at customs. This\n"
+" unit of measure must correspond to the assigned Tariff Fraction in the\n"
+" product, as indicated in the SAT catalog.\n"
+"\n"
+" - **Weight**: If the *UMT Customs* is `KG`, here must be specific the weight\n"
+" of each product.\n"
+"\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/Product_CET.png\n"
+"\n"
+"- In Unit of measurement\n"
+"\n"
+" - **Customs Code**: Code that corresponding to the unit of measurement in the\n"
+" SAT's catalog. This is the code that use the aduana to the products\n"
+" related. Link_\n"
+"\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/Code_Aduana.png\n"
+"\n"
+"- In the invoice lines:\n"
+"\n"
+" - **Qty UMT**: It is the quantity expressed in the unit of measure of\n"
+" customs of the product.\n"
+"\n"
+" It will be used for the attribute \"CantidadAduana\" in each of the\n"
+" merchandise to sell, when the Code Customs of the product UMT is\n"
+" different to 99.\n"
+"\n"
+" This field is automatically filled in the invoice lines in the\n"
+" following cases:\n"
+"\n"
+" 1. The product has the same value for UMT customs and UoM.\n"
+" In this case, Qty UMT is set to the same value of the quantity of\n"
+" products on the line.\n"
+"\n"
+" 2. The code of the unit of measurement in UMT of the product is equal to 06 (kilo).\n"
+" In this case, Qty UMT will be equal to the weight defined in the\n"
+" product multiplied by the quantity of products being sold.\n"
+"\n"
+" In other cases, this value must be defined by the user, in each one of the\n"
+" lines.\n"
+"\n"
+" - **Unit Value UMT**: Represents the unit price of the merchandise in the\n"
+" Customs UMT. It is used to set the attribute \"ValorUnitarioAduana\" in\n"
+" each of the CFDI merchandise. It is transparent to the user.\n"
+"\n"
+" - **UMT Adduana**: This value by default is the same that is defined in the\n"
+" product of the line.\n"
+"\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/invoice_line_ET.png\n"
+" :width: 700pt\n"
+"\n"
+"- In the partner:\n"
+"\n"
+" - **CURP**: It is used to store the unique Key of the Register of\n"
+" Population (CURP) of the issuer of the CFDI. When it is a natural\n"
+" person, it must contain 18 characters.\n"
+"\n"
+" - **Need external trade?**: Field used to indicate if the customer needs\n"
+" their invoices with external complement. If the field is equal to True,\n"
+" then the add-on is added to the CFDIs for this client.\n"
+"\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/partnerET2.png\n"
+"\n"
+" - **Locality**: Field used to indicate the locality of the emitter and\n"
+" receiver in the CFDI\n"
+"\n"
+" - **Colony Code**: This field is used to store the emitter's code of the\n"
+" colony. It must be a value from the ones provided by the SAT's catalog.\n"
+" Note: This field only must be configured in the company address or in\n"
+" the partners that are used as branch address in multi-branch enviroments.\n"
+" c_colonia_\n"
+"\n"
+" .. figure:: ../l10n_mx_edi_external_trade/static/src/partnerET.png\n"
+"\n"
+"- In the Company\n"
+"\n"
+" - **Number of Reliable Exporter**: Identification of the exporter\n"
+" according to the Article 22 of Annex 1 of the Free Trade Agreement with\n"
+" the European Association and to the Decision of the European Community,\n"
+" used to establish the attribute \"NumeroExportadorConfiable\" if the\n"
+" country of the customer belongs to the Union European\n"
+"\n"
+"- In addition, the following models were added:\n"
+"\n"
+" - **Locality**: model used to store the localities from Mexico provided\n"
+" by the SAT's catalog. Its fields are name, state, country and code.\n"
+" c_localidad_\n"
+"\n"
+"In this version, the external trade complement does not support the Type of\n"
+"Transfer Proof ('T'). For this reason, the nodes \"Propietario\" and\n"
+"\"MotivodeTraslado\" are not specified in the External Trade Template. On the\n"
+"other hand, the optional node \"DescripcionesEspecificas\" will not be added\n"
+"in this version, since it needs fields that depend on the stock module.\n"
+"They will be added in a later version.\n"
+"\n"
+".. _catalog: http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/c_INCOTERM.xls\n"
+".. _c_FraccionArancelaria: http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/c_FraccionArancelaria.xls \n"
+".. _Link: http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/c_UnidadMedidaAduana.xls\n"
+".. _c_colonia: http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/c_Colonia.xls\n"
+".. _c_localidad: http://www.sat.gob.mx/informacion_fiscal/factura_electronica/Documents/c_Localidad.xls\n"
+""
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,help:base.field_res_users__share
msgid "External user with limited access, created only for the purpose of sharing data."
msgstr ""
@@ -8812,8 +9347,7 @@ msgid "Extra"
msgstr ""
#. module: base
-#: model:ir.module.category,name:base.module_category_usability
-#: model:ir.ui.view,arch_db:base.user_groups_view
+#: model:ir.ui.view,arch_db:base.view_users_form
msgid "Extra Rights"
msgstr ""
@@ -8936,7 +9470,7 @@ msgid "Field \"Type\" cannot be modified on models."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:1047
+#: code:addons/base/models/ir_ui_view.py:1076
#, python-format
msgid "Field %r used in attributes must be present in view but is missing:"
msgstr ""
@@ -8968,13 +9502,13 @@ msgid "Field Type"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:1041
+#: code:addons/base/models/ir_ui_view.py:1070
#, python-format
msgid "Field `%(field_name)s` does not exist"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:378
+#: code:addons/base/models/ir_model.py:395
#, python-format
msgid "Field names can only contain characters, digits and underscores (up to 63)."
msgstr ""
@@ -9002,7 +9536,7 @@ msgid "Fields Description"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:570
+#: code:addons/base/models/ir_model.py:594
#, python-format
msgid "Fields: %s"
msgstr ""
@@ -9072,7 +9606,6 @@ msgid "Filter on my documents"
msgstr ""
#. module: base
-#: model:ir.actions.act_window,name:base.actions_ir_filters_view
#: model:ir.model,name:base.model_ir_filters
#: model:ir.ui.view,arch_db:base.ir_filters_view_form
#: model:ir.ui.view,arch_db:base.ir_filters_view_search
@@ -9172,19 +9705,19 @@ msgid "For relationship fields, the technical name of the target model"
msgstr ""
#. module: base
-#: code:addons/base/wizard/base_partner_merge.py:262
+#: code:addons/base/wizard/base_partner_merge.py:268
#, python-format
msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:612
+#: code:addons/base/models/ir_model.py:636
#, python-format
msgid "For selection fields, the Selection Options must be given!"
msgstr ""
#. module: base
-#: code:addons/models.py:2813
+#: code:addons/models.py:2912
#, python-format
msgid "For this kind of document, you may only access records you created yourself.\n"
"\n"
@@ -9200,6 +9733,17 @@ msgid "Form"
msgstr ""
#. module: base
+#: selection:ir.actions.act_url,binding_type:0
+#: selection:ir.actions.act_window,binding_type:0
+#: selection:ir.actions.act_window_close,binding_type:0
+#: selection:ir.actions.actions,binding_type:0
+#: selection:ir.actions.client,binding_type:0
+#: selection:ir.actions.report,binding_type:0
+#: selection:ir.actions.server,binding_type:0
+msgid "Form-only"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,help:base.field_res_partner__email_formatted
#: model:ir.model.fields,help:base.field_res_users__email_formatted
msgid "Format email address \"Name <email@domain>\""
@@ -9469,6 +10013,16 @@ msgid "Germany"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_website_sale_dashboard
+msgid "Get a new dashboard view in the Website App"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_website_sale_dashboard_with_margin
+msgid "Get margin information in your e-commerce dashboard"
+msgstr ""
+
+#. module: base
#: model:res.country,name:base.gh
msgid "Ghana"
msgstr ""
@@ -9503,7 +10057,7 @@ msgid "Global rules are combined together with a logical AND operator, and with
msgstr ""
#. module: base
-#: code:addons/base/models/res_config.py:732
+#: code:addons/base/models/res_config.py:734
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -9689,6 +10243,7 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_action_res_groups
#: model:ir.ui.view,arch_db:base.view_groups_form
#: model:ir.ui.view,arch_db:base.view_groups_search
+#: model:ir.ui.view,arch_db:base.view_users_form
msgid "Groups"
msgstr ""
@@ -9758,6 +10313,11 @@ msgid "HR Org Chart"
msgstr ""
#. module: base
+#: model:res.country,vat_label:base.ca
+msgid "HST"
+msgstr ""
+
+#. module: base
#: selection:ir.actions.report,report_type:0
msgid "HTML"
msgstr ""
@@ -9881,6 +10441,11 @@ msgid "Helps you manage the timesheets."
msgstr ""
#. module: base
+#: model:ir.module.category,description:base.module_category_user_type
+msgid "Helps you manage users."
+msgstr ""
+
+#. module: base
#: model:ir.module.category,description:base.module_category_event_management
msgid "Helps you manage your Events."
msgstr ""
@@ -9891,8 +10456,8 @@ msgid "Helps you manage your appraisals."
msgstr ""
#. module: base
-#: model:ir.module.category,description:base.module_category_human_resources
-msgid "Helps you manage your employees."
+#: model:ir.module.category,description:base.module_category_hr_contract
+msgid "Helps you manage your contracts."
msgstr ""
#. module: base
@@ -9947,11 +10512,21 @@ msgid "Helps you manage your survey for review of different-different users."
msgstr ""
#. module: base
+#: model:ir.module.category,description:base.module_category_website_sign
+msgid "Helps you sign and complete your documents easily."
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.wizard_lang_export
msgid "Here is the exported translation file:"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_hidden
+msgid "Hidden"
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_attachment_form
msgid "History"
msgstr ""
@@ -10039,6 +10614,11 @@ msgid "Human Resource"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources
+msgid "Human Resources"
+msgstr ""
+
+#. module: base
#: model:ir.module.category,name:base.module_category_human_resources_survey
msgid "Human Resources Survey"
msgstr ""
@@ -10568,7 +11148,7 @@ msgid "Input View"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:436
+#: code:addons/base/models/ir_module.py:428
#: model:ir.ui.view,arch_db:base.module_form
#: model:ir.ui.view,arch_db:base.module_view_kanban
#, python-format
@@ -10615,13 +11195,13 @@ msgid "Instant Messaging Bus allow you to send messages to users, in live."
msgstr ""
#. module: base
-#: code:addons/models.py:1210
+#: code:addons/models.py:1272
#, python-format
msgid "Insufficient fields for Calendar View!"
msgstr ""
#. module: base
-#: code:addons/models.py:1220
+#: code:addons/models.py:1282
#, python-format
msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay"
msgstr ""
@@ -10688,6 +11268,11 @@ msgid "Internal Source"
msgstr ""
#. module: base
+#: model:res.groups,name:base.group_user
+msgid "Internal User"
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_users_search
msgid "Internal Users"
msgstr ""
@@ -10718,18 +11303,24 @@ msgid "Introspection report on objects"
msgstr ""
#. module: base
-#: code:addons/models.py:3521
+#: code:addons/models.py:3546
#, python-format
msgid "Invalid \"order\" specified. A valid \"order\" specification is a comma-separated list of valid field names (optionally followed by asc/desc for the direction)"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:319
+#: code:addons/base/models/res_users.py:395
#, python-format
msgid "Invalid 'group by' parameter"
msgstr ""
#. module: base
+#: code:addons/models.py:1983
+#, python-format
+msgid "Invalid aggregation function %r."
+msgstr ""
+
+#. module: base
#: code:addons/base/models/ir_fields.py:324
#, python-format
msgid "Invalid database id '%s' for the field '%%(field)s'"
@@ -10748,19 +11339,25 @@ msgid "Invalid field %s.%s"
msgstr ""
#. module: base
+#: code:addons/models.py:1973
+#, python-format
+msgid "Invalid field specification %r."
+msgstr ""
+
+#. module: base
#: sql_constraint:ir.ui.view:0
msgid "Invalid inheritance mode: if the mode is 'extension', the view must extend an other view"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions.py:128
-#: code:addons/base/models/ir_actions.py:130
+#: code:addons/base/models/ir_actions.py:129
+#: code:addons/base/models/ir_actions.py:131
#, python-format
msgid "Invalid model name %r in action definition."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:632
+#: code:addons/base/models/ir_ui_view.py:661
#, python-format
msgid "Invalid position attribute: '%s'"
msgstr ""
@@ -10772,12 +11369,18 @@ msgid "Invalid prefix or suffix for sequence '%s'"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:327
+#: code:addons/base/models/res_users.py:403
#, python-format
msgid "Invalid search criterion"
msgstr ""
#. module: base
+#: code:addons/base/models/ir_ui_view.py:582
+#, python-format
+msgid "Invalid specification for moved nodes: '%s'"
+msgstr ""
+
+#. module: base
#: code:addons/base/models/ir_property.py:69
#, python-format
msgid "Invalid type"
@@ -10790,7 +11393,7 @@ msgid "Invalid value for %s.%s: %s"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:343
+#: code:addons/base/models/ir_ui_view.py:342
#, python-format
msgid "Invalid view definition"
msgstr ""
@@ -10852,6 +11455,11 @@ msgid "Ireland"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_lock
+msgid "Irreversible Lock Date"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_is_company
msgid "Is Company"
msgstr ""
@@ -11376,11 +11984,6 @@ msgid "Launch Configuration Wizard"
msgstr ""
#. module: base
-#: model:ir.ui.view,arch_db:base.wizard_lang_export
-msgid "Launchpad"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_res_country__address_format
msgid "Layout in Reports"
msgstr ""
@@ -11441,11 +12044,6 @@ msgid "Left Margin (mm)"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_left
-msgid "Left parent"
-msgstr ""
-
-#. module: base
#: selection:res.lang,direction:0
msgid "Left-to-Right"
msgstr ""
@@ -11561,11 +12159,6 @@ msgid "Link module between Point of Sale and Sales"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_project_forecast_sale
-msgid "Link module between project_forecast and sale(_timesheet)"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_actions_server__link_field_id
#: model:ir.model.fields,field_description:base.field_ir_cron__link_field_id
msgid "Link using field"
@@ -11607,6 +12200,11 @@ msgid "Live Currency Exchange Rate"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_im_support
+msgid "Livechat Support"
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_base_language_install
msgid "Load"
msgstr ""
@@ -11728,12 +12326,17 @@ msgid "Madam"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:466
+#: code:addons/base/models/ir_mail_server.py:488
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_mail_enterprise
+msgid "Mail Enterprise"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_test_mail
msgid "Mail Tests"
msgstr ""
@@ -11744,7 +12347,7 @@ msgid "Mail Tests: performances and tests specific to mail"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:464
+#: code:addons/base/models/ir_mail_server.py:486
#, python-format
msgid "Mail delivery failed via SMTP server '%s'.\n"
"%s: %s"
@@ -11918,7 +12521,7 @@ msgid "Many2One"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:623
+#: code:addons/base/models/ir_model.py:647
#, python-format
msgid "Many2one %s on model %s does not exist!"
msgstr ""
@@ -11977,11 +12580,6 @@ msgid "Martinique"
msgstr ""
#. module: base
-#: model:ir.module.category,name:base.module_category_mass_mailing
-msgid "Mass Mailing"
-msgstr ""
-
-#. module: base
#: model:ir.module.module,shortdesc:base.module_mass_mailing_themes
msgid "Mass Mailing Themes"
msgstr ""
@@ -12045,18 +12643,6 @@ msgid "Memos pad"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:382
-#, python-format
-msgid "Model %s does not exist"
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_model.py:383
-#, python-format
-msgid "Please specify a valid model for the object relation"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_ui_menu__name
#: model:ir.ui.view,arch_db:base.edit_menu
#: model:ir.ui.view,arch_db:base.edit_menu_access
@@ -12139,13 +12725,14 @@ msgid "Methods that start with `get_default_` are deprecated. Override `get_valu
msgstr ""
#. module: base
-#: code:addons/base/models/res_config.py:605
+#: code:addons/base/models/res_config.py:607
#, python-format
msgid "Methods that start with `set_` are deprecated. Override `set_values` instead (Method %s)"
msgstr ""
#. module: base
#: model:ir.module.module,summary:base.module_l10n_mx_edi
+#: model:ir.module.module,summary:base.module_l10n_mx_edi_payment
msgid "Mexican Localization for EDI documents"
msgstr ""
@@ -12207,25 +12794,25 @@ msgid "Miss"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:217
+#: code:addons/base/models/ir_mail_server.py:240
#, python-format
msgid "Missing SMTP Server"
msgstr ""
#. module: base
-#: code:addons/models.py:2782
+#: code:addons/models.py:2881
#, python-format
msgid "Missing document(s)"
msgstr ""
#. module: base
-#: code:addons/models.py:5176
+#: code:addons/models.py:5177
#, python-format
msgid "Missing required value for the field '%s' (%s)"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:387
+#: code:addons/base/models/ir_ui_view.py:386
#, python-format
msgid "Missing view architecture."
msgstr ""
@@ -12267,7 +12854,13 @@ msgid "Model"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:619
+#: code:addons/base/models/ir_model.py:489
+#, python-format
+msgid "Model %s does not exist"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_model.py:643
#, python-format
msgid "Model %s does not exist!"
msgstr ""
@@ -12275,7 +12868,7 @@ msgstr ""
#. module: base
#: code:addons/base/models/ir_model.py:180
#, python-format
-msgid "Model '%s' contains module data and cannot be removed!"
+msgid "Model '%s' contains module data and cannot be removed."
msgstr ""
#. module: base
@@ -12325,8 +12918,8 @@ msgid "Model name of the object to open in the view window"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:771
-#: code:addons/base/models/ir_ui_view.py:987
+#: code:addons/base/models/ir_ui_view.py:800
+#: code:addons/base/models/ir_ui_view.py:1016
#, python-format
msgid "Model not found: %(model)s"
msgstr ""
@@ -12410,7 +13003,7 @@ msgid "Module exclusion"
msgstr ""
#. module: base
-#: code:addons/convert.py:830
+#: code:addons/convert.py:829
#, python-format
msgid "Module loading %s failed: file %s could not be processed:\n"
" %s"
@@ -12427,7 +13020,7 @@ msgid "Modules"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:410
+#: code:addons/base/models/ir_module.py:402
#, python-format
msgid "Modules \"%s\" and \"%s\" are incompatible."
msgstr ""
@@ -12458,11 +13051,6 @@ msgid "Montenegro"
msgstr ""
#. module: base
-#: model:ir.ui.view,arch_db:base.ir_logging_search_view
-msgid "Month"
-msgstr ""
-
-#. module: base
#: model:ir.ui.view,arch_db:base.sequence_view
msgid "Month: %(month)s"
msgstr ""
@@ -12503,12 +13091,14 @@ msgid "Mrs."
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__has_group_multi_company
#: model:ir.ui.view,arch_db:base.view_users_form
#: model:res.groups,name:base.group_multi_company
msgid "Multi Companies"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__has_group_multi_currency
#: model:res.groups,name:base.group_multi_currency
msgid "Multi Currencies"
msgstr ""
@@ -12700,12 +13290,19 @@ msgid "Niue"
msgstr ""
#. module: base
+#: code:addons/base/models/res_users.py:784
+#: code:addons/base/models/res_users.py:816
+#, python-format
+msgid "No 'group_xml_id' or 'category_xml_id' is set on the computed field %s linked to the method _compute_groups_id"
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.res_config_settings_view_form
msgid "No Record Found"
msgstr ""
#. module: base
-#: code:addons/models.py:1299
+#: code:addons/models.py:1361
#, python-format
msgid "No default view of type '%s' could be found !"
msgstr ""
@@ -12716,7 +13313,7 @@ msgid "No gap"
msgstr ""
#. module: base
-#: code:addons/fields.py:2255
+#: code:addons/fields.py:2261
#, python-format
msgid "No inverse field %r found for %r"
msgstr ""
@@ -12749,13 +13346,13 @@ msgid "Non Updatable"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:439
+#: code:addons/base/models/ir_model.py:456
#, python-format
msgid "Non-relational field %r in dependency %r"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:396
+#: code:addons/base/models/ir_model.py:413
#, python-format
msgid "Non-relational field name '%s' in related field '%s'"
msgstr ""
@@ -12780,6 +13377,12 @@ msgid "Norfolk Island"
msgstr ""
#. module: base
+#: code:addons/base/models/res_bank.py:68
+#, python-format
+msgid "Normal"
+msgstr ""
+
+#. module: base
#: model:res.country,name:base.kp
msgid "North Korea"
msgstr ""
@@ -12813,7 +13416,7 @@ msgid "Not Installed"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1365
+#: code:addons/base/models/ir_model.py:1395
#, python-format
msgid "Not enough access rights on the external ID:"
msgstr ""
@@ -12827,6 +13430,11 @@ msgid "Notes"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_note
+msgid "Notes, Reminders, Todos"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_ir_module_category__module_nr
msgid "Number of Apps"
msgstr ""
@@ -13434,6 +14042,16 @@ msgid "Odoo Mexican Localization Reports"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx_edi_customs
+msgid "Odoo Mexico Localization for Invoice with customs Number"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx_edi_landing
+msgid "Odoo Mexico Localization for Stock/Landing"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,summary:base.module_web_mobile
msgid "Odoo Mobile Core module"
msgstr ""
@@ -14023,19 +14641,19 @@ msgid "On delete property for many2one fields"
msgstr ""
#. module: base
-#: code:addons/models.py:2782
+#: code:addons/models.py:2881
#, python-format
msgid "One of the documents you are trying to access has been deleted, please try again after refreshing."
msgstr ""
#. module: base
-#: code:addons/models.py:3122
+#: code:addons/models.py:3221
#, python-format
msgid "One of the records you are trying to modify has already been deleted (Document type: %s)."
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:391
+#: code:addons/base/models/res_partner.py:401
#, python-format
msgid "One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`"
msgstr ""
@@ -14097,13 +14715,13 @@ msgid "Only one currency rate per day allowed!"
msgstr ""
#. module: base
-#: code:addons/base/wizard/base_partner_merge.py:286
+#: code:addons/base/wizard/base_partner_merge.py:291
#, python-format
msgid "Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1179
+#: code:addons/base/models/ir_model.py:1209
#, python-format
msgid "Only users with the following access level are currently allowed to do that"
msgstr ""
@@ -14428,19 +15046,6 @@ msgid "Original View"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:773
-#: code:addons/base/models/res_users.py:938
-#, python-format
-msgid "Other"
-msgstr ""
-
-#. module: base
-#: model:ir.module.category,name:base.module_category_extra
-#: model:ir.ui.view,arch_db:base.user_groups_view
-msgid "Other Extra Rights"
-msgstr ""
-
-#. module: base
#: selection:ir.module.module,license:0
msgid "Other OSI Approved Licence"
msgstr ""
@@ -14497,6 +15102,12 @@ msgid "Output DPI"
msgstr ""
#. module: base
+#: code:addons/models.py:1995
+#, python-format
+msgid "Output name %r is used twice."
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_base_language_import__overwrite
#: model:ir.model.fields,field_description:base.field_base_language_install__overwrite
msgid "Overwrite Existing Terms"
@@ -14640,19 +15251,15 @@ msgid "Parent Company"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_left
-msgid "Parent Left"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_id
#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__menu_id
msgid "Parent Menu"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_right
-msgid "Parent Right"
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_path
+#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_path
+msgid "Parent Path"
msgstr ""
#. module: base
@@ -14702,7 +15309,7 @@ msgid "Partners Geolocation"
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:764
+#: code:addons/base/models/res_partner.py:782
#, python-format
msgid "Partners: "
msgstr ""
@@ -14714,11 +15321,6 @@ msgid "Password"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_auth_crypt
-msgid "Password Encryption"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_logging__path
msgid "Path"
msgstr ""
@@ -14883,13 +15485,19 @@ msgid "Plano de contas SNC para Portugal"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1182
+#: code:addons/base/models/ir_mail_server.py:164
+#, python-format
+msgid "Please configure an email on the current user to simulate sending an email message via this outgoing server"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_model.py:1212
#, python-format
msgid "Please contact your system administrator if you think this is an error."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:218
+#: code:addons/base/models/ir_mail_server.py:241
#, python-format
msgid "Please define at least one SMTP server, or provide the SMTP parameters explicitly."
msgstr ""
@@ -14900,7 +15508,13 @@ msgid "Please set the Model to Create before choosing values"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:251
+#: code:addons/base/models/ir_model.py:490
+#, python-format
+msgid "Please specify a valid model for the object relation"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/res_users.py:320
#, python-format
msgid "Please use the change password wizard (in User Preferences or User menu) to change your own password."
msgstr ""
@@ -15084,7 +15698,17 @@ msgid "Priority"
msgstr ""
#. module: base
-#: code:addons/models.py:111
+#: selection:res.partner,type:0
+msgid "Private Address"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
+msgid "Private Address Form"
+msgstr ""
+
+#. module: base
+#: code:addons/models.py:113
#, python-format
msgid "Private methods (such as %s) cannot be called remotely."
msgstr ""
@@ -15105,13 +15729,13 @@ msgid "Product Email Template"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_mrp_plm
-msgid "Product Lifecycle Management (PLM)"
+#: model:ir.module.module,shortdesc:base.module_mrp_bom_cost
+msgid "Product Extension: Compute cost from BoM"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_product_extended
-msgid "Product extension to track sales and purchases"
+#: model:ir.module.module,shortdesc:base.module_mrp_plm
+msgid "Product Lifecycle Management (PLM)"
msgstr ""
#. module: base
@@ -15248,7 +15872,7 @@ msgid "Properties"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:651
+#: code:addons/base/models/ir_model.py:675
#, python-format
msgid "Properties of base fields cannot be altered in this manner! Please modify them through Python code, preferably through a custom addon!"
msgstr ""
@@ -15336,6 +15960,16 @@ msgid "Purchase Orders, Receipts, Vendor Bills"
msgstr ""
#. module: base
+#: model:ir.module.module,summary:base.module_purchase_stock
+msgid "Purchase Orders, Receipts, Vendor Bills for Stock"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_stock
+msgid "Purchase Stock"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_purchase_mrp
msgid "Purchase and MRP Management"
msgstr ""
@@ -15428,7 +16062,7 @@ msgid "Quotations, Sales Orders, Invoicing"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:350
+#: code:addons/base/models/ir_ui_view.py:349
#, python-format
msgid "Qweb view cannot have 'Groups' define on the record. Use 'groups' attributes inside the view definition"
msgstr ""
@@ -15439,6 +16073,16 @@ msgid "R ARTS, ENTERTAINMENT AND RECREATION"
msgstr ""
#. module: base
+#: model:res.country,vat_label:base.mx
+msgid "RFC"
+msgstr ""
+
+#. module: base
+#: model:res.country,vat_label:base.do
+msgid "RNC"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_res_currency_rate__rate
msgid "Rate"
msgstr ""
@@ -15506,8 +16150,8 @@ msgid "Record cannot be modified right now: This cron task is currently being ex
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions.py:238
-#: code:addons/models.py:3915
+#: code:addons/base/models/ir_actions.py:239
+#: code:addons/models.py:3940
#, python-format
msgid "Record does not exist or has been deleted."
msgstr ""
@@ -15529,19 +16173,19 @@ msgid "Recurring invoicing, renewals"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:352
+#: code:addons/base/models/ir_module.py:344
#, python-format
msgid "Recursion error in modules dependencies !"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions.py:397
+#: code:addons/base/models/ir_actions.py:398
#, python-format
msgid "Recursion found in child server actions"
msgstr ""
#. module: base
-#: code:addons/models.py:3452
+#: code:addons/models.py:3499
#, python-format
msgid "Recursivity Detected."
msgstr ""
@@ -15573,13 +16217,18 @@ msgid "Related Server Action"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:408
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__related_field_id
+msgid "Related field"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_model.py:425
#, python-format
msgid "Related field '%s' does not have comodel '%s'"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:406
+#: code:addons/base/models/ir_model.py:423
#, python-format
msgid "Related field '%s' does not have type '%s'"
msgstr ""
@@ -15600,6 +16249,11 @@ msgid "Relation Table"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_fields__relation_field_id
+msgid "Relation field"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_ir_actions_report__attachment_use
msgid "Reload from Attachment"
msgstr ""
@@ -15695,7 +16349,6 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.reporting_menuitem
-#: model:ir.ui.menu,name:base.reports_menuitem
msgid "Reporting"
msgstr ""
@@ -15704,6 +16357,7 @@ msgstr ""
#: model:ir.actions.act_window,name:base.reports_action
#: model:ir.model.fields,field_description:base.field_ir_module_module__reports_by_module
#: model:ir.ui.menu,name:base.menu_ir_action_report
+#: model:ir.ui.menu,name:base.reports_menuitem
msgid "Reports"
msgstr ""
@@ -15719,7 +16373,7 @@ msgid "Resellers"
msgstr ""
#. module: base
-#: code:addons/models.py:803
+#: code:addons/models.py:868
#, python-format
msgid "Resolve other errors first"
msgstr ""
@@ -15787,11 +16441,6 @@ msgid "Right Margin (mm)"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category__parent_right
-msgid "Right parent"
-msgstr ""
-
-#. module: base
#: selection:res.lang,direction:0
msgid "Right-to-Left"
msgstr ""
@@ -16316,6 +16965,11 @@ msgid "Send text messages as event reminders"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_delivery_easypost
+msgid "Send your parcels through Easypost and track them online"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,description:base.module_delivery_dhl
msgid "Send your shippings through DHL and track them online"
msgstr ""
@@ -16450,7 +17104,7 @@ msgid "Setting a value makes this action available in the sidebar for the given
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:559
+#: code:addons/base/models/res_users.py:637
#, python-format
msgid "Setting empty passwords is not allowed for security reasons!"
msgstr ""
@@ -16639,25 +17293,25 @@ msgstr ""
#. module: base
#: code:addons/base/models/ir_attachment.py:342
-#: code:addons/base/models/ir_model.py:1173
+#: code:addons/base/models/ir_model.py:1203
#, python-format
msgid "Sorry, you are not allowed to access this document."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1175
+#: code:addons/base/models/ir_model.py:1205
#, python-format
msgid "Sorry, you are not allowed to create this kind of document."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1176
+#: code:addons/base/models/ir_model.py:1206
#, python-format
msgid "Sorry, you are not allowed to delete this document."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:1174
+#: code:addons/base/models/ir_model.py:1204
#, python-format
msgid "Sorry, you are not allowed to modify this document."
msgstr ""
@@ -16668,7 +17322,7 @@ msgid "Sort"
msgstr ""
#. module: base
-#: code:addons/models.py:3653
+#: code:addons/models.py:3678
#, python-format
msgid "Sorting field %s not found on model %s"
msgstr ""
@@ -16779,6 +17433,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__state
#: model:ir.model.fields,field_description:base.field_res_partner__state_id
#: model:ir.model.fields,field_description:base.field_res_users__state_id
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_country_state_form
#: model:ir.ui.view,arch_db:base.view_country_state_tree
@@ -16838,11 +17493,6 @@ msgid "Sticky memos, Collaborative"
msgstr ""
#. module: base
-#: model:ir.module.module,summary:base.module_note
-msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
-
-#. module: base
#: model:ir.module.category,name:base.module_category_stock
msgid "Stock"
msgstr ""
@@ -16876,6 +17526,7 @@ msgid "Street"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_partner_address_form
#: model:ir.ui.view,arch_db:base.view_partner_form
@@ -16885,6 +17536,7 @@ msgid "Street 2..."
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_partner_address_form
#: model:ir.ui.view,arch_db:base.view_partner_form
@@ -17068,8 +17720,7 @@ msgstr ""
#. module: base
#: model:ir.ui.view,arch_db:base.wizard_lang_export
-msgid "TGZ format: this is a compressed archive containing a PO file, directly suitable\n"
-" for uploading to Odoo's translation platform,"
+msgid "TGZ format: bundles multiple PO(T) files as a single archive"
msgstr ""
#. module: base
@@ -17139,6 +17790,11 @@ msgid "Tax Identification Number. Fill it if the company is subjected to taxes.
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_website_sale_taxcloud_delivery
+msgid "TaxCloud and Delivery - Ecommerce"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,summary:base.module_account_taxcloud
msgid "TaxCloud make it easy for business to comply with sales tax law"
msgstr ""
@@ -17159,6 +17815,7 @@ msgid "Technical Data"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__has_group_no_one
#: model:res.groups,name:base.group_no_one
msgid "Technical Features"
msgstr ""
@@ -17170,13 +17827,13 @@ msgid "Technical Name"
msgstr ""
#. module: base
-#: model:ir.module.category,name:base.module_category_hidden
#: model:ir.module.category,name:base.module_category_technical_settings
+#: model:ir.ui.view,arch_db:base.view_users_form
msgid "Technical Settings"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_translation.py:753
+#: code:addons/base/models/ir_translation.py:759
#, python-format
msgid "Technical Translations"
msgstr ""
@@ -17263,7 +17920,7 @@ msgid "Thailand - Accounting Reports"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:291
+#: code:addons/base/models/res_users.py:360
#, python-format
msgid "The \"App Switcher\" action cannot be selected as home action."
msgstr ""
@@ -17275,7 +17932,7 @@ msgid "The ISO country code in two chars. \n"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:367
+#: code:addons/base/models/ir_model.py:384
#, python-format
msgid "The Selection Options expression is not a valid Pythonic expression. Please provide an expression in the [('key','Label'), ...] format."
msgstr ""
@@ -17292,13 +17949,13 @@ msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:758
+#: code:addons/base/models/ir_module.py:750
#, python-format
msgid "The `%s` module appears to be unavailable at the moment, please try again later."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:572
+#: code:addons/base/models/ir_module.py:564
#, python-format
msgid "The `base` module cannot be uninstalled"
msgstr ""
@@ -17309,7 +17966,7 @@ msgid "The active field allows you to hide the category without removing it."
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:284
+#: code:addons/base/models/res_users.py:353
#, python-format
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
@@ -17365,7 +18022,7 @@ msgid "The database object this attachment will be attached to."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:557
+#: code:addons/base/models/ir_model.py:581
#, python-format
msgid "The field '%s' cannot be removed because the field '%s' depends on it."
msgstr ""
@@ -17464,7 +18121,7 @@ msgid "The name of the country must be unique !"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:153
+#: code:addons/base/models/res_users.py:143
#, python-format
msgid "The name of the group can not start with \"-\""
msgstr ""
@@ -17545,15 +18202,15 @@ msgid "The record id this is attached to."
msgstr ""
#. module: base
-#: code:addons/models.py:2683
+#: code:addons/models.py:2782
#, python-format
msgid "The requested operation cannot be completed due to record rules: Document type: %s, Operation: %s, Records: %s, User: %s"
msgstr ""
#. module: base
-#: code:addons/models.py:2478
-#: code:addons/models.py:2687
-#: code:addons/models.py:2772
+#: code:addons/models.py:2577
+#: code:addons/models.py:2786
+#: code:addons/models.py:2871
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -17576,12 +18233,30 @@ msgid "The selected modules have been updated / installed !"
msgstr ""
#. module: base
+#: code:addons/base/models/ir_mail_server.py:169
+#, python-format
+msgid "The server refused the sender address (%(email_from)s) with error %(repl)s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_mail_server.py:181
+#, python-format
+msgid "The server refused the test connection with error %(repl)s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_mail_server.py:174
+#, python-format
+msgid "The server refused the test recipient (%(email_to)s) with error %(repl)s"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,help:base.field_res_country_state__code
msgid "The state code."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:492
+#: code:addons/base/models/ir_model.py:516
#, python-format
msgid "The table %r if used for other, possibly incompatible fields."
msgstr ""
@@ -17602,13 +18277,13 @@ msgid "The user this filter is private to. When left empty the filter is public
msgstr ""
#. module: base
-#: code:addons/models.py:5208
+#: code:addons/models.py:5209
#, python-format
msgid "The value for the field '%s' already exists (this is probably '%s' in the current model)."
msgstr ""
#. module: base
-#: code:addons/models.py:5214
+#: code:addons/models.py:5215
#, python-format
msgid "The values for the fields '%s' already exist (they are probably '%s' in the current model)."
msgstr ""
@@ -17640,7 +18315,7 @@ msgid "This Window"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:585
+#: code:addons/base/models/ir_model.py:609
#, python-format
msgid "This column contains module data and cannot be removed!"
msgstr ""
@@ -17694,6 +18369,12 @@ msgid "This module contains tests related to mail. Those are\n"
msgstr ""
#. module: base
+#: model:ir.module.module,description:base.module_website_sale_taxcloud_delivery
+msgid "This module ensures that when delivery price is computed online, and taxes are computed with TaxCloud, the tax computation is done correctly on both the order and delivery.\n"
+" "
+msgstr ""
+
+#. module: base
#: model:ir.ui.view,arch_db:base.view_base_module_upgrade
msgid "This module will trigger the uninstallation of below modules."
msgstr ""
@@ -17739,6 +18420,11 @@ msgid "Timesheet Validation and Grid View"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_timesheet_forecast
+msgid "Timesheet and Forecast"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_project_timesheet_holidays
msgid "Timesheet when on Leaves"
msgstr ""
@@ -17821,7 +18507,7 @@ msgid "To be upgraded"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:731
+#: code:addons/base/models/ir_module.py:723
#, python-format
msgid "To enable it, make sure this directory exists and is writable on the server:"
msgstr ""
@@ -17961,7 +18647,7 @@ msgid "Translation comments"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_translation.py:631
+#: code:addons/base/models/ir_translation.py:637
#, python-format
msgid "Translation features are unavailable until you install an extra translation."
msgstr ""
@@ -17972,7 +18658,7 @@ msgid "Translation in Progress"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_translation.py:552
+#: code:addons/base/models/ir_translation.py:558
#, python-format
msgid "Translation is not valid:\n"
"%s"
@@ -18057,6 +18743,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_model_fields__state
#: model:ir.model.fields,field_description:base.field_ir_property__type
#: model:ir.model.fields,field_description:base.field_ir_translation__type
+#: model:ir.model.fields,field_description:base.field_res_partner_bank__acc_type
#: model:ir.ui.view,arch_db:base.ir_logging_search_view
#: model:ir.ui.view,arch_db:base.view_attachment_search
#: model:ir.ui.view,arch_db:base.view_view_search
@@ -18158,31 +18845,31 @@ msgid "Ukraine"
msgstr ""
#. module: base
-#: code:addons/models.py:2848
+#: code:addons/models.py:2947
#, python-format
msgid "Unable to delete this document because it is used as a default property"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions_report.py:622
+#: code:addons/base/models/ir_actions_report.py:629
#, python-format
msgid "Unable to find Wkhtmltopdf on this system. The PDF can not be created."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:342
+#: code:addons/base/models/ir_module.py:334
#, python-format
msgid "Unable to install module \"%s\" because an external dependency is not met: %s"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:346
+#: code:addons/base/models/ir_module.py:338
#, python-format
msgid "Unable to process module \"%s\" because an external dependency is not met: %s"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:344
+#: code:addons/base/models/ir_module.py:336
#, python-format
msgid "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
msgstr ""
@@ -18193,14 +18880,14 @@ msgid "Uncategorized"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:575
+#: code:addons/base/models/ir_module.py:567
#: model:ir.ui.view,arch_db:base.module_form
#, python-format
msgid "Uninstall"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:584
+#: code:addons/base/models/ir_module.py:576
#: model:ir.ui.view,arch_db:base.view_base_module_uninstall
#, python-format
msgid "Uninstall module"
@@ -18239,31 +18926,36 @@ msgid "United States Postal Service (USPS) Shipping"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_uom
+msgid "Units of measure"
+msgstr ""
+
+#. module: base
#: selection:ir.module.module.dependency,state:0
#: selection:ir.module.module.exclusion,state:0
msgid "Unknown"
msgstr ""
#. module: base
-#: code:addons/models.py:941
+#: code:addons/models.py:1003
#, python-format
msgid "Unknown database identifier '%s'"
msgstr ""
#. module: base
-#: code:addons/models.py:802
+#: code:addons/models.py:867
#, python-format
msgid "Unknown error during import:"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:437
+#: code:addons/base/models/ir_model.py:454
#, python-format
msgid "Unknown field %r in dependency %r"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:394
+#: code:addons/base/models/ir_model.py:411
#, python-format
msgid "Unknown field name '%s' in related field '%s'"
msgstr ""
@@ -18281,7 +18973,7 @@ msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
msgstr ""
#. module: base
-#: code:addons/translate.py:708
+#: code:addons/translate.py:712
#, python-format
msgid "Unrecognized extension: must be one of .csv, .po, or .tgz (received .%s)."
msgstr ""
@@ -18469,11 +19161,26 @@ msgid "User Login"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.view_users_form
+msgid "User Type"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,field_description:base.field_res_users__log_ids
msgid "User log entries"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_res_users__group_base_user
+msgid "User type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_user_type
+msgid "User types"
+msgstr ""
+
+#. module: base
#: model:ir.actions.act_window,name:base.ir_default_menu_action
#: model:ir.ui.menu,name:base.ir_default_menu
#: model:ir.ui.view,arch_db:base.ir_default_form_view
@@ -18483,6 +19190,7 @@ msgid "User-defined Defaults"
msgstr ""
#. module: base
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
#: model:ir.ui.menu,name:base.menu_ir_filters
msgid "User-defined Filters"
msgstr ""
@@ -18769,7 +19477,7 @@ msgid "View type: Tree type to use for the tree view, set to 'tree' for a hierar
msgstr ""
#. module: base
-#: code:addons/base/models/ir_model.py:571
+#: code:addons/base/models/ir_model.py:595
#, python-format
msgid "View: %s"
msgstr ""
@@ -18846,10 +19554,10 @@ msgid "Warehouse Management: Batch Picking"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:476
-#: code:addons/base/models/ir_model.py:416
-#: code:addons/base/models/ir_model.py:491
-#: code:addons/base/models/res_partner.py:336
+#: code:addons/base/models/ir_mail_server.py:498
+#: code:addons/base/models/ir_model.py:433
+#: code:addons/base/models/ir_model.py:515
+#: code:addons/base/models/res_partner.py:346
#, python-format
msgid "Warning"
msgstr ""
@@ -18861,7 +19569,7 @@ msgid "Warning!"
msgstr ""
#. module: base
-#: code:addons/models.py:4924
+#: code:addons/models.py:4953
#, python-format
msgid "Warnings"
msgstr ""
@@ -19023,18 +19731,28 @@ msgid "Website Sale Coupon"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_website_sale_dashboard
+msgid "Website Sale Dashboard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_website_sale_dashboard_with_margin
+msgid "Website Sale Dashboard With Margin"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_website_sale_digital
msgid "Website Sale Digital - Sell digital products"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_sale_stock
-msgid "Website Sale Stock - Website Delivery Information"
+#: model:ir.module.module,shortdesc:base.module_website_sale_stock_options
+msgid "Website Sale Stock & Options"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_website_sale_stock_options
-msgid "Website Sale Stock&Options"
+#: model:ir.module.module,shortdesc:base.module_website_sale_stock
+msgid "Website Sale Stock - Website Delivery Information"
msgstr ""
#. module: base
@@ -19048,6 +19766,11 @@ msgid "Website Studio"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_website_survey
+msgid "Website Survey"
+msgstr ""
+
+#. module: base
#: model:ir.module.module,shortdesc:base.module_website_theme_install
msgid "Website Theme Install"
msgstr ""
@@ -19149,13 +19872,13 @@ msgid "Wizards to be Launched"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions_report.py:393
+#: code:addons/base/models/ir_actions_report.py:396
#, python-format
msgid "Wkhtmltopdf failed (error code: %s). Memory limit too low or maximum file number of subprocess reached. Message : %s"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_actions_report.py:396
+#: code:addons/base/models/ir_actions_report.py:399
#, python-format
msgid "Wkhtmltopdf failed (error code: %s). Message: %s"
msgstr ""
@@ -19204,24 +19927,35 @@ msgstr ""
#. module: base
#: model:ir.ui.view,arch_db:base.view_users_simple_form
-msgid "You are creating a new user. After saving, the user will receive an invite email containing a link to set its password."
+msgid "You are inviting a new user."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:429
+#: code:addons/base/models/ir_module.py:421
#, python-format
msgid "You are trying to install incompatible modules in category \"%s\":"
msgstr ""
#. module: base
+#: code:addons/base/models/ir_module.py:306
+#, python-format
+msgid "You are trying to remove a module that is installed or will be installed."
+msgstr ""
+
+#. module: base
+#: model:ir.ui.view,arch_db:base.view_users_form
+msgid "You can archive the contact"
+msgstr ""
+
+#. module: base
#: model:ir.model.fields,help:base.field_ir_attachment__type
msgid "You can either upload a file from your computer or copy/paste an internet link to your file."
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:505
+#: code:addons/base/models/res_partner.py:84
#, python-format
-msgid "You can not change the company as the partner/user has multiple user linked with different companies."
+msgid "You can not create recursive tags."
msgstr ""
#. module: base
@@ -19230,31 +19964,50 @@ msgid "You can not have two users with the same login !"
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:387
+#: code:addons/base/models/res_users.py:468
#, python-format
msgid "You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)"
msgstr ""
#. module: base
-#: code:addons/base/models/res_partner.py:319
+#: code:addons/base/models/report_paperformat.py:68
+#, python-format
+msgid "You can select either a format or a specific page width/height, but not both."
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/res_partner.py:243
+#: code:addons/base/models/res_partner.py:503
+#, python-format
+msgid "You cannot archive a contact linked to an internal user."
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/res_partner.py:327
#, python-format
msgid "You cannot create recursive Partner hierarchies."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:357
+#: code:addons/base/models/res_company.py:245
+#, python-format
+msgid "You cannot create recursive companies."
+msgstr ""
+
+#. module: base
+#: code:addons/base/models/ir_ui_view.py:356
#, python-format
msgid "You cannot create recursive inherited views."
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:344
+#: code:addons/base/models/res_users.py:421
#, python-format
msgid "You cannot deactivate the admin user."
msgstr ""
#. module: base
-#: code:addons/base/models/res_users.py:346
+#: code:addons/base/models/res_users.py:423
#, python-format
msgid "You cannot deactivate the user you're currently logged in as."
msgstr ""
@@ -19269,19 +20022,19 @@ msgstr ""
#. module: base
#: code:addons/base/models/res_lang.py:243
#, python-format
-msgid "You cannot delete the language which is User's Preferred Language!"
+msgid "You cannot delete the language which is the user's preferred language."
msgstr ""
#. module: base
-#: code:addons/base/wizard/base_partner_merge.py:269
+#: code:addons/base/wizard/base_partner_merge.py:275
#, python-format
msgid "You cannot merge a contact with one of his parent."
msgstr ""
#. module: base
-#: code:addons/base/wizard/base_partner_merge.py:364
+#: code:addons/base/wizard/base_partner_merge.py:374
#, python-format
-msgid "You have to specify a filter for your selection"
+msgid "You have to specify a filter for your selection."
msgstr ""
#. module: base
@@ -19290,31 +20043,20 @@ msgid "You should try other search criteria."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:362
+#: code:addons/base/models/ir_module.py:354
#, python-format
msgid "You try to install module '%s' that depends on module '%s'.\n"
"But the latter module is not available in your system."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_module.py:306
-#, python-format
-msgid "You try to remove a module that is installed or will be installed"
-msgstr ""
-
-#. module: base
-#: code:addons/base/models/ir_module.py:628
+#: code:addons/base/models/ir_module.py:620
#, python-format
msgid "You try to upgrade the module %s that depends on the module: %s.\n"
"But this module is not available in your system."
msgstr ""
#. module: base
-#: model:ir.ui.view,arch_db:base.view_users_simple_form
-msgid "You will be able to define additional access rights by editing the newly created user under the Settings / Users menu."
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_website_crm
msgid "Your Contact Form\n"
"-----------------\n"
@@ -19335,18 +20077,19 @@ msgid "Your Contact Form\n"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:224
+#: code:addons/base/models/ir_mail_server.py:247
#, python-format
msgid "Your Odoo Server does not support SMTP-over-SSL. You could use STARTTLS instead. If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
msgstr ""
#. module: base
-#: code:addons/base/models/ir_mail_server.py:477
+#: code:addons/base/models/ir_mail_server.py:499
#, python-format
msgid "Your server does not seem to support SSL, you may want to try STARTTLS instead"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.res_partner_view_form_private
#: model:ir.ui.view,arch_db:base.view_company_form
#: model:ir.ui.view,arch_db:base.view_partner_address_form
#: model:ir.ui.view,arch_db:base.view_partner_form
@@ -19400,7 +20143,7 @@ msgid "account_plaid"
msgstr ""
#. module: base
-#: code:addons/base/models/res_currency.py:113
+#: code:addons/base/models/res_currency.py:124
#, python-format
msgid "and"
msgstr ""
@@ -19889,7 +20632,7 @@ msgid "monetary"
msgstr ""
#. module: base
-#: code:addons/base/models/ir_ui_view.py:488
+#: code:addons/base/models/ir_ui_view.py:493
#, python-format
msgid "n/a"
msgstr ""
@@ -20053,6 +20796,11 @@ msgid "true"
msgstr ""
#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_dashboard
+msgid "web_dashboard"
+msgstr ""
+
+#. module: base
#: model:ir.model,name:base.model_wizard_ir_model_menu_create
msgid "wizard.ir.model.menu.create"
msgstr ""