summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2017-07-25 12:26:34 +0200
committerMartin Trigaux <mat@odoo.com>2017-07-25 12:26:50 +0200
commit044b8b1240e6b294d26df10fa4518b97ae4879f0 (patch)
treeedf9d0dfc3b08e202ca6fd5ba6fbc943a2c43ac5
parenta4e30a1b43d0b9acd76508d9e6c466cd1dbdffab (diff)
[I18N] export saas-16 source terms
-rw-r--r--.tx/config35
-rw-r--r--addons/account/i18n/account.pot1109
-rw-r--r--addons/account_accountant/i18n/account_accountant.pot8
-rw-r--r--addons/account_asset/i18n/account_asset.pot47
-rw-r--r--addons/account_bank_statement_import/i18n/account_bank_statement_import.pot99
-rw-r--r--addons/account_check_printing/i18n/account_check_printing.pot29
-rw-r--r--addons/barcodes/i18n/barcodes.pot34
-rw-r--r--addons/base_address_extended/i18n/base_address_extended.pot18
-rw-r--r--addons/base_sparse_field/i18n/base_sparse_field.pot135
-rw-r--r--addons/board/i18n/board.pot24
-rw-r--r--addons/calendar/i18n/calendar.pot75
-rw-r--r--addons/crm/i18n/crm.pot137
-rw-r--r--addons/crm_phone_validation/i18n/crm_phone_validation.pot42
-rw-r--r--addons/delivery/i18n/delivery.pot43
-rw-r--r--addons/document/i18n/document.pot31
-rw-r--r--addons/event/i18n/event.pot51
-rw-r--r--addons/fleet/i18n/fleet.pot127
-rw-r--r--addons/gamification/i18n/gamification.pot362
-rw-r--r--addons/gamification_sale_crm/i18n/gamification_sale_crm.pot10
-rw-r--r--addons/google_spreadsheet/i18n/google_spreadsheet.pot14
-rw-r--r--addons/hr/i18n/hr.pot133
-rw-r--r--addons/hr_contract/i18n/hr_contract.pot124
-rw-r--r--addons/hr_expense/i18n/hr_expense.pot57
-rw-r--r--addons/hr_expense_check/i18n/hr_expense_check.pot57
-rw-r--r--addons/hr_holidays/i18n/hr_holidays.pot82
-rw-r--r--addons/hr_org_chart/i18n/hr_org_chart.pot95
-rw-r--r--addons/hr_payroll/i18n/hr_payroll.pot103
-rw-r--r--addons/hr_recruitment/i18n/hr_recruitment.pot51
-rw-r--r--addons/hr_timesheet/i18n/hr_timesheet.pot99
-rw-r--r--addons/mail/i18n/mail.pot357
-rw-r--r--addons/maintenance/i18n/maintenance.pot73
-rw-r--r--addons/mass_mailing/i18n/mass_mailing.pot60
-rw-r--r--addons/mass_mailing_event/i18n/mass_mailing_event.pot27
-rw-r--r--addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot27
-rw-r--r--addons/mrp/i18n/mrp.pot233
-rw-r--r--addons/mrp_repair/i18n/mrp_repair.pot155
-rw-r--r--addons/pad/i18n/pad.pot36
-rw-r--r--addons/payment/i18n/payment.pot48
-rw-r--r--addons/payment_authorize/i18n/payment_authorize.pot12
-rw-r--r--addons/phone_validation/i18n/phone_validation.pot78
-rw-r--r--addons/point_of_sale/i18n/point_of_sale.pot802
-rw-r--r--addons/pos_sale/i18n/pos_sale.pot18
-rw-r--r--addons/product/i18n/product.pot89
-rw-r--r--addons/project/i18n/project.pot59
-rw-r--r--addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot120
-rw-r--r--addons/purchase/i18n/purchase.pot63
-rw-r--r--addons/report_intrastat/i18n/report_intrastat.pot20
-rw-r--r--addons/resource/i18n/resource.pot61
-rw-r--r--addons/sale/i18n/sale.pot103
-rw-r--r--addons/sale_stock/i18n/sale_stock.pot56
-rw-r--r--addons/sale_timesheet/i18n/sale_timesheet.pot258
-rw-r--r--addons/sales_team/i18n/sales_team.pot110
-rw-r--r--addons/stock/i18n/stock.pot362
-rw-r--r--addons/stock_account/i18n/stock_account.pot74
-rw-r--r--addons/web/i18n/web.pot1293
-rw-r--r--addons/web_diagram/i18n/web_diagram.pot48
-rw-r--r--addons/website_customer/i18n/website_customer.pot20
-rw-r--r--addons/website_event/i18n/website_event.pot94
-rw-r--r--addons/website_hr_recruitment/i18n/website_hr_recruitment.pot93
-rw-r--r--addons/website_partner/i18n/website_partner.pot38
-rw-r--r--addons/website_portal/i18n/website_portal.pot205
-rw-r--r--addons/website_portal_purchase/i18n/website_portal_purchase.pot158
-rw-r--r--addons/website_portal_sale/i18n/website_portal_sale.pot68
-rw-r--r--addons/website_project/i18n/website_project.pot46
-rw-r--r--addons/website_project_issue/i18n/website_project_issue.pot33
-rw-r--r--addons/website_quote/i18n/website_quote.pot35
-rw-r--r--addons/website_sale/i18n/website_sale.pot183
-rw-r--r--addons/website_sale_comparison/i18n/website_sale_comparison.pot170
-rw-r--r--addons/website_sale_wishlist/i18n/website_sale_wishlist.pot160
-rw-r--r--odoo/addons/base/i18n/base.pot330
70 files changed, 6065 insertions, 3441 deletions
diff --git a/.tx/config b/.tx/config
index c6806928d84..969ececfaeb 100644
--- a/.tx/config
+++ b/.tx/config
@@ -187,6 +187,11 @@ file_filter = addons/crm_livechat/i18n/<lang>.po
source_file = addons/crm_livechat/i18n/crm_livechat.pot
source_lang = en
+[odoo-master.crm_phone_validation]
+file_filter = addons/crm_phone_validation/i18n/<lang>.po
+source_file = addons/crm_phone_validation/i18n/crm_phone_validation.pot
+source_lang = en
+
[odoo-master.crm_project_issue]
file_filter = addons/crm_project_issue/i18n/<lang>.po
source_file = addons/crm_project_issue/i18n/crm_project_issue.pot
@@ -297,6 +302,11 @@ file_filter = addons/hr_maintenance/i18n/<lang>.po
source_file = addons/hr_maintenance/i18n/hr_maintenance.pot
source_lang = en
+[odoo-master.hr_org_chart]
+file_filter = addons/hr_org_chart/i18n/<lang>.po
+source_file = addons/hr_org_chart/i18n/hr_org_chart.pot
+source_lang = en
+
[odoo-master.hr_payroll]
file_filter = addons/hr_payroll/i18n/<lang>.po
source_file = addons/hr_payroll/i18n/hr_payroll.pot
@@ -377,6 +387,16 @@ file_filter = addons/mass_mailing/i18n/<lang>.po
source_file = addons/mass_mailing/i18n/mass_mailing.pot
source_lang = en
+[odoo-master.mass_mailing_event]
+file_filter = addons/mass_mailing_event/i18n/<lang>.po
+source_file = addons/mass_mailing_event/i18n/mass_mailing_event.pot
+source_lang = en
+
+[odoo-master.mass_mailing_event_track]
+file_filter = addons/mass_mailing_event_track/i18n/<lang>.po
+source_file = addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
+source_lang = en
+
[odoo-master.membership]
file_filter = addons/membership/i18n/<lang>.po
source_file = addons/membership/i18n/membership.pot
@@ -467,6 +487,11 @@ file_filter = addons/payment_transfer/i18n/<lang>.po
source_file = addons/payment_transfer/i18n/payment_transfer.pot
source_lang = en
+[odoo-master.phone_validation]
+file_filter = addons/phone_validation/i18n/<lang>.po
+source_file = addons/phone_validation/i18n/phone_validation.pot
+source_lang = en
+
[odoo-master.point_of_sale]
file_filter = addons/point_of_sale/i18n/<lang>.po
source_file = addons/point_of_sale/i18n/point_of_sale.pot
@@ -557,6 +582,11 @@ file_filter = addons/project_issue_sheet/i18n/<lang>.po
source_file = addons/project_issue_sheet/i18n/project_issue_sheet.pot
source_lang = en
+[odoo-master.project_timesheet_holidays]
+file_filter = addons/project_timesheet_holidays/i18n/<lang>.po
+source_file = addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
+source_lang = en
+
[odoo-master.purchase]
file_filter = addons/purchase/i18n/<lang>.po
source_file = addons/purchase/i18n/purchase.pot
@@ -867,6 +897,11 @@ file_filter = addons/website_portal_sale/i18n/<lang>.po
source_file = addons/website_portal_sale/i18n/website_portal_sale.pot
source_lang = en
+[odoo-master.website_portal_purchase]
+file_filter = addons/website_portal_purchase/i18n/<lang>.po
+source_file = addons/website_portal_purchase/i18n/website_portal_purchase.pot
+source_lang = en
+
[odoo-master.website_project]
file_filter = addons/website_project/i18n/<lang>.po
source_file = addons/website_project/i18n/website_project.pot
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 974411fb254..3d8be6134ce 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,9 +19,9 @@ msgstr ""
#: model:mail.template,body_html:account.email_template_edi_invoice
msgid "\n"
"<p>Dear ${object.partner_id.name}\n"
-"% set access_action = object.get_access_action()\n"
-"% set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id)\n"
+"% set access_action = object.with_context(force_website=True).get_access_action()\n"
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
+"% set access_url = is_online and '/mail/view?model=account.invoice&res_id=%d' % (object.id) or '/report/pdf/account.report_invoice/' + str(object.id)\n"
"\n"
"% if object.partner_id.parent_id:\n"
" (<i>${object.partner_id.parent_id.name}</i>)\n"
@@ -73,13 +73,6 @@ msgid " * The 'Draft' status is used when a user is encoding a new and unconfirm
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1501
-#, python-format
-msgid " seconds"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_chart_template_code_digits
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_code_digits
msgid "# of Digits"
@@ -126,21 +119,21 @@ msgid "${object.subject}"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:460
+#: code:addons/account/models/account_bank_statement.py:466
#, python-format
msgid "%d transactions were automatically reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:585
+#: code:addons/account/models/account.py:595
#, python-format
msgid "%s (Copy)"
msgstr ""
#. module: account
#: code:addons/account/models/account.py:128
-#: code:addons/account/models/account.py:299
#: code:addons/account/models/account.py:300
+#: code:addons/account/models/account.py:301
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -166,7 +159,7 @@ msgid "-> View partially reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:461
+#: code:addons/account/models/account_bank_statement.py:467
#, python-format
msgid "1 transaction was automatically reconciled."
msgstr ""
@@ -192,7 +185,7 @@ msgid ": General ledger"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:354
+#: code:addons/account/models/account.py:355
#, python-format
msgid ": Refund"
msgstr ""
@@ -303,6 +296,11 @@ msgid "<span class=\"fa\"/> Invite Your Users"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.partner_view_buttons
+msgid "<span class=\"o_stat_text\">Invoiced</span>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "<span class=\"panel-title\">\n"
" <span class=\"fa\" data-icon=\"\"/>\n"
@@ -428,6 +426,11 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "<span>Journal Entries</span>"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "<span>New Bill</span>"
msgstr ""
@@ -817,19 +820,19 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1425
+#: code:addons/account/models/account_invoice.py:1464
#, python-format
msgid "A Payment Terms should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1428
+#: code:addons/account/models/account_invoice.py:1467
#, python-format
msgid "A Payment Terms should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:501
+#: code:addons/account/models/account.py:511
#, python-format
msgid "A bank account can only belong to one journal."
msgstr ""
@@ -876,7 +879,7 @@ msgid "A product in Odoo is something you sell or buy \n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:800
+#: code:addons/account/models/account_move.py:791
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
@@ -887,14 +890,20 @@ 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:863
-#: code:addons/account/models/account_bank_statement.py:866
+#: code:addons/account/models/account_bank_statement.py:880
+#: code:addons/account/models/account_bank_statement.py:883
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:218
+#: code:addons/account/models/account_bank_statement.py:891
+#, python-format
+msgid "A selected statement line was already reconciled with an account move."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:225
#, python-format
msgid "A statement cannot be canceled when its lines are reconciled."
msgstr ""
@@ -905,7 +914,7 @@ msgid "A tax fiscal position could be defined only once time on same taxes."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:379
+#: code:addons/account/models/account_bank_statement.py:387
#, python-format
msgid "A transaction can't have a 0 amount."
msgstr ""
@@ -924,10 +933,11 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:98
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:103
-#: code:addons/account/static/src/xml/account_reconciliation.xml:144
-#: code:addons/account/static/src/xml/account_reconciliation.xml:273
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:467
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:469
+#: code:addons/account/static/src/xml/account_reconciliation.xml:168
+#: code:addons/account/static/src/xml/account_reconciliation.xml:217
+#: code:addons/account/static/src/xml/account_reconciliation.xml:242
#: model:ir.model,name:account.model_account_account
#: model:ir.model.fields,field_description:account.field_account_invoice_account_id
#: model:ir.model.fields,field_description:account.field_account_invoice_line_account_id
@@ -1047,6 +1057,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_property_account_payable_id
+#: model:ir.model.fields,field_description:account.field_res_users_property_account_payable_id
msgid "Account Payable"
msgstr ""
@@ -1062,6 +1073,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_property_account_receivable_id
+#: model:ir.model.fields,field_description:account.field_res_users_property_account_receivable_id
msgid "Account Receivable"
msgstr ""
@@ -1202,13 +1214,17 @@ msgid "Account tag"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_tax_refund_account_id
+msgid "Account that will be set on invoice tax lines for credit notes. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_tax_account_id
#: model:ir.model.fields,help:account.field_account_tax_template_account_id
msgid "Account that will be set on invoice tax lines for invoices. Leave empty to use the expense account."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_tax_refund_account_id
#: model:ir.model.fields,help:account.field_account_tax_template_refund_account_id
msgid "Account that will be set on invoice tax lines for refunds. Leave empty to use the expense account."
msgstr ""
@@ -1320,7 +1336,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
-msgid "Activate Other Currencies"
+msgid "Activate Currencies"
msgstr ""
#. module: account
@@ -1344,6 +1360,12 @@ msgid "Add"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
+#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
+msgid "Add Credit Note"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_has_second_line
#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_has_second_line
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -1423,12 +1445,9 @@ msgid "Aged Partner Balance is a more detailed report of your receivables by int
msgstr ""
#. module: account
-#. openerp-web
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
-#: code:addons/account/static/src/xml/account_reconciliation.xml:310
-#, python-format
msgid "All"
msgstr ""
@@ -1494,8 +1513,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:322
-#: code:addons/account/static/src/xml/account_reconciliation.xml:329
+#: code:addons/account/static/src/xml/account_reconciliation.xml:44
#, python-format
msgid "All invoices and payments have been matched, your accounts' balances are clean."
msgstr ""
@@ -1511,7 +1529,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:240
+#: code:addons/account/models/account_bank_statement.py:247
#, python-format
msgid "All the account entries lines must be processed in order to close the statement."
msgstr ""
@@ -1558,10 +1576,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:138
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:142
-#: code:addons/account/static/src/xml/account_reconciliation.xml:153
-#: code:addons/account/static/src/xml/account_reconciliation.xml:272
+#: code:addons/account/static/src/xml/account_reconciliation.xml:191
+#: code:addons/account/static/src/xml/account_reconciliation.xml:224
+#: code:addons/account/static/src/xml/account_reconciliation.xml:241
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
#: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount
@@ -1676,8 +1693,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:150
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:156
+#: code:addons/account/static/src/xml/account_reconciliation.xml:176
#, python-format
msgid "Analytic Acc."
msgstr ""
@@ -1771,20 +1787,24 @@ 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."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id
+#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id
msgid "Apply only if delivery or invocing country match the group."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_country_id
+#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id
msgid "Apply only if delivery or invoicing country match."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_fiscal_position_template_vat_required
#: model:ir.model.fields,help:account.field_account_fiscal_position_vat_required
msgid "Apply only if partner has a VAT number."
msgstr ""
@@ -1801,7 +1821,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "Ask Refund"
+msgid "Ask for a Credit Note"
msgstr ""
#. module: account
@@ -1856,13 +1876,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:15
+#: code:addons/account/static/src/xml/account_reconciliation.xml:24
#, python-format
msgid "Automatic reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:466
+#: code:addons/account/models/account_bank_statement.py:472
#, python-format
msgid "Automatically reconciled items"
msgstr ""
@@ -1879,7 +1899,7 @@ msgid "Awaiting payments"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:183
+#: code:addons/account/models/chart_template.py:186
#, python-format
msgid "BILL"
msgstr ""
@@ -1921,9 +1941,10 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:705
+#: code:addons/account/models/chart_template.py:736
#: model:ir.model.fields,field_description:account.field_account_journal_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
msgid "Bank"
msgstr ""
@@ -1945,8 +1966,13 @@ msgid "Bank Account"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form
+msgid "Bank Account Name"
+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 Refund, otherwise a Partner bank account number."
+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
@@ -1982,13 +2008,6 @@ msgid "Bank Operations"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1120
-#, 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 ""
@@ -2032,6 +2051,13 @@ 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_move_line_statement_line_id
msgid "Bank statement line reconciled with this entry"
msgstr ""
@@ -2043,12 +2069,18 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:208
+#: code:addons/account/static/src/xml/account_reconciliation.xml:31
#, python-format
msgid "Bank statements are fully reconciled."
msgstr ""
#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:42
+#, python-format
+msgid "Bank: Balance"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_base
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Base"
@@ -2087,11 +2119,6 @@ msgid "Bill Date"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Bill Refund"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Bill lines"
msgstr ""
@@ -2117,7 +2144,7 @@ msgid "Bills Payment"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:164
+#: code:addons/account/models/account_journal_dashboard.py:179
#, python-format
msgid "Bills to pay"
msgstr ""
@@ -2159,6 +2186,11 @@ msgid "By Country"
msgstr ""
#. module: account
+#: model:ir.filters,name:account.filter_invoice_refund
+msgid "By Credit Note"
+msgstr ""
+
+#. module: account
#: model:ir.filters,name:account.filter_invoice_product
msgid "By Product"
msgstr ""
@@ -2169,11 +2201,6 @@ msgid "By Product Category"
msgstr ""
#. module: account
-#: model:ir.filters,name:account.filter_invoice_refund
-msgid "By Refund"
-msgstr ""
-
-#. module: account
#: model:ir.filters,name:account.filter_invoice_salespersons
msgid "By Salespersons"
msgstr ""
@@ -2184,6 +2211,13 @@ msgid "By unchecking the active field, you may hide a fiscal position without de
msgstr ""
#. module: account
+#: code:addons/account/models/chart_template.py:165
+#: code:addons/account/models/chart_template.py:189
+#, python-format
+msgid "CABA"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
msgid "CAMT Import"
msgstr ""
@@ -2258,7 +2292,7 @@ msgstr ""
#. module: account
#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create refund and reconcile"
+msgid "Cancel: create credit note and reconcile"
msgstr ""
#. module: account
@@ -2274,6 +2308,18 @@ msgid "Cancelled Invoice"
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:56
+#, python-format
+msgid "Cannot create a credit note for the invoice which is already reconciled, invoice should be unreconciled first, then only you can add credit note for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:54
+#, python-format
+msgid "Cannot create credit note for the draft/cancelled invoice."
+msgstr ""
+
+#. module: account
#: code:addons/account/models/account_move.py:189
#, python-format
msgid "Cannot create moves for different companies."
@@ -2286,51 +2332,50 @@ msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:492
+#: code:addons/account/models/account_invoice.py:499
#, 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:391
+#: code:addons/account/models/account.py:392
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:421
+#: code:addons/account/models/account.py:422
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:54
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.journal,type:0
+#: code:addons/account/models/chart_template.py:736
#, python-format
-msgid "Cannot refund draft/cancelled invoice."
+msgid "Cash"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:56
-#, python-format
-msgid "Cannot refund invoice which is already reconciled, invoice should be unreconciled first. You can only refund this invoice."
+#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_cash_account_code_prefix
+msgid "Cash Accounts Prefix"
msgstr ""
#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
-#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:705
-#, python-format
-msgid "Cash"
+#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
+msgid "Cash Basis Journal"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_cash_account_code_prefix
-msgid "Cash Accounts Prefix"
+#: code:addons/account/models/chart_template.py:189
+#, python-format
+msgid "Cash Basis Tax Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:203
+#: code:addons/account/models/account_bank_statement.py:210
#: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox
#, python-format
msgid "Cash Control"
@@ -2357,12 +2402,18 @@ msgid "Cash and Banks"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:178
+#: code:addons/account/models/account_bank_statement.py:185
#, python-format
msgid "Cash difference observed during the counting (%s)"
msgstr ""
#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:40
+#, python-format
+msgid "Cash: Balance"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_cashbox_line
msgid "CashBox Line"
msgstr ""
@@ -2400,6 +2451,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_template_chart_template_id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_chart_template_id
+#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_chart_template_id
#: model:ir.model.fields,field_description:account.field_account_tax_template_chart_template_id
#: model:ir.model.fields,field_description:account.field_res_company_chart_template_id
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_chart_template_id
@@ -2457,7 +2509,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence
-msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal"
+msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal"
msgstr ""
#. module: account
@@ -2490,7 +2542,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:146
+#: code:addons/account/models/chart_template.py:147
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#, python-format
msgid "Choose Accounting Template"
@@ -2498,7 +2550,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1879
+#: code:addons/account/static/src/xml/account_reconciliation.xml:129
#, python-format
msgid "Choose counterpart"
msgstr ""
@@ -2529,6 +2581,11 @@ msgid "Click to add/remove from favorite"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_out_refund
+msgid "Click to create a credit note."
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree1
msgid "Click to create a customer invoice."
msgstr ""
@@ -2559,6 +2616,11 @@ msgid "Click to record a new vendor bill."
msgstr ""
#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_in_refund
+msgid "Click to record a new vendor credit note."
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
msgid "Click to register a bank statement."
msgstr ""
@@ -2571,23 +2633,16 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:41
+#: code:addons/account/static/src/xml/account_reconciliation.xml:249
#, python-format
msgid "Close"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:232
+#: code:addons/account/static/src/xml/account_reconciliation.xml:58
#, python-format
-msgid "Close the statement"
-msgstr ""
-
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:231
-#, python-format
-msgid "Close the statements"
+msgid "Close statement"
msgstr ""
#. module: account
@@ -2614,6 +2669,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_tag_color
+#: model:ir.model.fields,field_description:account.field_account_journal_color
msgid "Color Index"
msgstr ""
@@ -2650,6 +2706,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_ref_company_ids
+#: model:ir.model.fields,field_description:account.field_res_users_ref_company_ids
msgid "Companies that refers to partner"
msgstr ""
@@ -2733,7 +2790,7 @@ msgid "Complete Set of Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:429
+#: code:addons/account/models/account_invoice.py:434
#, python-format
msgid "Compose Email"
msgstr ""
@@ -2754,28 +2811,28 @@ msgid "Configuration"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:477
-#: code:addons/account/models/account_payment.py:479
+#: code:addons/account/models/account_payment.py:509
+#: code:addons/account/models/account_payment.py:511
#, python-format
msgid "Configuration Error !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:341
+#: code:addons/account/models/account_invoice.py:346
#, 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:258
+#: code:addons/account/models/account.py:259
#, 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:260
+#: code:addons/account/models/account.py:261
#, python-format
msgid "Configuration error!\n"
"The currency of the journal should be the same than the default debit account."
@@ -2832,7 +2889,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1505
+#: code:addons/account/static/src/xml/account_reconciliation.xml:50
#, python-format
msgid "Congrats, you're all done !"
msgstr ""
@@ -2855,6 +2912,8 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_contract_ids
#: model:ir.model.fields,field_description:account.field_res_partner_contracts_count
+#: model:ir.model.fields,field_description:account.field_res_users_contract_ids
+#: model:ir.model.fields,field_description:account.field_res_users_contracts_count
msgid "Contracts"
msgstr ""
@@ -2880,11 +2939,13 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_id
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_country_id
msgid "Country"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_group_id
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_country_group_id
msgid "Country Group"
msgstr ""
@@ -2899,25 +2960,20 @@ msgid "Create Customers"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
-msgid "Create Refund"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Create Vendors"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1876
+#: code:addons/account/static/src/xml/account_reconciliation.xml:129
#, python-format
msgid "Create Write-off"
msgstr ""
#. module: account
#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft refund"
+msgid "Create a draft credit note"
msgstr ""
#. module: account
@@ -2926,32 +2982,25 @@ msgid "Create and post move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:240
+#: code:addons/account/models/account_journal_dashboard.py:258
#, python-format
msgid "Create cash statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:226
+#: code:addons/account/models/account_journal_dashboard.py:244
#, python-format
msgid "Create invoice/bill"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:84
+#: code:addons/account/static/src/xml/account_reconciliation.xml:161
#, python-format
msgid "Create model"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2482
-#, python-format
-msgid "Create writeoff"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Create your products"
msgstr ""
@@ -3108,11 +3157,42 @@ msgid "Credit Move"
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:998
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+#: model:ir.model,name:account.model_account_invoice_refund
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.invoice_form
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+#: model:ir.ui.view,arch_db:account.report_invoice_document
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
+#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
+#, python-format
msgid "Credit Note"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Credit Note Bill"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice
+msgid "Credit Note Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id
+msgid "Credit Note Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
msgid "Credit account"
msgstr ""
@@ -3154,8 +3234,8 @@ msgstr ""
#: 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_res_partner_currency_id
+#: model:ir.model.fields,field_description:account.field_res_users_currency_id
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_currency_id
-#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_partnerledger
@@ -3175,8 +3255,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1462
-#: code:addons/account/models/account_move.py:1472
+#: code:addons/account/models/account_move.py:1450
+#: code:addons/account/models/account_move.py:1465
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3209,6 +3289,20 @@ msgid "Customer"
msgstr ""
#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/models/account_payment.py:542
+#, python-format
+msgid "Customer Credit Note"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_out_refund
+#: model:ir.ui.menu,name:account.menu_action_invoice_out_refund
+msgid "Customer Credit Notes"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Customer Flow"
msgstr ""
@@ -3220,7 +3314,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:182
+#: code:addons/account/models/chart_template.py:185
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
#: model:ir.ui.view,arch_db:account.account_planner
@@ -3229,13 +3323,14 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:508
+#: code:addons/account/models/account_payment.py:540
#, python-format
msgid "Customer Payment"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_property_payment_term_id
+#: model:ir.model.fields,field_description:account.field_res_users_property_payment_term_id
msgid "Customer Payment Terms"
msgstr ""
@@ -3245,14 +3340,7 @@ msgid "Customer Payments"
msgstr ""
#. module: account
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:510
-#, python-format
-msgid "Customer Refund"
-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"
msgstr ""
@@ -3263,10 +3351,7 @@ msgid "Customer ref:"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:307
#: model:ir.ui.menu,name:account.menu_account_customer
-#, python-format
msgid "Customers"
msgstr ""
@@ -3280,8 +3365,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:146
-#: code:addons/account/static/src/xml/account_reconciliation.xml:268
+#: code:addons/account/static/src/xml/account_reconciliation.xml:222
+#: code:addons/account/static/src/xml/account_reconciliation.xml:237
#: 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
@@ -3371,7 +3456,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence
-msgid "Dedicated Refund Sequence"
+msgid "Dedicated Credit Note Sequence"
msgstr ""
#. module: account
@@ -3422,6 +3507,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_trust
+#: model:ir.model.fields,field_description:account.field_res_users_trust
msgid "Degree of trust you have in this debtor"
msgstr ""
@@ -3443,7 +3529,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:271
+#: code:addons/account/static/src/xml/account_reconciliation.xml:240
#: 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.report_invoice_document
@@ -3465,6 +3551,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_auto_apply
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_auto_apply
msgid "Detect Automatically"
msgstr ""
@@ -3647,6 +3734,12 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "Draft Credit Note"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Draft Invoice"
msgstr ""
@@ -3657,12 +3750,6 @@ msgid "Draft Invoices"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "Draft Refund"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Draft bills"
msgstr ""
@@ -3684,7 +3771,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:147
+#: code:addons/account/static/src/xml/account_reconciliation.xml:223
#: 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.report_overdue_document
@@ -3719,9 +3806,9 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:930
+#: code:addons/account/models/account_invoice.py:940
#, python-format
-msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund."
+msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note."
msgstr ""
#. module: account
@@ -3740,22 +3827,15 @@ msgid "EU Digital Goods VAT"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:162
-#: code:addons/account/models/chart_template.py:175
-#: code:addons/account/models/chart_template.py:185
+#: code:addons/account/models/chart_template.py:163
+#: code:addons/account/models/chart_template.py:178
+#: code:addons/account/models/chart_template.py:188
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1509
-#, python-format
-msgid "Efficiency at its finest"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_move.py:958
+#: code:addons/account/models/account_move.py:954
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
@@ -3821,7 +3901,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:923
+#: code:addons/account/models/account_move.py:919
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -3859,23 +3939,18 @@ msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:28
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Excel template"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:185
+#: code:addons/account/models/chart_template.py:188
#, python-format
msgid "Exchange Difference"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_config_settings_currency_exchange_journal_id
#: model:ir.model.fields,field_description:account.field_res_company_currency_exchange_journal_id
msgid "Exchange Gain or Loss Journal"
msgstr ""
@@ -3907,6 +3982,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_product_category_property_account_expense_categ_id
+#: model:ir.model.fields,field_description:account.field_product_product_property_account_expense_id
#: model:ir.model.fields,field_description:account.field_product_template_property_account_expense_id
#: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
msgid "Expense Account"
@@ -3934,13 +4010,6 @@ msgid "Extra Features"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1516
-#, python-format
-msgid "Fast reconciler"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Favorite"
msgstr ""
@@ -3957,6 +4026,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_state_ids
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_state_ids
msgid "Federal States"
msgstr ""
@@ -3977,7 +4047,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:69
+#: code:addons/account/static/src/xml/account_reconciliation.xml:139
#, python-format
msgid "Filter..."
msgstr ""
@@ -4045,6 +4115,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_invoice_fiscal_position_id
#: model:ir.model.fields,field_description:account.field_account_invoice_report_fiscal_position_id
#: model:ir.model.fields,field_description:account.field_res_partner_property_account_position_id
+#: model:ir.model.fields,field_description:account.field_res_users_property_account_position_id
#: model:ir.ui.view,arch_db:account.view_account_position_form
#: model:ir.ui.view,arch_db:account.view_account_position_template_search
#: model:ir.ui.view,arch_db:account.view_account_position_template_tree
@@ -4136,7 +4207,18 @@ msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:81
+#: code:addons/account/report/account_aged_partner_balance.py:201
+#: code:addons/account/report/account_balance.py:64
+#: code:addons/account/report/account_general_ledger.py:114
+#: code:addons/account/report/account_journal.py:100
+#: code:addons/account/report/account_partner_ledger.py:74
+#: code:addons/account/report/account_report_financial.py:149
+#, python-format
+msgid "Form content is missing, this report cannot be printed."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:86
#, python-format
msgid "Free Reference"
msgstr ""
@@ -4168,7 +4250,7 @@ msgid "Full Reconcile"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:103
+#: code:addons/account/models/account_journal_dashboard.py:116
#, python-format
msgid "Future"
msgstr ""
@@ -4238,13 +4320,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:229
+#: code:addons/account/static/src/xml/account_reconciliation.xml:55
#, python-format
-msgid "Go to bank statements"
+msgid "Go to bank statement(s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:493
+#: code:addons/account/models/account_invoice.py:500
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -4256,9 +4338,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:208
-#: code:addons/account/static/src/xml/account_reconciliation.xml:321
-#: code:addons/account/static/src/xml/account_reconciliation.xml:328
+#: code:addons/account/static/src/xml/account_reconciliation.xml:31
+#: code:addons/account/static/src/xml/account_reconciliation.xml:43
#, python-format
msgid "Good Job!"
msgstr ""
@@ -4305,6 +4386,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_has_unreconciled_entries
+#: model:ir.model.fields,field_description:account.field_res_users_has_unreconciled_entries
msgid "Has Unreconciled Entries"
msgstr ""
@@ -4398,13 +4480,13 @@ msgid "ID"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:182
+#: code:addons/account/models/chart_template.py:185
#, python-format
msgid "INV"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:385
+#: code:addons/account/models/account_bank_statement.py:393
#, python-format
msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
msgstr ""
@@ -4566,13 +4648,13 @@ msgid "In Odoo,"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:405
+#: code:addons/account/models/account_bank_statement.py:413
#, 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:192
+#: code:addons/account/models/account_bank_statement.py:199
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
@@ -4624,6 +4706,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_product_category_property_account_income_categ_id
+#: model:ir.model.fields,field_description:account.field_product_product_property_account_income_id
#: model:ir.model.fields,field_description:account.field_product_template_property_account_income_id
#: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
msgid "Income Account"
@@ -4636,7 +4719,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1798
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:566
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -4707,7 +4790,7 @@ msgid "Internal notes..."
msgstr ""
#. module: account
-#: code:addons/account/models/partner.py:44
+#: code:addons/account/models/partner.py:45
#, python-format
msgid "Invalid \"Zip Range\", please configure it properly."
msgstr ""
@@ -4718,11 +4801,12 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:980
+#: code:addons/account/models/account_invoice.py:996
#: 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
#: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn
+#: model:ir.model.fields,field_description:account.field_res_users_invoice_warn
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
@@ -4777,11 +4861,6 @@ msgid "Invoice Reference"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_invoice_refund
-msgid "Invoice Refund"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_report_state
msgid "Invoice Status"
msgstr ""
@@ -4793,35 +4872,35 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund_invoice_id
-msgid "Invoice for which this invoice is the refund"
+msgid "Invoice for which this invoice is the credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:557
+#: code:addons/account/models/account_invoice.py:569
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:603
+#: code:addons/account/models/account_invoice.py:617
#, python-format
msgid "Invoice must be in draft or open state in order to be cancelled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:579
+#: code:addons/account/models/account_invoice.py:591
#, python-format
msgid "Invoice must be in draft state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:597
+#: code:addons/account/models/account_invoice.py:611
#, 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:589
+#: code:addons/account/models/account_invoice.py:603
#, python-format
msgid "Invoice must be validated in order to set it to register payment."
msgstr ""
@@ -4832,13 +4911,7 @@ msgid "Invoice paid"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:113
-#, python-format
-msgid "Invoice refund"
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_invoice.py:1514
+#: code:addons/account/models/account_invoice.py:1559
#, python-format
msgid "Invoice sent"
msgstr ""
@@ -4864,6 +4937,7 @@ msgstr ""
#: model:ir.actions.report.xml,name:account.account_invoices
#: model:ir.model.fields,field_description:account.field_account_payment_invoice_ids
#: model:ir.model.fields,field_description:account.field_res_partner_invoice_ids
+#: model:ir.model.fields,field_description:account.field_res_users_invoice_ids
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -4876,13 +4950,6 @@ msgid "Invoices"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2115
-#, python-format
-msgid "Invoices & Payments Matching"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all_supp
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -4898,7 +4965,7 @@ msgid "Invoices Statistics"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:164
+#: code:addons/account/models/account_journal_dashboard.py:179
#, python-format
msgid "Invoices owed to you"
msgstr ""
@@ -4948,26 +5015,20 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:956
+#: code:addons/account/models/account_move.py:952
#, 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_bank_statement.py:407
-#, python-format
-msgid "It is not allowed to delete a bank statement line 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 ""
-
-#. module: account
-#: code:addons/account/models/account_payment.py:329
+#: code:addons/account/models/account_payment.py:353
#, 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 ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:216
+#: code:addons/account/static/src/xml/account_reconciliation.xml:51
#, python-format
msgid "It took you"
msgstr ""
@@ -5009,9 +5070,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2151
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2156
-#: code:addons/account/static/src/xml/account_reconciliation.xml:145
+#: code:addons/account/static/src/xml/account_reconciliation.xml:183
+#: code:addons/account/static/src/xml/account_reconciliation.xml:218
#: 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
@@ -5038,7 +5098,7 @@ msgid "Journal & Partner"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:254
+#: code:addons/account/models/account_bank_statement.py:261
#: 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
@@ -5091,7 +5151,7 @@ msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:278
+#: code:addons/account/models/account_payment.py:302
#: 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
@@ -5105,8 +5165,8 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_move_line_select_by_type
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_entry_ids
#: model:ir.model.fields,field_description:account.field_account_move_line_ids
-#: model:ir.model.fields,field_description:account.field_res_partner_issued_total
#: model:ir.model.fields,field_description:account.field_res_partner_journal_item_count
+#: 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.view_account_payment_form
@@ -5119,7 +5179,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2114
+#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:261
#: model:ir.actions.client,name:account.action_manual_reconcile
#, python-format
msgid "Journal Items to Reconcile"
@@ -5208,8 +5268,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:112
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:116
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:468
+#: code:addons/account/static/src/xml/account_reconciliation.xml:187
+#: code:addons/account/static/src/xml/account_reconciliation.xml:219
#: 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
@@ -5302,9 +5363,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:342
+#: code:addons/account/static/src/xml/account_reconciliation.xml:117
#, python-format
-msgid "Last Reconciliation :"
+msgid "Last Reconciliation:"
msgstr ""
#. module: account
@@ -5445,6 +5506,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_last_time_entries_checked
+#: model:ir.model.fields,help:account.field_res_users_last_time_entries_checked
msgid "Last time the invoices & payments matching was performed for this partner. It is set either if there's not at least an unreconciled debit and an unreconciled credit or if you click the \"Done\" button."
msgstr ""
@@ -5456,6 +5518,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_last_time_entries_checked
#: model:ir.model.fields,field_description:account.field_res_partner_last_time_entries_checked
+#: model:ir.model.fields,field_description:account.field_res_users_last_time_entries_checked
msgid "Latest Invoices & Payments Matching Date"
msgstr ""
@@ -5475,14 +5538,14 @@ msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:149
+#: code:addons/account/models/account_invoice.py:154
#, python-format
msgid "Less Payment"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:15
+#: code:addons/account/static/src/xml/account_reconciliation.xml:24
#, python-format
msgid "Let odoo try to reconcile entries for the user"
msgstr ""
@@ -5535,7 +5598,7 @@ msgid "Logo"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:166
+#: code:addons/account/models/account_bank_statement.py:173
#, python-format
msgid "Loss"
msgstr ""
@@ -5552,7 +5615,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:184
+#: code:addons/account/models/chart_template.py:187
#, python-format
msgid "MISC"
msgstr ""
@@ -5563,6 +5626,7 @@ msgid "Mail your invoices in one-click using"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Main Currency"
msgstr ""
@@ -5583,12 +5647,6 @@ msgid "Main currency of your company"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.tax_adjustments_form
-#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
-msgid "Make Manual Tax Adjustments"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Manage time &amp; material contracts or fixed-price recurring subscriptions."
msgstr ""
@@ -5628,12 +5686,8 @@ msgid "Manual Invoice Taxes"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation
-msgid "Manual Payments & Invoices Matching"
-msgstr ""
-
-#. module: account
#: model:ir.actions.client,name:account.action_manual_reconciliation
+#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation
msgid "Manual Reconciliation"
msgstr ""
@@ -5685,6 +5739,11 @@ msgid "Matching Number"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_max_date
+msgid "Max Date of Matched Lines"
+msgstr ""
+
+#. module: account
#: selection:res.company,fiscalyear_last_month:0
msgid "May"
msgstr ""
@@ -5715,6 +5774,7 @@ 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 ""
@@ -5756,7 +5816,7 @@ msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:184
+#: code:addons/account/models/chart_template.py:187
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -5764,14 +5824,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:85
+#: code:addons/account/static/src/xml/account_reconciliation.xml:162
#, python-format
msgid "Modify models"
msgstr ""
#. module: account
#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgid "Modify: create credit note, reconcile and create a new draft invoice"
msgstr ""
#. module: account
@@ -5785,18 +5845,6 @@ msgid "Monthly Turnover"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:108
-#, python-format
-msgid "More"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Most currencies are already created by default. If you plan\n"
" to use some of them, you should check their <strong>Active</strong>\n"
@@ -5818,7 +5866,17 @@ msgid "Move Line"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1249
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_move_line_count
+msgid "Move Line Count"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_payment_move_reconciled
+msgid "Move Reconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:1245
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
@@ -5886,9 +5944,8 @@ msgid "Navigate easily through reports and see what is behind the numbers"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.act_account_tax_net
#: model:ir.actions.act_window,name:account.act_account_tax_net_posted
-msgid "Net Tax Lines"
+msgid "Net Tax Lines (Posted)"
msgstr ""
#. module: account
@@ -5907,7 +5964,7 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1226
+#: code:addons/account/models/account_move.py:1222
#, python-format
msgid "New expected payment date: "
msgstr ""
@@ -5918,11 +5975,6 @@ msgid "Next, register any unmatched payments:<br/>"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
-msgid "No Feeds"
-msgstr ""
-
-#. module: account
#: selection:accounting.report,filter_cmp:0
msgid "No Filters"
msgstr ""
@@ -5938,7 +5990,7 @@ msgid "No Message"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1104
+#: code:addons/account/models/account_invoice.py:1135
#, python-format
msgid "No appropriate payment method enabled on journal %s"
msgstr ""
@@ -5949,13 +6001,6 @@ msgid "No detail"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:127
-#, python-format
-msgid "No result matching '"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_res_company_fiscalyear_lock_date
msgid "No users, including Advisers, can edit accounts prior to and inclusive of this date. Use it for fiscal year locking for example."
msgstr ""
@@ -6003,20 +6048,20 @@ msgid "Not Paid"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:28
-#, python-format
-msgid "Not implemented."
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:274
+#: code:addons/account/static/src/xml/account_reconciliation.xml:243
#: model:ir.model.fields,field_description:account.field_account_account_template_note
#, python-format
msgid "Note"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_out_refund
+msgid "Note that the easiest way to create a credit note is to do it directly form\n"
+" the customer invoice, to refund it totally or partially."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_note
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_note
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_note
@@ -6068,7 +6113,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:196
+#: code:addons/account/static/src/xml/account_reconciliation.xml:17
#, python-format
msgid "OK"
msgstr ""
@@ -6167,25 +6212,18 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:343
+#: code:addons/account/models/account_payment.py:367
#, python-format
msgid "Only a draft payment can be posted. Trying to post a payment in state %s."
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:808
+#: code:addons/account/models/chart_template.py:839
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1510
-#, python-format
-msgid "Only use the ctrl-enter shortcut to validate reconciliations."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_res_company_period_lock_date
msgid "Only users with the 'Adviser' role can edit accounts prior to and inclusive of this date. Use it for period locking inside an open fiscal year, for example."
msgstr ""
@@ -6205,9 +6243,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1882
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1914
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2049
+#: code:addons/account/static/src/xml/account_reconciliation.xml:129
#, python-format
msgid "Open balance"
msgstr ""
@@ -6223,7 +6259,7 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:994
+#: code:addons/account/models/account_bank_statement.py:1013
#, 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 ""
@@ -6286,13 +6322,6 @@ msgid "Other Info"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:309
-#, python-format
-msgid "OtherAccounts"
-msgstr ""
-
-#. module: account
#: selection:account.payment.method,payment_type:0
msgid "Outbound"
msgstr ""
@@ -6314,13 +6343,13 @@ msgid "Outstanding Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:116
+#: code:addons/account/models/account_invoice.py:121
#, python-format
msgid "Outstanding credits"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:119
+#: code:addons/account/models/account_invoice.py:124
#, python-format
msgid "Outstanding debits"
msgstr ""
@@ -6364,7 +6393,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:290
+#: code:addons/account/models/account_payment.py:314
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -6404,8 +6433,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1739
-#: code:addons/account/static/src/xml/account_reconciliation.xml:269
+#: code:addons/account/static/src/xml/account_reconciliation.xml:221
+#: code:addons/account/static/src/xml/account_reconciliation.xml:238
#: 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_line_partner_id
@@ -6465,7 +6494,7 @@ msgid "Partners"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:96
+#: code:addons/account/models/account_journal_dashboard.py:109
#, python-format
msgid "Past"
msgstr ""
@@ -6500,6 +6529,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_debit_limit
+#: model:ir.model.fields,field_description:account.field_res_users_debit_limit
msgid "Payable Limit"
msgstr ""
@@ -6531,6 +6561,11 @@ msgid "Payment Journal"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_payment_form
+msgid "Payment Matching"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Payment Method"
msgstr ""
@@ -6699,7 +6734,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1496
+#: code:addons/account/models/account_invoice.py:1541
#, python-format
msgid "Percentages for Payment Terms Line must be between 0 and 100."
msgstr ""
@@ -6737,7 +6772,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:829
+#: code:addons/account/models/account_invoice.py:843
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -6745,7 +6780,7 @@ msgstr ""
#. module: account
#: code:addons/account/models/account_move.py:151
#, python-format
-msgid "Please define a sequence for the refunds"
+msgid "Please define a sequence for the credit notes"
msgstr ""
#. module: account
@@ -6755,7 +6790,7 @@ msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:827
+#: code:addons/account/models/account_invoice.py:841
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -6918,7 +6953,7 @@ msgid "Products"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:170
+#: code:addons/account/models/account_bank_statement.py:177
#, python-format
msgid "Profit"
msgstr ""
@@ -6982,6 +7017,12 @@ msgid "Purchase Tax(%)"
msgstr ""
#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:38
+#, python-format
+msgid "Purchase: Untaxed Total"
+msgstr ""
+
+#. module: account
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
#: model:ir.ui.menu,name:account.menu_finance_payables
@@ -7068,9 +7109,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1860
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2466
-#: code:addons/account/static/src/xml/account_reconciliation.xml:335
+#: code:addons/account/static/src/xml/account_reconciliation.xml:71
+#: code:addons/account/static/src/xml/account_reconciliation.xml:103
+#: code:addons/account/static/src/xml/account_reconciliation.xml:104
#: 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
@@ -7147,13 +7188,6 @@ msgid "Reconciliation on Bank Statements"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2179
-#, python-format
-msgid "Reconciling "
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Reconciling journal entries"
msgstr ""
@@ -7174,8 +7208,11 @@ msgid "Recording invoices"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:220
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_partnerledger
+#, python-format
msgid "Ref"
msgstr ""
@@ -7220,33 +7257,6 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:982
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.invoice_form
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-#: model:ir.ui.view,arch_db:account.report_invoice_document
-#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
-#, python-format
-msgid "Refund"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice
-msgid "Refund Date"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id
-msgid "Refund Entry Sequence"
-msgstr ""
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_invoice_refund
-#: model:ir.ui.view,arch_db:account.invoice_form
-msgid "Refund Invoice"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund_filter_refund
msgid "Refund Method"
msgstr ""
@@ -7257,12 +7267,6 @@ msgid "Refund base on this type. You can not Modify and Cancel if the invoice is
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
-msgid "Refunds"
-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
@@ -7359,7 +7363,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:153
+#: code:addons/account/static/src/xml/account_reconciliation.xml:225
#, python-format
msgid "Residual"
msgstr ""
@@ -7493,6 +7497,12 @@ msgid "Sales Tax(%)"
msgstr ""
#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:36
+#, python-format
+msgid "Sales: Untaxed Total"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_report_user_id
#: model:ir.model.fields,field_description:account.field_account_invoice_user_id
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -7507,7 +7517,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:92
+#: code:addons/account/static/src/xml/account_reconciliation.xml:197
#, python-format
msgid "Save and New"
msgstr ""
@@ -7622,14 +7632,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1767
-#, python-format
-msgid "Select Partner"
-msgstr ""
-
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:241
+#: code:addons/account/static/src/xml/account_reconciliation.xml:72
#, python-format
msgid "Select a partner or choose a counterpart"
msgstr ""
@@ -7659,6 +7662,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_invoice_warn
+#: model:ir.model.fields,help:account.field_res_users_invoice_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -7706,6 +7710,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_sequence
#: model:ir.model.fields,field_description:account.field_account_financial_report_sequence
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_sequence
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_sequence
#: model:ir.model.fields,field_description:account.field_account_invoice_line_sequence
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_sequence
#: model:ir.model.fields,field_description:account.field_account_journal_sequence
@@ -7757,13 +7762,6 @@ msgid "Short Code"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:302
-#, python-format
-msgid "Show"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Show all records which has next action date is before today"
msgstr ""
@@ -7774,13 +7772,6 @@ msgid "Show journal on dashboard"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:20
-#, python-format
-msgid "Show more... ("
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_report_sign
msgid "Sign on Reports"
msgstr ""
@@ -7792,7 +7783,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2469
+#: code:addons/account/static/src/xml/account_reconciliation.xml:105
#, python-format
msgid "Skip"
msgstr ""
@@ -7851,7 +7842,7 @@ msgid "Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:245
+#: code:addons/account/models/account_bank_statement.py:252
#, python-format
msgid "Statement %s confirmed, journal items were created."
msgstr ""
@@ -7931,13 +7922,6 @@ msgid "Take Money Out"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1517
-#, python-format
-msgid "Take on average less than 5 seconds to reconcile a transaction."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_target_move
#: model:ir.model.fields,field_description:account.field_account_balance_report_target_move
#: model:ir.model.fields,field_description:account.field_account_common_account_report_target_move
@@ -7953,8 +7937,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:124
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:129
+#: code:addons/account/static/src/xml/account_reconciliation.xml:172
#: 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
@@ -7968,8 +7951,8 @@ msgid "Tax"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:789
-#: code:addons/account/models/chart_template.py:792
+#: code:addons/account/models/chart_template.py:820
+#: code:addons/account/models/chart_template.py:823
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -7983,13 +7966,19 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax_refund_account_id
+msgid "Tax Account on Credit Notes"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax_template_refund_account_id
msgid "Tax Account on Refunds"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.tax_adjustments_form
#: model:ir.model.fields,field_description:account.field_account_tax_tax_adjustment
#: model:ir.model.fields,field_description:account.field_account_tax_template_tax_adjustment
+#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
msgid "Tax Adjustment"
msgstr ""
@@ -8014,11 +8003,6 @@ msgid "Tax Cash Basis Entry of"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id
-msgid "Tax Cash Basis Journal"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax_amount_type
#: model:ir.model.fields,field_description:account.field_account_tax_template_amount_type
msgid "Tax Computation"
@@ -8046,13 +8030,16 @@ msgid "Tax ID"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.act_account_tax_tax
-#: model:ir.actions.act_window,name:account.act_account_tax_tax_posted
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_line_ids
msgid "Tax Lines"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.act_account_tax_tax_posted
+msgid "Tax Lines (Posted)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_ids
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_tax_ids
#: model:ir.ui.view,arch_db:account.view_account_position_form
@@ -8204,6 +8191,11 @@ msgid "Technical field used to adapt the interface to the payment type selected.
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_partial_reconcile_max_date
+msgid "Technical field used to determine at which date this reconciliation needs to be shown on the aged receivable/payable reports."
+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
@@ -8278,7 +8270,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:216
+#: code:addons/account/static/src/xml/account_reconciliation.xml:51
#, python-format
msgid "That's on average"
msgstr ""
@@ -8301,7 +8293,7 @@ msgid "The Deposit Ticket module can also be used to settle credit card batch ma
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:925
+#: code:addons/account/models/account_move.py:921
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -8312,6 +8304,11 @@ msgid "The accounting journal corresponding to this bank account."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_config_settings_currency_exchange_journal_id
+msgid "The accounting journal where automatic exchange differences will be registered"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement_line_amount_currency
#: model:ir.model.fields,help:account.field_account_move_line_amount_currency
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
@@ -8324,19 +8321,19 @@ msgid "The amount expressed in the related account currency if not equal to the
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:476
+#: code:addons/account/models/account_move.py:477
#, 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:580
+#: code:addons/account/models/account.py:590
#, python-format
msgid "The application scope of taxes in a group must be either the same as the group or \"None\"."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:267
+#: code:addons/account/models/account.py:268
#, python-format
msgid "The bank account of a bank journal must belong to the same company (%s)."
msgstr ""
@@ -8383,7 +8380,7 @@ msgid "The discussions with your customer are automatically displayed at\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:184
+#: code:addons/account/models/account_bank_statement.py:191
#, python-format
msgid "The ending balance is incorrect !\n"
"The expected balance (%s) is different from the computed one. (%s)"
@@ -8396,11 +8393,12 @@ 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:271
+#: code:addons/account/models/account.py:272
#, python-format
msgid "The holder of a journal's bank account must be the company (%s)."
msgstr ""
@@ -8411,7 +8409,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:477
+#: code:addons/account/models/account_payment.py:509
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -8461,11 +8459,12 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_has_unreconciled_entries
+#: model:ir.model.fields,help:account.field_res_users_has_unreconciled_entries
msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:927
+#: code:addons/account/models/account_move.py:923
#, python-format
msgid "The partner has to be the same on all lines for receivable and payable accounts!"
msgstr ""
@@ -8476,7 +8475,13 @@ msgid "The partner reference of this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:346
+#: code:addons/account/models/account_payment.py:55
+#, python-format
+msgid "The payment amount must be strictly positive."
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_payment.py:370
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -8492,13 +8497,13 @@ msgid "The residual amount on a journal item expressed in the company currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:461
+#: code:addons/account/models/account_move.py:462
#, 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:1350
+#: code:addons/account/models/account_invoice.py:1383
#, python-format
msgid "The selected unit of measure is not compatible with the unit of measure of the product."
msgstr ""
@@ -8510,19 +8515,19 @@ 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:479
+#: code:addons/account/models/account_payment.py:511
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:90
+#: code:addons/account/models/company.py:95
#, 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:172
+#: code:addons/account/models/account_bank_statement.py:179
#, python-format
msgid "There is no account defined on the journal %s for %s involved in a cash difference."
msgstr ""
@@ -8534,7 +8539,7 @@ msgid "There is no journal items in draft state to post."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1585
+#: code:addons/account/models/account_move.py:1641
#, python-format
msgid "There is no tax cash basis journal defined for this company: \"%s\" \n"
"Configure it in Accounting/Configuration/Settings"
@@ -8542,20 +8547,12 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:321
-#: code:addons/account/static/src/xml/account_reconciliation.xml:328
+#: code:addons/account/static/src/xml/account_reconciliation.xml:43
#, python-format
msgid "There is nothing to reconcile."
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1493
-#, python-format
-msgid "There you go, it's all done !"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_config_settings_view_form
msgid "These taxes are set in any new product created."
msgstr ""
@@ -8571,7 +8568,7 @@ msgid "These users handle billing specifically."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1081
+#: code:addons/account/models/account_invoice.py:1110
#, python-format
msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>"
msgstr ""
@@ -8582,7 +8579,7 @@ msgid "This Month"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:101
+#: code:addons/account/models/account_journal_dashboard.py:114
#, python-format
msgid "This Week"
msgstr ""
@@ -8593,11 +8590,13 @@ msgid "This Year"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_product_product_property_account_expense_id
#: model:ir.model.fields,help:account.field_product_template_property_account_expense_id
msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_product_product_property_account_income_id
#: model:ir.model.fields,help:account.field_product_template_property_account_income_id
msgid "This account will be used for invoices instead of the default one to value sales for the current product."
msgstr ""
@@ -8614,11 +8613,13 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_property_account_payable_id
+#: model:ir.model.fields,help:account.field_res_users_property_account_payable_id
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_property_account_receivable_id
+#: model:ir.model.fields,help:account.field_res_users_property_account_receivable_id
msgid "This account will be used instead of the default one as the receivable account for the current partner"
msgstr ""
@@ -8649,13 +8650,13 @@ msgid "This feature is useful if you issue a high amounts of invoices."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_journal_sequence_id
-msgid "This field contains the information related to the numbering of the journal entries of this journal."
+#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id
+msgid "This field contains the information related to the numbering of the credit note entries of this journal."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id
-msgid "This field contains the information related to the numbering of the refund entries of this journal."
+#: model:ir.model.fields,help:account.field_account_journal_sequence_id
+msgid "This field contains the information related to the numbering of the journal entries of this journal."
msgstr ""
#. module: account
@@ -8687,13 +8688,13 @@ msgid "This is the accounting dashboard. If you have not yet\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:308
+#: code:addons/account/models/account.py:309
#, python-format
msgid "This journal already contains items, therefore you cannot modify its company."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:311
+#: code:addons/account/models/account.py:312
#, python-format
msgid "This journal already contains items, therefore you cannot modify its short name."
msgstr ""
@@ -8705,7 +8706,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:279
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:351
#, 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 ""
@@ -8722,25 +8723,27 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:209
+#: code:addons/account/static/src/xml/account_reconciliation.xml:32
#, 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:157
+#: code:addons/account/static/src/xml/account_reconciliation.xml:229
#, python-format
msgid "This payment is registered but not reconciled."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_property_supplier_payment_term_id
+#: model:ir.model.fields,help:account.field_res_users_property_supplier_payment_term_id
msgid "This payment term will be used instead of the default one for purchase orders and vendor bills"
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_property_payment_term_id
+#: model:ir.model.fields,help:account.field_res_users_property_payment_term_id
msgid "This payment term will be used instead of the default one for sales orders and customer invoices"
msgstr ""
@@ -8767,7 +8770,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:21
+#: code:addons/account/static/src/xml/account_reconciliation.xml:28
#, python-format
msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
msgstr ""
@@ -8803,7 +8806,7 @@ msgid "To pay"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:921
+#: code:addons/account/models/account_move.py:917
#, python-format
msgid "To reconcile the entries company should be the same for all entries!"
msgstr ""
@@ -8819,14 +8822,11 @@ msgid "Today Activities"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:149
#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total
#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
#: model:ir.ui.view,arch_db:account.invoice_tree
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_cashbox
-#, python-format
msgid "Total"
msgstr ""
@@ -8849,16 +8849,19 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_total_invoiced
+#: model:ir.model.fields,field_description:account.field_res_users_total_invoiced
msgid "Total Invoiced"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_debit
+#: model:ir.model.fields,field_description:account.field_res_users_debit
msgid "Total Payable"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_credit
+#: model:ir.model.fields,field_description:account.field_res_users_credit
msgid "Total Receivable"
msgstr ""
@@ -8874,23 +8877,29 @@ msgid "Total Without Tax"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed
#: model:ir.model.fields,help:account.field_account_invoice_line_price_subtotal_signed
-msgid "Total amount in the currency of the company, negative for refunds."
+msgid "Total amount in the currency of the company, negative for credit note."
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed
+msgid "Total amount in the currency of the company, negative for credit notes."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_amount_total_signed
-msgid "Total amount in the currency of the invoice, negative for refunds."
+msgid "Total amount in the currency of the invoice, negative for credit notes."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_credit
+#: model:ir.model.fields,help:account.field_res_users_credit
msgid "Total amount this customer owes you."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_res_partner_debit
+#: model:ir.model.fields,help:account.field_res_users_debit
msgid "Total amount you have to pay to this vendor."
msgstr ""
@@ -8916,7 +8925,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:270
+#: code:addons/account/static/src/xml/account_reconciliation.xml:239
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Transaction"
@@ -8944,19 +8953,19 @@ msgid "Transfer To"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:228
+#: code:addons/account/models/account_payment.py:252
#, python-format
msgid "Transfer account not defined on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:482
#, python-format
msgid "Transfer from %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:533
+#: code:addons/account/models/account_payment.py:565
#, python-format
msgid "Transfer to %s"
msgstr ""
@@ -8993,14 +9002,19 @@ msgid "Type"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:850
+#: selection:account.journal,bank_statements_source:0
+msgid "Undefined Yet"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/chart_template.py:881
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:284
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:348
#, python-format
msgid "Undo the partial reconciliation."
msgstr ""
@@ -9019,7 +9033,7 @@ msgid "Unit of Measure"
msgstr ""
#. module: account
-#: code:addons/account/report/account_aged_partner_balance.py:189
+#: code:addons/account/report/account_aged_partner_balance.py:190
#, python-format
msgid "Unknown Partner"
msgstr ""
@@ -9196,10 +9210,12 @@ msgstr ""
#: 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
#: model:ir.model.fields,help:account.field_res_partner_currency_id
+#: model:ir.model.fields,help:account.field_res_users_currency_id
msgid "Utility field to express amount currency"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_vat_required
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_vat_required
msgid "VAT required"
msgstr ""
@@ -9211,7 +9227,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1881
+#: code:addons/account/static/src/xml/account_reconciliation.xml:70
#: 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
@@ -9256,7 +9272,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:981
+#: code:addons/account/models/account_invoice.py:997
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9264,7 +9280,7 @@ msgid "Vendor Bill"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:183
+#: code:addons/account/models/chart_template.py:186
#: model:ir.actions.act_window,name:account.action_invoice_tree2
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
#: model:ir.ui.view,arch_db:account.account_planner
@@ -9273,18 +9289,40 @@ msgid "Vendor Bills"
msgstr ""
#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/models/account_payment.py:545
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+#, python-format
+msgid "Vendor Credit Note"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_in_refund
+#: model:ir.ui.menu,name:account.menu_action_invoice_in_refund
+msgid "Vendor Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:999
+#, python-format
+msgid "Vendor Credit note"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Vendor Flow"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:515
+#: code:addons/account/models/account_payment.py:547
#, python-format
msgid "Vendor Payment"
msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_property_supplier_payment_term_id
+#: model:ir.model.fields,field_description:account.field_res_users_property_supplier_payment_term_id
msgid "Vendor Payment Terms"
msgstr ""
@@ -9295,25 +9333,13 @@ msgid "Vendor Reference"
msgstr ""
#. module: account
-#: selection:account.invoice,type:0
-#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:983
-#: code:addons/account/models/account_payment.py:513
-#: model:ir.ui.view,arch_db:account.report_invoice_document
-#, python-format
-msgid "Vendor Refund"
-msgstr ""
-
-#. module: account
+#: model:ir.model.fields,field_description:account.field_product_product_supplier_taxes_id
#: model:ir.model.fields,field_description:account.field_product_template_supplier_taxes_id
msgid "Vendor Taxes"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:308
#: model:ir.ui.menu,name:account.menu_account_supplier
-#, python-format
msgid "Vendors"
msgstr ""
@@ -9328,7 +9354,7 @@ msgid "Warning"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:513
+#: code:addons/account/models/account_invoice.py:520
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -9339,8 +9365,8 @@ msgid "Warning on the Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1290
-#: code:addons/account/models/account_invoice.py:1349
+#: code:addons/account/models/account_invoice.py:1323
+#: code:addons/account/models/account_invoice.py:1382
#, python-format
msgid "Warning!"
msgstr ""
@@ -9388,13 +9414,6 @@ msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1504
-#, python-format
-msgid "Whew, that was fast !"
-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
@@ -9434,7 +9453,7 @@ msgid "Wizard for Tax Adjustments"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:962
+#: code:addons/account/models/account_move.py:958
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#, python-format
msgid "Write-Off"
@@ -9466,7 +9485,7 @@ msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:919
+#: code:addons/account/models/account_move.py:915
#, python-format
msgid "You are trying to reconcile some entries that are already reconciled!"
msgstr ""
@@ -9483,7 +9502,7 @@ msgid "You can control the invoice from your vendor according to\n"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config.py:88
+#: code:addons/account/models/res_config.py:94
#, python-format
msgid "You can not change a company chart of account once it has been installed"
msgstr ""
@@ -9495,12 +9514,18 @@ msgid "You can not change the unit of measure of a product that has been already
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:327
+#: code:addons/account/models/account_payment.py:351
#, python-format
msgid "You can not delete a payment that is already posted"
msgstr ""
#. module: account
+#: code:addons/account/models/account_invoice.py:1404
+#, 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:128
#, python-format
msgid "You can only register payments for open invoices"
@@ -9524,7 +9549,7 @@ msgid "You cannot add/modify entries prior to and inclusive of the lock date %s.
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:962
+#: code:addons/account/models/account_invoice.py:978
#, python-format
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
msgstr ""
@@ -9542,21 +9567,21 @@ msgid "You cannot change the value of the reconciliation on this account as it a
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:468
+#: code:addons/account/models/account_move.py:469
#, python-format
msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:466
+#: code:addons/account/models/account_invoice.py:471
#, 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."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:464
+#: code:addons/account/models/account_invoice.py:469
#, python-format
-msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead."
+msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead."
msgstr ""
#. module: account
@@ -9566,21 +9591,21 @@ msgid "You cannot do that on an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1251
+#: code:addons/account/models/account_move.py:1247
#, 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:1253
+#: code:addons/account/models/account_move.py:1249
#, 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:323
+#: code:addons/account/models/account.py:324
#, python-format
msgid "You cannot empty the account number once set.\n"
"If you would like to delete the account number, you can do it from the Bank Accounts list."
@@ -9600,7 +9625,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1799
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:567
#, python-format
msgid "You cannot mix items from receivable and payable accounts."
msgstr ""
@@ -9613,7 +9638,7 @@ msgid "You cannot modify a posted entry of this journal.\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:591
+#: code:addons/account/models/account_invoice.py:605
#, python-format
msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first."
msgstr ""
@@ -9631,21 +9656,28 @@ msgid "You cannot remove/deactivate an account which is set on a customer or ven
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1096
-#: code:addons/account/models/account_move.py:1217
+#: code:addons/account/models/account_move.py:1092
+#: code:addons/account/models/account_move.py:1213
#, python-format
msgid "You cannot use deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1137
+#: code:addons/account/models/account_move.py:1133
#, 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:64
+#: code:addons/account/models/account_invoice.py:593
+#, 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:77
+#: code:addons/account/static/src/xml/account_reconciliation.xml:156
#, python-format
msgid "You did not configure any reconcile model yet, you can do it"
msgstr ""
@@ -9663,7 +9695,7 @@ msgid "You must define a Start Date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1291
+#: code:addons/account/models/account_invoice.py:1324
#, python-format
msgid "You must first select a partner!"
msgstr ""
@@ -9681,19 +9713,19 @@ msgid "You must set a start date."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1446
+#: code:addons/account/models/account_move.py:1512
#, 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:1448
+#: code:addons/account/models/account_move.py:1514
#, 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:1450
+#: code:addons/account/models/account_move.py:1516
#, 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 ""
@@ -9706,13 +9738,6 @@ msgid "You should have defined an 'Internal Transfer Account' in your cash regis
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:218
-#, python-format
-msgid "You validated"
-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"
@@ -9761,11 +9786,13 @@ msgid "Zip Range"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_zip_from
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_zip_from
msgid "Zip Range From"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_zip_to
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_zip_to
msgid "Zip Range To"
msgstr ""
@@ -9792,11 +9819,6 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "accounting settings"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.account_planner
msgid "activate this feature"
msgstr ""
@@ -9828,6 +9850,11 @@ msgid "create a journal entry"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
+msgid "credit note"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
msgid "days"
msgstr ""
@@ -9863,32 +9890,20 @@ msgid "invoice"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_supplier_form
-msgid "outstanding debits"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.invoice_form
-msgid "outstanding payments"
-msgstr ""
-
-#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:218
+#: code:addons/account/static/src/xml/account_reconciliation.xml:38
#, python-format
-msgid "reconciliations with the ctrl-enter shortcut."
+msgid "o_manual_statement"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate
-msgid "refund"
+#: model:ir.ui.view,arch_db:account.invoice_supplier_form
+msgid "outstanding debits"
msgstr ""
#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:20
-#, python-format
-msgid "remaining)"
+#: model:ir.ui.view,arch_db:account.invoice_form
+msgid "outstanding payments"
msgstr ""
#. module: account
@@ -9934,7 +9949,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:216
+#: code:addons/account/static/src/xml/account_reconciliation.xml:51
#, python-format
msgid "seconds per transaction."
msgstr ""
@@ -9971,7 +9986,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:77
+#: code:addons/account/static/src/xml/account_reconciliation.xml:156
#, python-format
msgid "there"
msgstr ""
@@ -9983,7 +9998,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:216
+#: code:addons/account/static/src/xml/account_reconciliation.xml:51
#, python-format
msgid "to reconcile"
msgstr ""
@@ -9995,7 +10010,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:216
+#: code:addons/account/static/src/xml/account_reconciliation.xml:51
#, python-format
msgid "transactions."
msgstr ""
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index 658534d9812..494727727f1 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr ""
#. module: account_accountant
#: model:ir.ui.view,arch_db:account_accountant.account_config_settings_view_form_inherit_account_accountant
-msgid "Last day of your fiscal year"
+msgid "Last day of your fiscal year, for automatic opening entries"
msgstr ""
#. module: account_accountant
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 59277192469..068569c20b5 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+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:399
+#: code:addons/account_asset/models/account_asset.py:404
#, python-format
msgid " (copy)"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:534
+#: code:addons/account_asset/models/account_asset.py:538
#, python-format
msgid " (grouped)"
msgstr ""
@@ -75,6 +75,13 @@ msgid "Account used to record the purchase of the asset at its original price."
msgstr ""
#. module: account_asset
+#. openerp-web
+#: code:addons/account_asset/static/src/js/account_asset.js:41
+#, python-format
+msgid "Accounting entries waiting for manual verification"
+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"
@@ -86,7 +93,7 @@ msgid "Additional Options"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:591
+#: code:addons/account_asset/models/account_asset.py:595
#, python-format
msgid "Amount"
msgstr ""
@@ -155,6 +162,7 @@ msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name
+#: model:ir.model.fields,field_description:account_asset.field_product_product_asset_category_id
#: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Asset Type"
@@ -187,7 +195,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:319
+#: code:addons/account_asset/models/account_asset.py:318
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -375,7 +383,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:591
+#: code:addons/account_asset/models/account_asset.py:595
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id
#, python-format
msgid "Currency"
@@ -418,6 +426,7 @@ msgid "Deferred Revenue Account"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_product_product_deferred_revenue_category_id
#: model:ir.model.fields,field_description:account_asset.field_product_template_deferred_revenue_category_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Deferred Revenue Type"
@@ -504,7 +513,7 @@ msgid "Depreciation board modified"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:594
+#: code:addons/account_asset/models/account_asset.py:598
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -520,19 +529,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:322
+#: code:addons/account_asset/models/account_asset.py:327
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:325
+#: code:addons/account_asset/models/account_asset.py:330
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:573
+#: code:addons/account_asset/models/account_asset.py:577
#, python-format
msgid "Document closed."
msgstr ""
@@ -657,7 +666,7 @@ msgid "Journal"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:433
+#: code:addons/account_asset/models/account_asset.py:438
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
@@ -764,7 +773,7 @@ msgid "One Entry Every"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:593
+#: code:addons/account_asset/models/account_asset.py:597
#: 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
@@ -789,7 +798,7 @@ msgstr ""
#. module: account_asset
#. openerp-web
-#: code:addons/account_asset/static/src/js/account_asset.js:28
+#: code:addons/account_asset/static/src/js/account_asset.js:38
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_posted_check
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_move_check
#: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search
@@ -819,7 +828,7 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:365
+#: code:addons/account_asset/models/account_asset.py:370
#, python-format
msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
msgstr ""
@@ -965,7 +974,7 @@ msgstr ""
#. module: account_asset
#. openerp-web
-#: code:addons/account_asset/static/src/js/account_asset.js:28
+#: code:addons/account_asset/static/src/js/account_asset.js:44
#, python-format
msgid "Unposted"
msgstr ""
@@ -1007,13 +1016,13 @@ msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:602
+#: code:addons/account_asset/models/account_asset.py:606
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:604
+#: code:addons/account_asset/models/account_asset.py:608
#, 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 32c6952c711..04956ae121a 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:240
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
#, 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:240
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245
#, python-format
msgid "1 transaction had already been imported and was ignored."
msgstr ""
@@ -53,7 +53,7 @@ msgid "Allow Cancelling Entries"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:242
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:247
#, python-format
msgid "Already imported items"
msgstr ""
@@ -69,7 +69,7 @@ msgid "At Least One Outbound"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:76
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:78
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_bank_id
#, python-format
msgid "Bank"
@@ -112,14 +112,24 @@ msgid "Cancel"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:165
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:167
#, python-format
msgid "Cannot find in which journal import this statement. Please manually select a journal."
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
+msgid "Check Printing Payment Method Selected"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
+msgid "Check Sequence"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence
-msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal"
+msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal"
msgstr ""
#. module: account_bank_statement_import
@@ -128,11 +138,26 @@ msgid "Check this box if you want to allow the cancellation the entries related
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
+msgid "Check this option if your pre-printed checks are not numbered."
+msgstr ""
+
+#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id
+msgid "Checks numbering sequence."
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
msgid "Choose a file to import..."
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_color
+msgid "Color Index"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_company_id
msgid "Company"
msgstr ""
@@ -143,7 +168,7 @@ msgid "Company related to this journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:106
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:108
#, python-format
msgid "Could not make sense of the given file.\n"
"Did you install the module to support this type of file ?"
@@ -162,6 +187,11 @@ msgid "Created on"
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_id
+msgid "Credit Note Entry Sequence"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id
msgid "Currency"
msgstr ""
@@ -173,7 +203,7 @@ 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 Refund Sequence"
+msgid "Dedicated Credit Note Sequence"
msgstr ""
#. module: account_bank_statement_import
@@ -275,7 +305,7 @@ msgid "Journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:67
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:69
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
#, python-format
msgid "Journal Creation"
@@ -325,6 +355,11 @@ msgid "Loss Account"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing
+msgid "Manual Numbering"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_inbound_payment_method_ids
msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software."
msgstr ""
@@ -335,7 +370,12 @@ msgid "Means of payment for sending money. Odoo modules offer various payments h
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:136
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_bank_statement_import
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:138
#, python-format
msgid "No currency found matching '%s'."
msgstr ""
@@ -356,11 +396,6 @@ msgid "Profit Account"
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_id
-msgid "Refund Entry Sequence"
-msgstr ""
-
-#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type
msgid "Select 'Sale' for customer invoices journals.\n"
"Select 'Purchase' for vendor bills journals.\n"
@@ -379,6 +414,11 @@ msgid "Sequence"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number
+msgid "Sequence number of the next printed check."
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code
msgid "Short Code"
msgstr ""
@@ -389,18 +429,23 @@ msgid "Show journal on dashboard"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected
+msgid "Technical feature used to know whether check printing was enabled as payment method."
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
msgid "The account of the statement you are importing is not yet recorded in Odoo. In order to proceed with the import, you need to create a bank journal for this account."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:151
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:153
#, 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:161
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:163
#, python-format
msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s) !"
msgstr ""
@@ -416,23 +461,23 @@ msgid "The journal entries of this journal will be named using this prefix."
msgstr ""
#. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id
-msgid "This field contains the information related to the numbering of the journal entries of this journal."
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
+msgid "This field contains the information related to the numbering of the credit note entries of this journal."
msgstr ""
#. module: account_bank_statement_import
-#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id
-msgid "This field contains the information related to the numbering of the refund entries of this journal."
+#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id
+msgid "This field contains the information related to the numbering of the journal entries of this journal."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:111
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:113
#, 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:119
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:121
#, python-format
msgid "This file doesn't contain any transaction."
msgstr ""
@@ -463,7 +508,7 @@ 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:232
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:237
#, python-format
msgid "You have already imported that file."
msgstr ""
diff --git a/addons/account_check_printing/i18n/account_check_printing.pot b/addons/account_check_printing/i18n/account_check_printing.pot
index 1df76126dfd..ab9e18ea5de 100644
--- a/addons/account_check_printing/i18n/account_check_printing.pot
+++ b/addons/account_check_printing/i18n/account_check_printing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,14 +22,13 @@ msgid " : Check Number Sequence"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:37
-#: code:addons/account_check_printing/models/account_payment.py:74
+#: code:addons/account_check_printing/models/account_payment.py:59
#, python-format
msgid " and %s/100"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:83
+#: code:addons/account_check_printing/models/account_payment.py:81
#, python-format
msgid "A check memo cannot exceed 60 characters."
msgstr ""
@@ -46,11 +45,6 @@ msgid "Cancel"
msgstr ""
#. module: account_check_printing
-#: model:account.payment.method,name:account_check_printing.account_payment_method_check
-msgid "Check"
-msgstr ""
-
-#. module: account_check_printing
#: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_number
#: model:ir.model.fields,field_description:account_check_printing.field_account_register_payments_check_number
msgid "Check Number"
@@ -84,6 +78,11 @@ msgid "Check to print"
msgstr ""
#. module: account_check_printing
+#: model:account.payment.method,name:account_check_printing.account_payment_method_check
+msgid "Checks"
+msgstr ""
+
+#. module: account_check_printing
#: model:ir.ui.view,arch_db:account_check_printing.view_payment_check_printing_search
msgid "Checks To Print"
msgstr ""
@@ -125,7 +124,7 @@ msgid "ID"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:103
+#: code:addons/account_check_printing/models/account_payment.py:101
#, python-format
msgid "In order to print multiple checks at once, they must belong to the same bank journal."
msgstr ""
@@ -174,7 +173,7 @@ msgid "Payments"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:100
+#: code:addons/account_check_printing/models/account_payment.py:98
#, python-format
msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled"
msgstr ""
@@ -200,7 +199,7 @@ msgid "Print Checks"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:113
+#: code:addons/account_check_printing/models/account_payment.py:111
#: model:ir.model,name:account_check_printing.model_print_prenumbered_checks
#: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
#, python-format
@@ -234,7 +233,7 @@ msgid "The selected journal is configured to print check numbers. If your pre-pr
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/models/account_payment.py:136
+#: code:addons/account_check_printing/models/account_payment.py:133
#, python-format
msgid "There is no check layout configured.\n"
"Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct."
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index 29927eaaae7..f034eee2fea 100644
--- a/addons/barcodes/i18n/barcodes.pot
+++ b/addons/barcodes/i18n/barcodes.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,6 +53,13 @@ msgid "A barcode nomenclature defines how the point of sale identify and interpr
msgstr ""
#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:323
+#, python-format
+msgid "Action currently unavailable"
+msgstr ""
+
+#. module: barcodes
#: code:addons/barcodes/models/barcodes.py:183
#: selection:barcode.rule,type:0
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
@@ -143,7 +150,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:102
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:286
#, python-format
msgid "Discard"
msgstr ""
@@ -182,14 +189,21 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:233
+#, python-format
+msgid "Error : Barcode command is undefined"
+msgstr ""
+
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:59
#, python-format
msgid "Error : Document not editable"
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:259
#, python-format
msgid "Error : No last scanned barcode"
msgstr ""
@@ -272,7 +286,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:88
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:279
#, python-format
msgid "Select"
msgstr ""
@@ -284,7 +298,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:87
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:278
#, python-format
msgid "Set quantity"
msgstr ""
@@ -324,14 +338,14 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:60
#, python-format
msgid "To modify this document, please first start edition."
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68
+#: code:addons/barcodes/static/src/js/barcode_form_view.js:260
#, python-format
msgid "To set the quantity please scan a barcode first."
msgstr ""
diff --git a/addons/base_address_extended/i18n/base_address_extended.pot b/addons/base_address_extended/i18n/base_address_extended.pot
index 518eeb3fb53..c3730653181 100644
--- a/addons/base_address_extended/i18n/base_address_extended.pot
+++ b/addons/base_address_extended/i18n/base_address_extended.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgid "Change how the system computes the full street field based on the differe
msgstr ""
#. module: base_address_extended
+#: model:ir.model,name:base_address_extended.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_address_extended
#: model:ir.model,name:base_address_extended.model_res_partner
msgid "Contact"
msgstr ""
@@ -31,7 +36,9 @@ msgid "Country"
msgstr ""
#. module: base_address_extended
+#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number2
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number2
+#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number2
msgid "Door Number"
msgstr ""
@@ -46,7 +53,9 @@ msgid "Format to use for streets belonging to this country.\n"
msgstr ""
#. module: base_address_extended
+#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number
+#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number
msgid "House Number"
msgstr ""
@@ -56,13 +65,16 @@ msgid "Street Format"
msgstr ""
#. module: base_address_extended
+#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_name
#: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_name
+#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_name
msgid "Street Name"
msgstr ""
#. module: base_address_extended
#: model:ir.ui.view,arch_db:base_address_extended.view_partner_address_structured_form
#: model:ir.ui.view,arch_db:base_address_extended.view_partner_structured_form
+#: model:ir.ui.view,arch_db:base_address_extended.view_res_company_extended_form
msgid "Street Name..."
msgstr ""
diff --git a/addons/base_sparse_field/i18n/base_sparse_field.pot b/addons/base_sparse_field/i18n/base_sparse_field.pot
new file mode 100644
index 00000000000..f13fe8be1d9
--- /dev/null
+++ b/addons/base_sparse_field/i18n/base_sparse_field.pot
@@ -0,0 +1,135 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_sparse_field
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_boolean
+msgid "Boolean"
+msgstr ""
+
+#. module: base_sparse_field
+#: code:addons/base_sparse_field/models/models.py:24
+#, python-format
+msgid "Changing the storing system for field \"%s\" is not allowed."
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_char
+msgid "Char"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_data
+msgid "Data"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model,name:base_sparse_field.model_ir_model_fields
+msgid "Fields"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_float
+msgid "Float"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_id
+msgid "ID"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,help:base_sparse_field.field_ir_model_fields_serialization_field_id
+msgid "If set, this field will be stored in the sparse structure of the serialization field, instead of having its own database column. This cannot be changed after creation."
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_integer
+msgid "Integer"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:sparse_fields.test,selection:0
+msgid "One"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_sparse_field
+#: code:addons/base_sparse_field/models/models.py:26
+#, python-format
+msgid "Renaming sparse field \"%s\" is not allowed"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_selection
+msgid "Selection"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model.fields,field_description:base_sparse_field.field_ir_model_fields_serialization_field_id
+msgid "Serialization Field"
+msgstr ""
+
+#. module: base_sparse_field
+#: code:addons/base_sparse_field/models/models.py:38
+#, python-format
+msgid "Serialization field `%s` not found for sparse field `%s`!"
+msgstr ""
+
+#. module: base_sparse_field
+#: selection:sparse_fields.test,selection:0
+msgid "Two"
+msgstr ""
+
+#. module: base_sparse_field
+#: model:ir.model,name:base_sparse_field.model_sparse_fields_test
+msgid "sparse_fields.test"
+msgstr ""
+
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 5ea6bc086a5..16ef54cf24b 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:423
+#: code:addons/board/static/src/js/favorite_menu.js:97
#, python-format
msgid "'%s' added to dashboard"
msgstr ""
@@ -36,23 +36,23 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:70
+#: code:addons/board/static/src/xml/board.xml:69
#, python-format
msgid "Add"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:64
+#: code:addons/board/static/src/xml/board.xml:63
#, python-format
msgid "Add to my Dashboard"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:141
+#: code:addons/board/static/src/js/dashboard.js:332
#, python-format
-msgid "Are you sure you want to remove this item ?"
+msgid "Are you sure you want to remove this item?"
msgstr ""
#. module: board
@@ -76,14 +76,14 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:37
+#: code:addons/board/static/src/xml/board.xml:36
#, python-format
msgid "Choose dashboard layout"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:425
+#: code:addons/board/static/src/js/favorite_menu.js:99
#, python-format
msgid "Could not add filter to dashboard"
msgstr ""
@@ -95,7 +95,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:96
+#: code:addons/board/static/src/js/dashboard.js:86
#, python-format
msgid "Edit Layout"
msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:32
+#: code:addons/board/static/src/js/dashboard.js:49
#: 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
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 8ffc467d4c3..616ee3ffe54 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -140,7 +140,7 @@ msgid "\n"
" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>\n"
" <table style=\"margin-top: 20px;\"><tr>\n"
" <td>\n"
-" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;\">\n"
+" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#875A7B;padding-top: 4px;border:1px solid #875A7B;\">\n"
" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" </div>\n"
" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #875A7B;\">\n"
@@ -273,13 +273,6 @@ msgid "\n"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:98
-#, python-format
-msgid " [Me]"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted
msgid "# Meetings Highlight"
msgstr ""
@@ -300,26 +293,26 @@ msgid "${object.event_id.name}: Date updated"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:658
+#: code:addons/calendar/models/calendar.py:671
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:656
+#: code:addons/calendar/models/calendar.py:669
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:196
+#: code:addons/calendar/models/calendar.py:206
#, python-format
msgid "%s has accepted invitation"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:204
+#: code:addons/calendar/models/calendar.py:214
#, python-format
msgid "%s has declined invitation"
msgstr ""
@@ -348,19 +341,12 @@ msgid "Active"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:78
-#, python-format
-msgid "Add Favorite Calendar"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_allday
msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:653
+#: code:addons/calendar/models/calendar.py:666
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -399,7 +385,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:1506
+#: code:addons/calendar/models/calendar.py:1508
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -448,11 +434,6 @@ msgid "Click to schedule a new meeting."
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_color_partner_id
-msgid "Color index of creator"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_attendee_common_name
msgid "Common name"
msgstr ""
@@ -548,13 +529,6 @@ msgid "Display Name"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:159
-#, python-format
-msgid "Do you really want to delete this filter from favorites ?"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_duration
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Duration"
@@ -604,13 +578,13 @@ msgid "Ending at"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:848
+#: code:addons/calendar/models/calendar.py:854
#, python-format
msgid "Ending date cannot be set before starting date."
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:846
+#: code:addons/calendar/models/calendar.py:852
#, python-format
msgid "Ending datetime cannot be set before starting datetime."
msgstr ""
@@ -637,13 +611,6 @@ msgid "Event recurrence interval cannot be negative."
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:99
-#, python-format
-msgid "Everybody's calendars"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.event,privacy:0
msgid "Everyone"
msgstr ""
@@ -659,7 +626,7 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:888
+#: code:addons/calendar/models/calendar.py:894
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -791,6 +758,7 @@ msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_res_partner_calendar_last_notif_ack
+#: model:ir.model.fields,field_description:calendar.field_res_users_calendar_last_notif_ack
msgid "Last notification marked as read from base Calendar"
msgstr ""
@@ -962,6 +930,11 @@ msgid "Participant"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,help:calendar.field_calendar_event_partner_id
+msgid "Partner-related data of the user"
+msgstr ""
+
+#. module: calendar
#: code:addons/calendar/models/calendar.py:1110
#, python-format
msgid "Please select a proper day of the month."
@@ -1019,13 +992,6 @@ msgid "Reminders"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:26
-#, python-format
-msgid "Remove this favorite from the list"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_count
msgid "Repeat"
msgstr ""
@@ -1051,6 +1017,7 @@ msgid "Repeat x times"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_partner_id
#: model:ir.model.fields,field_description:calendar.field_calendar_event_user_id
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
msgid "Responsible"
@@ -1281,7 +1248,7 @@ msgid "Yes I'm going."
msgstr ""
#. module: calendar
-#: code:addons/calendar/models/calendar.py:128
+#: code:addons/calendar/models/calendar.py:137
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index d2aa494e98c..64fafb2c725 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -657,11 +657,7 @@ msgid "Active"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_activity_report_action_tree
-#: model:ir.model.fields,field_description:crm.field_res_partner_activities_count
-#: model:ir.model.fields,field_description:crm.field_res_users_activities_count
#: model:ir.ui.menu,name:crm.crm_activity_report_menu
-#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1
msgid "Activities"
msgstr ""
@@ -751,7 +747,7 @@ msgid "All contacts must have the same email. Only the Administrator can merge c
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:844
+#: code:addons/crm/models/crm_lead.py:856
#, python-format
msgid "All email incoming to %s will automatically\n"
" create new opportunity. Update your business card, phone book, social media,...\n"
@@ -991,7 +987,7 @@ msgid "Click on an opportunity to zoom to it."
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:847
+#: code:addons/crm/models/crm_lead.py:859
#, python-format
msgid "Click to add a new opportunity"
msgstr ""
@@ -1168,7 +1164,7 @@ msgid "Convert to opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1018
+#: code:addons/crm/models/crm_lead.py:1031
#: selection:crm.lead2opportunity.partner,name:0
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
@@ -1344,7 +1340,7 @@ msgid "Current Line"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1062
+#: code:addons/crm/models/crm_lead.py:1075
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_partner_id
@@ -1360,7 +1356,7 @@ msgid "Customer"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1064
+#: code:addons/crm/models/crm_lead.py:1077
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1383,7 +1379,7 @@ msgid "Customizations"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:83
+#: 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 ""
@@ -1638,9 +1634,22 @@ msgid "Expected Closing Date"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:190
+#: selection:crm.team,dashboard_graph_group_pipeline:0
+msgid "Expected Closing Day"
+msgstr ""
+
+#. module: crm
+#: selection:crm.team,dashboard_graph_group_pipeline:0
+msgid "Expected Closing Month"
+msgstr ""
+
+#. module: crm
+#: selection:crm.team,dashboard_graph_group_pipeline:0
+msgid "Expected Closing Week"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
-#, python-format
msgid "Expected Revenue"
msgstr ""
@@ -1650,6 +1659,11 @@ msgid "Expected Revenues"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_period_pipeline
+msgid "Expected to Close"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
msgid "Expiration Closing Month"
msgstr ""
@@ -1714,7 +1728,7 @@ msgid "Force assignation"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:515
+#: code:addons/crm/models/crm_lead.py:527
#, python-format
msgid "From %s : %s"
msgstr ""
@@ -1773,6 +1787,11 @@ msgid "Group By"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_group_pipeline
+msgid "Group by"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_number_group
msgid "Group of Contacts"
msgstr ""
@@ -1830,6 +1849,11 @@ msgid "High"
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_group_pipeline
+msgid "How this channel's dashboard graph will group the results."
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_id
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_id
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_id
@@ -2021,7 +2045,7 @@ msgid "Last Updated on"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:821
+#: code:addons/crm/models/crm_lead.py:833
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
@@ -2092,7 +2116,7 @@ msgid "Leads & Opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:56
+#: code:addons/crm/models/crm_lead.py:55
#, python-format
msgid "Leads / Opportunities"
msgstr ""
@@ -2192,7 +2216,7 @@ msgstr ""
#. module: crm
#. openerp-web
-#: code:addons/crm/models/crm_lead.py:1024
+#: code:addons/crm/models/crm_lead.py:1037
#: code:addons/crm/static/src/js/web_planner_crm.js:33
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -2267,7 +2291,7 @@ msgid "Medium"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:863
+#: code:addons/crm/models/crm_lead.py:875
#, python-format
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
msgstr ""
@@ -2351,25 +2375,25 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:466
+#: code:addons/crm/models/crm_lead.py:478
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:497
+#: code:addons/crm/models/crm_lead.py:509
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:497
+#: code:addons/crm/models/crm_lead.py:509
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:466
+#: code:addons/crm/models/crm_lead.py:478
#, python-format
msgid "Merged opportunity"
msgstr ""
@@ -2473,11 +2497,6 @@ msgid "New propspect assigned to the right salesperson"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_date_action_next
-msgid "Next Action"
-msgstr ""
-
-#. module: crm
#: model:ir.actions.act_window,name:crm.crm_lead_action_activities
#: model:ir.ui.menu,name:crm.crm_lead_menu_activities
#: model:ir.ui.view,arch_db:crm.crm_lead_view_tree_activity
@@ -2495,7 +2514,7 @@ msgid "Next activity late"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:1084
+#: code:addons/crm/models/crm_lead.py:1097
#, python-format
msgid "No Subject"
msgstr ""
@@ -2667,7 +2686,7 @@ msgid "Opportunities that are assigned to me"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:796
+#: code:addons/crm/models/crm_lead.py:808
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
@@ -2822,6 +2841,11 @@ msgid "Phone"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_sale_config_settings_module_crm_phone_validation
+msgid "Phone Validation"
+msgstr ""
+
+#. module: crm
#. openerp-web
#: code:addons/crm/static/src/js/web_planner_crm.js:23
#, python-format
@@ -2834,7 +2858,7 @@ msgid "Phone scripts"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_team.py:134
+#: code:addons/crm/models/crm_team.py:172
#: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities
#: model:ir.ui.menu,name:crm.crm_opportunity_report_menu
#: model:ir.ui.view,arch_db:crm.crm_planner
@@ -2870,6 +2894,12 @@ msgid "Pipeline Analysis gives you an instant access to\n"
msgstr ""
#. module: crm
+#: code:addons/crm/models/crm_team.py:238
+#, python-format
+msgid "Pipeline: Expected Revenue"
+msgstr ""
+
+#. module: crm
#: model:web.planner,tooltip_planner:crm.planner_crm
msgid "Plan your sales strategy: objectives, leads, KPIs, and much more!"
msgstr ""
@@ -2880,7 +2910,7 @@ msgid "Planner"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:569
+#: code:addons/crm/models/crm_lead.py:581
#, python-format
msgid "Please select more than one element (lead or opportunity) from the list view."
msgstr ""
@@ -2900,6 +2930,7 @@ msgid "Pricing &amp; Discounts"
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 ""
@@ -3000,11 +3031,6 @@ msgid "Quotation signed by the customer"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_priority
-msgid "Rating"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Read the documentation about pricing &amp; discounts"
msgstr ""
@@ -3111,6 +3137,7 @@ msgid "Salesmen"
msgstr ""
#. module: crm
+#: selection:crm.team,dashboard_graph_group_pipeline:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_user_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_user_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_user_id
@@ -3297,6 +3324,7 @@ msgid "Specific team that uses this stage. Other teams will not be able to see o
msgstr ""
#. module: crm
+#: 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
@@ -3501,6 +3529,11 @@ msgid "The three main practices to develop a sales force are\n"
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_period_pipeline
+msgid "The time period this channel's dashboard graph will consider."
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "The whole process may take a few hours. But it's worth doing\n"
" it."
@@ -3570,7 +3603,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:990
+#: code:addons/crm/models/crm_lead.py:1003
#, python-format
msgid "This target does not exist."
msgstr ""
@@ -3785,6 +3818,11 @@ msgid "VIP letter to potential sponsors"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm
+msgid "Validate and normalize phone numbers."
+msgstr ""
+
+#. module: crm
#: selection:crm.lead,priority:0
#: selection:crm.opportunity.report,priority:0
msgid "Very High"
@@ -3884,13 +3922,28 @@ msgid "Win / Loss Ratio"
msgstr ""
#. module: crm
+#: selection:crm.team,dashboard_graph_period_pipeline:0
+msgid "Within a Month"
+msgstr ""
+
+#. module: crm
+#: selection:crm.team,dashboard_graph_period_pipeline:0
+msgid "Within a Week"
+msgstr ""
+
+#. module: crm
+#: selection:crm.team,dashboard_graph_period_pipeline:0
+msgid "Within a Year"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_wizard_id
msgid "Wizard"
msgstr ""
#. module: crm
#. openerp-web
-#: code:addons/crm/models/crm_lead.py:1023
+#: code:addons/crm/models/crm_lead.py:1036
#: code:addons/crm/static/src/js/web_planner_crm.js:15
#: code:addons/crm/static/src/js/web_planner_crm.js:22
#: code:addons/crm/static/src/js/web_planner_crm.js:27
@@ -4067,7 +4120,7 @@ msgid "e.g. www.odoo.com"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:851
+#: code:addons/crm/models/crm_lead.py:863
#, python-format
msgid "opportunities"
msgstr ""
@@ -4129,7 +4182,7 @@ msgid "to setup your own domain\n"
msgstr ""
#. module: crm
-#: code:addons/crm/models/crm_lead.py:857
+#: code:addons/crm/models/crm_lead.py:869
#, python-format
msgid "unknown"
msgstr ""
diff --git a/addons/crm_phone_validation/i18n/crm_phone_validation.pot b/addons/crm_phone_validation/i18n/crm_phone_validation.pot
new file mode 100644
index 00000000000..1dc79b222fa
--- /dev/null
+++ b/addons/crm_phone_validation/i18n/crm_phone_validation.pot
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * crm_phone_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: crm_phone_validation
+#: model:ir.model.fields,help:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
+msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
+msgstr ""
+
+#. module: crm_phone_validation
+#: model:ir.model,name:crm_phone_validation.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: crm_phone_validation
+#: model:ir.model.fields,field_description:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method
+msgid "Enforce International Format"
+msgstr ""
+
+#. module: crm_phone_validation
+#: model:ir.model,name:crm_phone_validation.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm_phone_validation
+#: model:ir.model,name:crm_phone_validation.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 929dee54f01..ff6f37f3e52 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -82,12 +82,12 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_sale
-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/Refund"
+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 ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_description_purchase
-msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund."
+msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note."
msgstr ""
#. module: delivery
@@ -423,6 +423,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
msgid "Delivery Method"
msgstr ""
@@ -441,8 +442,15 @@ msgid "Delivery Package Selection Wizard"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
+#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view
#: model:ir.ui.menu,name:delivery.menu_delivery_packagings
+#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_tree
+msgid "Delivery Packages"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id
+#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form
msgid "Delivery Packaging"
msgstr ""
@@ -617,6 +625,7 @@ msgstr ""
#. module: delivery
#: model:delivery.carrier,name:delivery.free_delivery_carrier
#: model:product.product,name:delivery.free_delivery_carrier_product_product
+#: model:product.template,name:delivery.free_delivery_carrier_product_template
msgid "Free delivery charges"
msgstr ""
@@ -652,6 +661,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_hs_code
+#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code
#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
msgid "HS Code"
msgstr ""
@@ -1034,7 +1044,7 @@ msgstr ""
#. module: delivery
#: code:addons/delivery/models/stock_picking.py:36
-#: code:addons/delivery/models/stock_picking.py:128
+#: code:addons/delivery/models/stock_picking.py:129
#, python-format
msgid "Package Details"
msgstr ""
@@ -1046,16 +1056,10 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_product_packaging
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids
msgid "Packaging"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view
-msgid "Packagings"
-msgstr ""
-
-#. module: delivery
#: model:ir.model,name:delivery.model_stock_pack_operation
msgid "Packing Operation"
msgstr ""
@@ -1144,6 +1148,11 @@ msgid "Product Life Time"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids
+msgid "Product Packages"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_removal_time
msgid "Product Removal Time"
msgstr ""
@@ -1354,7 +1363,7 @@ msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:147
+#: code:addons/delivery/models/stock_picking.py:150
#, python-format
msgid "Shipment sent to carrier %s for shipping with tracking number %s<br/>Cost: %.2f %s"
msgstr ""
@@ -1395,6 +1404,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_hs_code
+#: model:ir.model.fields,help:delivery.field_product_product_hs_code
#: model:ir.model.fields,help:delivery.field_product_template_hs_code
msgid "Standardized code for international shipping and goods declaration"
msgstr ""
@@ -1521,6 +1531,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id
+#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id
msgid "This delivery method will be used when invoicing from picking."
msgstr ""
@@ -1747,14 +1758,14 @@ msgid "Width must be positive"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:187
+#: code:addons/delivery/models/stock_picking.py:190
#, python-format
msgid "You are shipping different packaging types in the same shipment.\n"
"Packaging Types: %s"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:163
+#: code:addons/delivery/models/stock_picking.py:166
#, python-format
msgid "Your delivery method has no redirect on courier provider's website to track this order."
msgstr ""
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index 17e1fb17221..b37c332cf8c 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,19 +17,40 @@ msgstr ""
#. module: document
#. openerp-web
-#: code:addons/document/static/src/js/document.js:26
+#: code:addons/document/static/src/js/document.js:69
#, python-format
msgid "%s (%s)"
msgstr ""
#. module: document
#. openerp-web
-#: code:addons/document/static/src/js/document.js:14
+#: code:addons/document/static/src/js/document.js:18
#, python-format
msgid "Attachment(s)"
msgstr ""
#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:163
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:176
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: document
+#. openerp-web
+#: code:addons/document/static/src/js/document.js:138
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: document
#: model:ir.model,name:document.model_ir_attachment
msgid "ir.attachment"
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index b8de719c216..bf5d6ec52a1 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -412,6 +412,11 @@ msgid "Archived"
msgstr ""
#. module: event
+#: model:ir.ui.view,arch_db:event.view_event_form
+msgid "Are you sure you want to cancel this event? All the linked attendees will be cancelled as well."
+msgstr ""
+
+#. module: event
#: model:ir.ui.view,arch_db:event.event_config_settings_view_form
msgid "Attendance"
msgstr ""
@@ -562,7 +567,7 @@ msgid "Company"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:467
+#: code:addons/event/models/event.py:480
#, python-format
msgid "Compose Email"
msgstr ""
@@ -655,13 +660,13 @@ msgid "Created on"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:444
+#: code:addons/event/models/event.py:443
#, python-format
msgid "Customer"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:446
+#: code:addons/event/models/event.py:445
#, python-format
msgid "Customer Email"
msgstr ""
@@ -741,7 +746,7 @@ msgid "Event"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:333
+#: code:addons/event/models/event.py:332
#, python-format
msgid "Event Attendees"
msgstr ""
@@ -840,6 +845,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.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
@@ -1104,7 +1110,7 @@ msgid "No more available seats."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:363
+#: code:addons/event/models/event.py:362
#, python-format
msgid "No more seats available for this event."
msgstr ""
@@ -1121,6 +1127,7 @@ 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 ""
@@ -1383,6 +1390,12 @@ msgid "The email address of the organizer is likely to be put here, with the eff
msgstr ""
#. module: event
+#: code:addons/event/models/event.py:309
+#, python-format
+msgid "There are already attendees who attended this event. Please reset it to draft if you want to cancel this event."
+msgstr ""
+
+#. module: event
#: model:ir.model.fields,help:event.field_event_mail_template_id
#: model:ir.model.fields,help:event.field_event_type_mail_template_id
msgid "This field contains the template of the mail that will be automatically sent"
@@ -1496,19 +1509,13 @@ msgid "Week(s)"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:310
-#, python-format
-msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event."
-msgstr ""
-
-#. module: event
-#: code:addons/event/models/event.py:420
+#: code:addons/event/models/event.py:419
#, 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:421
#, python-format
msgid "You must wait the event starting day before doing this action."
msgstr ""
@@ -1539,37 +1546,37 @@ msgid "event.confirm"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:489
+#: code:addons/event/models/event.py:502
#, python-format
msgid "in %d days"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:493
+#: code:addons/event/models/event.py:506
#, python-format
msgid "next month"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:491
+#: code:addons/event/models/event.py:504
#, python-format
msgid "next week"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:495
+#: code:addons/event/models/event.py:508
#, python-format
msgid "on "
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:485
+#: code:addons/event/models/event.py:498
#, python-format
msgid "today"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:487
+#: code:addons/event/models/event.py:500
#, python-format
msgid "tomorrow"
msgstr ""
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 81254654930..3a25f7ef5ac 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: fleet
-#: code:addons/fleet/models/fleet.py:307
+#: code:addons/fleet/models/fleet_vehicle.py:196
#, python-format
msgid "%s %s has been added to the fleet!"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:652
+#: code:addons/fleet/models/fleet_vehicle_cost.py:266
#, python-format
msgid "%s contract(s) need(s) to be renewed and/or closed!"
msgstr ""
@@ -63,11 +63,6 @@ msgid "A/C Recharge"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
-msgid "Acquisition Date"
-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"
@@ -197,13 +192,13 @@ msgid "Calculation Benefit In Kind"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
-msgid "Car Value"
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
msgstr ""
#. module: fleet
-#: model:fleet.service.type,name:fleet.type_service_14
-msgid "Car Wash"
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value
+msgid "Catalog Value (VAT Incl.)"
msgstr ""
#. module: fleet
@@ -408,6 +403,14 @@ msgid "Cost"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_description
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_description
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_description
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_description
+msgid "Cost Description"
+msgstr ""
+
+#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
msgid "Cost Details"
msgstr ""
@@ -498,7 +501,7 @@ msgid "Created on"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_3011
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id
msgid "Current state of the vehicle"
msgstr ""
@@ -536,7 +539,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date
-msgid "Date when the vehicle has been bought"
+msgid "Date when the vehicle has been immatriculated"
msgstr ""
#. module: fleet
@@ -576,16 +579,18 @@ 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_odometer_driver_id
msgid "Driver"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_driver_id
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_driver_id
msgid "Driver of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:325
+#: code:addons/fleet/models/fleet_vehicle.py:214
#, python-format
msgid "Driver: from '%s' to '%s'"
msgstr ""
@@ -593,7 +598,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
msgid "Each contract (e.g.: leasing) may include several services\n"
-" (reparation, insurances, periodic maintenance)."
+" (reparation, insurances, periodic maintenance)."
msgstr ""
#. module: fleet
@@ -622,7 +627,7 @@ msgid "Employee Car"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:37
+#: code:addons/fleet/models/fleet_vehicle_cost.py:44
#, python-format
msgid "Emptying the odometer value of a vehicle is not allowed."
msgstr ""
@@ -799,15 +804,15 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_action
msgid "Here you can add refuelling entries for all vehicles. You can\n"
-" also filter logs of a particular vehicle using the search\n"
-" field."
+" also filter logs of a particular vehicle using the search\n"
+" field."
msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action
msgid "Here you can add various odometer entries for all vehicles.\n"
-" You can also show odometer value for a particular vehicle using\n"
-" the search field."
+" You can also show odometer value for a particular vehicle using\n"
+" the search field."
msgstr ""
#. module: fleet
@@ -832,10 +837,10 @@ msgstr ""
#: 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
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_id
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_2959
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_3193
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_3182
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_id
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3038
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_tag_id
msgid "ID"
msgstr ""
@@ -846,7 +851,13 @@ msgid "Ignition Coil Replacement"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date
+msgid "Immatriculation Date"
+msgstr ""
+
+#. module: fleet
#: selection:fleet.vehicle.log.contract,state:0
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
msgid "In Progress"
msgstr ""
@@ -975,7 +986,7 @@ msgid "License Plate"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:332
+#: code:addons/fleet/models/fleet_vehicle.py:221
#, python-format
msgid "License Plate: from '%s' to '%s'"
msgstr ""
@@ -1034,8 +1045,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
msgid "Manage all your contracts (leasing, insurances, etc.) with\n"
-" their related services, costs. Odoo will automatically warn\n"
-" you when some contracts have to be renewed."
+" their related services, costs. Odoo will automatically warn\n"
+" you when some contracts have to be renewed."
msgstr ""
#. module: fleet
@@ -1071,7 +1082,7 @@ msgid "Miles"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2992
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Model"
@@ -1100,12 +1111,12 @@ msgid "Model of a vehicle"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2992
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id
msgid "Model of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:321
+#: code:addons/fleet/models/fleet_vehicle.py:210
#, python-format
msgid "Model: from '%s' to '%s'"
msgstr ""
@@ -1149,10 +1160,10 @@ msgid "No"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:320
-#: code:addons/fleet/models/fleet.py:324
-#: code:addons/fleet/models/fleet.py:328
-#: code:addons/fleet/models/fleet.py:331
+#: code:addons/fleet/models/fleet_vehicle.py:209
+#: code:addons/fleet/models/fleet_vehicle.py:213
+#: code:addons/fleet/models/fleet_vehicle.py:217
+#: code:addons/fleet/models/fleet_vehicle.py:220
#, python-format
msgid "None"
msgstr ""
@@ -1203,7 +1214,6 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_odometer
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_value
@@ -1216,6 +1226,11 @@ msgid "Odometer Values Per Vehicle"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer
+msgid "Odometer at creation"
+msgstr ""
+
+#. module: fleet
#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Odometer details"
msgstr ""
@@ -1226,9 +1241,13 @@ msgid "Odometer log for a vehicle"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
+msgid "Odometer measure of the vehicle at the moment of the contract creation"
+msgstr ""
+
+#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer_id
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_id
@@ -1241,8 +1260,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_action
msgid "Odoo helps you keeping track of all the services done\n"
-" on your vehicle. Services can be of many type: occasional\n"
-" repair, fixed maintenance, etc."
+" on your vehicle. Services can be of many type: occasional\n"
+" repair, fixed maintenance, etc."
msgstr ""
#. module: fleet
@@ -1262,7 +1281,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "Odoo will warn you when services or contract have to be\n"
-" renewed."
+" renewed."
msgstr ""
#. module: fleet
@@ -1281,6 +1300,11 @@ msgid "Omnium"
msgstr ""
#. module: fleet
+#: sql_constraint:fleet.vehicle:0
+msgid "Only one car can be assigned to the same employee!"
+msgstr ""
+
+#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_16
msgid "Options"
msgstr ""
@@ -1392,7 +1416,7 @@ msgid "Refueling Details"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:587
+#: code:addons/fleet/models/fleet_vehicle_cost.py:192
#: 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
@@ -1425,6 +1449,11 @@ msgid "Reporting"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_residual_value
+msgid "Residual Value"
+msgstr ""
+
+#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_15
msgid "Residual value (Excluding VAT)"
msgstr ""
@@ -1555,7 +1584,7 @@ msgid "Starter Replacement"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3011
+#: 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"
msgstr ""
@@ -1566,7 +1595,7 @@ msgid "State name already exists"
msgstr ""
#. module: fleet
-#: code:addons/fleet/models/fleet.py:329
+#: code:addons/fleet/models/fleet_vehicle.py:218
#, python-format
msgid "State: from '%s' to '%s'"
msgstr ""
@@ -1729,7 +1758,7 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer_unit
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer_unit
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer_unit
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3026
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3029
msgid "Unit"
msgstr ""
@@ -1739,7 +1768,7 @@ msgstr ""
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_unit
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_services_odometer_unit
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3026
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3029
msgid "Unit of the odometer "
msgstr ""
@@ -1946,7 +1975,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_action
msgid "You can customize available status to track the evolution of\n"
-" each vehicle. Example: Active, Being Repaired, Sold."
+" each vehicle. Example: Active, Being Repaired, Sold."
msgstr ""
#. module: fleet
@@ -1957,8 +1986,8 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "You will be able to manage your fleet by keeping track of the\n"
-" contracts, services, fixed and recurring costs, odometers and\n"
-" fuel logs associated to each vehicle."
+" contracts, services, fixed and recurring costs, odometers and\n"
+" fuel logs associated to each vehicle."
msgstr ""
#. module: fleet
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
index a1b24f9137b..2db8c357f54 100644
--- a/addons/gamification/i18n/gamification.pot
+++ b/addons/gamification/i18n/gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,246 @@ msgstr ""
"Plural-Forms: \n"
#. 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"
+"<tr>\n"
+" <td valign=\"top\" align=\"center\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"600\" style=\"margin: 0 auto; width: 600px;\">\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"
+" </tr>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" bgcolor=\"#fff\" style=\"background-color:#fff;\">\n"
+" <tr><td style=\"padding: 15px;\">\n"
+" % if object.visibility_mode == 'personal':\n"
+" <span style=\"color:#666666;font-size:13px;\">Here is your current progress in the challenge <strong>${object.name}</strong>.</span>\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"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;color:#666666;\">\n"
+" <thead>\n"
+" <tr style=\"color:#9A6C8E; font-size:12px;\">\n"
+" <th align=\"left\" style=\"padding-bottom: 0px;width:40%;text-align:left;\">Goals</th>\n"
+" <th style=\"width:20%;text-align:right;\" align=\"left\">Target</th>\n"
+" <th style=\"width:20%;text-align:right;\" align=\"right\">Current</th>\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"
+" </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"
+" <td style=\"padding: 20px 0;\" align=\"left\">\n"
+" ${line['name']}\n"
+" % if line['suffix'] or line['monetary']:\n"
+" (${line['full_suffix']})\n"
+" % endif\n"
+" </td>\n"
+" <td style=\"padding: 20px 0;\" align=\"right\">${\"%.2f\" % line['target']}\n"
+" % if line['suffix']:\n"
+" ${line['suffix']}\n"
+" % endif\n"
+" </td>\n"
+" <td style=\"padding: 20px 0;\" align=\"right\">${\"%.2f\" % line['current']}\n"
+" % if line['suffix']:\n"
+" ${line['suffix']}\n"
+" % endif\n"
+" </td>\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"
+" </tr>\n"
+" % endfor \n"
+" </tbody>\n"
+" </table> \n"
+" % else: \n"
+" <span style=\"color:#A8A8A8;font-size:13px;\">\n"
+" The following message contains the current progress for the challenge <strong>${object.name}</strong>.\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"
+" <tr>\n"
+" <td width=\"50%\">\n"
+" <p style=\"font-size:22px;color:#666666;\">Top Achievers for goal <strong>${line['name']}</strong></p>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" <!-- Podium -->\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%\">\n"
+" <tr>\n"
+" % set top_goals = [line['goals'][1], line['goals'][0], line['goals'][2]]\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 heightA = 95\n"
+" % set heightB = 75\n"
+" % set bgColor = '#b898b0'\n"
+" % set fontSize = 50\n"
+" % set podiumPosition = '2'\n"
+" % elif loop.index == 2:\n"
+" % set extra_div = ''\n"
+" % set heightA = 55\n"
+" % set heightB = 115\n"
+" % set bgColor = '#9A6C8E'\n"
+" % set fontSize = 85\n"
+" % set podiumPosition = '1'\n"
+" % elif loop.index == 3:\n"
+" % set extra_div = '<div style=\"height:60px;\"></div>'\n"
+" % set heightA = 115\n"
+" % set heightB = 55\n"
+" % set bgColor = '#c8afc1'\n"
+" % set fontSize = 35\n"
+" % set podiumPosition = '3'\n"
+" % endif\n"
+" <div style=\"margin:0 3px 0 3px;height:220px;\">\n"
+" <div style=\"height:${heightA}px;\">\n"
+" ${extra_div | safe} \n"
+" <div style=\"height:55px;\">\n"
+" <img style=\"margin-bottom:5px;width:50px;height:50px;border-radius:50%;\" src=\"/web/image?model=res.users&amp;field=image_small&amp;id=${goal['user_id']}\" alt=\"\"/>\n"
+" </div> \n"
+" <div align=\"center\" style =\"color:${bgColor};\">\n"
+" ${goal['name']}\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"
+" </div>\n"
+" </div>\n"
+" </td>\n"
+" % endfor\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endif\n"
+" <!-- data table -->\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-bottom:5px\">\n"
+" <tr>\n"
+" <td>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" width=\"100%\" style=\"margin-top:30px;margin-bottom:5px;color:#666666;\">\n"
+" <thead>\n"
+" <tr style=\"color:#9A6C8E; font-size:12px;\">\n"
+" <th style=\"width:10%;text-align:center;\">Rank</th>\n"
+" <th style=\"width:15%;text-align:left;\">Name</th>\n"
+" <th style=\"width:30%;text-align:right;\">Performance \n"
+" % if line['suffix']:\n"
+" (${line['suffix']})\n"
+" % elif line['monetary']:\n"
+" (${company.currency_id.symbol})\n"
+" % endif\n"
+" </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"
+" </tr>\n"
+" </thead>\n"
+" <tbody>\n"
+" % for goal in line['goals']:\n"
+" <tr>\n"
+" % set tdBgColor = '#fff'\n"
+" % set tdColor = 'gray'\n"
+" % set mutedColor = '#AAAAAA'\n"
+" % set tdPercentageColor = '#9A6C8E'\n"
+" <td width=\"10%\" align=\"center\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:20px;\">${goal['rank']+1}\n"
+" </td>\n"
+" <td width=\"15%\" align=\"left\" valign=\"middle\" style=\"background-color:${tdBgColor};padding :5px 0;font-size:13px;\">${goal['name']}</td>\n"
+" <td width=\"20%\" align=\"right\" style=\"background-color:${tdBgColor};padding:5px 0;line-height:1;\">${\"%.2f\" % goal['current']}<br/><span style=\"font-size:13px;color:${mutedColor};\">on ${\"%.2f\" % line['target']}</span>\n"
+" </td>\n"
+" <td width=\"20%\" 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"
+" </tr>\n"
+" % endfor\n"
+" </tbody>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </table> \n"
+" % endfor\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"
@@ -27,87 +267,13 @@ msgid "\n"
msgstr ""
#. module: gamification
-#: model:mail.template,body_html:gamification.simple_report_template
-msgid "\n"
-"<p>\n"
-" <strong>${object.name}</strong>\n"
-"</p>\n"
-"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
-"\n"
-"% if object.visibility_mode == 'personal':\n"
-" <table width=\"100%\" border=\"1\">\n"
-" <tr>\n"
-" <th>Goal</th>\n"
-" <th>Target</th>\n"
-" <th>Current</th>\n"
-" <th>Completeness</th>\n"
-" </tr>\n"
-" % for line in ctx[\"challenge_lines\"]:\n"
-" <tr\n"
-" % if line['completeness'] >= 100:\n"
-" style=\"font-weight:bold;\"\n"
-" % endif\n"
-" >\n"
-" <td>${line['name']}</td>\n"
-" <td>${line['target']}\n"
-" % if line['suffix']:\n"
-" ${line['suffix']}\n"
-" % endif\n"
-" </td>\n"
-" <td>${line['current']}\n"
-" % if line['suffix']:\n"
-" ${line['suffix']}\n"
-" % endif\n"
-" </td>\n"
-" <td>${line['completeness']} %</td>\n"
-" </tr>\n"
-" % endfor\n"
-" </table>\n"
-"% else:\n"
-" % for line in ctx[\"challenge_lines\"]:\n"
-" <table width=\"100%\" border=\"1\">\n"
-" <tr>\n"
-" <th colspan=\"4\">${line['name']}</th>\n"
-" </tr>\n"
-" <tr>\n"
-" <th>#</th>\n"
-" <th>Person</th>\n"
-" <th>Completeness</th>\n"
-" <th>Current</th>\n"
-" </tr>\n"
-" % for goal in line['goals']:\n"
-" <tr\n"
-" % if goal.completeness >= 100:\n"
-" style=\"font-weight:bold;\"\n"
-" % endif\n"
-" >\n"
-" <td>${goal['rank']}</td>\n"
-" <td>${goal['name']}</td>\n"
-" <td>${goal['completeness']}%</td>\n"
-" <td>${goal['current']}/${line['target']}\n"
-" % if line['suffix']:\n"
-" ${line['suffix']}\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" % endfor\n"
-" </table>\n"
-"\n"
-" <br/><br/>\n"
-"\n"
-" % endfor\n"
-"% endif\n"
-" "
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:586
+#: code:addons/gamification/models/challenge.py:587
#, python-format
msgid "%s has joined the challenge"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:595
+#: code:addons/gamification/models/challenge.py:596
#, python-format
msgid "%s has refused the challenge"
msgstr ""
@@ -149,25 +315,25 @@ msgid "<?xml version=\"1.0\"?>\n"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:652
+#: code:addons/gamification/models/challenge.py:653
#, python-format
msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:649
+#: code:addons/gamification/models/challenge.py:650
#, 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:647
+#: code:addons/gamification/models/challenge.py:648
#, python-format
msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:657
+#: code:addons/gamification/models/challenge.py:658
#, python-format
msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
msgstr ""
@@ -194,7 +360,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition
-#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3164
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3233
msgid "A goal is considered as completed when the current value is compared to the value to reach"
msgstr ""
@@ -328,7 +494,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:409
+#: code:addons/gamification/models/goal.py:410
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -525,7 +691,7 @@ msgid "Defined how will be computed the goals. The result of the operation will
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3173
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3242
msgid "Definition Description"
msgstr ""
@@ -724,7 +890,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3175
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3244
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name
#: model:ir.ui.view,arch_db:gamification.goal_search_view
msgid "Goal Definition"
@@ -755,7 +921,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3164
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3233
msgid "Goal Performance"
msgstr ""
@@ -1090,7 +1256,7 @@ msgid "No one, assigned through challenges"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:664
+#: code:addons/gamification/models/challenge.py:665
#, python-format
msgid "Nobody reached the required conditions to receive special badges."
msgstr ""
@@ -1256,7 +1422,7 @@ msgid "Responsible"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:489
+#: code:addons/gamification/models/challenge.py:490
#, python-format
msgid "Retrieving progress for personal challenge without user information"
msgstr ""
@@ -1421,7 +1587,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3169
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3238
msgid "Suffix"
msgstr ""
@@ -1446,7 +1612,7 @@ msgid "The action that will be called to update the goal value."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:643
+#: code:addons/gamification/models/challenge.py:644
#, python-format
msgid "The challenge %s is finished."
msgstr ""
@@ -1454,7 +1620,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix
-#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3169
+#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3238
msgid "The currency and suffix field"
msgstr ""
@@ -1474,7 +1640,7 @@ msgid "The day a new challenge will be automatically started. If no periodicity
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:90
+#: code:addons/gamification/models/goal.py:91
#, python-format
msgid "The domain for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1517,7 +1683,7 @@ msgid "The maximum number of time this badge can be sent per month per person."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:107
+#: code:addons/gamification/models/goal.py:108
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1525,7 +1691,7 @@ msgid "The model configuration for the definition %s seems incorrect, please che
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:104
+#: code:addons/gamification/models/goal.py:105
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1662,7 +1828,7 @@ msgid "Update"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:444
+#: code:addons/gamification/models/goal.py:445
#, python-format
msgid "Update %s"
msgstr ""
@@ -1735,7 +1901,7 @@ msgid "You can not grant a badge to yourself"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:195
+#: code:addons/gamification/models/challenge.py:196
#, python-format
msgid "You can not reset a challenge with unfinished goals."
msgstr ""
diff --git a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
index 7b61422ff50..307df49a14a 100644
--- a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
+++ b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: gamification_sale_crm
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_customer_refunds
-msgid "Customer Refunds"
+msgid "Customer Credit Notes"
msgstr ""
#. module: gamification_sale_crm
@@ -65,7 +65,7 @@ msgstr ""
#. module: gamification_sale_crm
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds
-msgid "Total Customer Refunds"
+msgid "Total Customer Credit Notes"
msgstr ""
#. module: gamification_sale_crm
diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
index d5cc39cfbe0..822c08c7416 100644
--- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -43,12 +43,20 @@ msgid "Name"
msgstr ""
#. module: google_spreadsheet
+#: model:ir.ui.view,arch_db:google_spreadsheet.base_config_settings_view_form_inherit_spreadsheet
+msgid "Please use the settings of Google Drive\n"
+" on the left or above."
+msgstr ""
+
+#. module: google_spreadsheet
#: model:ir.model.fields,help:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
+#: model:ir.model.fields,help:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
msgid "The URL to generate the authorization code from Google"
msgstr ""
#. module: google_spreadsheet
#: model:ir.model.fields,field_description:google_spreadsheet.field_base_config_settings_google_drive_uri_copy
+#: model:ir.model.fields,field_description:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy
msgid "URI"
msgstr ""
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 6438af674df..a5822f6bd65 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -80,11 +80,6 @@ msgid "Citizenship & Other Information"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_employee_city
-msgid "City"
-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 "Click to add a new employee."
@@ -133,6 +128,11 @@ msgid "Company Working Hours"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department_complete_name
+msgid "Complete Name"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.menu,name:hr.menu_human_resources_configuration
msgid "Configuration"
msgstr ""
@@ -221,11 +221,6 @@ msgid "Email Aliases"
msgstr ""
#. module: hr
-#: model:ir.model,name:hr.model_mail_thread
-msgid "Email Thread"
-msgstr ""
-
-#. module: hr
#: model:ir.model,name:hr.model_hr_employee
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Employee"
@@ -284,20 +279,20 @@ msgid "Employees Tags"
msgstr ""
#. module: hr
-#: code:addons/hr/models/hr.py:260
-#, python-format
-msgid "Error! You cannot create recursive departments."
+#: model:ir.model.fields,help:hr.field_hr_employee_address_home_id
+msgid "Enter here the private address of the employee, not the one linked to your company."
msgstr ""
#. module: hr
-#: code:addons/hr/models/hr.py:164
+#: code:addons/hr/models/hr.py:294
#, python-format
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgid "Error! You cannot create recursive departments."
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_res_users_event_count
-msgid "Events"
+#: code:addons/hr/models/hr.py:181
+#, python-format
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
#. module: hr
@@ -352,11 +347,6 @@ msgid "Hired Employees"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
-msgid "Home Address"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_main
msgid "Human Resources"
msgstr ""
@@ -405,6 +395,8 @@ msgstr ""
#. module: hr
#: model:ir.model,name:hr.model_hr_job
+#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id
+#: model:ir.model.fields,field_description:hr.field_hr_job_name
msgid "Job Position"
msgstr ""
@@ -422,12 +414,6 @@ msgid "Job Positions are used to define jobs and their requirements.\n"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id
-#: model:ir.model.fields,field_description:hr.field_hr_job_name
-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"
@@ -461,11 +447,6 @@ msgid "Last Updated on"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_res_users_calendar_last_notif_ack
-msgid "Last notification marked as read from base Calendar"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
msgid "Launch Recruitment"
msgstr ""
@@ -490,7 +471,7 @@ msgstr ""
#. module: hr
#: selection:hr.employee,marital:0
-msgid "Married"
+msgid "Married (or similar)"
msgstr ""
#. module: hr
@@ -514,11 +495,6 @@ msgid "Messages"
msgstr ""
#. module: hr
-#: model:ir.ui.view,arch_db:hr.hr_department_view_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_name
msgid "Name"
msgstr ""
@@ -549,11 +525,6 @@ msgid "Number of employees currently occupying this job position."
msgstr ""
#. module: hr
-#: model:ir.model.fields,help:hr.field_res_users_event_count
-msgid "Number of events the partner has participated."
-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 ""
@@ -596,18 +567,23 @@ msgid "Passport No"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee_image
+msgid "Photo"
+msgstr ""
+
+#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
-msgid "Personal Information"
+msgid "Position"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_employee_image
-msgid "Photo"
+#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id
+msgid "Private Address"
msgstr ""
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
-msgid "Position"
+msgid "Private Information"
msgstr ""
#. module: hr
@@ -616,8 +592,8 @@ msgid "Prout prout prout"
msgstr ""
#. module: hr
-#: model:ir.ui.view,arch_db:hr.view_employee_form
-msgid "Public Information"
+#: model:ir.ui.view,arch_db:hr.view_hr_job_form
+msgid "Recruitment"
msgstr ""
#. module: hr
@@ -682,6 +658,21 @@ msgid "Settings"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_config_settings_module_hr_org_chart
+msgid "Show Organizational Chart"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+msgid "Show organizational chart on employee form"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form
+msgid "Show organizational chart on employee form."
+msgstr ""
+
+#. module: hr
#: selection:hr.employee,marital:0
msgid "Single"
msgstr ""
@@ -772,6 +763,16 @@ msgid "Users"
msgstr ""
#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_no
+msgid "Visa No"
+msgstr ""
+
+#. module: hr
#: selection:hr.employee,marital:0
msgid "Widower"
msgstr ""
@@ -795,6 +796,11 @@ msgid "Work Email"
msgstr ""
#. module: hr
+#: model:ir.ui.view,arch_db:hr.view_employee_form
+msgid "Work Information"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_work_location
msgid "Work Location"
msgstr ""
@@ -810,6 +816,16 @@ msgid "Work Organization"
msgstr ""
#. module: hr
+#: model:ir.ui.view,arch_db:hr.view_employee_form
+msgid "Work Permit"
+msgstr ""
+
+#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_employee_permit_no
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_work_phone
msgid "Work Phone"
msgstr ""
@@ -832,12 +848,6 @@ msgid "Your document has not been created because your email address is not reco
msgstr ""
#. module: hr
-#: code:addons/hr/models/mail_thread.py:41
-#, python-format
-msgid "alias %s does not accept unknown employees"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.view_department_form
msgid "department"
msgstr ""
@@ -858,9 +868,8 @@ msgid "hr.config.settings"
msgstr ""
#. module: hr
-#: code:addons/hr/models/mail_thread.py:41
-#, python-format
-msgid "skipping"
+#: model:ir.model,name:hr.model_mail_alias_mixin
+msgid "mail.alias.mixin"
msgstr ""
#. module: hr
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 46356879c2f..803fdcc1873 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,16 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
+msgid "<span class=\"text-muted\">(If fixed-term contract)</span>"
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
+msgid "<span>/ month</span>"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_advantages
msgid "Advantages"
msgstr ""
@@ -26,8 +36,8 @@ msgid "Advantages..."
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
-msgid "Basic Salary of the employee"
+#: selection:hr.contract,state:0
+msgid "Cancelled"
msgstr ""
#. module: hr_contract
@@ -36,6 +46,11 @@ msgid "Click here to create new contracts."
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_company_id
+msgid "Company"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle
msgid "Company Vehicle"
msgstr ""
@@ -47,8 +62,13 @@ msgid "Contract Reference"
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
+msgid "Contract Terms"
+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_6101
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6256
#: 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
@@ -75,7 +95,7 @@ msgid "Contract expired"
msgstr ""
#. module: hr_contract
-#: code:addons/hr_contract/models/hr_contract.py:87
+#: code:addons/hr_contract/models/hr_contract.py:100
#, python-format
msgid "Contract start date must be less than contract end date."
msgstr ""
@@ -110,6 +130,11 @@ msgid "Created on"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_contract_id
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
#: model:ir.ui.view,arch_db:hr_contract.hr_hr_employee_view_form2
@@ -122,6 +147,11 @@ msgid "Current Employee"
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
+msgid "Delete"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_department_id
msgid "Department"
msgstr ""
@@ -133,8 +163,8 @@ msgid "Display Name"
msgstr ""
#. module: hr_contract
-#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
-msgid "Duration"
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
+msgid "Edit Contract"
msgstr ""
#. module: hr_contract
@@ -150,11 +180,36 @@ msgid "Employee Contract"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage
+msgid "Employee's monthly gross wage."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id
+msgid "Employee's working schedule."
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
msgid "End Date"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_end
+msgid "End date of the contract (if it's a fixed-term contract)."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract_trial_date_end
+msgid "End date of the trial period (if there is one)."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
+msgid "End of Trial Period"
+msgstr ""
+
+#. module: hr_contract
#: selection:hr.contract,state:0
#: model:mail.message.subtype,name:hr_contract.mt_contract_close
msgid "Expired"
@@ -206,11 +261,6 @@ msgid "In kilometers"
msgstr ""
#. module: hr_contract
-#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
-msgid "Information"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_manager
msgid "Is a Manager"
msgstr ""
@@ -222,7 +272,7 @@ msgstr ""
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_job_id
-msgid "Job Title"
+msgid "Job Position"
msgstr ""
#. module: hr_contract
@@ -259,6 +309,11 @@ msgid "Medical Examination Date"
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
+msgid "Monthly Advantages in Cash"
+msgstr ""
+
+#. module: hr_contract
#: selection:hr.contract,state:0
msgid "New"
msgstr ""
@@ -275,6 +330,11 @@ msgid "Number of Children"
msgstr ""
#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_place_of_birth
msgid "Place of Birth"
msgstr ""
@@ -286,7 +346,7 @@ msgstr ""
#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
-msgid "Salary and Advantages"
+msgid "Salary Information"
msgstr ""
#. module: hr_contract
@@ -311,6 +371,16 @@ msgid "Start Date"
msgstr ""
#. module: hr_contract
+#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_start
+msgid "Start date of the contract."
+msgstr ""
+
+#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
+msgid "State"
+msgstr ""
+
+#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_state
msgid "Status"
msgstr ""
@@ -328,21 +398,6 @@ msgid "To Renew"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end
-msgid "Trial End Date"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
-msgid "Trial Period Duration"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_start
-msgid "Trial Start Date"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_visa_expire
msgid "Visa Expire Date"
msgstr ""
@@ -358,17 +413,12 @@ msgid "Wage"
msgstr ""
#. module: hr_contract
-#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
-msgid "Work Permit"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_permit_no
msgid "Work Permit No"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_working_hours
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_resource_calendar_id
msgid "Working Schedule"
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 8f5b56a537e..8368d2aa9d1 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -252,6 +252,11 @@ msgid "All Expenses"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_account_id
+msgid "An expense account is expected"
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_analytic_account_id
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "Analytic Account"
@@ -309,6 +314,7 @@ msgid "Business trip"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_product_product_can_be_expensed
#: model:ir.model.fields,field_description:hr_expense.field_product_template_can_be_expensed
msgid "Can be Expensed"
msgstr ""
@@ -342,7 +348,7 @@ msgid "Click here to create new expenses."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:318
+#: code:addons/hr_expense/models/hr_expense.py:319
#, python-format
msgid "Click to add a new expense,"
msgstr ""
@@ -711,19 +717,19 @@ msgid "Expenses follow this flow:"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:413
+#: code:addons/hr_expense/models/hr_expense.py:414
#, python-format
msgid "Expenses must belong to the same Employee."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:525
+#: code:addons/hr_expense/models/hr_expense.py:538
#, python-format
msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:417
+#: code:addons/hr_expense/models/hr_expense.py:418
#, python-format
msgid "Expenses must have been paid by the same entity (Company or employee)"
msgstr ""
@@ -827,7 +833,7 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9374
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9585
msgid "ID"
msgstr ""
@@ -960,19 +966,19 @@ msgid "New Mail"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:258
+#: code:addons/hr_expense/models/hr_expense.py:259
#, 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:224
+#: code:addons/hr_expense/models/hr_expense.py:225
#, python-format
msgid "No Home Address found for the employee %s, please configure one."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:203
+#: code:addons/hr_expense/models/hr_expense.py:204
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
@@ -1091,7 +1097,7 @@ msgid "Planner"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:263
+#: code:addons/hr_expense/models/hr_expense.py:264
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
@@ -1300,7 +1306,7 @@ msgid "See how to manage payables"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:88
+#: code:addons/hr_expense/models/hr_expense.py:89
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
msgstr ""
@@ -1356,6 +1362,7 @@ msgid "Setup your domain alias"
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."
msgstr ""
@@ -1443,6 +1450,12 @@ msgid "The next step is to settle an internal policy to"
msgstr ""
#. module: hr_expense
+#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:35
+#, python-format
+msgid "The payment amount must be strictly positive."
+msgstr ""
+
+#. module: hr_expense
#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_bank_journal_id
msgid "The payment method used when the expense is paid by the company."
msgstr ""
@@ -1588,7 +1601,7 @@ msgid "When you charge"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:522
+#: code:addons/hr_expense/models/hr_expense.py:535
#, python-format
msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
@@ -1599,19 +1612,25 @@ msgid "You can setup a generic email alias to create incoming expenses easily. W
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:439
+#: code:addons/hr_expense/models/hr_expense.py:573
+#, python-format
+msgid "You cannot add expense lines of another employee."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:445
#, python-format
msgid "You cannot delete a posted expense."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:106
+#: code:addons/hr_expense/models/hr_expense.py:107
#, python-format
msgid "You cannot report expenses for different employees in the same report!"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:104
+#: code:addons/hr_expense/models/hr_expense.py:105
#, python-format
msgid "You cannot report twice the same line!"
msgstr ""
@@ -1628,7 +1647,7 @@ msgid "You record expenses,"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:504
+#: code:addons/hr_expense/models/hr_expense.py:517
#, python-format
msgid "Your Expense %s has been refused.<br/><ul class=o_timeline_tracking_value_list><li>Reason<span> : </span><span class=o_timeline_tracking_value>%s</span></li></ul>"
msgstr ""
@@ -1679,7 +1698,7 @@ msgid "hr.expense.config.settings"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:319
+#: code:addons/hr_expense/models/hr_expense.py:320
#, python-format
msgid "or send receipts by email to %s."
msgstr ""
diff --git a/addons/hr_expense_check/i18n/hr_expense_check.pot b/addons/hr_expense_check/i18n/hr_expense_check.pot
new file mode 100644
index 00000000000..27089aeafc5
--- /dev/null
+++ b/addons/hr_expense_check/i18n/hr_expense_check.pot
@@ -0,0 +1,57 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * hr_expense_check
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_expense_check
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_amount_in_words
+msgid "Amount in Words"
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
+msgid "Check Number"
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
+msgid "Check this option if your pre-printed checks are not numbered."
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
+msgid "Code"
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model,name:hr_expense_check.model_hr_expense_register_payment_wizard
+msgid "Hr Expense Register Payment wizard"
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,field_description:hr_expense_check.field_hr_expense_register_payment_wizard_check_manual_sequencing
+msgid "Manual Numbering"
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_check_number
+msgid "Number of the check corresponding to this payment. If your pre-printed check are not already numbered, you can manage the numbering in the journal configuration page."
+msgstr ""
+
+#. module: hr_expense_check
+#: model:ir.model.fields,help:hr_expense_check.field_hr_expense_register_payment_wizard_payment_method_code_2
+msgid "Technical field used to adapt the interface to the payment type selected."
+msgstr ""
+
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index bd46713702e..d4c731d558d 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,13 +41,19 @@ msgid "!important; font-size: 8px; min-width: 18px\"&gt;"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:125
+#: code:addons/hr_holidays/models/hr_holidays.py:123
#, python-format
msgid "%g remaining out of %g"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:334
+#: code:addons/hr_holidays/models/hr_holidays.py:333
+#, python-format
+msgid "%s : %.2f day(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/models/hr_holidays.py:335
#, python-format
msgid "%s on %s : %.2f day(s)"
msgstr ""
@@ -186,7 +192,7 @@ msgid "Allocation for %s"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:336
+#: code:addons/hr_holidays/models/hr_holidays.py:337
#, python-format
msgid "Allocation of %s : %.2f day(s) To %s"
msgstr ""
@@ -223,7 +229,7 @@ msgid "Appraisal Analysis"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:554
+#: code:addons/hr_holidays/models/hr_holidays.py:568
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
#, python-format
msgid "Approve"
@@ -439,6 +445,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_name
+#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_status_form
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "Description"
msgstr ""
@@ -493,11 +500,17 @@ msgid "Filters only on allocations and requests that belong to an holiday type t
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_first_approver_id
msgid "First Approval"
msgstr ""
#. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:107
+#, python-format
+msgid "Form content is missing, this report cannot be printed."
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept_date_from
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_date_from
msgid "From"
@@ -651,31 +664,31 @@ msgid "Leave Types"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:434
+#: code:addons/hr_holidays/models/hr_holidays.py:435
#, 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_holidays.py:449
+#: code:addons/hr_holidays/models/hr_holidays.py:467
#, python-format
msgid "Leave request must be confirmed in order to approve it."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:508
+#: code:addons/hr_holidays/models/hr_holidays.py:528
#, 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_holidays.py:421
+#: code:addons/hr_holidays/models/hr_holidays.py:422
#, 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_holidays.py:406
+#: code:addons/hr_holidays/models/hr_holidays.py:407
#, python-format
msgid "Leave request state must be \"Refused\" or \"To Approve\" in order to reset to Draft."
msgstr ""
@@ -841,6 +854,7 @@ msgid "Magenta"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
#: model:res.groups,name:hr_holidays.group_hr_holidays_manager
msgid "Manager"
@@ -944,31 +958,36 @@ msgid "Once you have recorded your leave request, it will be sent\n"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:451
+#: code:addons/hr_holidays/models/hr_holidays.py:469
#, 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_holidays.py:404
+#: code:addons/hr_holidays/models/hr_holidays.py:405
#, 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_holidays.py:429
-#: code:addons/hr_holidays/models/hr_holidays.py:444
+#: code:addons/hr_holidays/models/hr_holidays.py:430
+#: code:addons/hr_holidays/models/hr_holidays.py:462
#, python-format
msgid "Only an HR Officer or Manager can approve leave requests."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:503
+#: code:addons/hr_holidays/models/hr_holidays.py:523
#, 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"
+msgstr ""
+
+#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_parent_id
msgid "Parent"
msgstr ""
@@ -990,7 +1009,7 @@ msgid "Red"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:557
+#: code:addons/hr_holidays/models/hr_holidays.py:571
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
#, python-format
msgid "Refuse"
@@ -1091,18 +1110,18 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.holidays,state:0
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_manager_id2
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_second_approver_id
msgid "Second Approval"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:570
+#: code:addons/hr_holidays/models/hr_holidays.py:584
#, python-format
msgid "See Allocation"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:570
+#: code:addons/hr_holidays/models/hr_holidays.py:584
#, python-format
msgid "See Leave"
msgstr ""
@@ -1155,7 +1174,7 @@ msgid "The number of days must be greater than 0."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:261
+#: code:addons/hr_holidays/models/hr_holidays.py:259
#, python-format
msgid "The number of remaining leaves is not sufficient for this leave type.\n"
"Please verify also the leaves waiting for validation."
@@ -1175,12 +1194,12 @@ msgid "The status is set to 'To Submit', when a holiday request is created.\n"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_manager_id
+#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_first_approver_id
msgid "This area is automatically filled by the user who validate the leave"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_manager_id2
+#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_second_approver_id
msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
msgstr ""
@@ -1267,6 +1286,11 @@ msgid "Validate"
msgstr ""
#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+msgid "Validator"
+msgstr ""
+
+#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Violet"
msgstr ""
@@ -1309,13 +1333,13 @@ msgid "You can assign remaining Legal Leaves for each employee, Odoo\n"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:251
+#: code:addons/hr_holidays/models/hr_holidays.py:249
#, python-format
msgid "You can not have 2 leaves that overlaps on same day!"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:374
+#: code:addons/hr_holidays/models/hr_holidays.py:375
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
@@ -1327,8 +1351,8 @@ msgid "You cannot reduce validated allocation requests"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/models/hr_holidays.py:355
-#: code:addons/hr_holidays/models/hr_holidays.py:366
+#: code:addons/hr_holidays/models/hr_holidays.py:356
+#: code:addons/hr_holidays/models/hr_holidays.py:367
#, python-format
msgid "You cannot set a leave request as '%s'. Contact a human resource manager."
msgstr ""
diff --git a/addons/hr_org_chart/i18n/hr_org_chart.pot b/addons/hr_org_chart/i18n/hr_org_chart.pot
new file mode 100644
index 00000000000..2a917c1a857
--- /dev/null
+++ b/addons/hr_org_chart/i18n/hr_org_chart.pot
@@ -0,0 +1,95 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * hr_org_chart
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:136
+#, python-format
+msgid "Direct Subordinates of %s"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:126
+#, python-format
+msgid "Direct subordinates"
+msgstr ""
+
+#. module: hr_org_chart
+#: model:ir.model,name:hr_org_chart.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:89
+#, python-format
+msgid "In order to get an organigram, set a manager and save the record."
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:146
+#, python-format
+msgid "Indirect Subordinates of %s"
+msgstr ""
+
+#. module: hr_org_chart
+#: model:ir.model.fields,field_description:hr_org_chart.field_hr_employee_child_all_count
+msgid "Indirect Surbordinates Count"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:136
+#, python-format
+msgid "Indirect subordinates"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:87
+#, python-format
+msgid "No hierarchy position."
+msgstr ""
+
+#. module: hr_org_chart
+#: model:ir.ui.view,arch_db:hr_org_chart.hr_employee_view_form_inherit_org_chart
+msgid "Organization Chart"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/js/hr_org_chart.js:139
+#, python-format
+msgid "Subordinates of %s"
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:88
+#, python-format
+msgid "This employee has no manager or subordinate."
+msgstr ""
+
+#. module: hr_org_chart
+#. openerp-web
+#: code:addons/hr_org_chart/static/src/xml/hr_org_chart.xml:144
+#, python-format
+msgid "Total"
+msgstr ""
+
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 1be7749212f..cae9c116394 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+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_payroll.py:49
+#: code:addons/hr_payroll/models/hr_salary_rule.py:41
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -115,8 +115,8 @@ msgstr ""
#. module: hr_payroll
#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
msgid "A contribution register is a third party involved in the salary\n"
-" payment of the employees. It can be the social security, the\n"
-" estate or anyone that collect or inject money on payslips."
+" payment of the employees. It can be the social security, the\n"
+" estate or anyone that collect or inject money on payslips."
msgstr ""
#. module: hr_payroll
@@ -147,6 +147,11 @@ msgid "Add an internal note..."
msgstr ""
#. module: hr_payroll
+#: model:ir.ui.view,arch_db:hr_payroll.hr_contract_advantage_template_view_form
+msgid "Advantage Name"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
msgid "All Children Rules"
msgstr ""
@@ -227,14 +232,14 @@ msgid "Cancel Payslip"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:241
+#: code:addons/hr_payroll/models/hr_payslip.py:99
#, python-format
msgid "Cannot cancel a payslip that is done."
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id
-#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7569
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7559
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter
msgid "Category"
msgstr ""
@@ -278,6 +283,7 @@ msgid "Close"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_input_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_code
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_worked_days_code
@@ -356,6 +362,12 @@ msgid "Contract"
msgstr ""
#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.hr_contract_advantage_template_action
+#: model:ir.ui.menu,name:hr_payroll.hr_contract_advantage_template_menu_action
+msgid "Contract Advantage Templates"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.hr_contribution_register_form
msgid "Contribution"
msgstr ""
@@ -382,6 +394,7 @@ msgid "Contribution Registers"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_uid
@@ -399,6 +412,7 @@ msgid "Created by"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_date
@@ -436,6 +450,16 @@ msgid "Date To"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_default_value
+msgid "Default value for this advantage"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model.fields,help:hr_payroll.field_hr_contract_schedule_pay
+msgid "Defines the frequency of the wage payment."
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_payslip_struct_id
msgid "Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn't mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period"
msgstr ""
@@ -466,6 +490,7 @@ msgid "Details by Salary Rule Category"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_display_name
@@ -545,6 +570,11 @@ msgid "Employee Payslips"
msgstr ""
#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract_advantage_template
+msgid "Employee's Advantage on Contract"
+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
@@ -553,7 +583,7 @@ msgid "Employees"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:44
+#: code:addons/hr_payroll/models/hr_salary_rule.py:36
#, python-format
msgid "Error ! You cannot create a recursive Salary Structure."
msgstr ""
@@ -579,6 +609,12 @@ msgid "For example, enter 50.0 to apply a percentage of 50%"
msgstr ""
#. module: hr_payroll
+#: code:addons/hr_payroll/report/report_contribution_register.py:34
+#, python-format
+msgid "Form content is missing, this report cannot be printed."
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_fr_hr_payroll
msgid "French Payroll"
msgstr ""
@@ -612,6 +648,7 @@ msgid "Group By"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_id
@@ -680,6 +717,7 @@ msgid "It is used in computation. For e.g. A rule for sales having 1% commission
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure___last_update
@@ -699,6 +737,7 @@ msgid "Last Modified on"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_uid
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_uid
@@ -716,6 +755,7 @@ msgid "Last Updated by"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_write_date
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_write_date
@@ -738,6 +778,16 @@ msgid "Linking a salary category to its parent is used only for the reporting pu
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_lower_bound
+msgid "Lower Bound"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_lower_bound
+msgid "Lower bound authorized by the employer for this advantage"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_paid
msgid "Made Payment Order ? "
msgstr ""
@@ -770,6 +820,7 @@ msgid "Monthly"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_name
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_name
@@ -783,7 +834,7 @@ msgid "Name"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:340
+#: code:addons/hr_payroll/models/hr_payslip.py:198
#, python-format
msgid "Normal Working Days paid at 100%"
msgstr ""
@@ -914,7 +965,7 @@ msgid "Payslip"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:227
+#: code:addons/hr_payroll/models/hr_payslip.py:85
#, python-format
msgid "Payslip 'Date From' must be before 'Date To'."
msgstr ""
@@ -1109,7 +1160,7 @@ msgid "Refund"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:247
+#: code:addons/hr_payroll/models/hr_payslip.py:105
#, python-format
msgid "Refund: "
msgstr ""
@@ -1180,8 +1231,8 @@ msgid "Salary Rules"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:542
-#: code:addons/hr_payroll/models/hr_payroll.py:590
+#: code:addons/hr_payroll/models/hr_payslip.py:396
+#: code:addons/hr_payroll/models/hr_payslip.py:445
#, python-format
msgid "Salary Slip of %s for %s"
msgstr ""
@@ -1349,6 +1400,16 @@ msgid "Track time spent by employees"
msgstr ""
#. module: hr_payroll
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_contract_advantage_template_upper_bound
+msgid "Upper Bound"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model.fields,help:hr_payroll.field_hr_contract_advantage_template_upper_bound
+msgid "Upper bound authorized by the employer for this advantage"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence
#: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_sequence
msgid "Use to arrange calculation sequence"
@@ -1386,37 +1447,37 @@ msgid "Worked Days & Inputs"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:765
+#: code:addons/hr_payroll/models/hr_salary_rule.py:198
#, python-format
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:771
+#: code:addons/hr_payroll/models/hr_salary_rule.py:204
#, python-format
msgid "Wrong python code defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:794
+#: code:addons/hr_payroll/models/hr_salary_rule.py:227
#, python-format
msgid "Wrong python condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:758
+#: code:addons/hr_payroll/models/hr_salary_rule.py:191
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:788
+#: code:addons/hr_payroll/models/hr_salary_rule.py:221
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:271
+#: code:addons/hr_payroll/models/hr_payslip.py:129
#, python-format
msgid "You cannot delete a payslip which is not draft or cancelled!"
msgstr ""
@@ -1428,7 +1489,7 @@ msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/models/hr_payroll.py:833
+#: code:addons/hr_payroll/models/hr_payslip.py:516
#, 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 0f9083b07c2..c2236b0ac16 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -385,14 +385,14 @@ msgid "Configure Recruitment"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:350
+#: code:addons/hr_recruitment/models/hr_recruitment.py:349
#: 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:351
#, python-format
msgid "Contact Email"
msgstr ""
@@ -600,6 +600,11 @@ msgid "Email Alias"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
+msgid "Email alias"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_job_alias_id
msgid "Email alias for this job position. New emails will automatically create new applicants for this job position."
msgstr ""
@@ -706,6 +711,11 @@ msgid "HR Department"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_hr_responsible_id
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
msgid "Hired Employees"
msgstr ""
@@ -892,16 +902,6 @@ msgid "Mobile"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
-msgid "Mobile:"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "My Activities"
msgstr ""
@@ -948,7 +948,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:400
+#: code:addons/hr_recruitment/models/hr_recruitment.py:412
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -980,7 +980,7 @@ msgid "Next Activities"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:368
+#: code:addons/hr_recruitment/models/hr_recruitment.py:367
#, python-format
msgid "No Subject"
msgstr ""
@@ -1019,6 +1019,11 @@ msgid "Odoo helps you track applicants in the recruitment\n"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
+msgid "Offer"
+msgstr ""
+
+#. module: hr_recruitment
#: model:res.groups,name:hr_recruitment.group_hr_recruitment_user
msgid "Officer"
msgstr ""
@@ -1088,6 +1093,11 @@ msgid "Partner"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_job_hr_responsible_id
+msgid "Person responsible of validating the employee's contracts."
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone
msgid "Phone"
msgstr ""
@@ -1322,11 +1332,6 @@ msgid "Sources of Applicants"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
-msgid "Specific Email Address"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id
msgid "Specific job that uses this stage. Other jobs will not use this stage."
msgstr ""
@@ -1571,7 +1576,7 @@ 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:404
+#: code:addons/hr_recruitment/models/hr_recruitment.py:416
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index e24a6ab5827..bb4df9552d5 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgid "<span class=\"o_label\">Timesheets</span>"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_employee_view_form_inherit_timesheet
+msgid "<span class=\"o_stat_text\">Timesheets</span>"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "<span>Timesheet Entries</span>"
msgstr ""
@@ -31,7 +36,6 @@ msgid "<strong>Total</strong>"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_by_project
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_report
msgid "Activities"
@@ -43,12 +47,23 @@ msgid "Activity Analysis"
msgstr ""
#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
+#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
+msgid "All Timesheets"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_allow_timesheets
#: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
msgid "Allow timesheets"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
@@ -79,11 +94,6 @@ msgid "Billing"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_crossovered_budget_line
-msgid "Budget Lines"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Cancel"
msgstr ""
@@ -167,17 +177,11 @@ msgid "Description"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
-msgid "Detailed Activities"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_display_name
msgid "Display Name"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Duration"
msgstr ""
@@ -188,6 +192,12 @@ msgid "Effective Hours"
msgstr ""
#. module: hr_timesheet
+#: 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"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_expense
msgid "Expenses"
msgstr ""
@@ -243,18 +253,26 @@ msgid "Leave Management"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_timesheet_holidays
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+msgid "Leaves"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
msgid "Manage your resources with Gantt charts"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
-msgid "My Timesheet"
+#: model:res.groups,name:hr_timesheet.group_timesheet_manager
+msgid "Manager"
msgstr ""
#. module: hr_timesheet
-#: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
-msgid "Officer"
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
+#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_mine
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+msgid "My Timesheets"
msgstr ""
#. module: hr_timesheet
@@ -268,11 +286,6 @@ msgid "Planned Hours"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Product"
-msgstr ""
-
-#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_progress
msgid "Progress"
msgstr ""
@@ -327,6 +340,16 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+msgid "Save this page and come back here to set up the feature."
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_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.hr_timesheet_config_settings_view_form
msgid "Sell services and invoice time spent"
msgstr ""
@@ -388,16 +411,32 @@ msgid "Tasks by user and project"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+msgid "This Week"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Time"
msgstr ""
#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
+msgid "Time (Hours)"
+msgstr ""
+
+#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_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.view,arch_db:hr_timesheet.hr_timesheet_line_search
#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
msgid "Timesheet"
@@ -431,10 +470,13 @@ msgid "Timesheet by Month"
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.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
#: model:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
+#: model:ir.ui.view,arch_db:hr_timesheet.timesheet_view_calendar
#: model:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Timesheets"
@@ -467,8 +509,13 @@ msgid "Track leaves to optimize your scheduling"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Users"
+#: model:res.groups,name:hr_timesheet.group_hr_timesheet_user
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form
+msgid "Validated leaves create timesheets automatically."
msgstr ""
#. module: hr_timesheet
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index bd6e0be0ab2..887f4f45271 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgid "\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:641
+#: code:addons/mail/models/mail_channel.py:665
#, python-format
msgid " This channel is private. People must be invited to join it."
msgstr ""
@@ -122,32 +122,32 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:66
+#: code:addons/mail/static/src/js/chat_manager.js:62
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:33
+#: code:addons/mail/static/src/js/activity.js:31
#, python-format
msgid "%d days overdue"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:236
+#: code:addons/mail/models/mail_template.py:253
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:233
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:76
+#: code:addons/mail/models/res_users.py:77
#, python-format
msgid "%s has joined the %s network."
msgstr ""
@@ -172,7 +172,7 @@ msgid "-------- Show older messages --------"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:645
+#: code:addons/mail/models/mail_channel.py:669
#, python-format
msgid "<br><br>\n"
" You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
@@ -182,20 +182,20 @@ msgid "<br><br>\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:552
+#: code:addons/mail/models/mail_channel.py:576
#, 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:475
-#: code:addons/mail/models/mail_channel.py:528
+#: code:addons/mail/models/mail_channel.py:499
+#: code:addons/mail/models/mail_channel.py:552
#, 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:168
+#: code:addons/mail/models/mail_channel.py:182
#, python-format
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
@@ -276,12 +276,22 @@ msgid "<strong>\n"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_activity_done
+msgid "<strong> Feedback : </strong>"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "<strong>Only records checked in list view will be used.</strong><br/>\n"
" If you want to send a lot of emails, we recommend you to use the mass mailing module."
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+msgid "<strong>Recommended Activities</strong>"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
@@ -568,7 +578,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:195
+#: code:addons/mail/static/src/js/chat_manager.js:191
#, python-format
msgid "Anonymous"
msgstr ""
@@ -589,7 +599,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:117
+#: code:addons/mail/static/src/js/followers.js:330
#, python-format
msgid "Apply"
msgstr ""
@@ -721,7 +731,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:125
+#: code:addons/mail/static/src/js/followers.js:338
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -850,13 +860,13 @@ msgid "Choose an example"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:339
+#: code:addons/mail/models/mail_thread.py:340
#, python-format
msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:355
+#: code:addons/mail/models/mail_thread.py:356
#, python-format
msgid "Click here to add new %s"
msgstr ""
@@ -974,7 +984,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:315
+#: code:addons/mail/static/src/js/client_action.js:322
#, python-format
msgid "Create %s"
msgstr ""
@@ -1042,7 +1052,7 @@ msgid "Current user has a starred notification linked to this message"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:19
+#: code:addons/mail/models/res_partner.py:21
#, python-format
msgid "Customers"
msgstr ""
@@ -1122,7 +1132,6 @@ msgid "Date of the last message posted on the record."
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
msgid "Deadline"
msgstr ""
@@ -1217,7 +1226,10 @@ msgid "Direct Messages"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:52
#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#, python-format
msgid "Discard"
msgstr ""
@@ -1290,7 +1302,26 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:39
+#: code:addons/mail/static/src/xml/activity.xml:50
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:48
+#, python-format
+msgid "Done & Schedule Next"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_date_deadline
+msgid "Due Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:37
#, python-format
msgid "Due in %d days"
msgstr ""
@@ -1309,7 +1340,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:114
+#: code:addons/mail/static/src/js/followers.js:327
#, python-format
msgid "Edit Subscription of "
msgstr ""
@@ -1322,6 +1353,7 @@ msgid "Edit subscription"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_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
@@ -1471,7 +1503,7 @@ msgid "Failed"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:374
+#: code:addons/mail/models/mail_template.py:392
#, python-format
msgid "Failed to render template %r using values %r"
msgstr ""
@@ -1496,6 +1528,14 @@ msgid "Favorited By"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/activity.js:192
+#: model:ir.model.fields,field_description:mail.field_mail_activity_feedback
+#, python-format
+msgid "Feedback"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
#: model:ir.model.fields,field_description:mail.field_mail_template_model_object_field
msgid "Field"
@@ -1540,7 +1580,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:695
+#: code:addons/mail/models/mail_thread.py:694
#: code:addons/mail/static/src/xml/followers.xml:21
#, python-format
msgid "Follow"
@@ -1786,7 +1826,7 @@ msgid "Gateway"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:53
+#: code:addons/mail/models/res_users.py:54
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -2070,7 +2110,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1038
+#: code:addons/mail/static/src/js/chat_manager.js:639
#: code:addons/mail/static/src/xml/client_action.xml:22
#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
@@ -2103,7 +2143,7 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1787
+#: code:addons/mail/models/mail_thread.py:1782
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
@@ -2116,7 +2156,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:623
+#: code:addons/mail/static/src/js/chat_manager.js:567
#, python-format
msgid "Invitation"
msgstr ""
@@ -2129,7 +2169,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:41
+#: code:addons/mail/static/src/js/client_action.js:39
#: code:addons/mail/static/src/xml/client_action.xml:127
#, python-format
msgid "Invite"
@@ -2137,14 +2177,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:143
+#: code:addons/mail/static/src/js/followers.js:170
#, python-format
msgid "Invite Follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:32
+#: code:addons/mail/static/src/js/client_action.js:30
#: code:addons/mail/static/src/xml/client_action.xml:127
#, python-format
msgid "Invite people"
@@ -2152,7 +2192,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:644
+#: code:addons/mail/static/src/js/client_action.js:646
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -2423,8 +2463,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_channel.py:654
-#: code:addons/mail/static/src/xml/client_action.xml:101
+#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/static/src/xml/client_action.xml:105
#, python-format
msgid "Leave this channel"
msgstr ""
@@ -2440,7 +2480,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:665
+#: code:addons/mail/models/mail_channel.py:689
#, python-format
msgid "List users in the current channel"
msgstr ""
@@ -2462,14 +2502,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:41
+#: code:addons/mail/static/src/js/chatter_composer.js:31
#, python-format
msgid "Log"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:59
+#: code:addons/mail/static/src/xml/chatter.xml:57
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr ""
@@ -2492,7 +2532,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:59
+#: code:addons/mail/static/src/xml/chatter.xml:57
#, python-format
msgid "Log an internal note"
msgstr ""
@@ -2506,6 +2546,20 @@ msgid "Log an internal note which will not be sent to followers, but which can b
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:60
+#, python-format
+msgid "Log or schedule an activity"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:60
+#, python-format
+msgid "Lor or schedule an activity"
+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
@@ -2907,9 +2961,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:58
+#: code:addons/mail/static/src/js/chat_manager.js:54
#: code:addons/mail/static/src/js/window_manager.js:139
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:54
#: code:addons/mail/static/src/xml/systray.xml:24
#, python-format
msgid "New message"
@@ -2931,7 +2985,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:79
+#: code:addons/mail/static/src/js/client_action.js:81
#, python-format
msgid "New people"
msgstr ""
@@ -3011,6 +3065,11 @@ msgid "Next Activity Type"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_has_recommended_activities
+msgid "Next activities available"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:22
#, python-format
@@ -3019,7 +3078,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:218
+#: code:addons/mail/static/src/js/followers.js:185
#, python-format
msgid "No follower"
msgstr ""
@@ -3306,7 +3365,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:125
+#: code:addons/mail/static/src/js/client_action.js:131
#, python-format
msgid "Odoo has now the permission to send you native notifications on this device."
msgstr ""
@@ -3320,7 +3379,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:123
+#: code:addons/mail/static/src/js/client_action.js:129
#, python-format
msgid "Odoo will not have the permission to send native notifications on this device."
msgstr ""
@@ -3376,7 +3435,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:220
+#: code:addons/mail/static/src/js/followers.js:187
#, python-format
msgid "One follower"
msgstr ""
@@ -3583,7 +3642,7 @@ msgid "Partner Mass Mailing"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:31
+#: code:addons/mail/models/res_partner.py:33
#, python-format
msgid "Partner Profile"
msgstr ""
@@ -3610,14 +3669,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:123
+#: code:addons/mail/static/src/js/client_action.js:129
#, python-format
msgid "Permission denied"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:125
+#: code:addons/mail/static/src/js/client_action.js:131
#, python-format
msgid "Permission granted"
msgstr ""
@@ -3661,21 +3720,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:194
+#: code:addons/mail/static/src/js/chatter_composer.js:157
#, python-format
msgid "Please complete partner's informations"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/many2many_tags_email.js:66
+#: code:addons/mail/static/src/js/many2many_tags_email.js:83
#, python-format
msgid "Please complete partner's informations and Email"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:655
+#: code:addons/mail/static/src/js/composer.js:652
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
@@ -3706,6 +3765,11 @@ msgid "Powered by"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_previous_type_ids
+msgid "Preceding Activities"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Preferred reply address"
msgstr ""
@@ -3727,6 +3791,11 @@ msgid "Preview of"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_previous_activity_type_id
+msgid "Previous Activity Type"
+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"
@@ -3741,7 +3810,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:137
+#: code:addons/mail/static/src/js/client_action.js:143
#, python-format
msgid "Public Channels"
msgstr ""
@@ -3754,7 +3823,7 @@ msgid "Publisher: Update Notification"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:178
+#: code:addons/mail/wizard/mail_compose_message.py:179
#, python-format
msgid "Re:"
msgstr ""
@@ -3786,6 +3855,16 @@ msgid "Recipients"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_recommended_activity_type_id
+msgid "Recommended Activity Type"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_activity_type_next_type_ids
+msgid "Recommended Next Activities"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_force_thread_id
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_force_thread_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_force_thread_id
@@ -3939,7 +4018,7 @@ msgid "Rich-text/HTML message"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:831
+#: code:addons/mail/models/mail_thread.py:830
#, python-format
msgid "Routing mail with Message-Id %s: route %s: %s"
msgstr ""
@@ -3978,14 +4057,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:62
-#, python-format
-msgid "Schedule an Activity"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:62
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:56
#, python-format
msgid "Schedule an activity"
@@ -4039,7 +4110,7 @@ msgid "Send Email"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:257
+#: code:addons/mail/models/mail_template.py:274
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -4052,7 +4123,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:56
+#: code:addons/mail/static/src/xml/chatter.xml:54
#, python-format
msgid "Send a message"
msgstr ""
@@ -4075,14 +4146,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:396
+#: code:addons/mail/static/src/js/thread_field.js:83
#, python-format
msgid "Sending Error"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:97
+#: code:addons/mail/static/src/xml/client_action.xml:101
#, python-format
msgid "Sends messages by email"
msgstr ""
@@ -4135,7 +4206,7 @@ msgid "Show all records which has next action date is before today"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:634
+#: code:addons/mail/models/mail_channel.py:658
#, python-format
msgid "Show an helper message"
msgstr ""
@@ -4194,7 +4265,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1044
+#: code:addons/mail/static/src/js/chat_manager.js:645
#: code:addons/mail/static/src/xml/client_action.xml:28
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred
#: model:ir.model.fields,field_description:mail.field_mail_mail_starred
@@ -4314,7 +4385,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id
#: 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_2047
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_1971
#: 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"
@@ -4345,6 +4416,11 @@ msgid "Task to perform"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_activity_has_recommended_activities
+msgid "Technical field for UX purpose"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.wizard_email_template_preview
msgid "Template Preview"
msgstr ""
@@ -4364,11 +4440,6 @@ msgid "Test Mail Model"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_alias_id
-msgid "The email address associated with this group. New emails received will automatically create new topics."
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
msgid "The escaped html code replacing the shortcut"
msgstr ""
@@ -4398,8 +4469,8 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:572
-#: code:addons/mail/models/mail_message.py:667
+#: code:addons/mail/models/mail_message.py:574
+#: code:addons/mail/models/mail_message.py:669
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -4472,7 +4543,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: selection:account.invoice,activity_state:0
-#: code:addons/mail/static/src/js/activity.js:27
+#: code:addons/mail/static/src/js/activity.js:25
#: code:addons/mail/static/src/js/thread.js:231
#: selection:crm.lead,activity_state:0
#: selection:event.track,activity_state:0
@@ -4516,7 +4587,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:37
+#: code:addons/mail/static/src/js/activity.js:35
#, python-format
msgid "Tomorrow"
msgstr ""
@@ -4580,14 +4651,14 @@ msgid "Unable to connect to SMTP Server"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:30
+#: code:addons/mail/models/mail_message.py:32
#, python-format
msgid "Unable to send email, please configure the sender's email address."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:699
+#: code:addons/mail/models/mail_thread.py:698
#: code:addons/mail/static/src/xml/followers.xml:23
#, python-format
msgid "Unfollow"
@@ -4778,7 +4849,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:655
+#: code:addons/mail/static/src/js/composer.js:652
#, python-format
msgid "Uploading error"
msgstr ""
@@ -4818,7 +4889,7 @@ msgid "Users"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:678
+#: code:addons/mail/models/mail_channel.py:702
#, python-format
msgid "Users in this channel: %s %s and you."
msgstr ""
@@ -4829,8 +4900,8 @@ msgid "Using your own email server is required to send/receive emails in Communi
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:667
-#: code:addons/mail/models/mail_thread.py:669
+#: code:addons/mail/models/mail_thread.py:666
+#: code:addons/mail/models/mail_thread.py:668
#: model:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
@@ -4838,10 +4909,11 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:330
+#: code:addons/mail/static/src/js/followers.js:240
#, python-format
msgid "Warning! \n"
-" If you remove a follower, he won't be notified of any email or discussion on this document. Do you really want to remove this follower ?"
+" If you remove a follower, he won't be notified of any email or discussion on this document.\n"
+" Do you really want to remove this follower ?"
msgstr ""
#. module: mail
@@ -4879,6 +4951,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/activity.xml:46
+#, python-format
+msgid "Write Feedback"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/composer.xml:18
#, python-format
msgid "Write something..."
@@ -4886,7 +4965,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:31
+#: code:addons/mail/static/src/js/activity.js:29
#: code:addons/mail/static/src/js/thread.js:233
#, python-format
msgid "Yesterday"
@@ -4894,25 +4973,25 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:78
+#: code:addons/mail/static/src/js/client_action.js:80
#, python-format
msgid "You added <b>%s</b> to the conversation."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:675
+#: code:addons/mail/models/mail_channel.py:699
#, python-format
msgid "You are alone in this channel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:644
+#: code:addons/mail/models/mail_channel.py:668
#, python-format
msgid "You are in a private conversation with <b>@%s</b>."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:639
+#: code:addons/mail/models/mail_channel.py:663
#, python-format
msgid "You are in channel <b>#%s</b>."
msgstr ""
@@ -4925,20 +5004,20 @@ 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:52
+#: code:addons/mail/models/res_users.py:53
#, 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:133
+#: code:addons/mail/models/mail_channel.py:144
#, 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:346
+#: code:addons/mail/models/mail_thread.py:347
#, python-format
msgid "You could also add a new %(document)s by sending an email to: %(email_link)s."
msgstr ""
@@ -4950,7 +5029,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:623
+#: code:addons/mail/static/src/js/chat_manager.js:567
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -4963,21 +5042,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:519
+#: code:addons/mail/static/src/js/chat_manager.js:463
#, python-format
msgid "You unpinned your conversation with <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:517
+#: code:addons/mail/static/src/js/chat_manager.js:461
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:396
+#: code:addons/mail/static/src/js/thread_field.js:83
#, python-format
msgid "Your message has not been sent."
msgstr ""
@@ -4989,15 +5068,9 @@ msgid "Your template should define email_from"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:965
+#: code:addons/mail/models/mail_thread.py:960
#, python-format
-msgid "alias %s does not accept unknown author"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:961
-#, python-format
-msgid "alias %s restricted to internal followers"
+msgid "alias %s: %s"
msgstr ""
#. module: mail
@@ -5016,7 +5089,7 @@ msgid "created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:312
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -5041,7 +5114,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:222
+#: code:addons/mail/static/src/js/followers.js:189
#, python-format
msgid "followers"
msgstr ""
@@ -5069,6 +5142,12 @@ msgid "has been"
msgstr ""
#. module: mail
+#: code:addons/mail/models/mail_alias.py:271
+#, python-format
+msgid "incorrectly configured alias"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
msgid "ir.actions.server"
msgstr ""
@@ -5084,24 +5163,19 @@ msgid "mail.alias.mixin"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
-msgid "members"
-msgstr ""
-
-#. module: mail
-#: code:addons/mail/models/mail_thread.py:940
+#: code:addons/mail/models/mail_thread.py:939
#, python-format
msgid "model %s does not accept document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:935
+#: code:addons/mail/models/mail_thread.py:934
#, python-format
msgid "model %s does not accept document update"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:928
+#: code:addons/mail/models/mail_thread.py:927
#, python-format
msgid "model %s does not accept document update, fall back on document creation"
msgstr ""
@@ -5139,13 +5213,13 @@ msgid "planned by"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:910
+#: code:addons/mail/models/mail_thread.py:909
#, 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:914
+#: code:addons/mail/models/mail_thread.py:913
#, python-format
msgid "posting a message without model should be with a parent_id (private message)"
msgstr ""
@@ -5175,30 +5249,47 @@ msgid "record:"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:932
+#: code:addons/mail/models/mail_thread.py:931
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:925
+#: code:addons/mail/models/mail_thread.py:924
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:910
+#: code:addons/mail/models/mail_thread.py:909
#, python-format
msgid "resetting thread_id"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:914
-#: code:addons/mail/models/mail_thread.py:932
-#: code:addons/mail/models/mail_thread.py:935
-#: code:addons/mail/models/mail_thread.py:940
-#: code:addons/mail/models/mail_thread.py:961
-#: code:addons/mail/models/mail_thread.py:965
+#: code:addons/mail/models/mail_channel.py:254
+#, python-format
+msgid "restricted to channel members"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_alias.py:276
+#, python-format
+msgid "restricted to followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_alias.py:280
+#, python-format
+msgid "restricted to known authors"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:913
+#: code:addons/mail/models/mail_thread.py:931
+#: code:addons/mail/models/mail_thread.py:934
+#: code:addons/mail/models/mail_thread.py:939
+#: code:addons/mail/models/mail_thread.py:960
#, python-format
msgid "skipping"
msgstr ""
@@ -5211,7 +5302,13 @@ msgid "this document"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:903
+#: code:addons/mail/models/mail_thread.py:960
+#, python-format
+msgid "unknown error"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:902
#, python-format
msgid "unknown target model %s"
msgstr ""
diff --git a/addons/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot
index 2edfdfaa4f7..08481c1ae90 100644
--- a/addons/maintenance/i18n/maintenance.pot
+++ b/addons/maintenance/i18n/maintenance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,6 @@ msgstr ""
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_name
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
-#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
msgid "Category Name"
msgstr ""
@@ -197,14 +196,10 @@ msgid "Close Date"
msgstr ""
#. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_color
-msgid "Color"
-msgstr ""
-
-#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_color
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_color
#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_color
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_color
msgid "Color Index"
msgstr ""
@@ -368,7 +363,7 @@ msgid "Equipment Categories"
msgstr ""
#. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3535
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3609
msgid "Equipment Category"
msgstr ""
@@ -516,7 +511,7 @@ msgstr ""
#. module: maintenance
#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_maintenance_duration
-msgid "Maintenance Duration in minutes and seconds."
+msgid "Maintenance Duration in hours."
msgstr ""
#. module: maintenance
@@ -550,8 +545,11 @@ msgstr ""
#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_from_equipment
#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_link
#: model:ir.actions.act_window,name:maintenance.hr_equipment_todo_request_action_from_dashboard
+#: model:ir.actions.act_window,name:maintenance.maintenance_request_action_reports
#: model:ir.model,name:maintenance.model_maintenance_request
+#: model:ir.ui.menu,name:maintenance.maintenance_request_reporting
#: model:ir.ui.menu,name:maintenance.menu_m_request_form
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Maintenance Requests"
msgstr ""
@@ -566,11 +564,6 @@ msgid "Maintenance Stages"
msgstr ""
#. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
-msgid "Maintenance Subject"
-msgstr ""
-
-#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_team_id
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_tree
@@ -602,11 +595,6 @@ msgid "Model"
msgstr ""
#. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-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 "My Activities"
@@ -626,6 +614,7 @@ msgstr ""
#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_name
#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_name
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_tree
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
msgid "Name"
msgstr ""
@@ -641,6 +630,11 @@ msgid "Next Preventive Maintenance"
msgstr ""
#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.maintenance_request_action_reports
+msgid "No maintenance request."
+msgstr ""
+
+#. module: maintenance
#: selection:maintenance.request,priority:0
msgid "Normal"
msgstr ""
@@ -747,6 +741,7 @@ msgid "Repaired"
msgstr ""
#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.maintenance_reporting
#: model:ir.ui.menu,name:maintenance.menu_m_reports
msgid "Reporting"
msgstr ""
@@ -778,6 +773,11 @@ msgid "Requested By"
msgstr ""
#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+msgid "Requested by :"
+msgstr ""
+
+#. module: maintenance
#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
@@ -785,6 +785,11 @@ msgid "Responsible"
msgstr ""
#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+msgid "Responsible :"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
msgid "Scheduled"
msgstr ""
@@ -858,23 +863,23 @@ msgid "Status changed"
msgstr ""
#. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_partner_id
-msgid "Subcontracting Partner"
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_name
+msgid "Subjects"
msgstr ""
#. module: maintenance
-#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
-msgid "Subject"
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_maintenance_team_id
+msgid "Team"
msgstr ""
#. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_name
-msgid "Subjects"
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_member_ids
+msgid "Team Members"
msgstr ""
#. module: maintenance
-#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_maintenance_team_id
-msgid "Team"
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
+msgid "Team Name"
msgstr ""
#. module: maintenance
@@ -969,6 +974,11 @@ msgid "Todo Request Count High Priority"
msgstr ""
#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_unscheduled
+msgid "Todo Request Count Unscheduled"
+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
msgid "Top Priorities"
@@ -992,6 +1002,11 @@ msgid "Unread Messages"
msgstr ""
#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "Unscheduled"
+msgstr ""
+
+#. module: maintenance
#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
msgid "Unscheduled Maintenance"
msgstr ""
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index b0c6f5cad1f..1879099d67d 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "%<br/>\n"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:482
+#: code:addons/mass_mailing/models/mass_mailing.py:479
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -199,11 +199,6 @@ msgid "A/B Testing percentage"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
-msgid "AB Testing"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event
msgid "ALL DAY"
msgstr ""
@@ -215,6 +210,16 @@ msgid "Active"
msgstr ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
+msgid "Allow A/B Testing"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
+msgid "Anna Machiavelli"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line
msgid "Apps That Help You Grow Your Business"
msgstr ""
@@ -274,7 +279,7 @@ msgid "Bounced Ratio"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3844
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3862
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Campaign"
msgstr ""
@@ -522,6 +527,11 @@ msgid "Date when this email has bounced."
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
+msgid "Dear John,"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_kanban
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban
msgid "Delete"
@@ -576,7 +586,7 @@ msgid "Domain"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:490
+#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#: selection:mail.statistics.report,state:0
#, python-format
@@ -732,11 +742,11 @@ 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, allowing to send various mailings in a single campaign to test the effectiveness of the mailings."
+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:490
+#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "In Queue"
@@ -879,7 +889,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_lists
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3868
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3886
#: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_lists
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_tree
@@ -1194,7 +1204,7 @@ 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:671
+#: code:addons/mass_mailing/models/mass_mailing.py:668
#, python-format
msgid "Please select recipients."
msgstr ""
@@ -1401,14 +1411,14 @@ msgid "Send to All"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:490
+#: code:addons/mass_mailing/models/mass_mailing.py:487
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "Sending"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:490
+#: code:addons/mass_mailing/models/mass_mailing.py:487
#: 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
@@ -1453,6 +1463,11 @@ msgid "Settings"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
+msgid "Sincerely,<br/>"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
msgid "Source"
msgstr ""
@@ -1521,7 +1536,7 @@ msgid "Tags"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:545
+#: code:addons/mass_mailing/models/mass_mailing.py:542
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
#, python-format
msgid "Test Mailing"
@@ -1596,7 +1611,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_campaign_id
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3844
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3862
msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
msgstr ""
@@ -1770,6 +1785,13 @@ msgid "link.tracker.click"
msgstr ""
#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.theme_basic_template
+msgid "lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.<br/>\n"
+" Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.<br/>\n"
+" Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mass_mailing_config_settings
msgid "mass.mailing.config.settings"
msgstr ""
diff --git a/addons/mass_mailing_event/i18n/mass_mailing_event.pot b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
new file mode 100644
index 00000000000..a4895366052
--- /dev/null
+++ b/addons/mass_mailing_event/i18n/mass_mailing_event.pot
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mass_mailing_event
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mass_mailing_event
+#: model:ir.model,name:mass_mailing_event.model_event_event
+msgid "Event"
+msgstr ""
+
+#. module: mass_mailing_event
+#: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing
+msgid "Mail Attendees"
+msgstr ""
+
diff --git a/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
new file mode 100644
index 00000000000..0810c9e4560
--- /dev/null
+++ b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot
@@ -0,0 +1,27 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mass_mailing_event_track
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mass_mailing_event_track
+#: model:ir.model,name:mass_mailing_event_track.model_event_event
+msgid "Event"
+msgstr ""
+
+#. module: mass_mailing_event_track
+#: model:ir.ui.view,arch_db:mass_mailing_event_track.event_event_view_form_inherit_mass_mailing_track
+msgid "Mail Track Speakers"
+msgstr ""
+
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 4c6f4fc40fa..a33c08ba1bb 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "# Work Orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:271
+#: code:addons/mrp/models/mrp_bom.py:293
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Click to upload files to your product.\n"
@@ -217,7 +217,7 @@ msgid "<strong>WorkCenter</strong>"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:429
+#: code:addons/mrp/models/mrp_workorder.py:438
#, python-format
msgid "A Manufacturing Order is already done or cancelled!"
msgstr ""
@@ -232,6 +232,7 @@ 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
@@ -288,7 +289,18 @@ msgid "Archived"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:263
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_name
+msgid "Attachment Name"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_local_url
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_website_url
+msgid "Attachment URL"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:285
#, python-format
msgid "Attachments"
msgstr ""
@@ -489,11 +501,6 @@ msgid "By-Products"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_product_product_can_be_expensed
-msgid "Can be Expensed"
-msgstr ""
-
-#. module: mrp
#: code:addons/mrp/models/stock_warehouse.py:36
#, python-format
msgid "Can't find any generic Manufacture route."
@@ -515,7 +522,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:279
+#: code:addons/mrp/models/mrp_production.py:282
#, python-format
msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
@@ -552,6 +559,11 @@ msgid "Check availability"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_checksum
+msgid "Checksum/SHA1"
+msgstr ""
+
+#. module: mrp
#. openerp-web
#: code:addons/mrp/static/src/xml/mrp.xml:9
#, python-format
@@ -622,6 +634,7 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_company_id
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_company_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_company_id
#: 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
@@ -723,6 +736,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_message_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_uid
@@ -742,6 +756,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_message_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_date
@@ -782,6 +797,11 @@ msgid "Dashboard"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_db_datas
+msgid "Database Data"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.oee_search_view
msgid "Date"
msgstr ""
@@ -813,6 +833,7 @@ msgid "Default Unit of Measure"
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
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_note
@@ -849,6 +870,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_message_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_production_display_name
@@ -958,6 +980,21 @@ msgid "Expected duration (in minutes)"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_datas
+msgid "File Content"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_datas_fname
+msgid "File Name"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_file_size
+msgid "File Size"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
msgid "Filters"
msgstr ""
@@ -1000,6 +1037,11 @@ msgid "General Information"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_document_priority
+msgid "Gives the sequence order when displaying a list of MRP documents."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_bom_sequence
msgid "Gives the sequence order when displaying a list of bills of material."
msgstr ""
@@ -1010,11 +1052,6 @@ msgid "Gives the sequence order when displaying a list of routing Work Centers."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_ir_attachment_priority
-msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter_sequence
msgid "Gives the sequence order when displaying a list of work centers."
msgstr ""
@@ -1060,7 +1097,7 @@ msgid "Has Moves"
msgstr ""
#. module: mrp
-#: selection:ir.attachment,priority:0
+#: selection:mrp.document,priority:0
msgid "High"
msgstr ""
@@ -1069,6 +1106,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_id
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_id
#: model:ir.model.fields,field_description:mrp.field_mrp_message_id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_id
@@ -1123,6 +1161,11 @@ msgid "In Progress"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_index_content
+msgid "Indexed Content"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_stock_move_lots_lot_produced_qty
msgid "Informative, not used in matching"
msgstr ""
@@ -1170,6 +1213,11 @@ msgid "Is a Blocking Reason"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_public
+msgid "Is public document"
+msgstr ""
+
+#. module: mrp
#: code:addons/mrp/models/mrp_workcenter.py:162
#, python-format
msgid "It has been unblocked already. "
@@ -1195,6 +1243,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_document___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_message___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_production___last_update
@@ -1216,6 +1265,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_message_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_uid
@@ -1235,6 +1285,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_message_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_date
@@ -1259,7 +1310,7 @@ msgid "Late"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:385
+#: code:addons/mrp/models/mrp_production.py:393
#, python-format
msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. "
msgstr ""
@@ -1280,7 +1331,7 @@ msgid "Location where the system will stock the finished products."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9642
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9897
#: model:ir.ui.view,arch_db:mrp.oee_search_view
msgid "Loss Reason"
msgstr ""
@@ -1300,7 +1351,7 @@ msgid "Lots"
msgstr ""
#. module: mrp
-#: selection:ir.attachment,priority:0
+#: selection:mrp.document,priority:0
msgid "Low"
msgstr ""
@@ -1455,9 +1506,8 @@ msgid "Message"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Messages can be configured to appear during any operation: receptions, delivery orders,\n"
-" manufacturing orders, work orders, etc."
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_mimetype
+msgid "Mime Type"
msgstr ""
#. module: mrp
@@ -1468,12 +1518,6 @@ msgid "Miscellaneous"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
-#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_move_id
msgid "Move"
msgstr ""
@@ -1529,11 +1573,12 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_production.py:46
#: code:addons/mrp/models/mrp_production.py:268
-#: code:addons/mrp/models/mrp_production.py:269
+#: code:addons/mrp/models/mrp_production.py:272
#: code:addons/mrp/models/mrp_routing.py:18
#: code:addons/mrp/models/mrp_routing.py:34
#: code:addons/mrp/models/mrp_routing.py:35
#: code:addons/mrp/models/mrp_unbuild.py:20
+#: code:addons/mrp/models/mrp_unbuild.py:80
#: code:addons/mrp/models/mrp_unbuild.py:81
#, python-format
msgid "New"
@@ -1588,8 +1633,8 @@ msgid "None"
msgstr ""
#. module: mrp
-#: selection:ir.attachment,priority:0
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+#: selection:mrp.document,priority:0
#: selection:mrp.production,priority:0
#: selection:mrp.workcenter,working_state:0
msgid "Normal"
@@ -1785,6 +1830,7 @@ msgid "Planned Date"
msgstr ""
#. module: mrp
+#: model:ir.ui.menu,name:mrp.mrp_planning_menu_root
#: model:ir.ui.view,arch_db:mrp.view_mrp_config
msgid "Planning"
msgstr ""
@@ -1806,7 +1852,7 @@ msgid "Post Inventory"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_ir_attachment_priority
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_priority
#: model:ir.model.fields,field_description:mrp.field_mrp_production_priority
msgid "Priority"
msgstr ""
@@ -2007,6 +2053,11 @@ msgid "Propagate cancel and split"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_stock_location_path
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: mrp
#: selection:mrp.workcenter.productivity.loss,loss_type:0
msgid "Quality"
msgstr ""
@@ -2098,7 +2149,7 @@ msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:24
+#: code:addons/mrp/static/src/js/mrp.js:146
#, python-format
msgid "Ready to produce"
msgstr ""
@@ -2120,7 +2171,7 @@ msgid "Record Production"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_bom.py:132
+#: code:addons/mrp/models/mrp_bom.py:160
#, python-format
msgid "Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!"
msgstr ""
@@ -2161,6 +2212,11 @@ msgid "Related Procurements"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_ir_attachment_id
+msgid "Related attachment"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_repair
msgid "Repair"
msgstr ""
@@ -2181,11 +2237,31 @@ msgid "Requires Serial"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_field
+msgid "Resource Field"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_id
+msgid "Resource ID"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
msgid "Resource Leaves"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_model
+msgid "Resource Model"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_res_name
+msgid "Resource Name"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
msgid "Resources"
msgstr ""
@@ -2287,8 +2363,8 @@ msgid "Scheduled Month"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:558
-#: code:addons/mrp/models/mrp_workorder.py:438
+#: code:addons/mrp/models/mrp_production.py:571
+#: code:addons/mrp/models/mrp_workorder.py:447
#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
@@ -2390,7 +2466,7 @@ msgid "Ship this product as a set of components (kit)"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_unbuild.py:89
+#: code:addons/mrp/models/mrp_unbuild.py:88
#, python-format
msgid "Should have a lot for the finished product"
msgstr ""
@@ -2407,11 +2483,6 @@ msgid "Source"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_product_product_can_be_expensed
-msgid "Specify whether the product can be selected in an HR expense."
-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"
@@ -2450,6 +2521,11 @@ msgid "Stock Moves"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_store_fname
+msgid "Stored Filename"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_child_bom_id
msgid "Sub BoM"
msgstr ""
@@ -2515,7 +2591,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:77
-#: code:addons/mrp/models/mrp_bom.py:232
+#: code:addons/mrp/models/mrp_bom.py:254
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -2532,6 +2608,11 @@ msgid "The components of 1st operation"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_document_res_model
+msgid "The database object this attachment will be attached to."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_production_routing_id
msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
msgstr ""
@@ -2567,6 +2648,11 @@ msgid "The quantity to produce must be positive!"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_document_res_id
+msgid "The record id this is attached to."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_routing_id
msgid "The routing contains all the Work Centers used and for how long. This will create work orders afterwardswhich alters the execution of the manufacturing order. "
msgstr ""
@@ -2609,7 +2695,7 @@ msgid "Time Tracking"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:367
+#: code:addons/mrp/models/mrp_workorder.py:368
#, python-format
msgid "Time Tracking: "
msgstr ""
@@ -2732,6 +2818,11 @@ msgid "Tracking"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_type
+msgid "Type"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
msgid "Unblock"
msgstr ""
@@ -2821,10 +2912,15 @@ msgid "Urgent"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_document_url
+msgid "Url"
+msgstr ""
+
+#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
-msgid "Use messages to warn manufacturing or inventory people about any change in the\n"
-" products, process, or actions to take care of. (e.g; Warning, the bill of material changed,\n"
-" check the details in new worksheet)"
+msgid "Use messages to warn users about any change in the products,\n"
+" process, or actions to take care of. (e.g; Warning, the bill\n"
+" of material changed, check the details in new worksheet)"
msgstr ""
#. module: mrp
@@ -2856,7 +2952,7 @@ msgid "Variants"
msgstr ""
#. module: mrp
-#: selection:ir.attachment,priority:0
+#: selection:mrp.document,priority:0
msgid "Very High"
msgstr ""
@@ -2884,7 +2980,7 @@ msgstr ""
#. module: mrp
#. openerp-web
-#: code:addons/mrp/static/src/js/mrp.js:24
+#: code:addons/mrp/static/src/js/mrp.js:146
#, python-format
msgid "Waiting Materials"
msgstr ""
@@ -2896,7 +2992,7 @@ msgstr ""
#. module: mrp
#: code:addons/mrp/models/mrp_bom.py:77
-#: code:addons/mrp/models/mrp_bom.py:232
+#: code:addons/mrp/models/mrp_bom.py:254
#, python-format
msgid "Warning"
msgstr ""
@@ -3003,6 +3099,12 @@ 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.ui.view,arch_db:mrp.view_mrp_config
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 ""
@@ -3062,7 +3164,7 @@ msgid "Work Sheet"
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:536
+#: code:addons/mrp/models/mrp_production.py:547
#, python-format
msgid "Work order %s is still running"
msgstr ""
@@ -3113,18 +3215,17 @@ msgid "Workorder Message"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_message_action_main
-#: model:ir.ui.menu,name:mrp.mrp_message_menu
-msgid "Workorder Messages"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_worksheet
+msgid "Worksheet"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_worksheet
-msgid "Worksheet"
+#: model:ir.model.fields,help:mrp.field_mrp_document_type
+msgid "You can either upload a file from your computer or copy/paste an internet link to your file."
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_production.py:475
+#: code:addons/mrp/models/mrp_production.py:483
#, python-format
msgid "You can not cancel production order, a work order is still in progress."
msgstr ""
@@ -3167,19 +3268,19 @@ msgid "You have already processed %d. Please input a quantity higher than %d "
msgstr ""
#. module: mrp
-#: code:addons/mrp/models/mrp_workorder.py:357
+#: code:addons/mrp/models/mrp_workorder.py:358
#, 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:353
+#: code:addons/mrp/models/mrp_workorder.py:354
#, 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:406
+#: code:addons/mrp/models/mrp_workorder.py:412
#, 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 ""
@@ -3231,11 +3332,6 @@ msgid "hour(s)"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
-#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
msgid "last"
msgstr ""
@@ -3263,6 +3359,11 @@ msgid "mrp.config.settings"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_document
+msgid "mrp.document"
+msgstr ""
+
+#. module: mrp
#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
msgid "report.mrp.report_mrpbomstructure"
msgstr ""
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 1035a49a690..2223bb21cba 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,16 @@ msgstr ""
"Plural-Forms: \n"
#. module: mrp_repair
+#: model:mail.template,report_name:mrp_repair.mail_template_mrp_repair_quotation
+msgid "${(object.name or '').replace('/','_')}"
+msgstr ""
+
+#. module: mrp_repair
+#: model:mail.template,subject:mrp_repair.mail_template_mrp_repair_quotation
+msgid "${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "(<i>Remove</i>)"
msgstr ""
@@ -36,28 +46,41 @@ msgid "* The 'Draft' status is used when a user is encoding a new and unconfirme
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<i>(Add)</i>"
+#: model:mail.template,body_html:mrp_repair.mail_template_mrp_repair_quotation
+msgid "<?xml version=\"1.0\"?>\n"
+"<data><p>Dear ${object.partner_id.name}</p>\n"
+" <p>\n"
+" Here is your repair order ${doc_name} <strong>${object.name}</strong>\n"
+" % if object.origin:\n"
+" (with reference: ${object.origin} )\n"
+" % endif\n"
+" % if object.invoice_method != 'none':\n"
+" amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}.</strong>\n"
+" % endif\n"
+" </p>\n"
+" <p>You can reply to this email if you have any questions.</p>\n"
+" <p>Thank you,</p>\n"
+" </data>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Fees Line(s)</strong>"
+msgid "<i>(Add)</i>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Guarantee Limit:</strong>"
+msgid "<strong>Lot/Serial Number:</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Lot Number</strong>"
+msgid "<strong>Operations</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Operation Line(s)</strong>"
+msgid "<strong>Parts</strong>"
msgstr ""
#. module: mrp_repair
@@ -77,7 +100,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Subtotal</strong>"
+msgid "<strong>Total Without Taxes</strong>"
msgstr ""
#. module: mrp_repair
@@ -86,6 +109,11 @@ msgid "<strong>Total</strong>"
msgstr ""
#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
+msgid "<strong>Warranty:</strong>"
+msgstr ""
+
+#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Add"
msgstr ""
@@ -106,11 +134,6 @@ msgid "After Repair"
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "Amount"
-msgstr ""
-
-#. module: mrp_repair
#: selection:mrp.repair,invoice_method:0
msgid "Before Repair"
msgstr ""
@@ -180,8 +203,8 @@ msgid "Confirmed"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:511
-#: code:addons/mrp_repair/models/mrp_repair.py:573
+#: code:addons/mrp_repair/models/mrp_repair.py:544
+#: code:addons/mrp_repair/models/mrp_repair.py:602
#, 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."
@@ -223,6 +246,11 @@ msgid "Current Location"
msgstr ""
#. module: mrp_repair
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_id
+msgid "Customer"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
msgid "Default Address"
msgstr ""
@@ -284,7 +312,6 @@ msgid "Extra Info"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fees_lines
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Fees"
msgstr ""
@@ -342,6 +369,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_invoice_id
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Invoice"
msgstr ""
@@ -372,6 +400,12 @@ msgid "Invoice and shipping address:"
msgstr ""
#. module: mrp_repair
+#: code:addons/mrp_repair/models/mrp_repair.py:361
+#, python-format
+msgid "Invoice created"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_invoiced
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_invoiced
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_invoiced
@@ -380,11 +414,6 @@ msgid "Invoiced"
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
-msgid "Invoicing"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_invoice_id
msgid "Invoicing Address"
msgstr ""
@@ -418,7 +447,8 @@ msgstr ""
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_lot_id
-msgid "Lot"
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_lot_id
+msgid "Lot/Serial"
msgstr ""
#. module: mrp_repair
@@ -447,34 +477,34 @@ msgid "No Invoice"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:502
-#: code:addons/mrp_repair/models/mrp_repair.py:564
+#: code:addons/mrp_repair/models/mrp_repair.py:535
+#: code:addons/mrp_repair/models/mrp_repair.py:593
#, python-format
msgid "No Pricelist!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:260
+#: code:addons/mrp_repair/models/mrp_repair.py:284
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:285
-#: code:addons/mrp_repair/models/mrp_repair.py:313
+#: code:addons/mrp_repair/models/mrp_repair.py:310
+#: code:addons/mrp_repair/models/mrp_repair.py:338
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:306
+#: code:addons/mrp_repair/models/mrp_repair.py:331
#, python-format
msgid "No product defined on Fees!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:509
-#: code:addons/mrp_repair/models/mrp_repair.py:571
+#: code:addons/mrp_repair/models/mrp_repair.py:542
+#: code:addons/mrp_repair/models/mrp_repair.py:600
#, python-format
msgid "No valid pricelist line found !"
msgstr ""
@@ -485,11 +515,7 @@ msgid "Notes"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
-msgid "Operation Lines"
-msgstr ""
-
-#. module: mrp_repair
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fees_lines
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Operations"
msgstr ""
@@ -500,12 +526,22 @@ msgid "Overdue Activities"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_partner_id
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
msgid "Partner"
msgstr ""
#. module: mrp_repair
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
+msgid "Parts"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
+msgid "Price"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_pricelist_id
msgid "Pricelist"
msgstr ""
@@ -516,6 +552,11 @@ msgid "Pricelist of the selected partner."
msgstr ""
#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
+msgid "Print Quotation"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_product_id
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_product_id
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
@@ -523,11 +564,6 @@ msgid "Product"
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
-msgid "Product Information"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_product_qty
msgid "Product Quantity"
msgstr ""
@@ -643,19 +679,19 @@ msgid "Repair must be canceled in order to reset it to draft."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:343
+#: code:addons/mrp_repair/models/mrp_repair.py:380
#, python-format
msgid "Repair must be confirmed before starting reparation."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:371
+#: code:addons/mrp_repair/models/mrp_repair.py:408
#, python-format
msgid "Repair must be repaired in order to make the product moves."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:354
+#: code:addons/mrp_repair/models/mrp_repair.py:391
#, python-format
msgid "Repair must be under repair in order to end reparation."
msgstr ""
@@ -679,11 +715,6 @@ msgid "Repaired"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_lot_id
-msgid "Repaired Lot"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
msgid "Repairs"
msgstr ""
@@ -705,6 +736,11 @@ msgid "Selecting 'Before Repair' or 'After Repair' will allow you to generate in
msgstr ""
#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
+msgid "Send Quotation"
+msgstr ""
+
+#. module: mrp_repair
#: code:addons/mrp_repair/models/mrp_repair.py:213
#, python-format
msgid "Serial number is required for operation line with product '%s'"
@@ -744,6 +780,11 @@ msgid "Subtotal"
msgstr ""
#. module: mrp_repair
+#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
+msgid "Tax"
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_amount_tax
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_tax_id
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_tax_id
@@ -780,12 +821,6 @@ msgid "This operation will cancel the Repair process, but will not cancel it's I
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_to_invoice
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_to_invoice
-msgid "To Invoice"
-msgstr ""
-
-#. module: mrp_repair
#: selection:mrp.repair,state:0
msgid "To be Invoiced"
msgstr ""
@@ -864,14 +899,14 @@ msgid "Yes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:248
+#: code:addons/mrp_repair/models/mrp_repair.py:272
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/models/mrp_repair.py:504
-#: code:addons/mrp_repair/models/mrp_repair.py:566
+#: code:addons/mrp_repair/models/mrp_repair.py:537
+#: code:addons/mrp_repair/models/mrp_repair.py:595
#, python-format
msgid "You have to select a pricelist in the Repair form !\n"
" Please set one before choosing a product."
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 23d684679cc..cc864e8b421 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,32 +32,19 @@ msgstr ""
#. module: pad
#: model:ir.model.fields,help:pad.field_base_config_settings_pad_key
+#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_key
#: model:ir.model.fields,help:pad.field_res_company_pad_key
msgid "Etherpad lite api key."
msgstr ""
#. module: pad
#: model:ir.model.fields,help:pad.field_base_config_settings_pad_server
+#: model:ir.model.fields,help:pad.field_hr_timesheet_config_settings_pad_server
#: model:ir.model.fields,help:pad.field_res_company_pad_server
msgid "Etherpad lite server. Example: beta.primarypad.com"
msgstr ""
#. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:27
-#, python-format
-msgid "Exit full screen"
-msgstr ""
-
-#. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:27
-#: code:addons/pad/static/src/xml/pad.xml:14
-#, python-format
-msgid "Full screen"
-msgstr ""
-
-#. module: pad
#: model:ir.model.fields,field_description:pad.field_pad_common_id
msgid "ID"
msgstr ""
@@ -68,12 +55,20 @@ msgid "Last Modified on"
msgstr ""
#. module: pad
+#. openerp-web
+#: code:addons/pad/static/src/js/pad.js:127
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: pad
#: model:ir.model.fields,field_description:pad.field_res_company_pad_key
msgid "Pad Api Key"
msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_key
+#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_key
msgid "Pad Api Key *"
msgstr ""
@@ -84,6 +79,7 @@ msgstr ""
#. module: pad
#: model:ir.model.fields,field_description:pad.field_base_config_settings_pad_server
+#: model:ir.model.fields,field_description:pad.field_hr_timesheet_config_settings_pad_server
msgid "Pad Server *"
msgstr ""
@@ -107,14 +103,14 @@ msgstr ""
#. module: pad
#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:55
+#: code:addons/pad/static/src/js/pad.js:146
#, python-format
msgid "This pad will be initialized on first edit"
msgstr ""
#. module: pad
#. openerp-web
-#: code:addons/pad/static/src/js/pad.js:52
+#: code:addons/pad/static/src/js/pad.js:140
#, python-format
msgid "Unable to load pad"
msgstr ""
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index c06c396fcc9..d37a14b67a3 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -255,6 +255,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_count
+#: model:ir.model.fields,field_description:payment.field_res_users_payment_token_count
msgid "Count Payment Token"
msgstr ""
@@ -335,11 +336,6 @@ msgid "Display Name"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_journal_use_in_payment
-msgid "Display this bank account on messages in payment process."
-msgstr ""
-
-#. module: payment
#: selection:payment.transaction,state:0
msgid "Done"
msgstr ""
@@ -474,11 +470,6 @@ msgid "Internal reference of the TX"
msgstr ""
#. module: payment
-#: model:ir.model,name:payment.model_account_journal
-msgid "Journal"
-msgstr ""
-
-#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_lang
msgid "Language"
msgstr ""
@@ -604,6 +595,18 @@ msgid "Ogone"
msgstr ""
#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:664
+#, python-format
+msgid "Only transactions in the Authorized status can be captured."
+msgstr ""
+
+#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:671
+#, python-format
+msgid "Only transactions in the Authorized status can be voided."
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_auto_confirm
msgid "Order Confirmation"
msgstr ""
@@ -650,6 +653,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_ids
+#: model:ir.model.fields,field_description:payment.field_res_users_payment_token_ids
#: model:ir.ui.view,arch_db:payment.payment_token_form_view
#: model:ir.ui.view,arch_db:payment.payment_token_tree_view
#: model:ir.ui.view,arch_db:payment.payment_token_view_search
@@ -824,6 +828,13 @@ msgid "The payment transaction reference must be unique!"
msgstr ""
#. module: payment
+#: code:addons/payment/models/account_payment.py:42
+#, 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."
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,help:payment.field_payment_acquirer_image
msgid "This field holds the image used for this provider, limited to 1024x1024px"
msgstr ""
@@ -840,6 +851,12 @@ msgid "This template renders the acquirer button with all necessary values.\n"
msgstr ""
#. module: payment
+#: code:addons/payment/models/payment_acquirer.py:166
+#, python-format
+msgid "Transaction Authorization is not supported by this payment provider."
+msgstr ""
+
+#. module: payment
#: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
msgid "Transfer information will be provided after choosing the payment method."
msgstr ""
@@ -850,11 +867,6 @@ msgid "Type"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_journal_use_in_payment
-msgid "Use in payment"
-msgstr ""
-
-#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction_date_validate
msgid "Validation Date"
msgstr ""
diff --git a/addons/payment_authorize/i18n/payment_authorize.pot b/addons/payment_authorize/i18n/payment_authorize.pot
index 373fadac77b..cfd53d5347d 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "API Transaction Key"
msgstr ""
#. module: payment_authorize
-#: code:addons/payment_authorize/models/authorize_request.py:66
+#: code:addons/payment_authorize/models/authorize_request.py:68
#, python-format
msgid "Authorize.net Error Message(s):\n"
" %s"
@@ -65,7 +65,7 @@ msgstr ""
#. module: payment_authorize
#: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
-msgid "How to configure your Authorize.Net account (look for Getting Started Guide) ?"
+msgid "How to get paid with Authorize.Net"
msgstr ""
#. module: payment_authorize
@@ -89,7 +89,7 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_authorize
-#: code:addons/payment_authorize/models/payment.py:347
+#: code:addons/payment_authorize/models/payment.py:346
#, python-format
msgid "The Customer Profile creation in Authorize.NET failed."
msgstr ""
diff --git a/addons/phone_validation/i18n/phone_validation.pot b/addons/phone_validation/i18n/phone_validation.pot
new file mode 100644
index 00000000000..0eef363c888
--- /dev/null
+++ b/addons/phone_validation/i18n/phone_validation.pot
@@ -0,0 +1,78 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * phone_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: phone_validation
+#: model:ir.model.fields,help:phone_validation.field_res_company_phone_international_format
+msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format."
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model,name:phone_validation.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model.fields,field_description:phone_validation.field_res_company_phone_international_format
+msgid "Enforce International Format"
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin_id
+msgid "ID"
+msgstr ""
+
+#. module: phone_validation
+#: code:addons/phone_validation/tools/phone_validation.py:23
+#, python-format
+msgid "Impossible number %s: probably invalid number of digits"
+msgstr ""
+
+#. module: phone_validation
+#: code:addons/phone_validation/tools/phone_validation.py:25
+#, python-format
+msgid "Invalid number %s: probably incorrect prefix"
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model.fields,field_description:phone_validation.field_phone_validation_mixin___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: phone_validation
+#: code:addons/phone_validation/tools/phone_validation.py:44
+#, python-format
+msgid "Unable to format %s:\n"
+"%s"
+msgstr ""
+
+#. module: phone_validation
+#: code:addons/phone_validation/tools/phone_validation.py:20
+#, python-format
+msgid "Unable to parse %s:\n"
+"%s"
+msgstr ""
+
+#. module: phone_validation
+#: model:ir.model,name:phone_validation.model_phone_validation_mixin
+msgid "phone.validation.mixin"
+msgstr ""
+
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 0d7ea224acf..262c3c79c77 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+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:748
-#: code:addons/point_of_sale/models/pos_order.py:757
+#: code:addons/point_of_sale/models/pos_order.py:772
+#: code:addons/point_of_sale/models/pos_order.py:781
#, python-format
msgid " REFUND"
msgstr ""
@@ -28,21 +28,51 @@ msgid "# of Lines"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "$ 3.12"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "$ 4.40"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "$ 4.50"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "$ 8.50"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1428
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1448
#, python-format
msgid "% discount"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1555
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1595
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1575
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1615
#, python-format
msgid "&nbsp;"
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:82
+#, python-format
+msgid "(RESCUE FOR %(session)s)"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "(update)"
msgstr ""
@@ -54,12 +84,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:287
+#: code:addons/point_of_sale/static/src/xml/pos.xml:302
#, python-format
msgid "123.14 €"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
+msgid "<b>Set Custom Image...</b>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_snippets
+msgid "<i class=\"fa fa-eye-slash\"/>Hide"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/tour.js:17
#, python-format
@@ -89,6 +129,42 @@ msgid "<span class=\"o_stat_text\">Take</span>\n"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span class=\"pos-change_amount\">$ 0.86</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span class=\"pos-change_title\">Change</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span class=\"total-amount-formatting\">TOTAL</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span id=\"total-amount\" class=\"pos_total-amount\">$ 469.14</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span>$ 470.00</span>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "<span>Cash (USD):</span>"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
msgid "<span>Cash Balance</span>"
msgstr ""
@@ -155,7 +231,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1926
+#: code:addons/point_of_sale/static/src/js/screens.js:1931
#, python-format
msgid "? Clicking \"Confirm\" will validate the payment."
msgstr ""
@@ -227,7 +303,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1594
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1614
#, python-format
msgid "ABC"
msgstr ""
@@ -259,11 +335,6 @@ msgid "Accounting journal used to post sales entries."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_activation
-msgid "Activation"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_active
msgid "Active"
msgstr ""
@@ -275,7 +346,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1772
+#: code:addons/point_of_sale/static/src/js/screens.js:1777
#, python-format
msgid "Add Tip"
msgstr ""
@@ -292,8 +363,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:382
-#: code:addons/point_of_sale/static/src/xml/pos.xml:470
+#: code:addons/point_of_sale/static/src/xml/pos.xml:397
+#: code:addons/point_of_sale/static/src/xml/pos.xml:485
#, python-format
msgid "Address"
msgstr ""
@@ -363,12 +434,18 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1918
+#: code:addons/point_of_sale/static/src/js/screens.js:1923
#, python-format
msgid "Are you sure that the customer wants to pay"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_attribute_val
+msgid "Attribute Values"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_attribute
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
msgid "Attributes"
msgstr ""
@@ -379,6 +456,11 @@ msgid "Attributes & Variants"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_session_rescue
+msgid "Auto-generated session for orphan orders, ignored in constraints"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_auto
msgid "Automatic Receipt Printing"
msgstr ""
@@ -401,6 +483,7 @@ msgid "Available in POS"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_product_product_available_in_pos
#: model:ir.model.fields,field_description:point_of_sale.field_product_template_available_in_pos
msgid "Available in the Point of Sale"
msgstr ""
@@ -412,8 +495,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:275
-#: code:addons/point_of_sale/static/src/xml/pos.xml:605
+#: code:addons/point_of_sale/static/src/xml/pos.xml:290
+#: code:addons/point_of_sale/static/src/xml/pos.xml:620
#, python-format
msgid "Back"
msgstr ""
@@ -431,8 +514,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:359
-#: code:addons/point_of_sale/static/src/xml/pos.xml:411
+#: code:addons/point_of_sale/static/src/xml/pos.xml:374
+#: code:addons/point_of_sale/static/src/xml/pos.xml:426
#, python-format
msgid "Barcode"
msgstr ""
@@ -444,7 +527,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1301
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1316
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
#, python-format
msgid "Barcode Scanner"
@@ -474,20 +557,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:806
+#: code:addons/point_of_sale/static/src/xml/pos.xml:821
#, python-format
msgid "CHANGE"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:438
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1021
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1038
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1067
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1084
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1104
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1156
+#: code:addons/point_of_sale/static/src/xml/pos.xml:453
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1053
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1082
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1099
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1119
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1171
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount
@@ -505,13 +588,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1907
+#: code:addons/point_of_sale/static/src/js/screens.js:1912
#, python-format
msgid "Cannot return change without a cash payment method"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:309
+#: code:addons/point_of_sale/models/pos_session.py:317
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_cash_control
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
#, python-format
@@ -529,7 +612,7 @@ msgid "Cash Register"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:135
+#: code:addons/point_of_sale/models/pos_session.py:141
#, python-format
msgid "Cash control can only be applied to cash journals."
msgstr ""
@@ -556,6 +639,11 @@ 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.actions.act_window,help:point_of_sale.product_pos_category_action
msgid "Categories are used to browse your products through the\n"
" touchscreen interface."
@@ -563,7 +651,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:511
+#: code:addons/point_of_sale/static/src/xml/pos.xml:526
#, python-format
msgid "Change"
msgstr ""
@@ -584,25 +672,28 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1772
+#: code:addons/point_of_sale/static/src/js/screens.js:1777
#, python-format
msgid "Change Tip"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:667
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1484
+#: code:addons/point_of_sale/static/src/xml/pos.xml:682
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1504
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1665
#, python-format
msgid "Change:"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_product_product_to_weight
#: model:ir.model.fields,help:point_of_sale.field_product_template_to_weight
msgid "Check if the product should be weighted using the hardware scale integration"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_product_product_available_in_pos
#: model:ir.model.fields,help:point_of_sale.field_product_template_available_in_pos
msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
@@ -624,7 +715,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1965
+#: code:addons/point_of_sale/static/src/js/screens.js:1970
#, python-format
msgid "Check your internet connection and try again."
msgstr ""
@@ -636,8 +727,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:330
-#: code:addons/point_of_sale/static/src/xml/pos.xml:331
+#: code:addons/point_of_sale/static/src/xml/pos.xml:345
+#: code:addons/point_of_sale/static/src/xml/pos.xml:346
#, python-format
msgid "City"
msgstr ""
@@ -680,8 +771,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:708
-#: code:addons/point_of_sale/static/src/js/chrome.js:716
+#: code:addons/point_of_sale/static/src/js/chrome.js:461
+#, 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: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"
@@ -694,7 +792,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:346
+#: code:addons/point_of_sale/static/src/js/gui.js:345
#, python-format
msgid "Closing ..."
msgstr ""
@@ -734,15 +832,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:713
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1018
+#: code:addons/point_of_sale/static/src/js/chrome.js:830
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1033
#, python-format
msgid "Confirm"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:115
+#: code:addons/point_of_sale/static/src/js/chrome.js:454
+#, python-format
+msgid "Connected, Not Owned"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/models.js:121
#, python-format
msgid "Connecting to the PosBox"
msgstr ""
@@ -759,14 +864,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1288
+#: code:addons/point_of_sale/static/src/js/screens.js:1292
#, python-format
msgid "Could Not Read Image"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:338
+#: code:addons/point_of_sale/static/src/xml/pos.xml:353
#, python-format
msgid "Country"
msgstr ""
@@ -833,9 +938,9 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1783
-#: code:addons/point_of_sale/static/src/xml/pos.xml:124
-#: code:addons/point_of_sale/static/src/xml/pos.xml:635
+#: code:addons/point_of_sale/static/src/js/screens.js:1788
+#: code:addons/point_of_sale/static/src/xml/pos.xml:139
+#: code:addons/point_of_sale/static/src/xml/pos.xml:650
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_partner_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_partner_id
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
@@ -844,13 +949,23 @@ msgid "Customer"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:457
-#: code:addons/point_of_sale/models/pos_order.py:508
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_customer_facing_display
+msgid "Customer Facing Display"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:463
+#: code:addons/point_of_sale/models/pos_order.py:514
#, python-format
msgid "Customer Invoice"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_customer_facing_display_html
+msgid "Customer facing display content"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
msgid "Dashboard"
msgstr ""
@@ -862,7 +977,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1291
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1306
#, python-format
msgid "Debug Window"
msgstr ""
@@ -883,6 +998,11 @@ msgid "Default Fiscal Position"
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.model.fields,help:point_of_sale.field_pos_config_barcode_nomenclature_id
msgid "Defines what kind of barcodes are available and how they are assigned to products, customers and cashiers"
msgstr ""
@@ -894,7 +1014,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1311
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1326
#, python-format
msgid "Delete Paid Orders"
msgstr ""
@@ -908,7 +1028,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1312
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1327
#, python-format
msgid "Delete Unpaid Orders"
msgstr ""
@@ -946,7 +1066,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:147
+#: code:addons/point_of_sale/static/src/xml/pos.xml:162
#, python-format
msgid "Disc"
msgstr ""
@@ -957,6 +1077,13 @@ msgid "Disc:"
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/chrome.js:459
+#, python-format
+msgid "Disconnected"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_discount
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_discount
msgid "Discount (%)"
@@ -969,9 +1096,9 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:749
-#: code:addons/point_of_sale/static/src/xml/pos.xml:888
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1457
+#: code:addons/point_of_sale/static/src/xml/pos.xml:764
+#: code:addons/point_of_sale/static/src/xml/pos.xml:903
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1477
#, python-format
msgid "Discount:"
msgstr ""
@@ -984,7 +1111,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:815
+#: code:addons/point_of_sale/static/src/xml/pos.xml:830
#, python-format
msgid "Discounts"
msgstr ""
@@ -1032,14 +1159,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1314
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1329
#, python-format
msgid "Download Paid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1316
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1331
#, python-format
msgid "Download Unpaid Orders"
msgstr ""
@@ -1051,14 +1178,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:509
+#: code:addons/point_of_sale/static/src/xml/pos.xml:524
#, python-format
msgid "Due"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1294
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1309
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_electronic_scale
#, python-format
msgid "Electronic Scale"
@@ -1066,15 +1193,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:351
-#: code:addons/point_of_sale/static/src/xml/pos.xml:391
+#: code:addons/point_of_sale/static/src/xml/pos.xml:366
+#: code:addons/point_of_sale/static/src/xml/pos.xml:406
#, python-format
msgid "Email"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1878
+#: code:addons/point_of_sale/static/src/js/screens.js:1883
#, python-format
msgid "Empty Order"
msgstr ""
@@ -1102,6 +1229,11 @@ msgid "Enables Payment Terminal integration"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_customer_facing_display
+msgid "Enables a remotely connected customer facing display"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_vkeyboard
msgid "Enables an integrated Virtual Keyboard"
msgstr ""
@@ -1134,28 +1266,28 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1217
+#: code:addons/point_of_sale/static/src/js/screens.js:1221
#, python-format
msgid "Error: Could not Save Changes"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:239
+#: code:addons/point_of_sale/static/src/js/models.js:246
#, python-format
msgid "Error: The Point of Sale User must belong to the same company as the Point of Sale. You are probably trying to load the point of sale as an administrator in a multi-company setup, with the administrator account set to the wrong company."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1313
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1328
#, python-format
msgid "Export Paid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1315
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1330
#, python-format
msgid "Export Unpaid Orders"
msgstr ""
@@ -1166,13 +1298,19 @@ msgid "Extra Info"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Fanta"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
msgid "Features"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1170
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1185
#, python-format
msgid "Finished Importing Orders"
msgstr ""
@@ -1213,11 +1351,6 @@ msgid "Give customer rewards, free samples, etc."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_res_users_partner_weight
-msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_category_sequence
msgid "Gives the sequence order when displaying a list of product categories."
msgstr ""
@@ -1228,6 +1361,12 @@ msgid "Global Discounts"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Gordon"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
@@ -1241,7 +1380,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1327
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1343
#, python-format
msgid "Hardware Events"
msgstr ""
@@ -1253,7 +1392,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1323
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1338
#, python-format
msgid "Hardware Status"
msgstr ""
@@ -1299,6 +1438,11 @@ msgid "IP Address"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_config_use_existing_lots
+msgid "If this is checked, you will be able to choose the Lots/Serial Numbers. You can also decide to not put lots in this operation type. This means it will create stock with no lot or not put a restriction on the lot taken. "
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.actions.act_window,help:point_of_sale.product_pos_category_action
msgid "If you put a photo on the category, the layout of the\n"
" touchscreen interface will automatically. We suggest not to put\n"
@@ -1311,23 +1455,8 @@ msgid "Image"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_implemented_partner_ids
-msgid "Implementation References"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_implemented_count
-msgid "Implemented Count"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_assigned_partner_id
-msgid "Implemented by"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1317
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1332
#, python-format
msgid "Import Orders"
msgstr ""
@@ -1343,7 +1472,7 @@ msgid "In Progress"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:439
+#: code:addons/point_of_sale/models/pos_order.py:445
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
@@ -1360,19 +1489,25 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:277
+#: code:addons/point_of_sale/static/src/js/gui.js:276
#, python-format
msgid "Incorrect Password"
msgstr ""
#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_category_action
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_category
+msgid "Internal Categories"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_note
msgid "Internal Notes"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:643
+#: code:addons/point_of_sale/static/src/xml/pos.xml:658
#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_invoice_id
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
@@ -1484,21 +1619,6 @@ msgid "Last Updated on"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_review
-msgid "Latest Partner Review"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_grade_id
-msgid "Level"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_partner_weight
-msgid "Level Weight"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_name
msgid "Line No"
msgstr ""
@@ -1516,7 +1636,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:477
+#: code:addons/point_of_sale/static/src/js/models.js:484
#: code:addons/point_of_sale/static/src/xml/pos.xml:38
#, python-format
msgid "Loading"
@@ -1535,7 +1655,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:304
+#: code:addons/point_of_sale/static/src/js/gui.js:303
#, python-format
msgid "Login as a Manager"
msgstr ""
@@ -1547,7 +1667,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:2026
+#: code:addons/point_of_sale/static/src/js/models.js:2186
#, python-format
msgid "Lot/Serial Number(s) Required"
msgstr ""
@@ -1568,6 +1688,12 @@ msgid "Make Payment"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Malibu Drink"
+msgstr ""
+
+#. module: point_of_sale
#: model:res.groups,name:point_of_sale.group_pos_manager
msgid "Manager"
msgstr ""
@@ -1584,7 +1710,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:512
+#: code:addons/point_of_sale/static/src/xml/pos.xml:527
#, python-format
msgid "Method"
msgstr ""
@@ -1601,13 +1727,13 @@ msgid "Month of order date"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_multi_currency
+msgid "Multi-Currencies"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_multi_currency
-msgid "Multi-Currencies"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_pricelist_setting
+msgid "Multiple Prices per Products"
msgstr ""
#. module: point_of_sale
@@ -1622,19 +1748,19 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:387
-#: code:addons/point_of_sale/static/src/xml/pos.xml:396
-#: code:addons/point_of_sale/static/src/xml/pos.xml:405
-#: code:addons/point_of_sale/static/src/xml/pos.xml:416
-#: code:addons/point_of_sale/static/src/xml/pos.xml:425
+#: code:addons/point_of_sale/static/src/xml/pos.xml:402
+#: code:addons/point_of_sale/static/src/xml/pos.xml:411
+#: code:addons/point_of_sale/static/src/xml/pos.xml:420
+#: code:addons/point_of_sale/static/src/xml/pos.xml:431
+#: code:addons/point_of_sale/static/src/xml/pos.xml:440
#, python-format
msgid "N/A"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:318
-#: code:addons/point_of_sale/static/src/xml/pos.xml:469
+#: code:addons/point_of_sale/static/src/xml/pos.xml:333
+#: code:addons/point_of_sale/static/src/xml/pos.xml:484
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_name
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
@@ -1644,7 +1770,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1888
+#: code:addons/point_of_sale/static/src/js/screens.js:1893
#, python-format
msgid "Negative Bank Payment"
msgstr ""
@@ -1663,18 +1789,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:668
+#: code:addons/point_of_sale/static/src/xml/pos.xml:683
#, python-format
msgid "Next Order"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_review_next
-msgid "Next Partner Review"
-msgstr ""
-
-#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:136
+#: code:addons/point_of_sale/models/pos_order.py:139
#, python-format
msgid "No cash statement found for this session. Unable to record returned cash."
msgstr ""
@@ -1693,8 +1814,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2018
-#: code:addons/point_of_sale/static/src/xml/pos.xml:340
+#: code:addons/point_of_sale/static/src/js/screens.js:2023
+#: code:addons/point_of_sale/static/src/xml/pos.xml:355
#, python-format
msgid "None"
msgstr ""
@@ -1721,30 +1842,36 @@ msgid "Number of Print"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Odoo Logo"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:395
+#: code:addons/point_of_sale/static/src/js/chrome.js:401
#, python-format
msgid "Offline"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:328
+#: code:addons/point_of_sale/static/src/js/gui.js:327
#, python-format
msgid "Offline Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:947
-#: code:addons/point_of_sale/static/src/xml/pos.xml:961
-#: code:addons/point_of_sale/static/src/xml/pos.xml:975
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1004
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1035
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1064
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1081
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1159
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1195
+#: code:addons/point_of_sale/static/src/xml/pos.xml:962
+#: code:addons/point_of_sale/static/src/xml/pos.xml:976
+#: code:addons/point_of_sale/static/src/xml/pos.xml:990
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1019
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1050
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1079
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1096
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1174
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1210
#, python-format
msgid "Ok"
msgstr ""
@@ -1758,7 +1885,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1274
+#: code:addons/point_of_sale/static/src/js/screens.js:1278
#, python-format
msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
msgstr ""
@@ -1775,8 +1902,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:654
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1329
+#: code:addons/point_of_sale/static/src/xml/pos.xml:669
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1345
#, python-format
msgid "Open Cashbox"
msgstr ""
@@ -1832,7 +1959,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:290
+#: code:addons/point_of_sale/static/src/xml/pos.xml:305
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_order_id
#, python-format
msgid "Order"
@@ -1840,8 +1967,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:1668
-#: code:addons/point_of_sale/static/src/js/models.js:1699
+#: code:addons/point_of_sale/static/src/js/models.js:1793
+#: code:addons/point_of_sale/static/src/js/models.js:1833
#, python-format
msgid "Order "
msgstr ""
@@ -1885,7 +2012,7 @@ msgid "Order Sequence Number"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:469
+#: code:addons/point_of_sale/models/pos_order.py:475
#, python-format
msgid "Order is not paid."
msgstr ""
@@ -1897,7 +2024,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1308
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1323
#: model:ir.actions.act_window,name:point_of_sale.act_pos_session_orders
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_filtered
#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
@@ -1917,7 +2044,7 @@ msgid "Orders Analysis"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:219
+#: code:addons/point_of_sale/models/pos_config.py:225
#, python-format
msgid "POS Order %s"
msgstr ""
@@ -1948,14 +2075,14 @@ msgid "POS Sales"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:228
+#: code:addons/point_of_sale/models/pos_config.py:234
#, python-format
msgid "POS order line %s"
msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
-msgid "POS ordered created during current year"
+msgid "POS orders created during the current year"
msgstr ""
#. module: point_of_sale
@@ -1981,13 +2108,8 @@ msgid "Partner"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_partnership
-msgid "Partnership Date"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:274
+#: code:addons/point_of_sale/static/src/js/gui.js:273
#, python-format
msgid "Password ?"
msgstr ""
@@ -1999,8 +2121,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:129
-#: code:addons/point_of_sale/static/src/xml/pos.xml:608
+#: code:addons/point_of_sale/static/src/xml/pos.xml:144
+#: code:addons/point_of_sale/static/src/xml/pos.xml:623
#: code:addons/point_of_sale/wizard/pos_payment.py:65
#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
@@ -2052,7 +2174,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:898
+#: code:addons/point_of_sale/static/src/xml/pos.xml:913
#, python-format
msgid "Payments:"
msgstr ""
@@ -2069,16 +2191,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:355
-#: code:addons/point_of_sale/static/src/xml/pos.xml:400
-#: code:addons/point_of_sale/static/src/xml/pos.xml:471
+#: code:addons/point_of_sale/static/src/xml/pos.xml:370
+#: code:addons/point_of_sale/static/src/xml/pos.xml:415
+#: code:addons/point_of_sale/static/src/xml/pos.xml:486
#, python-format
msgid "Phone"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1407
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1424
#, python-format
msgid "Phone:"
msgstr ""
@@ -2100,38 +2222,44 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1917
+#: code:addons/point_of_sale/static/src/js/screens.js:1922
#, python-format
msgid "Please Confirm Large Amount"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:269
+#: code:addons/point_of_sale/models/pos_order.py:273
#, 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:485
+#: code:addons/point_of_sale/models/pos_order.py:491
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:492
+#: code:addons/point_of_sale/static/src/xml/pos.xml:507
#, python-format
msgid "Please select a payment method."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1956
+#: code:addons/point_of_sale/static/src/js/screens.js:1961
#, python-format
msgid "Please select the Customer"
msgstr ""
#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_product_pos_category
+msgid "PoS Categories"
+msgstr ""
+
+#. module: point_of_sale
#: model:stock.picking.type,name:point_of_sale.picking_type_posout
msgid "PoS Orders"
msgstr ""
@@ -2144,6 +2272,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_config_id
#: 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.menu,name:point_of_sale.pos_config_menu_configuration
#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
#: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view
#: model:ir.ui.view,arch_db:point_of_sale.res_users_form_view
@@ -2161,6 +2290,7 @@ msgid "Point of Sale Analysis"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_product_product_pos_categ_id
#: model:ir.model.fields,field_description:point_of_sale.field_product_template_pos_categ_id
msgid "Point of Sale Category"
msgstr ""
@@ -2237,19 +2367,13 @@ msgid "Pos Order Line"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.product_pos_category_action
-#: model:ir.ui.menu,name:point_of_sale.menu_product_pos_category
-msgid "Pos Product Categories"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
msgid "Pos Session Username"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:334
+#: code:addons/point_of_sale/static/src/xml/pos.xml:349
#, python-format
msgid "Postcode"
msgstr ""
@@ -2268,7 +2392,9 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:152
+#: code:addons/point_of_sale/static/src/xml/pos.xml:167
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
#, python-format
msgid "Price"
msgstr ""
@@ -2297,7 +2423,7 @@ msgid "Pricelist"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_pricelist_setting
+#: 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_settings_view_form
msgid "Pricelists"
msgstr ""
@@ -2314,8 +2440,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:675
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1330
+#: code:addons/point_of_sale/static/src/xml/pos.xml:690
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1346
#, python-format
msgid "Print Receipt"
msgstr ""
@@ -2327,14 +2453,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:384
+#: code:addons/point_of_sale/static/src/js/chrome.js:389
#, python-format
msgid "Printer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/devices.js:427
+#: code:addons/point_of_sale/static/src/js/devices.js:430
#, python-format
msgid "Printing Error: "
msgstr ""
@@ -2349,6 +2475,11 @@ msgid "Product"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+msgid "Product Catalog"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_product_categ_id
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Product Category"
@@ -2372,8 +2503,14 @@ msgstr ""
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.product_product_action
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_action_product_product
+msgid "Product Variants"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_template_action_pos_product
#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
-#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form
+#: model:ir.ui.menu,name:point_of_sale.pos_config_menu_configuration_product
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Products"
@@ -2392,20 +2529,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:142
+#: code:addons/point_of_sale/static/src/xml/pos.xml:157
#, python-format
msgid "Qty"
msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_qty
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
msgid "Quantity"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1331
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1347
#, python-format
msgid "Read Weighing Scale"
msgstr ""
@@ -2448,6 +2587,18 @@ msgid "Receipt Ref"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_rescue
+msgid "Recovery Session"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1341
+#, python-format
+msgid "Refresh Display"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
msgid "Reporting"
msgstr ""
@@ -2459,7 +2610,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1298
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1313
#, python-format
msgid "Reset"
msgstr ""
@@ -2486,7 +2637,7 @@ msgid "Resume"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:764
+#: code:addons/point_of_sale/models/pos_order.py:788
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
msgid "Return Products"
@@ -2548,21 +2699,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:392
+#: code:addons/point_of_sale/static/src/js/chrome.js:397
#, python-format
msgid "Scale"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1304
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1319
#, python-format
msgid "Scan"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1305
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1320
#, python-format
msgid "Scan EAN-13"
msgstr ""
@@ -2574,21 +2725,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:375
+#: code:addons/point_of_sale/static/src/js/chrome.js:380
#, python-format
msgid "Scanner"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:442
+#: code:addons/point_of_sale/static/src/xml/pos.xml:457
#, python-format
msgid "Search Customers"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:199
+#: code:addons/point_of_sale/static/src/xml/pos.xml:214
#, python-format
msgid "Search Products"
msgstr ""
@@ -2611,27 +2762,27 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:450
+#: code:addons/point_of_sale/static/src/xml/pos.xml:465
#, python-format
msgid "Select Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:248
+#: code:addons/point_of_sale/static/src/js/gui.js:247
#, python-format
msgid "Select User"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:2029
+#: code:addons/point_of_sale/static/src/js/screens.js:2034
#, python-format
msgid "Select tax"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:204
+#: code:addons/point_of_sale/models/pos_order.py:208
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
@@ -2643,7 +2794,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_sequence
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_grade_sequence
msgid "Sequence"
msgstr ""
@@ -2654,27 +2804,27 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1058
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1073
#, python-format
msgid "Serial/Lot Number"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:727
+#: code:addons/point_of_sale/static/src/xml/pos.xml:742
#, python-format
msgid "Served by"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1969
+#: code:addons/point_of_sale/static/src/js/screens.js:1974
#, python-format
msgid "Server Error"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:276
+#: code:addons/point_of_sale/models/pos_config.py:285
#: 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
@@ -2691,7 +2841,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1184
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1199
#, python-format
msgid "Session ids:"
msgstr ""
@@ -2720,7 +2870,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1297
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1312
#, python-format
msgid "Set Weight"
msgstr ""
@@ -2736,6 +2886,13 @@ msgid "Set shop-specific prices, seasonal discounts, etc."
msgstr ""
#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/pos.web_editor.js:34
+#, python-format
+msgid "Set your customized advertisement here"
+msgstr ""
+
+#. module: point_of_sale
#: 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"
@@ -2775,7 +2932,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:333
+#: code:addons/point_of_sale/static/src/js/gui.js:332
#, python-format
msgid "Some orders could not be submitted to"
msgstr ""
@@ -2831,15 +2988,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:326
-#: code:addons/point_of_sale/static/src/xml/pos.xml:327
+#: code:addons/point_of_sale/static/src/xml/pos.xml:341
+#: code:addons/point_of_sale/static/src/xml/pos.xml:342
#, python-format
msgid "Street"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:777
+#: code:addons/point_of_sale/static/src/xml/pos.xml:792
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_price_subtotal_incl
#, python-format
msgid "Subtotal"
@@ -2857,21 +3014,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1443
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1463
#, python-format
msgid "Subtotal:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1176
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1191
#, python-format
msgid "Successfully imported"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1175
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1190
#, python-format
msgid "Successfully imported"
msgstr ""
@@ -2893,7 +3050,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:790
+#: code:addons/point_of_sale/static/src/xml/pos.xml:805
#, python-format
msgid "TOTAL"
msgstr ""
@@ -2905,8 +3062,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:297
-#: code:addons/point_of_sale/static/src/js/screens.js:2039
+#: code:addons/point_of_sale/models/pos_order.py:302
+#: code:addons/point_of_sale/static/src/js/screens.js:2044
#, python-format
msgid "Tax"
msgstr ""
@@ -2918,8 +3075,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:363
-#: code:addons/point_of_sale/static/src/xml/pos.xml:420
+#: code:addons/point_of_sale/static/src/xml/pos.xml:378
+#: code:addons/point_of_sale/static/src/xml/pos.xml:435
#, python-format
msgid "Tax ID"
msgstr ""
@@ -2934,60 +3091,60 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:912
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1277
+#: code:addons/point_of_sale/static/src/xml/pos.xml:927
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1292
#, python-format
msgid "Taxes:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:707
+#: code:addons/point_of_sale/static/src/xml/pos.xml:722
#, python-format
msgid "Tel:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:510
+#: code:addons/point_of_sale/static/src/xml/pos.xml:525
#, python-format
msgid "Tendered"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:257
+#: code:addons/point_of_sale/models/pos_order.py:261
#, python-format
msgid "The POS order must have lines when calling this method"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:999
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1014
#, python-format
msgid "The Point of Sale could not find any product, client, employee\n"
" or action associated with the scanned barcode."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:189
+#: code:addons/point_of_sale/models/pos_config.py:195
#, python-format
msgid "The company of a payment method is different than the one of point of sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:179
+#: code:addons/point_of_sale/models/pos_config.py:185
#, python-format
msgid "The company of the sales journal is different than the one of point of sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:174
+#: code:addons/point_of_sale/models/pos_config.py:180
#, python-format
msgid "The company of the stock location is different than the one of point of sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:194
+#: code:addons/point_of_sale/models/pos_config.py:200
#, python-format
msgid "The default fiscal position must be included in the available fiscal positions of the point of sale"
msgstr ""
@@ -3003,15 +3160,13 @@ msgid "The hostname or ip address of the hardware proxy, Will be autodetected if
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:184
+#: code:addons/point_of_sale/models/pos_config.py:190
#, python-format
msgid "The invoice journal and the point of sale must belong to the same company"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:107
#: sql_constraint:pos.session:0
-#, python-format
msgid "The name of this POS Session must be unique !"
msgstr ""
@@ -3023,14 +3178,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1964
+#: code:addons/point_of_sale/static/src/js/screens.js:1969
#, 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:1975
+#: code:addons/point_of_sale/static/src/js/screens.js:1980
#, python-format
msgid "The order could not be sent to the server due to an unknown error"
msgstr ""
@@ -3063,7 +3218,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:1293
#, python-format
msgid "The provided file could not be read due to an unknown error"
msgstr ""
@@ -3080,7 +3235,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1970
+#: code:addons/point_of_sale/static/src/js/screens.js:1975
#, python-format
msgid "The server encountered an error while receiving your order."
msgstr ""
@@ -3096,7 +3251,7 @@ msgid "The transactions are processed by MercuryPay."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:275
+#: 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 "
msgstr ""
@@ -3108,7 +3263,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:102
+#: code:addons/point_of_sale/static/src/xml/pos.xml:117
#, python-format
msgid "There are pending operations that could not be saved into the database, are you sure you want to exit?"
msgstr ""
@@ -3120,7 +3275,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1908
+#: code:addons/point_of_sale/static/src/js/screens.js:1913
#, python-format
msgid "There is no cash payment method available in this point of sale to handle the change.\n"
"\n"
@@ -3134,20 +3289,20 @@ msgid "There is no cash register for this PoS Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:713
+#: code:addons/point_of_sale/models/pos_order.py:729
#, 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:711
+#: code:addons/point_of_sale/models/pos_order.py:727
#, 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:1879
+#: code:addons/point_of_sale/static/src/js/screens.js:1884
#, python-format
msgid "There must be at least one product in your order before it can be validated"
msgstr ""
@@ -3178,23 +3333,23 @@ 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:493
+#: code:addons/point_of_sale/models/pos_order.py:499
#, 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 ""
#. 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:273
#, 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."
+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:273
+#: code:addons/point_of_sale/static/src/js/chrome.js:263
#, python-format
-msgid "This operation will permanently destroy all unpaid orders from all sessions that have been put in the local storage. You will lose all the data and exit the point of sale. This operation cannot be undone."
+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 ""
#. module: point_of_sale
@@ -3208,19 +3363,20 @@ 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:597
+#: code:addons/point_of_sale/models/pos_order.py:603
#, 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 ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_product_product_pos_categ_id
#: model:ir.model.fields,help:point_of_sale.field_product_template_pos_categ_id
msgid "Those categories are used to group similar products for point of sale."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:649
+#: code:addons/point_of_sale/static/src/xml/pos.xml:664
#, python-format
msgid "Tip"
msgstr ""
@@ -3231,12 +3387,13 @@ msgid "Tip Product"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_product_product_to_weight
#: model:ir.model.fields,field_description:point_of_sale.field_product_template_to_weight
msgid "To Weigh With Scale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:744
+#: code:addons/point_of_sale/models/pos_order.py:768
#, python-format
msgid "To return product(s), you need to open a session that will be used to register the refund."
msgstr ""
@@ -3269,7 +3426,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:827
+#: code:addons/point_of_sale/static/src/xml/pos.xml:842
#, python-format
msgid "Total Taxes"
msgstr ""
@@ -3296,22 +3453,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:926
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1276
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1463
+#: code:addons/point_of_sale/static/src/xml/pos.xml:941
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1291
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1483
#: model:ir.ui.view,arch_db:point_of_sale.report_saledetails
#, python-format
msgid "Total:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:317
+#: code:addons/point_of_sale/models/pos_order.py:322
#, python-format
msgid "Trade Receivables"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:172
+#: 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."
msgstr ""
@@ -3323,26 +3480,31 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:995
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1010
#, python-format
msgid "Unknown Barcode"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1974
+#: code:addons/point_of_sale/static/src/js/screens.js:1979
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1273
+#: code:addons/point_of_sale/static/src/js/screens.js:1277
#, python-format
msgid "Unsupported File Format"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_use_existing_lots
+msgid "Use Existing Lots/Serial Numbers"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_sale_pricelist
msgid "Use pricelists to adapt your price per customers"
msgstr ""
@@ -3367,7 +3529,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1408
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1427
#, python-format
msgid "User:"
msgstr ""
@@ -3384,14 +3546,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:710
+#: code:addons/point_of_sale/static/src/xml/pos.xml:725
#, python-format
msgid "VAT:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:609
+#: code:addons/point_of_sale/static/src/xml/pos.xml:624
#, python-format
msgid "Validate"
msgstr ""
@@ -3412,8 +3574,14 @@ msgid "Warehouse"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.customer_facing_display_html
+#: model:pos.config,customer_facing_display_html:point_of_sale.pos_config_main
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1325
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1340
#, python-format
msgid "Weighing"
msgstr ""
@@ -3426,8 +3594,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1249
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1427
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1264
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1447
#, python-format
msgid "With a"
msgstr ""
@@ -3444,26 +3612,26 @@ msgid "You can define another list of available currencies on the\n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:429
+#: code:addons/point_of_sale/models/pos_order.py:435
#, python-format
msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:31
+#: code:addons/point_of_sale/models/pos_session.py:33
#, python-format
msgid "You cannot confirm all orders of this session, because they have not the 'paid' status.\n"
"{reference} is in state {state}, total amount: {total}, paid: {paid}"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:154
+#: code:addons/point_of_sale/models/pos_session.py:160
#, python-format
msgid "You cannot create two active sessions related to the same point of sale!"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:145
+#: code:addons/point_of_sale/models/pos_session.py:151
#, python-format
msgid "You cannot create two active sessions with the same responsible!"
msgstr ""
@@ -3476,15 +3644,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1889
+#: code:addons/point_of_sale/static/src/js/screens.js:1894
#, python-format
msgid "You cannot have a negative amount in a Bank payment. Use a cash payment method to return money to the customer."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:291
+#: code:addons/point_of_sale/models/pos_session.py:299
#, python-format
-msgid "You cannot use the session of another users. This session is owned by %s. Please first close this one to use this point of sale."
+msgid "You cannot use the session of another user. This session is owned by %s. Please first close this one to use this point of sale."
msgstr ""
#. module: point_of_sale
@@ -3494,40 +3662,40 @@ 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:727
+#: code:addons/point_of_sale/models/pos_order.py:743
#, python-format
msgid "You have to open at least one cashbox."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:871
+#: code:addons/point_of_sale/models/pos_order.py:891
#, python-format
msgid "You have to select a pricelist in the sale form !"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:859
+#: code:addons/point_of_sale/models/pos_order.py:877
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_details.py:48
+#: code:addons/point_of_sale/models/pos_session.py:26
#, python-format
-msgid "You have to set a logo for your company."
+msgid "You have to set a Sale Journal for the POS:%s"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_details.py:50
+#: code:addons/point_of_sale/wizard/pos_details.py:48
#, python-format
-msgid "You have to set your reports's header and footer layout."
+msgid "You have to set a logo or a layout for your company."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:24
+#: code:addons/point_of_sale/wizard/pos_details.py:50
#, python-format
-msgid "You have to set a Sale Journal for the POS:%s"
+msgid "You have to set your reports's header and footer layout."
msgstr ""
#. module: point_of_sale
@@ -3538,13 +3706,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1957
+#: code:addons/point_of_sale/static/src/js/screens.js:1962
#, python-format
msgid "You need to select the customer before you can invoice an order."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:160
+#: code:addons/point_of_sale/models/pos_session.py:166
#, python-format
msgid "You should assign a Point of Sale to your session."
msgstr ""
@@ -3558,34 +3726,34 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1218
+#: code:addons/point_of_sale/static/src/js/screens.js:1222
#, python-format
msgid "Your Internet connection is probably down."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:273
+#: code:addons/point_of_sale/models/pos_session.py:281
#, python-format
msgid "Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1268
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1283
#, python-format
msgid "Your shopping cart is empty"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:335
+#: code:addons/point_of_sale/static/src/xml/pos.xml:350
#, python-format
msgid "ZIP"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1241
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1256
#, python-format
msgid "at"
msgstr ""
@@ -3597,14 +3765,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1181
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1196
#, python-format
msgid "belong to another session:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1530
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1550
#, python-format
msgid "caps lock"
msgstr ""
@@ -3621,23 +3789,23 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1557
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1599
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1577
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1619
#, python-format
msgid "close"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1515
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1592
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1535
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1612
#, python-format
msgid "delete"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1251
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1266
#, python-format
msgid "discount"
msgstr ""
@@ -3651,13 +3819,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1922
+#: code:addons/point_of_sale/static/src/js/screens.js:1927
#, python-format
msgid "for an order of"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:210
+#: code:addons/point_of_sale/models/pos_config.py:216
#, python-format
msgid "not used"
msgstr ""
@@ -3665,7 +3833,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:292
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1175
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1190
#, python-format
msgid "paid orders"
msgstr ""
@@ -3702,24 +3870,24 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:141
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1542
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1597
+#: code:addons/point_of_sale/models/pos_order.py:144
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1562
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1617
#, python-format
msgid "return"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1543
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1554
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1563
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1574
#, python-format
msgid "shift"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1516
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1536
#, python-format
msgid "tab"
msgstr ""
@@ -3727,21 +3895,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:284
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1176
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1191
#, python-format
msgid "unpaid orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1178
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1193
#, python-format
msgid "unpaid orders could not be imported"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1180
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1195
#, python-format
msgid "were duplicates of existing orders"
msgstr ""
diff --git a/addons/pos_sale/i18n/pos_sale.pot b/addons/pos_sale/i18n/pos_sale.pot
index ce795c53ce1..20da8d8d705 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:49+0000\n"
-"PO-Revision-Date: 2017-02-15 09:49+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -75,6 +75,12 @@ msgid "Sales Channel"
msgstr ""
#. module: pos_sale
+#: code:addons/pos_sale/models/crm_team.py:115
+#, python-format
+msgid "Sales: Untaxed Amount"
+msgstr ""
+
+#. module: pos_sale
#: selection:crm.team,dashboard_graph_group_pos:0
msgid "Salesperson"
msgstr ""
@@ -101,12 +107,6 @@ msgid "This Point of sale's sales will be related to this Sales Channel."
msgstr ""
#. module: pos_sale
-#: code:addons/pos_sale/models/crm_team.py:115
-#, python-format
-msgid "Untaxed Amount"
-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 8e9efa08c48..5069bd39164 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:317
+#: code:addons/product/models/product_template.py:327
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -94,9 +94,7 @@ msgid "<strong>Warning</strong>: adding or deleting attributes\n"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:171
#: sql_constraint:product.product:0
-#, python-format
msgid "A barcode can only be assigned to one product !"
msgstr ""
@@ -108,13 +106,13 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description_sale
#: model:ir.model.fields,help:product.field_product_template_description_sale
-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/Refund"
+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 ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description_purchase
#: model:ir.model.fields,help:product.field_product_template_description_purchase
-msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund."
+msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note."
msgstr ""
#. module: product
@@ -389,13 +387,18 @@ msgid "Company"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_category_complete_name
+msgid "Complete Name"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_compute_price
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Compute Price"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:42
+#: code:addons/product/models/product_template.py:52
#: selection:product.template,type:0
#, python-format
msgid "Consumable"
@@ -412,7 +415,7 @@ msgid "Conversion between Units of Measure can only occur if they belong to the
msgstr ""
#. module: product
-#: code:addons/product/models/product_uom.py:96
+#: 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 ""
@@ -513,7 +516,7 @@ msgid "Day(s)"
msgstr ""
#. module: product
-#: code:addons/product/models/res_company.py:58
+#: code:addons/product/models/res_company.py:59
#, python-format
msgid "Default %(currency)s pricelist for %(company)s"
msgstr ""
@@ -601,7 +604,7 @@ msgid "Ending valid for the pricelist item validation"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:43
+#: code:addons/product/models/product.py:57
#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
@@ -613,7 +616,7 @@ msgid "Error ! You cannot use this attribute with the following value."
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:308
+#: code:addons/product/models/product.py:286
#, python-format
msgid "Error! It is not allowed to choose more than one value for a given attribute."
msgstr ""
@@ -631,7 +634,7 @@ msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceLi
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:267
+#: code:addons/product/models/product_template.py:277
#, python-format
msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
msgstr ""
@@ -691,6 +694,12 @@ msgid "Global"
msgstr ""
#. module: product
+#: code:addons/product/models/product_template.py:32
+#, python-format
+msgid "Go to Internal Categories"
+msgstr ""
+
+#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
msgid "Group By"
msgstr ""
@@ -971,24 +980,15 @@ msgid "Other Pricelist"
msgstr ""
#. module: product
-#: model:ir.model,name:product.model_product_packaging
-#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
-#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
-#: model:ir.ui.view,arch_db:product.product_packaging_form_view
-#: model:ir.ui.view,arch_db:product.product_packaging_tree_view
-#: model:ir.ui.view,arch_db:product.product_template_form_view
-#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
-msgid "Packaging"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_packaging_name
-msgid "Packaging Type"
+msgid "Package Type"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,name:product.action_packaging_view
-msgid "Packagings"
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.view,arch_db:product.product_template_form_view
+#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
+msgid "Packaging"
msgstr ""
#. module: product
@@ -1198,6 +1198,19 @@ msgid "Product Name"
msgstr ""
#. module: product
+#: model:ir.actions.act_window,name:product.action_packaging_view
+#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
+#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
+#: model:ir.ui.view,arch_db:product.product_packaging_tree_view
+msgid "Product Packages"
+msgstr ""
+
+#. module: product
+#: model:ir.ui.view,arch_db:product.product_packaging_form_view
+msgid "Product Packaging"
+msgstr ""
+
+#. module: product
#: model:ir.model,name:product.model_product_template
#: model:ir.model.fields,field_description:product.field_product_attribute_line_product_tmpl_id
#: model:ir.model.fields,field_description:product.field_product_attribute_price_product_tmpl_id
@@ -1272,7 +1285,7 @@ msgid "Products Price Search"
msgstr ""
#. module: product
-#: code:addons/product/models/product.py:471
+#: code:addons/product/models/product.py:449
#, python-format
msgid "Products: "
msgstr ""
@@ -1375,6 +1388,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_res_partner_property_product_pricelist
+#: model:ir.model.fields,field_description:product.field_res_users_property_product_pricelist
msgid "Sale Pricelist"
msgstr ""
@@ -1412,7 +1426,7 @@ msgid "Sequence"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:43
+#: code:addons/product/models/product_template.py:53
#: selection:product.template,type:0
#, python-format
msgid "Service"
@@ -1534,9 +1548,7 @@ msgid "The computed quantity will be a multiple of this value. Use 1.0 for a Uni
msgstr ""
#. module: product
-#: code:addons/product/models/product_uom.py:43
#: sql_constraint:product.uom:0
-#, python-format
msgid "The conversion ratio for a unit of measure cannot be 0!"
msgstr ""
@@ -1582,9 +1594,7 @@ msgid "The product form contains information to simplify the sale process: price
msgstr ""
#. module: product
-#: code:addons/product/models/product_uom.py:44
#: sql_constraint:product.uom:0
-#, python-format
msgid "The rounding precision must be greater than 0!"
msgstr ""
@@ -1642,6 +1652,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_res_partner_property_product_pricelist
+#: model:ir.model.fields,help:product.field_res_users_property_product_pricelist
msgid "This pricelist will be used, instead of the default one, for sales to the current partner"
msgstr ""
@@ -1843,7 +1854,7 @@ msgid "Working Time"
msgstr ""
#. module: product
-#: code:addons/product/models/product_template.py:262
+#: code:addons/product/models/product_template.py:272
#, python-format
msgid "You cannot create a product with an Internal Category set as View. Please change the category or the category type."
msgstr ""
@@ -1857,7 +1868,7 @@ msgstr ""
#. module: product
#: code:addons/product/wizard/product_price_list.py:26
#, python-format
-msgid "You have to set a logo for your company."
+msgid "You have to set a logo or a layout for your company."
msgstr ""
#. module: product
@@ -1887,6 +1898,12 @@ msgid "You must define a product for everything you sell, whether it's a physica
msgstr ""
#. module: product
+#: code:addons/product/models/product_template.py:31
+#, python-format
+msgid "You must define at least one product category (that is not a view) in order to be able to create products."
+msgstr ""
+
+#. module: product
#: model:ir.model,name:product.model_base_config_settings
msgid "base.config.settings"
msgstr ""
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index eca69380267..5da76b71711 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -137,6 +137,7 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_res_partner_task_count
+#: model:ir.model.fields,field_description:project.field_res_users_task_count
msgid "# Tasks"
msgstr ""
@@ -151,8 +152,8 @@ msgid "# of Tasks"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:242
-#: code:addons/project/models/project.py:428
+#: code:addons/project/models/project.py:244
+#: code:addons/project/models/project.py:436
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -218,7 +219,7 @@ msgid "<i class=\"fa fa-user\"/> Person Responsible"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:122
+#: code:addons/project/models/project.py:124
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Documents are attached to the tasks and issues of your project.</p><p>\n"
@@ -228,7 +229,7 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:150
+#: code:addons/project/models/project.py:152
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">Click to create a new project.</p>"
msgstr ""
@@ -269,11 +270,6 @@ msgid "<span class=\"fa fa-thumbs-o-up\"/> The <strong>Right Way</strong> to use
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.view_project_kanban
-msgid "<span class=\"o_label\">Documents</span>"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "<span class=\"panel-title\">\n"
" <span class=\"fa fa-laptop\"/>\n"
@@ -905,7 +901,7 @@ msgid "At the end of the week, each employee should review\n"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:115
+#: code:addons/project/models/project.py:117
#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
#, python-format
msgid "Attachments"
@@ -1291,7 +1287,7 @@ msgid "Currently there are not any activity scheduled."
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:658
+#: code:addons/project/models/project.py:666
#: 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.ui.view,arch_db:project.edit_project
@@ -1300,7 +1296,7 @@ msgid "Customer"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:658
+#: code:addons/project/models/project.py:666
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1425,7 +1421,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/project.js:50
+#: code:addons/project/static/src/js/project.js:71
#: model:ir.ui.view,arch_db:project.project_project_view_form_simplified
#, python-format
msgid "Discard"
@@ -1545,7 +1541,7 @@ msgid "Ending Date"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:436
+#: code:addons/project/models/project.py:444
#, python-format
msgid "Error ! Task starting date must be lower than its ending date."
msgstr ""
@@ -1790,7 +1786,7 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:585
+#: code:addons/project/models/project.py:593
#, python-format
msgid "I take it"
msgstr ""
@@ -2176,11 +2172,6 @@ msgid "Merge into an existing task"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.view_project_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "More efficient communication between employees"
msgstr ""
@@ -2196,6 +2187,11 @@ msgid "My Favorites"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.view_task_search_form
+msgid "My Followed Tasks"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,name:project.project_task_action_activity
msgid "My Next Task Activities"
msgstr ""
@@ -2297,7 +2293,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:205
+#: code:addons/project/models/project.py:207
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "On invitation only"
@@ -2397,7 +2393,7 @@ msgid "Planner"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:738
+#: code:addons/project/models/project.py:746
#, python-format
msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
msgstr ""
@@ -2625,7 +2621,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/project.js:48
+#: code:addons/project/static/src/js/project.js:69
#, python-format
msgid "Remove Cover Image"
msgstr ""
@@ -2704,7 +2700,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/project.js:46
+#: code:addons/project/static/src/js/project.js:62
#, python-format
msgid "Select"
msgstr ""
@@ -2743,7 +2739,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/js/project.js:45
+#: code:addons/project/static/src/js/project.js:61
#, python-format
msgid "Set a Cover Image"
msgstr ""
@@ -3003,6 +2999,7 @@ msgstr ""
#: model:ir.model.fields,field_description:project.field_project_project_task_ids
#: model:ir.model.fields,field_description:project.field_project_project_task_needaction_count
#: model:ir.model.fields,field_description:project.field_res_partner_task_ids
+#: model:ir.model.fields,field_description:project.field_res_users_task_ids
#: model:ir.ui.menu,name:project.menu_action_view_task
#: model:ir.ui.view,arch_db:project.edit_project
#: model:ir.ui.view,arch_db:project.project_planner
@@ -3377,14 +3374,14 @@ msgid "View statistics for the week"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:206
+#: code:addons/project/models/project.py:208
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by all employees"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:207
+#: code:addons/project/models/project.py:209
#: selection:project.project,privacy_visibility:0
#, python-format
msgid "Visible by following customers"
@@ -3617,7 +3614,7 @@ msgid "send us an email"
msgstr ""
#. module: project
-#: code:addons/project/models/project.py:484
+#: code:addons/project/models/project.py:492
#, python-format
msgid "tasks"
msgstr ""
diff --git a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
new file mode 100644
index 00000000000..8ed6c814b54
--- /dev/null
+++ b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot
@@ -0,0 +1,120 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * project_timesheet_holidays
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_timesheet_ids
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
+#: model:ir.model.fields,help:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
+msgid "Default project value for timesheet generated from leave type."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
+msgid "Generate Timesheet"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate
+msgid "If checked, when validating a leave, timesheet will be generated in the Vacation Project of the company."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/res_company.py:33
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_project_id
+#, python-format
+msgid "Internal Project"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_task_id
+msgid "Internal Task for timesheet"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line_holiday_id
+msgid "Leave Request"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_task_id
+#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id
+msgid "Leave Task"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/res_company.py:43
+#, python-format
+msgid "Leaves"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
+msgid "Project"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit
+msgid "Task"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id
+msgid "The project will contain the timesheet generated when a leave is validated."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit
+msgid "Timesheet"
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: code:addons/project_timesheet_holidays/models/account_analytic.py:16
+#, python-format
+msgid "You cannot delete timesheet lines attached to a leaves. Please cancel the leaves instead."
+msgstr ""
+
+#. module: project_timesheet_holidays
+#: model:ir.model,name:project_timesheet_holidays.model_hr_timesheet_config_settings
+msgid "hr.timesheet.config.settings"
+msgstr ""
+
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 7d9711ccd49..f5e48770e67 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@ msgid "\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/stock.py:87
+#: code:addons/purchase/models/stock.py:89
#, python-format
msgid " Buy"
msgstr ""
@@ -85,6 +85,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_supplier_invoice_count
+#: model:ir.model.fields,field_description:purchase.field_res_users_supplier_invoice_count
msgid "# Vendor Bills"
msgstr ""
@@ -100,6 +101,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_order_count
+#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_order_count
msgid "# of Purchase Order"
msgstr ""
@@ -363,7 +365,7 @@ msgid "Billed Qty"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:578
+#: code:addons/purchase/models/purchase.py:579
#, python-format
msgid "Billed Quantity"
msgstr ""
@@ -391,8 +393,8 @@ msgid "Blocking Message"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:835
-#: code:addons/purchase/models/stock.py:81
+#: code:addons/purchase/models/purchase.py:841
+#: code:addons/purchase/models/stock.py:83
#: model:stock.location.route,name:purchase.route_warehouse0_buy
#, python-format
msgid "Buy"
@@ -419,13 +421,13 @@ msgid "Calls for tenders are used when you want to generate requests for quotati
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:851
+#: code:addons/purchase/models/purchase.py:857
#, python-format
msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/stock.py:84
+#: code:addons/purchase/models/stock.py:86
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -443,7 +445,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:701
+#: code:addons/purchase/models/purchase.py:707
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -682,7 +684,7 @@ msgid "Extended Filters"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:556
+#: code:addons/purchase/models/purchase.py:557
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -891,6 +893,7 @@ 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"
msgstr ""
@@ -933,11 +936,6 @@ msgid "My Activities"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
-msgid "New Mail"
-msgstr ""
-
-#. module: purchase
#: selection:product.template,purchase_line_warn:0
#: selection:res.partner,purchase_warn:0
msgid "No Message"
@@ -949,7 +947,7 @@ msgid "No longer edit orders once confirmed"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:996
+#: code:addons/purchase/models/purchase.py:1018
#, python-format
msgid "No vendor associated to product %s. Please set one to fix this procurement."
msgstr ""
@@ -1022,7 +1020,7 @@ msgid "Order of Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:575
+#: code:addons/purchase/models/purchase.py:576
#, python-format
msgid "Ordered Quantity"
msgstr ""
@@ -1033,7 +1031,7 @@ msgid "Ordered quantities"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:808
+#: code:addons/purchase/models/purchase.py:814
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -1211,6 +1209,7 @@ msgstr ""
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_id
#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_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.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.purchase_order_graph
#: model:ir.ui.view,arch_db:purchase.purchase_order_pivot
@@ -1282,7 +1281,7 @@ msgid "Purchase Orders Statistics"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:703
+#: code:addons/purchase/models/purchase.py:709
#, python-format
msgid "Purchase order line deleted."
msgstr ""
@@ -1394,7 +1393,7 @@ msgid "Received Qty"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:577
+#: code:addons/purchase/models/purchase.py:578
#, python-format
msgid "Received Quantity"
msgstr ""
@@ -1518,6 +1517,7 @@ msgstr ""
#: 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
+#: model:ir.model.fields,help:purchase.field_res_users_purchase_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -1611,6 +1611,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_res_partner_property_purchase_currency_id
+#: model:ir.model.fields,field_description:purchase.field_res_users_property_purchase_currency_id
msgid "Supplier Currency"
msgstr ""
@@ -1637,7 +1638,7 @@ msgid "Terms and Conditions"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:571
+#: code:addons/purchase/models/purchase.py:572
#, python-format
msgid "The ordered quantity has been decreased. Do not forget to take it into account on your bills and receipts."
msgstr ""
@@ -1693,6 +1694,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_partner_property_purchase_currency_id
+#: model:ir.model.fields,help:purchase.field_res_users_property_purchase_currency_id
msgid "This currency will be used, instead of the default one, for purchases from the current partner"
msgstr ""
@@ -1708,25 +1710,25 @@ msgid "This note will be displayed for vendors."
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:1024
+#: code:addons/purchase/models/purchase.py:1035
#, python-format
msgid "This purchase order has been created from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:1037
+#: code:addons/purchase/models/purchase.py:1048
#, python-format
msgid "This purchase order has been modified from: <a href=# data-oe-model=procurement.order data-oe-id=%d>%s</a>"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:197
+#: code:addons/purchase/models/account_invoice.py:200
#, python-format
msgid "This vendor bill has been created from: %s"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/account_invoice.py:211
+#: code:addons/purchase/models/account_invoice.py:214
#, python-format
msgid "This vendor bill has been modified from: %s"
msgstr ""
@@ -1814,6 +1816,11 @@ msgid "Unlock"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+msgid "Unread Messages"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
msgid "Untaxed"
msgstr ""
@@ -1935,7 +1942,7 @@ msgstr ""
#. module: purchase
#: code:addons/purchase/models/purchase.py:253
-#: code:addons/purchase/models/purchase.py:769
+#: code:addons/purchase/models/purchase.py:775
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -1961,7 +1968,7 @@ msgid "When products are bought, they can be delivered to this warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/models/purchase.py:809
+#: code:addons/purchase/models/purchase.py:815
#, python-format
msgid "You are decreasing the ordered quantity!\n"
"You must update the quantities on the reception and/or bills."
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index 20911c20a82..4140d4d3d87 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -91,6 +91,11 @@ msgid "Country code"
msgstr ""
#. module: report_intrastat
+#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
+msgid "Credit Note"
+msgstr ""
+
+#. module: report_intrastat
#: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_currency_id
msgid "Currency"
msgstr ""
@@ -167,6 +172,8 @@ msgstr ""
#. module: report_intrastat
#: model:ir.model,name:report_intrastat.model_report_intrastat_code
+#: model:ir.model.fields,field_description:report_intrastat.field_delivery_carrier_intrastat_id
+#: model:ir.model.fields,field_description:report_intrastat.field_product_product_intrastat_id
#: model:ir.model.fields,field_description:report_intrastat.field_product_template_intrastat_id
#: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_intrastat_id
#: model:ir.ui.view,arch_db:report_intrastat.view_report_intrastat_code_tree
@@ -244,11 +251,6 @@ msgid "Quantity"
msgstr ""
#. module: report_intrastat
-#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
-msgid "Refund"
-msgstr ""
-
-#. module: report_intrastat
#: selection:report.intrastat,month:0
msgid "September"
msgstr ""
@@ -300,7 +302,7 @@ msgstr ""
#. module: report_intrastat
#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document
-msgid "Vendor Refund"
+msgid "Vendor Credit Note"
msgstr ""
#. module: report_intrastat
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index aa093e5292e..e0483c563b1 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+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:666
+#: code:addons/resource/models/resource.py:691
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -27,11 +27,6 @@ msgid "Active"
msgstr ""
#. module: resource
-#: model:ir.model.fields,help:resource.field_res_users_country_enforce_cities
-msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities."
-msgstr ""
-
-#. module: resource
#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
msgid "Closing Days"
msgstr ""
@@ -44,7 +39,6 @@ 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_res_users_city_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
@@ -110,11 +104,6 @@ msgid "Display Name"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_street_number2
-msgid "Door Number"
-msgstr ""
-
-#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_resource_time_efficiency
msgid "Efficiency Factor"
msgstr ""
@@ -126,12 +115,7 @@ msgid "End Date"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_country_enforce_cities
-msgid "Enforce Cities"
-msgstr ""
-
-#. module: resource
-#: code:addons/resource/models/resource.py:697
+#: code:addons/resource/models/resource.py:722
#, python-format
msgid "Error! leave start-date must be lower then leave end-date."
msgstr ""
@@ -154,21 +138,6 @@ msgid "Friday Morning"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_partner_latitude
-msgid "Geo Latitude"
-msgstr ""
-
-#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_partner_longitude
-msgid "Geo Longitude"
-msgstr ""
-
-#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_date_localization
-msgid "Geolocation Date"
-msgstr ""
-
-#. module: resource
#: model:ir.model.fields,field_description:resource.field_resource_calendar_global_leave_ids
#: model:ir.ui.view,arch_db:resource.resource_calendar_form
msgid "Global Leaves"
@@ -186,11 +155,6 @@ msgid "Hours"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_street_number
-msgid "House Number"
-msgstr ""
-
-#. module: resource
#: selection:resource.resource,resource_type:0
msgid "Human"
msgstr ""
@@ -422,11 +386,6 @@ msgid "Starting Date of Leave by Month"
msgstr ""
#. module: resource
-#: model:ir.model.fields,field_description:resource.field_res_users_street_name
-msgid "Street Name"
-msgstr ""
-
-#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Sunday"
msgstr ""
@@ -437,14 +396,14 @@ msgid "Test Resource Model"
msgstr ""
#. module: resource
-#: model:ir.model.fields,help:resource.field_resource_resource_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."
+#: code:addons/resource/models/resource.py:677
+#, python-format
+msgid "The efficiency factor cannot be equal to 0."
msgstr ""
#. module: resource
-#: code:addons/resource/models/resource.py:667
-#, python-format
-msgid "The efficiency factor cannot be equal to 0."
+#: model:ir.model.fields,help:resource.field_resource_resource_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: resource
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index e7bf9142dd4..7a067c8d67a 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,10 +20,10 @@ msgstr ""
msgid "\n"
"<p>Dear ${object.partner_id.name}\n"
"% set access_action = object.with_context(force_website=True).get_access_action()\n"
-"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
-"% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
-"% set access_url = is_online and access_action['url'] or ''\n"
+"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
+"% set access_name = is_online and object.template_id and doc_name == 'quotation' and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
+"% set access_url = is_online and '/mail/view?model=sale.order&res_id=%d' % (object.id) or ''\n"
"\n"
"% if object.partner_id.parent_id:\n"
" (<i>${object.partner_id.parent_id.name}</i>)\n"
@@ -87,6 +87,7 @@ 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 "# of Sales Order"
msgstr ""
@@ -118,7 +119,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:83
+#: code:addons/sale/static/src/js/tour.js:85
#, python-format
msgid "<b>Invite salespeople or managers</b> via email.<br/><i>Enter one email per line.</i>"
msgstr ""
@@ -208,7 +209,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:64
+#: code:addons/sale/static/src/js/tour.js:66
#, python-format
msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>"
msgstr ""
@@ -282,7 +283,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_config_settings_group_stock_packaging
-msgid "Ability to select a package type in sales orders and \n"
+msgid "Ability to select a package type in sales orders and\n"
" to force a quantity that is a multiple of the number of units per package."
msgstr ""
@@ -317,7 +318,7 @@ msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:156
#, python-format
msgid "Advance: %s"
msgstr ""
@@ -501,7 +502,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:79
+#: code:addons/sale/static/src/js/tour.js:81
#, python-format
msgid "Configuration options are available in the Settings app."
msgstr ""
@@ -513,6 +514,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_confirmation_date
+#: model:ir.model.fields,field_description:sale.field_sale_report_confirmation_date
msgid "Confirmation Date"
msgstr ""
@@ -547,7 +549,7 @@ msgstr ""
#. module: sale
#: selection:product.template,track_service:0
-msgid "Create a task and track hours"
+msgid "Create a task per order line to track hours"
msgstr ""
#. module: sale
@@ -556,11 +558,6 @@ msgid "Create and View Invoices"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
-msgid "Create new projects & tasks for sold services, record time spent and get delivered quantities updated in sales orders accordingly."
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_create_uid
#: model:ir.model.fields,field_description:sale.field_sale_layout_category_create_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_create_uid
@@ -660,7 +657,7 @@ msgid "Delivered"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:724
+#: code:addons/sale/models/sale.py:734
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Delivered Quantity"
@@ -819,7 +816,7 @@ msgid "Extended Filters"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:697
+#: code:addons/sale/models/sale.py:707
#, python-format
msgid "Extra line with %s "
msgstr ""
@@ -980,7 +977,7 @@ msgid "Invoiced"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:725
+#: code:addons/sale/models/sale.py:735
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Invoiced Quantity"
@@ -1016,6 +1013,12 @@ msgid "Invoices will be created in draft so that you can review\n"
msgstr ""
#. module: sale
+#: code:addons/sale/models/sales_team.py:96
+#, python-format
+msgid "Invoices: Untaxed Total"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.menu,name:sale.menu_sale_invoicing
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
@@ -1172,6 +1175,7 @@ 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"
msgstr ""
@@ -1226,7 +1230,8 @@ msgstr ""
#. module: sale
#: code:addons/sale/models/sale.py:104
#: code:addons/sale/models/sale.py:255
-#: code:addons/sale/models/sale.py:256
+#: code:addons/sale/models/sale.py:257
+#: code:addons/sale/models/sale.py:259
#, python-format
msgid "New"
msgstr ""
@@ -1301,7 +1306,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:59
+#: code:addons/sale/static/src/js/tour.js:61
#, python-format
msgid "Once your quotation is ready, you can save, print or send it by email."
msgstr ""
@@ -1313,7 +1318,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/sale.js:26
+#: code:addons/sale/static/src/js/sale.js:32
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
@@ -1379,7 +1384,7 @@ msgid "Ordered Qty"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:722
+#: code:addons/sale/models/sale.py:732
#: model:ir.ui.view,arch_db:sale.view_order_form
#, python-format
msgid "Ordered Quantity"
@@ -1471,13 +1476,13 @@ msgid "Personalize sales order and invoice report"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:286
+#: code:addons/sale/models/sale.py:289
#, python-format
msgid "Please define an accounting sales journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:807
+#: code:addons/sale/models/sale.py:817
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
@@ -1539,7 +1544,6 @@ msgid "Print"
msgstr ""
#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_proforma_quotation
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_proforma_sales
msgid "Pro-Forma"
msgstr ""
@@ -1690,7 +1694,7 @@ msgid "Quotation sent"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sales_team.py:106
+#: code:addons/sale/models/sales_team.py:101
#: model:ir.actions.act_window,name:sale.action_quotations
#: model:ir.actions.act_window,name:sale.action_quotations_salesteams
#: model:ir.model.fields,field_description:sale.field_crm_team_use_quotations
@@ -1814,6 +1818,8 @@ msgstr ""
#: model:ir.model,name:sale.model_sale_order
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_ids
#: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn
+#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_ids
+#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn
#: model:ir.ui.view,arch_db:sale.view_order_form
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: model:res.request.link,name:sale.req_link_sale_order
@@ -1856,7 +1862,7 @@ msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sales_team.py:107
+#: code:addons/sale/models/sales_team.py:102
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.actions.act_window,name:sale.action_orders_salesteams
#: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams
@@ -1876,6 +1882,12 @@ msgid "Sales Orders Statistics"
msgstr ""
#. module: sale
+#: code:addons/sale/models/sales_team.py:94
+#, python-format
+msgid "Sales: Untaxed Total"
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_salesman_id
#: model:ir.model.fields,field_description:sale.field_sale_order_user_id
#: model:ir.model.fields,field_description:sale.field_sale_report_user_id
@@ -1923,6 +1935,7 @@ msgstr ""
#: model:ir.model.fields,help:sale.field_product_product_sale_line_warn
#: model:ir.model.fields,help:sale.field_product_template_sale_line_warn
#: model:ir.model.fields,help:sale.field_res_partner_sale_warn
+#: model:ir.model.fields,help:sale.field_res_users_sale_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -1948,6 +1961,11 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
+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
+#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Sell your products on eBay"
msgstr ""
@@ -1994,7 +2012,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/sale.js:19
+#: code:addons/sale/static/src/js/sale.js:25
#, python-format
msgid "Set an invoicing target: "
msgstr ""
@@ -2196,7 +2214,7 @@ msgid "Terms and conditions"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale_analytic.py:119
+#: code:addons/sale/models/sale_analytic.py:112
#, python-format
msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses."
msgstr ""
@@ -2218,19 +2236,19 @@ msgid "The margin is computed as the sum of product sales prices minus the cost
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:718
+#: code:addons/sale/models/sale.py:728
#, python-format
msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:147
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
#, python-format
msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:145
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:147
#, python-format
msgid "The product used to invoice a down payment should have an invoice policy set to \"Ordered quantities\". Please update your deposit product to be able to create a deposit invoice."
msgstr ""
@@ -2253,8 +2271,8 @@ msgid "There is no income account defined for this product: \"%s\". You may have
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:363
-#: code:addons/sale/models/sale.py:367
+#: code:addons/sale/models/sale.py:366
+#: code:addons/sale/models/sale.py:370
#, python-format
msgid "There is no invoicable line."
msgstr ""
@@ -2290,7 +2308,7 @@ msgid "This report performs analysis on your sales orders. Analysis check your s
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_timesheet_grid_sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_timesheet
#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale
msgid "Timesheets"
msgstr ""
@@ -2393,10 +2411,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sales_team.py:99
-#: code:addons/sale/models/sales_team.py:101
#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
-#, python-format
msgid "Untaxed Total"
msgstr ""
@@ -2423,14 +2438,14 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:69
+#: code:addons/sale/static/src/js/tour.js:71
#, python-format
msgid "Use the breadcrumbs to <b>go back to preceeding screens</b>."
msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/tour.js:73
+#: code:addons/sale/static/src/js/tour.js:75
#, python-format
msgid "Use this menu to access quotations, sales orders and customers."
msgstr ""
@@ -2492,7 +2507,7 @@ msgstr ""
#. module: sale
#. openerp-web
-#: code:addons/sale/static/src/js/sale.js:26
+#: code:addons/sale/static/src/js/sale.js:32
#, python-format
msgid "Wrong value entered!"
msgstr ""
@@ -2504,7 +2519,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:927
+#: code:addons/sale/models/sale.py:940
#, python-format
msgid "You can not remove a sales order line.\n"
"Discard changes and try setting the quantity to 0."
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 1c4a98b770b..05c265f41ba 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_stock
+#: code:addons/sale_stock/models/sale_order.py:148
+#, python-format
+msgid "\n"
+"There are %s %s available accross all warehouses."
+msgstr ""
+
+#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.report_delivery_document_inherit_sale_stock
msgid "<strong>Customer Reference:</strong>"
msgstr ""
@@ -139,7 +146,7 @@ msgid "Move forward expected delivery dates by"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:145
+#: code:addons/sale_stock/models/sale_order.py:152
#, python-format
msgid "Not enough inventory!"
msgstr ""
@@ -150,14 +157,14 @@ msgid "Order-Specific Routes"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:156
+#: code:addons/sale_stock/models/sale_order.py:162
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_product_packaging
-msgid "Packaging"
+msgid "Package"
msgstr ""
#. module: sale_stock
@@ -186,11 +193,6 @@ msgid "Reserving products manually in delivery orders or by running the schedule
msgstr ""
#. module: sale_stock
-#: model:ir.model,name:sale_stock.model_stock_return_picking
-msgid "Return Picking"
-msgstr ""
-
-#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_route_id
msgid "Route"
msgstr ""
@@ -293,40 +295,24 @@ 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:203
+#: code:addons/sale_stock/models/sale_order.py:209
#, python-format
msgid "This product is packaged by %.2f %s. You should sell %.2f %s."
msgstr ""
#. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_stock_return_picking_line_to_refund_so
-msgid "To Refund"
-msgstr ""
-
-#. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_stock_move_to_refund_so
-msgid "To Refund in SO"
-msgstr ""
-
-#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking
msgid "Transfer"
msgstr ""
#. module: sale_stock
-#: model:ir.model.fields,help:sale_stock.field_stock_move_to_refund_so
-#: model:ir.model.fields,help:sale_stock.field_stock_return_picking_line_to_refund_so
-msgid "Trigger a decrease of the delivered quantity in the associated Sales Order"
-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:202
+#: code:addons/sale_stock/models/sale_order.py:208
#, python-format
msgid "Warning"
msgstr ""
@@ -342,16 +328,15 @@ msgid "When to start shipping"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/models/sale_order.py:157
+#: code:addons/sale_stock/models/sale_order.py:163
#, 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:146
+#: code:addons/sale_stock/models/sale_order.py:144
#, python-format
-msgid "You plan to sell %s %s but you only have %s %s available!\n"
-"The stock on hand is %s %s."
+msgid "You plan to sell %s %s but you only have %s %s available in %s warehouse."
msgstr ""
#. module: sale_stock
@@ -369,8 +354,3 @@ msgstr ""
msgid "stock.config.settings"
msgstr ""
-#. module: sale_stock
-#: model:ir.model,name:sale_stock.model_stock_return_picking_line
-msgid "stock.return.picking.line"
-msgstr ""
-
diff --git a/addons/sale_timesheet/i18n/sale_timesheet.pot b/addons/sale_timesheet/i18n/sale_timesheet.pot
index 00f291b3465..dc89413eb60 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,35 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_account_id
-msgid "Account"
+#: code:addons/sale_timesheet/models/account_invoice.py:32
+#: code:addons/sale_timesheet/models/project.py:24
+#, python-format
+msgid "\n"
+" <p class=\"oe_view_nocontent_create\">\n"
+" Click to record timesheets.\n"
+" </p><p>\n"
+" You can register and track your workings hours by project every\n"
+" day. Every time spent on a project will become a cost and can be re-invoiced to\n"
+" customers if required.\n"
+" </p>\n"
+" "
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "<b>Total</b>"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "<span class=\"badge o_progress_billable_fixed\">Billable fixed</span>\n"
+" <span class=\"badge o_progress_billable_time\">Billable time</span>\n"
+" <span class=\"badge o_progress_non_billable\">Non billable</span>"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.project_project_view_kanban_inherit_sale_timesheet
+msgid "<span class=\"o_label\">Overview</span>"
msgstr ""
#. module: sale_timesheet
@@ -31,74 +58,148 @@ msgid "Assign to Order"
msgstr ""
#. module: sale_timesheet
+#: selection:account.analytic.line,timesheet_invoice_type:0
+msgid "Billable Fixed"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
+msgid "Billable Hours"
+msgstr ""
+
+#. module: sale_timesheet
+#: selection:account.analytic.line,timesheet_invoice_type:0
+msgid "Billable Time"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_account_analytic_line_timesheet_invoice_type
+msgid "Billable Type"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.filters,name:sale_timesheet.timesheet_filter_billing
+msgid "Billing Rate"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.actions.act_window,name:sale_timesheet.timesheet_action_billing_report
+#: model:ir.ui.menu,name:sale_timesheet.menu_timesheet_billing_analysis
+msgid "Billing Rate Analysis"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_res_company
msgid "Companies"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Cost"
+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 "Create a task under this project on sales order validation. This setting must be set for each company."
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_hr_employee
msgid "Employee"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_product_product_alert_time
-msgid "Number of days before an alert should be raised on the lot/serial number."
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Fixed"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_product_product_life_time
-msgid "Number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number."
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
+msgid "Fixed Price Projects"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_product_product_removal_time
-msgid "Number of days before the goods should be removed from the stock. It will be computed on the lot/serial number."
+#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
+msgid "Fixed price services"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_product_product_use_time
-msgid "Number of days before the goods starts deteriorating, without being dangerous yet. It will be computed on the lot/serial number."
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Hours"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
-msgid "Order Line"
+#: 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"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_procurement_order
-msgid "Procurement"
+#: model:ir.model.fields,help:sale_timesheet.field_account_analytic_line_timesheet_invoice_id
+msgid "Invoice created from the timesheet"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,help:sale_timesheet.field_project_task_procurement_id
-msgid "Procurement of the sale order line on which the timesheets should be assigned"
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Invoiced"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_product_product
-msgid "Product"
+#: model:ir.ui.view,arch_db:sale_timesheet.view_product_timesheet_form
+msgid "Keep empty to get a new project per order..."
+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 ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search
+msgid "Non Billable Hours"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_account_invoice_timesheet_count
+msgid "Number of timesheets"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
+msgid "Order Line"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Overview"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/project.py:43
+#, python-format
+msgid "Overview of %s"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_alert_time
-msgid "Product Alert Time"
+#: model:ir.model,name:sale_timesheet.model_procurement_order
+msgid "Procurement"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_life_time
-msgid "Product Life Time"
+#: model:ir.model.fields,help:sale_timesheet.field_project_task_procurement_id
+msgid "Procurement of the sale order line on which the timesheets should be assigned"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_removal_time
-msgid "Product Removal Time"
+#: model:ir.model,name:sale_timesheet.model_product_product
+msgid "Product"
msgstr ""
#. module: sale_timesheet
@@ -107,11 +208,18 @@ msgid "Product Template"
msgstr ""
#. module: sale_timesheet
-#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_use_time
-msgid "Product Use Time"
+#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_fixed
+#: model:ir.actions.act_window,name:sale_timesheet.product_template_action_time_based
+msgid "Products"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Profitability"
+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.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
@@ -124,6 +232,16 @@ msgid "Project associated to this sale"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Rates"
+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,name:sale_timesheet.model_sale_order
#: model:ir.ui.view,arch_db:sale_timesheet.view_sale_service_inherit_form2
msgid "Sales Order"
@@ -136,13 +254,27 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
+msgid "Setup your fixed price services"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_config_settings_view_form
+#: model:ir.ui.view,arch_db:sale_timesheet.project_config_settings_view_form
+#: model:ir.ui.view,arch_db:sale_timesheet.sale_config_settings_view_form_inherit_sale_timesheet
+msgid "Setup your time-based services"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_project_task
#: model:ir.model.fields,field_description:sale_timesheet.field_procurement_order_task_id
msgid "Task"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/procurement.py:80
+#: code:addons/sale_timesheet/models/procurement.py:84
#, python-format
msgid "Task Created (%s): <a href=# data-oe-model=project.task data-oe-id=%d>%s</a>"
msgstr ""
@@ -159,7 +291,12 @@ msgid "Tasks associated to this sale"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/procurement.py:84
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "There is no timesheet for now."
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/procurement.py:88
#, python-format
msgid "This task has been created from: <a href=# data-oe-model=sale.order data-oe-id=%d>%s</a> (%s)"
msgstr ""
@@ -171,6 +308,31 @@ msgid "This will set the unit of measure used in projects and tasks.\n"
msgstr ""
#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Time and material"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "Time by people"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.product_template_search_view_sale_timesheet
+msgid "Time-based services"
+msgstr ""
+
+#. module: sale_timesheet
+#. openerp-web
+#: code:addons/sale_timesheet/static/src/js/timesheet_plan.js:141
+#: 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
+#, python-format
+msgid "Timesheet"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_hr_employee_timesheet_cost
msgid "Timesheet Cost"
msgstr ""
@@ -191,20 +353,50 @@ msgid "Timesheet activities associated to this sale"
msgstr ""
#. module: sale_timesheet
-#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
+#: 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.view_order_form_inherit_sale_timesheet
+#, python-format
msgid "Timesheets"
msgstr ""
#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/project.py:18
+#, python-format
+msgid "Timesheets of %s"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "To invoice"
+msgstr ""
+
+#. module: sale_timesheet
+#: code:addons/sale_timesheet/models/account.py:32
+#, python-format
+msgid "You can not modify already invoiced timesheets."
+msgstr ""
+
+#. module: sale_timesheet
#: code:addons/sale_timesheet/models/sale_order.py:55
#, python-format
msgid "You can use only one product on timesheet within the same sales order. You should split your order to include only one contract based on time and material."
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/project.py:17
+#: code:addons/sale_timesheet/models/project.py:63
#, python-format
msgid "You cannot delete a task related to a Sales Order. You can only archive this task."
msgstr ""
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.timesheet_plan
+msgid "hours"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
+msgid "per hour"
+msgstr ""
+
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index e0168459d1f..3f83ca68144 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -82,6 +82,11 @@ msgid "Activity Types"
msgstr ""
#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
+msgid "Add to My Favorites"
+msgstr ""
+
+#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "Archived"
msgstr ""
@@ -103,7 +108,7 @@ msgid "Bar"
msgstr ""
#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:237
+#: code:addons/sales_team/models/crm_team.py:262
#, python-format
msgid "Big Pretty Button :)"
msgstr ""
@@ -141,6 +146,11 @@ msgid "Click here to define a new sales channel."
msgstr ""
#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
+msgid "Click to add/remove from favorite"
+msgstr ""
+
+#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:150
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:154
@@ -246,7 +256,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:18
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:246
#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
#: model:ir.ui.menu,name:sales_team.menu_sales_team_act
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
@@ -276,6 +286,16 @@ msgid "Display Name"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team_favorite_user_ids
+msgid "Favorite Members"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_crm_team_is_favorite
+msgid "Favorite teams to display them in the dashboard and access them easily."
+msgstr ""
+
+#. module: sales_team
#: model:ir.ui.menu,name:sales_team.menu_country_state_partner
msgid "Fed. States"
msgstr ""
@@ -367,6 +387,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:190
+#: selection:crm.team,dashboard_graph_period:0
#, python-format
msgid "Last Month"
msgstr ""
@@ -384,6 +405,16 @@ msgid "Last Updated on"
msgstr ""
#. module: sales_team
+#: selection:crm.team,dashboard_graph_period:0
+msgid "Last Week"
+msgstr ""
+
+#. module: sales_team
+#: selection:crm.team,dashboard_graph_period:0
+msgid "Last Year"
+msgstr ""
+
+#. module: sales_team
#: selection:crm.team,dashboard_graph_type:0
msgid "Line"
msgstr ""
@@ -416,8 +447,8 @@ msgid "Month"
msgstr ""
#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
+#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
+msgid "My Favorites"
msgstr ""
#. module: sales_team
@@ -430,11 +461,6 @@ msgid "My Pipeline"
msgstr ""
#. module: sales_team
-#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
-msgid "My Salesteams"
-msgstr ""
-
-#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:50
#, python-format
@@ -449,8 +475,14 @@ msgid "Next Activities"
msgstr ""
#. module: sales_team
+#: code:addons/sales_team/models/crm_team.py:248
+#, python-format
+msgid "Not Defined"
+msgstr ""
+
+#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:65
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
@@ -463,11 +495,6 @@ msgid "Performance"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_period
-msgid "Period"
-msgstr ""
-
-#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
msgid "Pipeline"
msgstr ""
@@ -483,6 +510,11 @@ msgid "Recommended Apps"
msgstr ""
#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
+msgid "Remove from My Favorites"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_reply_to
msgid "Reply-To"
msgstr ""
@@ -493,11 +525,6 @@ msgid "Reporting"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_res_users_property_product_pricelist
-msgid "Sale Pricelist"
-msgstr ""
-
-#. module: sales_team
#: selection:crm.team,dashboard_graph_model:0
#: model:crm.team,name:sales_team.team_sales_department
#: selection:crm.team,team_type:0
@@ -551,6 +578,16 @@ msgid "Save"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team_dashboard_graph_period
+msgid "Scale"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.res_partner_industry_menu
+msgid "Sectors of Activity"
+msgstr ""
+
+#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.sale_config_settings_view_form
msgid "Sell recurring services with automated billing"
msgstr ""
@@ -572,6 +609,11 @@ msgid "Settings"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,field_description:sales_team.field_crm_team_is_favorite
+msgid "Show on dashboard"
+msgstr ""
+
+#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale_contract
msgid "Subscriptions"
msgstr ""
@@ -627,27 +669,11 @@ msgstr ""
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
-#: selection:crm.team,dashboard_graph_period:0
#, python-format
msgid "This Month"
msgstr ""
#. module: sales_team
-#: selection:crm.team,dashboard_graph_period:0
-msgid "This Week"
-msgstr ""
-
-#. module: sales_team
-#: selection:crm.team,dashboard_graph_period:0
-msgid "This Year"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_res_users_property_product_pricelist
-msgid "This pricelist will be used, instead of the default one, for sales to the current partner"
-msgstr ""
-
-#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:29
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:61
@@ -720,8 +746,8 @@ msgid "Type"
msgstr ""
#. module: sales_team
-#: code:addons/sales_team/models/crm_team.py:124
-#: code:addons/sales_team/models/crm_team.py:127
+#: code:addons/sales_team/models/crm_team.py:139
+#: code:addons/sales_team/models/crm_team.py:166
#, python-format
msgid "Undefined graph model for Sales Channel: %s"
msgstr ""
@@ -769,7 +795,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:65
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:217
#, python-format
msgid "Wrong value entered!"
msgstr ""
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 8e86883b4aa..0653df5098f 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -492,7 +492,6 @@ msgid "Accurate visibility on all your operations"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_active
#: model:ir.model.fields,field_description:stock.field_stock_incoterms_active
#: model:ir.model.fields,field_description:stock.field_stock_location_active
#: model:ir.model.fields,field_description:stock.field_stock_location_path_active
@@ -593,7 +592,7 @@ msgid "All returned moves"
msgstr ""
#. module: stock
-#: code:addons/stock/models/procurement.py:220
+#: code:addons/stock/models/procurement.py:221
#, python-format
msgid "All stock moves have been cancelled for this procurement."
msgstr ""
@@ -724,13 +723,13 @@ msgid "Back Orders"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_backorder_confirmation.py:31
+#: code:addons/stock/wizard/stock_backorder_confirmation.py:30
#, python-format
msgid "Back order <em>%s</em> <b>cancelled</b>."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:981
+#: code:addons/stock/models/stock_picking.py:987
#, python-format
msgid "Back order <em>%s</em> <b>created</b>."
msgstr ""
@@ -835,6 +834,26 @@ msgid "By unchecking the active field, you may hide an INCOTERM you will not use
msgstr ""
#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_CIP
+msgid "CARRIAGE AND INSURANCE PAID TO"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_CPT
+msgid "CARRIAGE PAID TO"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_CFR
+msgid "COST AND FREIGHT"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_CIF
+msgid "COST, INSURANCE AND FREIGHT"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_calendar
msgid "Calendar View"
msgstr ""
@@ -1110,11 +1129,6 @@ msgid "Consignment"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "Consumable"
-msgstr ""
-
-#. module: stock
#: model:ir.model,name:stock.model_res_partner
msgid "Contact"
msgstr ""
@@ -1182,7 +1196,7 @@ msgid "Create Backorder"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:815
+#: code:addons/stock/models/stock_picking.py:821
#, python-format
msgid "Create Backorder?"
msgstr ""
@@ -1381,6 +1395,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_customer
+#: model:ir.model.fields,field_description:stock.field_res_users_property_stock_customer
#: selection:stock.location,usage:0
msgid "Customer Location"
msgstr ""
@@ -1397,6 +1412,41 @@ msgid "Customers"
msgstr ""
#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DAF
+msgid "DELIVERED AT FRONTIER"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DAP
+msgid "DELIVERED AT PLACE"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DAT
+msgid "DELIVERED AT TERMINAL"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DDP
+msgid "DELIVERED DUTY PAID"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DDU
+msgid "DELIVERED DUTY UNPAID"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DEQ
+msgid "DELIVERED EX QUAY"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_DES
+msgid "DELIVERED EX SHIP"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_dhl
msgid "DHL"
msgstr ""
@@ -1431,32 +1481,6 @@ msgid "Date of Transfer"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_date
-msgid "Date of latest Inventory"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_move_date
-msgid "Date of latest Stock Move"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_tree
-msgid "Dates of Inventories"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_form
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "Dates of Inventories & Moves"
-msgstr ""
-
-#. module: stock
-#: model:ir.model,name:stock.model_report_stock_lines_date
-msgid "Dates of Inventories and latest Moves"
-msgstr ""
-
-#. module: stock
#: selection:stock.warehouse.orderpoint,lead_type:0
msgid "Day(s) to get the products"
msgstr ""
@@ -1550,7 +1574,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:345
+#: code:addons/stock/models/product.py:346
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1575,6 +1599,11 @@ msgid "Delivery Orders"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
+msgid "Delivery Packages"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_delivery_route_id
msgid "Delivery Route"
msgstr ""
@@ -1701,7 +1730,6 @@ msgstr ""
#: 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_report_stock_forecast_display_name
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_display_name
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_display_name
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_display_name
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_display_name
@@ -1731,11 +1759,6 @@ msgid "Display Name"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_line_date
-msgid "Display the latest Inventories and Moves done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year. This also lets you find out which products have seen little move lately and may deserve special measures (discounted sale, quality control...)"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "Do not hesitate to send us an email to describe your experience or to suggest improvements!"
msgstr ""
@@ -1787,6 +1810,11 @@ msgid "Draft Moves"
msgstr ""
#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_EXW
+msgid "EX WORKS"
+msgstr ""
+
+#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "Edit its details or add new ones"
msgstr ""
@@ -1811,7 +1839,7 @@ msgid "Every stock operation in Odoo moves the products from one\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:669
+#: code:addons/stock/models/stock_quant.py:672
#, python-format
msgid "Everything inside a package should be in the same location"
msgstr ""
@@ -1844,7 +1872,7 @@ msgid "External note..."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:955
+#: code:addons/stock/models/stock_picking.py:961
#, python-format
msgid "Extra Move: "
msgstr ""
@@ -1855,6 +1883,21 @@ msgid "FIFO, LIFO..."
msgstr ""
#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_FAS
+msgid "FREE ALONGSIDE SHIP"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_FCA
+msgid "FREE CARRIER"
+msgstr ""
+
+#. module: stock
+#: model:stock.incoterms,name:stock.incoterm_FOB
+msgid "FREE ON BOARD"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_fedex
msgid "FedEx"
msgstr ""
@@ -1904,7 +1947,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:340
+#: code:addons/stock/models/product.py:341
#: 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
@@ -1922,31 +1965,31 @@ msgid "Full Location Name"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:343
+#: code:addons/stock/models/product.py:344
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:348
+#: code:addons/stock/models/product.py:349
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:358
+#: code:addons/stock/models/product.py:359
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:353
+#: code:addons/stock/models/product.py:354
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:335
+#: code:addons/stock/models/product.py:336
#, python-format
msgid "Future Receipts"
msgstr ""
@@ -2073,7 +2116,6 @@ msgstr ""
#: 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_report_stock_forecast_id
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_id
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_id
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_id
@@ -2093,7 +2135,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_id
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8746
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8797
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_id
#: model:ir.model.fields,field_description:stock.field_stock_scrap_id
@@ -2223,7 +2265,7 @@ msgid "Immediate Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:797
+#: code:addons/stock/models/stock_picking.py:803
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2396,6 +2438,24 @@ msgid "Internal reference number in case it differs from the manufacturer's lot/
msgstr ""
#. module: stock
+#: code:addons/stock/models/product.py:258
+#, python-format
+msgid "Invalid domain left operand %s"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:260
+#, python-format
+msgid "Invalid domain operator %s"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:262
+#, python-format
+msgid "Invalid domain right operand %s"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_category_id
msgid "Inventoried Category"
msgstr ""
@@ -2505,6 +2565,11 @@ msgid "Inventory Move"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_inventory_filter
+msgid "Inventory Product"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_name
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
msgid "Inventory Reference"
@@ -2600,7 +2665,6 @@ msgstr ""
#: 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_report_stock_forecast___last_update
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date___last_update
#: model:ir.model.fields,field_description:stock.field_stock_backorder_confirmation___last_update
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty___last_update
#: model:ir.model.fields,field_description:stock.field_stock_config_settings___last_update
@@ -2709,12 +2773,6 @@ msgid "Late Transfers"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_line_date
-#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
-msgid "Latest Inventories & Moves"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_launch_pack_operations
msgid "Launch Pack Operations"
msgstr ""
@@ -2883,7 +2941,7 @@ msgid "Lot/Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:197
+#: code:addons/stock/models/stock_pack_operation.py:198
#, python-format
msgid "Lot/Serial Number Details"
msgstr ""
@@ -2894,7 +2952,7 @@ msgid "Lot/Serial Number Inventory"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:279
+#: code:addons/stock/models/stock_pack_operation.py:280
#, python-format
msgid "Lot/Serial Number required"
msgstr ""
@@ -3006,7 +3064,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Manage product packaging"
+msgid "Manage product packages (e.g. pack of 6 bottles, box of 10 pieces)"
msgstr ""
#. module: stock
@@ -3061,6 +3119,7 @@ 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 ""
@@ -3106,11 +3165,6 @@ msgid "Modify"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
-msgid "More <i class=\"fa fa-caret-down\"/>"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_tree
msgid "Most operations are prepared automatically by Odoo according\n"
" to your preconfigured logistics rules, but you can also record\n"
@@ -3124,7 +3178,7 @@ msgid "Move"
msgstr ""
#. module: stock
-#: code:addons/stock/models/procurement.py:53
+#: code:addons/stock/models/procurement.py:54
#, python-format
msgid "Move From Another Location"
msgstr ""
@@ -3266,11 +3320,6 @@ msgid "No Backorder"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "No Inventory yet"
-msgstr ""
-
-#. module: stock
#: selection:res.partner,picking_warn:0
msgid "No Message"
msgstr ""
@@ -3282,17 +3331,12 @@ msgid "No Rescheduling Propagation"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "No Stock Move yet"
-msgstr ""
-
-#. module: stock
#: selection:product.template,tracking:0
msgid "No Tracking"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:828
+#: code:addons/stock/models/stock_picking.py:834
#, python-format
msgid "No negative quantities allowed"
msgstr ""
@@ -3304,7 +3348,7 @@ msgid "No products to return (only lines in Done state and not fully returned ye
msgstr ""
#. module: stock
-#: code:addons/stock/models/procurement.py:181
+#: code:addons/stock/models/procurement.py:182
#, python-format
msgid "No source location defined!"
msgstr ""
@@ -3451,7 +3495,7 @@ msgid "Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:213
+#: code:addons/stock/models/stock_pack_operation.py:214
#, python-format
msgid "Operation Details"
msgstr ""
@@ -3642,7 +3686,7 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:350
+#: code:addons/stock/models/product.py:351
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -3719,13 +3763,7 @@ msgid "Package Type"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Package Types"
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,name:stock.action_package_view
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
#: model:ir.ui.menu,name:stock.menu_package
#: model:ir.ui.menu,name:stock.menu_packages_config
#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
@@ -3738,7 +3776,6 @@ msgid "Packages are usually created by pack operations made on transfers and can
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
msgid "Packaging"
msgstr ""
@@ -3930,13 +3967,13 @@ msgid "Planner"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:784
+#: code:addons/stock/models/stock_picking.py:790
#, python-format
msgid "Please create some Initial Demand or Mark as Todo and create some Operations. "
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1020
+#: code:addons/stock/models/stock_picking.py:1026
#, python-format
msgid "Please process some quantities to put in the pack first!"
msgstr ""
@@ -4074,7 +4111,7 @@ msgid "Procurements"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:360
+#: code:addons/stock/models/product.py:361
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -4083,7 +4120,6 @@ msgstr ""
#: model:ir.model,name:stock.model_product_product
#: model:ir.model.fields,field_description:stock.field_make_procurement_product_id
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_product_id
-#: model:ir.model.fields,field_description:stock.field_report_stock_lines_date_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_inventory_line_product_id
#: model:ir.model.fields,field_description:stock.field_stock_move_product_id
@@ -4139,8 +4175,10 @@ msgid "Product Name"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging
#: model:ir.ui.menu,name:stock.menu_product_packagings
-msgid "Product Packaging"
+#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+msgid "Product Packages"
msgstr ""
#. module: stock
@@ -4205,7 +4243,7 @@ msgid "Products you scrap will be removed from the stock and moved to a specific
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:323
+#: code:addons/stock/models/product.py:324
#, python-format
msgid "Products: "
msgstr ""
@@ -4256,9 +4294,8 @@ msgid "Put Away Strategy"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_lot
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Put products in packages and get shipping labels per package unit thanks to shipping connectors."
+msgid "Put your products in packs (e.g. parcels, boxes) and track them"
msgstr ""
#. module: stock
@@ -4450,7 +4487,7 @@ msgid "Receive goods directly in stock (1 step)"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:337
+#: code:addons/stock/models/product.py:338
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4542,7 +4579,7 @@ msgid "Removal Strategy"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:467
+#: code:addons/stock/models/stock_quant.py:470
#, python-format
msgid "Removal strategy %s not implemented."
msgstr ""
@@ -4809,7 +4846,7 @@ msgid "Schedulers"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:1032
+#: code:addons/stock/models/stock_picking.py:1038
#: model:ir.actions.act_window,name:stock.action_stock_scrap
#: model:ir.ui.menu,name:stock.menu_stock_scrap
#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
@@ -4857,12 +4894,6 @@ msgid "Search Stock Location Paths"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_packaging
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form."
-msgstr ""
-
-#. module: stock
#: code:addons/stock/models/stock_inventory.py:108
#, python-format
msgid "Select products manually"
@@ -4875,6 +4906,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_picking_warn
+#: model:ir.model.fields,help:stock.field_res_users_picking_warn
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -4893,31 +4925,31 @@ msgid "Sequence"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:679
+#: code:addons/stock/models/stock_warehouse.py:680
#, python-format
msgid "Sequence in"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:683
+#: code:addons/stock/models/stock_warehouse.py:684
#, python-format
msgid "Sequence internal"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:680
+#: code:addons/stock/models/stock_warehouse.py:681
#, python-format
msgid "Sequence out"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:681
+#: code:addons/stock/models/stock_warehouse.py:682
#, python-format
msgid "Sequence packing"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:682
+#: code:addons/stock/models/stock_warehouse.py:683
#, python-format
msgid "Sequence picking"
msgstr ""
@@ -5060,7 +5092,7 @@ msgid "Show various information on stock availability for this move"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_picking.py:792
+#: code:addons/stock/models/stock_picking.py:798
#, python-format
msgid "Some products require lots/serial numbers, so you need to specify those first!"
msgstr ""
@@ -5234,6 +5266,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn
+#: model:ir.model.fields,field_description:stock.field_res_users_picking_warn
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_id
msgid "Stock Picking"
msgstr ""
@@ -5259,11 +5292,6 @@ msgid "Stock moves that have been processed"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "Stockable"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations
msgid "Storage Locations"
msgstr ""
@@ -5483,6 +5511,12 @@ msgid "The parent location that includes this location. Example : The 'Dispatch
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_picking.py:787
+#, python-format
+msgid "The pick is already validated"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_qty_multiple
msgid "The procurement quantity will be rounded up to this multiple. If it is 0, the exact quantity will be used."
msgstr ""
@@ -5498,7 +5532,7 @@ msgid "The push rule that created this stock move"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:169
+#: code:addons/stock/models/stock_pack_operation.py:170
#, python-format
msgid "The quantity to split should be smaller than the quantity To Do. "
msgstr ""
@@ -5515,7 +5549,7 @@ msgid "The requested operation cannot be processed because of a programming erro
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:825
+#: code:addons/stock/models/stock_move.py:828
#, python-format
msgid "The roundings of your unit of measure %s on the move vs. %s on the product don't allow to do these operations or you are not transferring the picking at once. "
msgstr ""
@@ -5653,11 +5687,13 @@ 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"
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_property_stock_supplier
+#: model:ir.model.fields,help:stock.field_res_users_property_stock_supplier
msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
msgstr ""
@@ -5734,6 +5770,11 @@ msgid "Today Activities"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
+msgid "Total"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_total_qty
msgid "Total Quantity"
msgstr ""
@@ -5744,7 +5785,7 @@ msgid "Total routes"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_production_lot.py:42
+#: code:addons/stock/models/stock_production_lot.py:52
#: model:ir.ui.view,arch_db:stock.inventory_planner
#: 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
@@ -5771,11 +5812,6 @@ msgid "Track product location in your warehouse"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-msgid "Track product packages (e.g.pallets, boxes)"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product_tracking
#: model:ir.model.fields,field_description:stock.field_product_template_tracking
#: model:ir.model.fields,field_description:stock.field_stock_scrap_tracking
@@ -5783,7 +5819,7 @@ msgid "Tracking"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:966
+#: code:addons/stock/models/stock_move.py:969
#: model:ir.model,name:stock.model_stock_picking
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -5910,7 +5946,7 @@ msgid "Units of Measures"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_quant.py:566
+#: code:addons/stock/models/stock_quant.py:569
#, python-format
msgid "Unknown Pack"
msgstr ""
@@ -5936,7 +5972,7 @@ msgid "Unpack"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:355
+#: code:addons/stock/models/product.py:356
#, python-format
msgid "Unplanned Qty"
msgstr ""
@@ -6045,6 +6081,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_supplier
+#: model:ir.model.fields,field_description:stock.field_res_users_property_stock_supplier
#: selection:stock.location,usage:0
msgid "Vendor Location"
msgstr ""
@@ -6168,7 +6205,7 @@ msgid "Warehouse to consider for the route selection"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_warehouse.py:709
+#: code:addons/stock/models/stock_warehouse.py:710
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -6193,7 +6230,7 @@ msgid "Warning on the Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:316
+#: code:addons/stock/models/product.py:317
#, python-format
msgid "Warning!"
msgstr ""
@@ -6292,6 +6329,12 @@ msgid "Wizard checks all the stock minimum rules and generate procurement order.
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"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,help:stock.action_routes_form
msgid "You can define here the main routes that run through\n"
" your warehouses and that define the flows of your products. These\n"
@@ -6324,13 +6367,13 @@ msgid "You can either do it immediately or mark it as Todo for future processing
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:499
+#: code:addons/stock/models/product.py:506
#, 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_pack_operation.py:158
+#: code:addons/stock/models/stock_pack_operation.py:159
#, python-format
msgid "You can not delete pack operations of a done picking"
msgstr ""
@@ -6342,7 +6385,7 @@ msgid "You can not reserve a negative quantity or a negative quant."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:909
+#: code:addons/stock/models/stock_move.py:912
#, python-format
msgid "You can only delete draft moves."
msgstr ""
@@ -6353,12 +6396,18 @@ msgid "You can review and edit the predefined units via the"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:656
+#: code:addons/stock/models/stock_move.py:659
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_scrap.py:72
+#, python-format
+msgid "You cannot delete a scrap which is done."
+msgstr ""
+
+#. module: stock
#: code:addons/stock/models/stock_inventory.py:375
#, python-format
msgid "You cannot have two inventory adjustements in state 'in Progess' with the same product(%s), same location(%s), same package, same owner and same lot. Please first validatethe first inventory adjustement with this product before creating another one."
@@ -6371,7 +6420,7 @@ msgid "You cannot move to a location of type view %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_scrap.py:85
+#: code:addons/stock/models/stock_scrap.py:91
#, python-format
msgid "You cannot scrap a move without having available stock for %s. You can correct it with an inventory adjustment."
msgstr ""
@@ -6384,19 +6433,13 @@ msgid "You cannot set a negative product quantity in an inventory line:\n"
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"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/models/stock_move.py:927
+#: code:addons/stock/models/stock_move.py:930
#, 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:923
+#: code:addons/stock/models/stock_move.py:926
#, python-format
msgid "You cannot split a move done"
msgstr ""
@@ -6408,7 +6451,7 @@ msgid "You do not have any products reserved for this picking. Please click the
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:808
+#: code:addons/stock/models/stock_move.py:811
#, python-format
msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. "
msgstr ""
@@ -6435,13 +6478,13 @@ msgid "You have processed less products than the initial demand."
msgstr ""
#. module: stock
-#: code:addons/stock/models/product.py:317
+#: code:addons/stock/models/product.py:318
#, 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_warehouse.py:789
+#: code:addons/stock/models/stock_warehouse.py:790
#, 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"
msgstr ""
@@ -6465,8 +6508,8 @@ msgid "You must define a warehouse for the company: %s."
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_move.py:552
-#: code:addons/stock/models/stock_pack_operation.py:232
+#: code:addons/stock/models/stock_move.py:555
+#: code:addons/stock/models/stock_pack_operation.py:233
#, python-format
msgid "You need to provide a Lot/Serial Number for product %s"
msgstr ""
@@ -6478,12 +6521,18 @@ msgid "You should only receive by the piece with the same serial number"
msgstr ""
#. module: stock
-#: code:addons/stock/models/stock_pack_operation.py:236
+#: code:addons/stock/models/stock_pack_operation.py:237
#, python-format
msgid "You should provide a different serial number for each piece"
msgstr ""
#. module: stock
+#: code:addons/stock/models/product.py:372
+#, 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:223
#, 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."
@@ -6656,11 +6705,6 @@ msgid "stock.scrap"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-msgid "t-field-options='{\"widget\": \"contact\", \"fields\": [\"address\", \"name\", \"phone\", \"fax\"], \"no_marker\": true}'/&gt;"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "the list of products"
msgstr ""
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 5d6a801043f..29629a19bb1 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,11 +37,6 @@ msgid "Affect landed costs on receipt operations and split them among products t
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
-msgid "Allow perpetual stock valuation in accounting"
-msgstr ""
-
-#. module: stock_account
#: selection:wizard.valuation.history,compute_at_date:0
msgid "At a Specific Date"
msgstr ""
@@ -59,13 +54,13 @@ msgid "Cancel"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:260
+#: code:addons/stock_account/models/stock.py:269
#, 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:262
+#: code:addons/stock_account/models/stock.py:271
#, 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 ""
@@ -114,7 +109,7 @@ msgid "Compute"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:335
+#: code:addons/stock_account/models/stock.py:344
#, python-format
msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation."
msgstr ""
@@ -132,7 +127,7 @@ msgstr ""
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
-msgid "Costing &amp; Valuation"
+msgid "Costing"
msgstr ""
#. module: stock_account
@@ -295,11 +290,6 @@ msgid "Lot/Serial Number"
msgstr ""
#. module: stock_account
-#: model:res.groups,name:stock_account.group_inventory_valuation
-msgid "Manage Inventory Valuation and Costing Methods"
-msgstr ""
-
-#. module: stock_account
#: code:addons/stock_account/models/product.py:108
#, python-format
msgid "No difference between standard price and new price!"
@@ -323,22 +313,6 @@ msgid "Perpetual (automated)"
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_config_settings_group_stock_inventory_valuation
-msgid "Perpetual Valuation"
-msgstr ""
-
-#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
-msgid "Perpetual valuation allows to get an up-to-date stock valuation in your accounting whenever products are transferred. It is only tailored for big companies where such a need matters. It requires extra configuration and testing to make sure accounting is impacted the right way for every kind of stock move. This must be set on product categories. The Periodic mode is applied by default (i.e. manual accounting entries at the end of the fiscal year). This last mode is recommended for starters and small/medium-size companies."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_stock_config_settings_group_stock_inventory_valuation
-msgid "Perpetual valuation allows to get up-to-date books whenever products are transferred. It is only tailored for big companies where such a need matters. It requires extra configuration and testing to make sure accounting is impacted the right way for every kind of stock move. \n"
-" This must be set on product categories. The Periodic mode is applied by default (i.e. manual accounting entries at the end of the fiscal year). This last mode is recommended for starters and small/medium-size companies."
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_new_price
msgid "Price"
msgstr ""
@@ -386,13 +360,17 @@ msgid "Retrieve the Inventory Value"
msgstr ""
#. module: stock_account
+#: model:ir.model,name:stock_account.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
msgid "Save this page and come back here to set up the feature."
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 "Set standard cost"
msgstr ""
@@ -493,17 +471,34 @@ msgid "Templates for Account Chart"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:289
+#: code:addons/stock_account/models/stock.py:298
#, python-format
msgid "The found valuation amount for product %s is zero. Which means there is probably a configuration error. Check the costing method and the standard price"
msgstr ""
#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_stock_move_to_refund
+#: model:ir.model.fields,field_description:stock_account.field_stock_return_picking_line_to_refund
+msgid "To Refund (update SO/PO)"
+msgstr ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_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_template_property_form
+msgid "Update Cost"
+msgstr ""
+
+#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_stock_location_valuation_in_account_id
msgid "Used for real-time inventory valuation. When set on a virtual location (non internal type), this account will be used to hold the value of products being moved from an internal location into this location, instead of the generic Stock Output Account set on the product. This has no effect for internal locations."
msgstr ""
@@ -562,14 +557,14 @@ msgid "Wizard that opens the stock valuation history table"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/models/stock.py:258
+#: code:addons/stock_account/models/stock.py:267
#, python-format
msgid "You don't have any stock journal defined on your product category, check if you have installed a chart of accounts"
msgstr ""
#. module: stock_account
#: code:addons/stock_account/models/product.py:110
-#: code:addons/stock_account/models/stock.py:264
+#: code:addons/stock_account/models/stock.py:273
#, 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 ""
@@ -589,3 +584,8 @@ msgstr ""
msgid "stock.history"
msgstr ""
+#. module: stock_account
+#: model:ir.model,name:stock_account.model_stock_return_picking_line
+msgid "stock.return.picking.line"
+msgstr ""
+
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index 1362fd9ccca..c460b8ece07 100644
--- a/addons/web/i18n/web.pot
+++ b/addons/web/i18n/web.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,93 +17,115 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:874
+#: code:addons/web/static/src/js/views/view_dialogs.js:125
#, python-format
msgid " & Close"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:222
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:479
+#, python-format
+msgid " [Me]"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome/search_filters.js:223
#, python-format
msgid " and "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:554
-#: code:addons/web/static/src/js/views/search_view.js:206
+#: code:addons/web/static/src/js/chrome/search_inputs.js:566
+#: code:addons/web/static/src/js/chrome/search_view.js:203
#, python-format
msgid " or "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:222
+#: code:addons/web/static/src/js/fields/field_utils.js:247
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:222
+#, python-format
+msgid " records"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome/view_manager.js:311
#, python-format
msgid " view couldn't be loaded"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:107
-#: code:addons/web/static/src/js/views/search_filters.js:340
+#: code:addons/web/static/src/xml/base.xml:587
+#, 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:342
#, python-format
msgid "%(field)s %(operator)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:108
+#: code:addons/web/static/src/js/chrome/search_filters.js:108
#, python-format
msgid "%(field)s %(operator)s \"%(value)s\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:65
+#: code:addons/web/static/src/js/chrome/view_manager.js:106
#, python-format
msgid "%(view_type)s view"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:103
+#: code:addons/web/static/src/js/core/translation.js:103
#, python-format
msgid "%d days ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:101
+#: code:addons/web/static/src/js/core/translation.js:101
#, python-format
msgid "%d hours ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:99
+#: code:addons/web/static/src/js/core/translation.js:99
#, python-format
msgid "%d minutes ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:105
+#: code:addons/web/static/src/js/core/translation.js:105
#, python-format
msgid "%d months ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:136
+#: code:addons/web/static/src/js/widgets/debug_manager.js:141
#, python-format
msgid "%d requests (%d ms) %d queries (%d ms)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:107
+#: code:addons/web/static/src/js/core/translation.js:107
#, python-format
msgid "%d years ago"
msgstr ""
@@ -117,72 +139,72 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:189
+#: code:addons/web/static/src/js/fields/field_utils.js:375
#, python-format
msgid "'%s' is not a correct date"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/time.js:193
+#: code:addons/web/static/src/js/core/time.js:193
#, python-format
msgid "'%s' is not a correct date, datetime nor time"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:175
+#: code:addons/web/static/src/js/fields/field_utils.js:422
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:146
+#: code:addons/web/static/src/js/fields/field_utils.js:433
#, python-format
msgid "'%s' is not a correct float"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:134
+#: code:addons/web/static/src/js/fields/field_utils.js:503
#, python-format
msgid "'%s' is not a correct integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:194
+#: code:addons/web/static/src/js/fields/field_utils.js:469
#, python-format
-msgid "'%s' is not a correct time"
+msgid "'%s' is not a correct monetary field"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/time.js:205
+#: code:addons/web/static/src/js/core/time.js:205
#, python-format
msgid "'%s' is not convertible to date, datetime nor time"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:77
+#: code:addons/web/static/src/xml/base_common.xml:101
#, python-format
-msgid "(%d records)"
+msgid "(no string)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:100
+#: code:addons/web/static/src/xml/base_common.xml:34
#, python-format
-msgid "(no string)"
+msgid "(nolabel)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:34
+#: code:addons/web/static/src/js/fields/field_utils.js:245
#, python-format
-msgid "(nolabel)"
+msgid "1 record"
msgstr ""
#. module: web
@@ -197,63 +219,56 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:708
+#: code:addons/web/static/src/xml/base.xml:564
#, python-format
msgid "ALL"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:709
+#: code:addons/web/static/src/xml/base.xml:565
#, python-format
msgid "ANY"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:19
+#: code:addons/web/static/src/js/services/crash_manager.js:19
#, python-format
msgid "Access Denied"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:15
+#: code:addons/web/static/src/js/services/crash_manager.js:15
#, python-format
msgid "Access Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1438
+#: code:addons/web/static/src/xml/base.xml:1265
#, python-format
msgid "Access to all Enterprise Apps"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:23
+#: code:addons/web/static/src/js/chrome/sidebar.js:34
#, python-format
msgid "Action"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1123
-#, python-format
-msgid "Action Button"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:120
+#: code:addons/web/static/src/xml/base_common.xml:135
#, python-format
msgid "Action ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:695
+#: code:addons/web/static/src/js/fields/basic_fields.js:1481
#, python-format
msgid "Activate"
msgstr ""
@@ -267,256 +282,312 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:692
-#: code:addons/web/static/src/js/views/form_widgets.js:698
-#: code:addons/web/static/src/js/views/form_widgets.js:704
+#: code:addons/web/static/src/js/fields/basic_fields.js:1480
+#: code:addons/web/static/src/js/fields/basic_fields.js:1484
+#: code:addons/web/static/src/js/fields/basic_fields.js:1488
#, python-format
msgid "Active"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1379
-#: code:addons/web/static/src/xml/base.xml:1267
+#: code:addons/web/static/src/js/fields/relational_fields.js:1114
+#: code:addons/web/static/src/xml/base.xml:1121
+#: code:addons/web/static/src/xml/kanban.xml:51
+#: code:addons/web/static/src/xml/kanban.xml:52
+#: code:addons/web/static/src/xml/kanban.xml:60
+#: code:addons/web/static/src/xml/kanban.xml:61
#, python-format
msgid "Add"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1091
+#: code:addons/web/static/src/xml/base.xml:943
#, python-format
msgid "Add Custom Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1095
+#: code:addons/web/static/src/xml/base.xml:947
#, python-format
msgid "Add a condition"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1019
+#: code:addons/web/static/src/js/views/list/list_editable_renderer.js:384
#, python-format
msgid "Add an item"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1201
+#: code:addons/web/static/src/xml/base.xml:1056
#, python-format
msgid "Add custom group"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:716
+#: code:addons/web/static/src/xml/base.xml:572
#, python-format
msgid "Add filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:770
+#: code:addons/web/static/src/xml/kanban.xml:48
+#, python-format
+msgid "Add new Column"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
#, python-format
msgid "Add new value"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:251
+#: code:addons/web/static/src/xml/base.xml:250
#, python-format
msgid "Add..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1306
+#: code:addons/web/static/src/js/fields/relational_fields.js:1137
#, python-format
msgid "Add: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1067
+#: code:addons/web/static/src/xml/base.xml:920
#, python-format
msgid "Advanced Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:169
+#: code:addons/web/static/src/js/core/dialog.js:177
#, python-format
msgid "Alert"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:698
-#: code:addons/web/static/src/xml/base.xml:703
+#: code:addons/web/static/src/xml/base.xml:554
+#: code:addons/web/static/src/xml/base.xml:559
#, python-format
msgid "All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:480
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:363
+#, python-format
+msgid "All day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:328
+#, python-format
+msgid "All the day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:380
#, python-format
msgid "All users"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:35
+#: code:addons/web/static/src/xml/base.xml:37
#, python-format
msgid "An error occurred"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1443
+#: code:addons/web/static/src/xml/base.xml:1270
#, python-format
msgid "And more"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:699
-#: code:addons/web/static/src/xml/base.xml:704
+#: code:addons/web/static/src/xml/base.xml:555
+#: code:addons/web/static/src/xml/base.xml:560
#, python-format
msgid "Any"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1094
-#: code:addons/web/static/src/xml/base.xml:1212
+#: code:addons/web/static/src/xml/base.xml:946
+#: code:addons/web/static/src/xml/base.xml:1067
#, python-format
msgid "Apply"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:699
-#: code:addons/web/static/src/js/views/list_view.js:289
+#: code:addons/web/static/src/js/fields/basic_fields.js:1485
+#: code:addons/web/static/src/js/views/list/list_controller.js:127
#, python-format
msgid "Archive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:700
+#: code:addons/web/static/src/xml/kanban.xml:25
+#, python-format
+msgid "Archive Records"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/fields/basic_fields.js:1484
#, python-format
msgid "Archived"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:250
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:275
+#, 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:251
#, python-format
msgid "Are you sure that you want to remove this filter?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:288
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:287
#, python-format
-msgid "Attachment :"
+msgid "Are you sure you want to delete this record ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1263
+#: code:addons/web/static/src/xml/base.xml:223
#, python-format
-msgid "Available fields"
+msgid "Attachment :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:547
+#: code:addons/web/static/src/xml/base.xml:1117
#, python-format
-msgid "Bar Chart"
+msgid "Available fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1857
+#: code:addons/web/static/src/xml/base.xml:447
#, python-format
-msgid "Binary file"
+msgid "Bar Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1442
+#: code:addons/web/static/src/xml/base.xml:1269
#, python-format
msgid "Bugfixes guarantee"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:97
+#: code:addons/web/static/src/xml/base_common.xml:98
#, python-format
msgid "Button"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:112
+#: code:addons/web/static/src/xml/base_common.xml:127
#, python-format
msgid "Button Type:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/utils.js:285
+#: code:addons/web/static/src/js/core/utils.js:113
#, python-format
msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_common.js:134
+#: code:addons/web/static/src/js/views/calendar/calendar_view.js:22
+#, python-format
+msgid "Calendar"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/calendar/calendar_view.js:36
#, python-format
-msgid "Can't convert value %s to context"
+msgid "Calendar view has not defined 'date_start' attribute."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:201
-#: code:addons/web/static/src/js/framework/dialog.js:183
-#: code:addons/web/static/src/js/views/form_common.js:1047
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:43
-#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:41
-#: code:addons/web/static/src/xml/base.xml:65
+#: code:addons/web/static/src/js/core/dialog.js:191
+#: code:addons/web/static/src/js/fields/relational_fields.js:66
+#: code:addons/web/static/src/js/fields/upgrade_fields.js:75
+#: code:addons/web/static/src/js/services/crash_manager.js:201
+#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:56
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:269
+#: code:addons/web/static/src/js/views/view_dialogs.js:353
+#: code:addons/web/static/src/xml/base.xml:67
#, python-format
msgid "Cancel"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/controllers/main.py:754
-#: code:addons/web/controllers/main.py:756
-#: code:addons/web/controllers/main.py:761
-#: code:addons/web/controllers/main.py:762
-#: code:addons/web/static/src/js/widgets/change_password.js:15
-#: code:addons/web/static/src/xml/base.xml:64
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:69
+#, python-format
+msgid "Cannot render chart with mode : "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:772
+#: code:addons/web/controllers/main.py:774
+#: code:addons/web/controllers/main.py:779
+#: code:addons/web/controllers/main.py:780
+#: code:addons/web/static/src/js/widgets/change_password.js:27
+#: code:addons/web/static/src/xml/base.xml:66
#, python-format
msgid "Change Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:71
+#: code:addons/web/static/src/xml/base_common.xml:73
#, python-format
msgid "Change default:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:969
-#: code:addons/web/static/src/xml/base.xml:999
+#: code:addons/web/static/src/xml/base.xml:823
+#: code:addons/web/static/src/xml/base.xml:854
#, python-format
msgid "Clear"
msgstr ""
@@ -530,9 +601,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:868
-#: code:addons/web/static/src/js/views/form_view.js:1122
-#: code:addons/web/static/src/js/views/form_widgets.js:706
+#: code:addons/web/static/src/js/fields/basic_fields.js:1489
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:298
+#: 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/domain_selector_dialog.js:21
#, python-format
@@ -541,170 +612,175 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:705
+#: code:addons/web/static/src/js/fields/basic_fields.js:1488
#, python-format
msgid "Closed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:454
+#: code:addons/web/static/src/xml/base.xml:354
#, python-format
msgid "Condition:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:59
+#: code:addons/web/static/src/xml/base.xml:61
#, python-format
msgid "Confirm New Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:194
+#: code:addons/web/static/src/js/core/dialog.js:202
#, python-format
msgid "Confirmation"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:220
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:260
#, python-format
msgid "Connection lost"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:229
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:269
#, python-format
msgid "Connection restored"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:59
+#: code:addons/web/static/src/xml/base_common.xml:61
+#: code:addons/web/static/src/xml/base_common.xml:114
#, python-format
msgid "Context:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:127
+#: code:addons/web/static/src/js/services/crash_manager.js:127
#, python-format
msgid "Copied !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:33
+#: code:addons/web/static/src/xml/base.xml:35
#, python-format
msgid "Copy the full error to clipboard"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1322
+#: code:addons/web/static/src/js/fields/basic_fields.js:1115
#, python-format
msgid "Could not display the selected image."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1034
+#: code:addons/web/static/src/js/core/utils.js:416
#, python-format
-msgid "Could not find id in dataset"
+msgid "Could not serialize XML"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/utils.js:180
+#: code:addons/web/static/src/js/views/graph/graph_view.js:35
+#: code:addons/web/static/src/js/views/graph/graph_view.js:48
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:39
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:58
+#: code:addons/web/static/src/xml/base.xml:443
+#: code:addons/web/static/src/xml/base.xml:470
#, python-format
-msgid "Could not serialize XML"
+msgid "Count"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_view.js:87
-#: code:addons/web/static/src/js/views/graph_widget.js:22
-#: code:addons/web/static/src/js/views/pivot_view.js:196
-#: code:addons/web/static/src/xml/base.xml:543
-#: code:addons/web/static/src/xml/base.xml:572
+#: code:addons/web/static/src/js/fields/relational_fields.js:45
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:212
+#: 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:321
+#: code:addons/web/static/src/js/views/view_dialogs.js:359
+#: code:addons/web/static/src/xml/base.xml:296
+#: code:addons/web/static/src/xml/base.xml:316
#, python-format
-msgid "Count"
+msgid "Create"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1050
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:29
-#: code:addons/web/static/src/js/views/list_view.js:49
-#: code:addons/web/static/src/js/views/list_view.js:1940
-#: code:addons/web/static/src/xml/base.xml:416
+#: code:addons/web/static/src/js/views/form/form_controller.js:468
#, python-format
-msgid "Create"
+msgid "Create "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:226
+#: code:addons/web/static/src/js/fields/relational_fields.js:357
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:26
+#: code:addons/web/static/src/js/fields/relational_fields.js:42
#, python-format
msgid "Create a %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:237
+#: code:addons/web/static/src/js/fields/relational_fields.js:366
#, python-format
msgid "Create and Edit..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:39
+#: code:addons/web/static/src/js/fields/relational_fields.js:56
#, python-format
msgid "Create and edit"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:281
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1081
+#: code:addons/web/static/src/js/fields/relational_fields.js:395
+#: 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:229
+#: code:addons/web/static/src/xml/base.xml:228
#, python-format
msgid "Created by :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:183
+#: code:addons/web/static/src/xml/base.xml:182
#, python-format
msgid "Creation Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:178
#, python-format
msgid "Creation User:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:178
+#: code:addons/web/static/src/js/chrome/search_menus.js:179
#, python-format
msgid "Custom Filter"
msgstr ""
@@ -716,89 +792,80 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:591
+#: code:addons/web/static/src/xml/base.xml:488
+#: code:addons/web/static/src/xml/web_calendar.xml:71
#, python-format
msgid "Day"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:693
+#: code:addons/web/static/src/js/fields/basic_fields.js:1481
#, python-format
msgid "Deactivate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:437
+#: code:addons/web/static/src/xml/base.xml:337
#, python-format
msgid "Default:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:164
-#: code:addons/web/static/src/js/views/list_view.js:291
-#: code:addons/web/static/src/xml/base.xml:1308
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:285
+#: code:addons/web/static/src/js/views/form/form_controller.js:152
+#: code:addons/web/static/src/js/views/list/list_controller.js:137
+#: code:addons/web/static/src/xml/base.xml:1162
+#: code:addons/web/static/src/xml/kanban.xml:22
#, python-format
msgid "Delete"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:240
+#: code:addons/web/static/src/xml/base.xml:239
#, python-format
msgid "Delete this attachment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1048
+#: code:addons/web/static/src/xml/base.xml:901
#, python-format
msgid "Delete this file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:868
+#: code:addons/web/static/src/js/views/view_dialogs.js:111
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:28
-#: code:addons/web/static/src/xml/base.xml:348
-#: code:addons/web/static/src/xml/base.xml:426
+#: code:addons/web/static/src/xml/base.xml:303
+#: code:addons/web/static/src/xml/base.xml:326
+#: code:addons/web/static/src/xml/kanban.xml:53
+#: code:addons/web/static/src/xml/kanban.xml:62
#, python-format
msgid "Discard"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:219
-#, python-format
-msgid "Do you really want to delete this attachment ?"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:325
+#: code:addons/web/static/src/js/widgets/data_export.js:336
#, python-format
msgid "Do you really want to delete this export template?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:728
-#, python-format
-msgid "Do you really want to delete this record?"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:544
+#: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:132
#, python-format
-msgid "Do you really want to remove these records?"
+msgid "Do you really want to delete this filter from favorites ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1423
+#: code:addons/web/static/src/xml/base.xml:1250
#, python-format
msgid "Documentation"
msgstr ""
@@ -812,51 +879,46 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:63
-#, python-format
-msgid "Domain:"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:16
+#: code:addons/web/static/src/js/widgets/domain_selector.js:501
#, python-format
-msgid "Don't leave yet,<br />it's still loading..."
+msgid "Domain error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1857
+#: code:addons/web/static/src/xml/base_common.xml:65
#, python-format
-msgid "Download"
+msgid "Domain:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1873
+#: code:addons/web/static/src/js/core/misc.js:16
#, python-format
-msgid "Download \"%s\""
+msgid "Don't leave yet,<br />it's still loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:578
+#: code:addons/web/static/src/xml/base.xml:476
#, python-format
msgid "Download xls"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:165
+#: code:addons/web/static/src/js/views/form/form_controller.js:158
#, python-format
msgid "Duplicate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:159
-#: code:addons/web/static/src/xml/base.xml:412
-#: code:addons/web/static/src/xml/base.xml:968
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:279
+#: code:addons/web/static/src/js/views/calendar/calendar_quick_create.js:50
+#: code:addons/web/static/src/xml/base.xml:158
+#: code:addons/web/static/src/xml/base.xml:312
+#: code:addons/web/static/src/xml/base.xml:822
#, python-format
msgid "Edit"
msgstr ""
@@ -870,22 +932,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:160
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:301
+#, python-format
+msgid "Edit Column"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
#, python-format
msgid "Edit SearchView"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:255
-#: code:addons/web/static/src/xml/base.xml:131
+#: code:addons/web/static/src/xml/kanban.xml:21
#, python-format
-msgid "Edit Workflow"
+msgid "Edit Stage"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:683
+#: code:addons/web/static/src/xml/base.xml:540
#, python-format
msgid "Edit domain"
msgstr ""
@@ -897,37 +965,44 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:130
-#: code:addons/web/static/src/js/view_manager.js:222
-#: code:addons/web/static/src/js/views/search_menus.js:86
-#: code:addons/web/static/src/js/views/search_menus.js:93
+#: code:addons/web/static/src/js/chrome/search_menus.js:86
+#: code:addons/web/static/src/js/chrome/search_menus.js:93
+#: code:addons/web/static/src/js/chrome/view_manager.js:311
+#: code:addons/web/static/src/js/services/crash_manager.js:130
#, python-format
msgid "Error"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:762
+#: code:addons/web/controllers/main.py:780
#, python-format
msgid "Error, password not changed !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:1024
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:488
+#, python-format
+msgid "Everybody's calendars"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/calendar/calendar_model.js:488
#, python-format
-msgid "Evaluation Error"
+msgid "Everything"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:577
+#: code:addons/web/static/src/xml/base.xml:475
#, python-format
msgid "Expand all"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:288
+#: code:addons/web/static/src/js/views/list/list_controller.js:122
#, python-format
msgid "Export"
msgstr ""
@@ -941,7 +1016,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1256
+#: code:addons/web/static/src/xml/base.xml:1110
#, python-format
msgid "Export Formats :"
msgstr ""
@@ -955,127 +1030,134 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1249
+#: code:addons/web/static/src/xml/base.xml:1103
#, python-format
msgid "Export Type :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1252
+#: code:addons/web/static/src/xml/base.xml:1106
#, python-format
msgid "Export all Data"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:436
+#: code:addons/web/static/src/js/chrome/view_manager.js:510
#, python-format
msgid "Failed to evaluate search criterions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1218
+#: code:addons/web/static/src/js/fields/field_utils.js:44
#, python-format
-msgid "Favorites"
+msgid "False"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1299
+#: code:addons/web/static/src/xml/base.xml:1072
#, python-format
-msgid "Field '%s' specified in view could not be found."
+msgid "Favorites"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:39
+#: code:addons/web/static/src/xml/base_common.xml:41
#, python-format
msgid "Field:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:336
-#: code:addons/web/static/src/xml/base.xml:157
+#: code:addons/web/static/src/js/widgets/debug_manager.js:354
+#: code:addons/web/static/src/xml/base.xml:156
#, python-format
msgid "Fields View Get"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:233
+#: code:addons/web/static/src/js/widgets/debug_manager.js:248
#, python-format
msgid "Fields of %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1275
+#: code:addons/web/static/src/xml/base.xml:1129
#, python-format
msgid "Fields to export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1185
+#: code:addons/web/static/src/js/fields/basic_fields.js:1034
#, python-format
msgid "File Upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1165
+#: code:addons/web/static/src/js/fields/basic_fields.js:1014
#, python-format
msgid "File upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:552
+#: code:addons/web/static/src/js/chrome/search_inputs.js:564
#, python-format
msgid "Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:86
+#: code:addons/web/static/src/js/chrome/search_menus.js:86
#, python-format
msgid "Filter name is required."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:496
+#: code:addons/web/static/src/js/chrome/search_inputs.js:508
#, python-format
msgid "Filter on: %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:93
+#: code:addons/web/static/src/js/chrome/search_menus.js:93
#, python-format
msgid "Filter with same name already exists."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1087
+#: code:addons/web/static/src/xml/base.xml:939
#, python-format
msgid "Filters"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:576
+#: code:addons/web/static/src/xml/base.xml:474
#, python-format
msgid "Flip axis"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot_view.js:848
+#: code:addons/web/static/src/xml/kanban.xml:19
+#, python-format
+msgid "Fold"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/pivot/pivot_controller.js:128
#, python-format
msgid "For Excel compatibility, data cannot be exported if there are more than 256 columns.\n"
"\n"
@@ -1084,44 +1166,43 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:33
-#: code:addons/web/static/src/js/views/form_view.js:301
+#: code:addons/web/static/src/js/views/form/form_view.js:17
#, python-format
msgid "Form"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1262
#, python-format
msgid "Get this feature and much more with Odoo Enterprise!"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:18
+#: code:addons/web/static/src/js/services/crash_manager.js:18
#, python-format
msgid "Global Business Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_view.js:18
+#: code:addons/web/static/src/js/views/graph/graph_view.js:20
#, python-format
msgid "Graph"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:699
-#: code:addons/web/static/src/xml/base.xml:1196
+#: code:addons/web/static/src/js/chrome/search_inputs.js:717
+#: code:addons/web/static/src/xml/base.xml:1051
#, python-format
msgid "Group By"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:674
+#: code:addons/web/static/src/js/chrome/search_inputs.js:692
#, python-format
msgid "Group by: %s"
msgstr ""
@@ -1133,91 +1214,99 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/priority.js:50
-#, python-format
-msgid "High"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:167
+#: code:addons/web/static/src/xml/base.xml:166
#, python-format
msgid "ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1322
+#: code:addons/web/static/src/js/fields/basic_fields.js:1115
#, python-format
msgid "Image"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1105
#, python-format
msgid "Import-Compatible Export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:694
+#: code:addons/web/static/src/js/fields/basic_fields.js:1480
#, python-format
msgid "Inactive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:209
-#: code:addons/web/static/src/js/views/graph_widget.js:217
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:205
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:213
#, python-format
msgid "Invalid data"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:658
-#: code:addons/web/controllers/main.py:672
+#: code:addons/web/controllers/main.py:676
+#: code:addons/web/controllers/main.py:690
#, python-format
-msgid "Invalid database name. Only alphanumerical characters and underscore are allowed."
+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:681
+#: code:addons/web/static/src/xml/base.xml:538
#, python-format
msgid "Invalid domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:808
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:392
+#: code:addons/web/static/src/xml/base.xml:669
#, python-format
msgid "Invalid field chain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:184
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:68
+#, python-format
+msgid "Invalid mode for chart"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/widgets/debug_manager.js:194
#, python-format
msgid "JS Tests"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:769
+#. openerp-web
+#: code:addons/web/static/src/js/views/kanban/kanban_view.js:15
+#, python-format
+msgid "Kanban"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:787
#, python-format
msgid "Languages"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:191
+#: code:addons/web/static/src/xml/base.xml:190
#, python-format
msgid "Latest Modification Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:187
+#: code:addons/web/static/src/xml/base.xml:186
#, python-format
msgid "Latest Modification by:"
msgstr ""
@@ -1231,47 +1320,44 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:548
+#: code:addons/web/static/src/xml/base.xml:448
#, python-format
msgid "Line Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:59
+#: code:addons/web/static/src/js/views/list/list_view.js:21
#, python-format
msgid "List"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/loading.js:47
+#: code:addons/web/static/src/xml/kanban.xml:41
#, python-format
-msgid "Loading"
+msgid "Load more... ("
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/loading.js:45
+#: code:addons/web/static/src/js/chrome/loading.js:58
#, python-format
-msgid "Loading (%d)"
+msgid "Loading"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:13
+#: code:addons/web/static/src/js/chrome/loading.js:56
#, python-format
-msgid "Loading..."
+msgid "Loading (%d)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:1028
+#: code:addons/web/static/src/js/core/misc.js:13
#, python-format
-msgid "Local evaluation failure\n"
-"%s\n"
-"\n"
-"%s"
+msgid "Loading..."
msgstr ""
#. module: web
@@ -1281,21 +1367,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1428
+#: code:addons/web/static/src/xml/base.xml:1255
#, python-format
msgid "Log out"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/priority.js:49
-#, python-format
-msgid "Low"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:452
+#: code:addons/web/static/src/js/chrome/search_inputs.js:457
#, python-format
msgid "M2O search fields do not currently handle multiple default values"
msgstr ""
@@ -1307,7 +1386,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:243
+#: code:addons/web/static/src/js/widgets/debug_manager.js:258
#: code:addons/web/static/src/xml/base.xml:130
#, python-format
msgid "Manage Filters"
@@ -1315,92 +1394,95 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:715
+#: code:addons/web/static/src/xml/base.xml:571
#, python-format
msgid "Match"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:722
+#: code:addons/web/static/src/xml/base.xml:578
#, python-format
msgid "Match records with"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:720
+#: code:addons/web/static/src/xml/base.xml:576
#, python-format
msgid "Match records with the following rule:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:19
+#: code:addons/web/static/src/js/core/misc.js:19
#, python-format
msgid "Maybe you should consider reloading the application by pressing F5..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:535
-#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:435
+#: code:addons/web/static/src/xml/base.xml:462
#, python-format
msgid "Measures"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:323
+#: code:addons/web/static/src/js/widgets/debug_manager.js:342
#, python-format
msgid "Metadata (%s)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:116
+#: code:addons/web/static/src/xml/base_common.xml:131
#, python-format
msgid "Method:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:16
+#: code:addons/web/static/src/js/services/crash_manager.js:16
#, python-format
msgid "Missing Record"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1440
+#: code:addons/web/static/src/xml/base.xml:1267
#, python-format
msgid "Mobile support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:234
+#: code:addons/web/static/src/xml/base.xml:233
#, python-format
msgid "Modified by :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:67
+#: code:addons/web/static/src/xml/base_common.xml:69
+#: code:addons/web/static/src/xml/base_common.xml:118
#, python-format
msgid "Modifiers:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:593
+#: code:addons/web/static/src/xml/base.xml:490
+#: code:addons/web/static/src/xml/web_calendar.xml:73
#, python-format
msgid "Month"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:948
+#: code:addons/web/static/src/js/views/form/form_renderer.js:290
+#: code:addons/web/static/src/xml/base.xml:805
#, python-format
msgid "More"
msgstr ""
@@ -1412,84 +1494,84 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1271
+#: code:addons/web/static/src/xml/base.xml:1125
#, python-format
msgid "Move Down"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1270
+#: code:addons/web/static/src/xml/base.xml:1124
#, python-format
msgid "Move Up"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1427
+#: code:addons/web/static/src/xml/base.xml:1254
#, python-format
msgid "My Odoo.com account"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:710
+#: code:addons/web/static/src/xml/base.xml:566
#, python-format
msgid "NONE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1325
+#: code:addons/web/static/src/xml/base.xml:1179
#, python-format
msgid "Name:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:315
+#: code:addons/web/static/src/js/views/basic/basic_model.js:439
#, python-format
msgid "New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:55
+#: code:addons/web/static/src/xml/base.xml:57
#, python-format
msgid "New Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1439
+#: code:addons/web/static/src/xml/base.xml:1266
#, python-format
msgid "New design"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:332
+#: code:addons/web/static/src/js/chrome/search_inputs.js:333
#, python-format
msgid "No"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:175
+#: code:addons/web/static/src/xml/base.xml:174
#, python-format
msgid "No Update:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:96
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:75
#, python-format
msgid "No data available for this chart. 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/xml/base.xml:610
+#: code:addons/web/static/src/xml/base.xml:506
#, python-format
msgid "No data available for this pivot table. Try to add some records, or make sure\n"
" that there is at least one measure and no active filter in the search bar."
@@ -1497,199 +1579,188 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:95
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:74
#, python-format
msgid "No data to display"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:609
+#: code:addons/web/static/src/xml/base.xml:505
#, python-format
msgid "No data to display."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:318
+#: code:addons/web/static/src/js/widgets/debug_manager.js:330
#, python-format
msgid "No metadata available"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:246
-#, python-format
-msgid "No results to show..."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:328
+#: code:addons/web/static/src/js/fields/field_utils.js:243
#, python-format
-msgid "No value found for the field %s for value %s"
+msgid "No records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/utils.js:144
+#: code:addons/web/static/src/js/fields/relational_fields.js:372
#, python-format
-msgid "Node [%s] is not a JSONified XML node"
+msgid "No results to show..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:700
+#: code:addons/web/static/src/xml/base.xml:556
#, python-format
msgid "None"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/priority.js:48
-#, python-format
-msgid "Normal"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:253
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:252
#, python-format
msgid "Not enough data points"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:900
+#: code:addons/web/static/src/xml/base.xml:776
#, python-format
msgid "Not shown in kanban"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:43
+#: code:addons/web/static/src/xml/base_common.xml:45
+#: code:addons/web/static/src/xml/base_common.xml:110
#, python-format
msgid "Object:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:37
+#: code:addons/web/static/src/js/core/dialog.js:37
#, python-format
msgid "Odoo"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/apps.js:149
+#: code:addons/web/static/src/js/apps.js:148
#, python-format
msgid "Odoo Apps will be available soon"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:125
-#: code:addons/web/static/src/js/framework/crash_manager.js:154
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:165
+#: code:addons/web/static/src/js/services/crash_manager.js:154
#, python-format
msgid "Odoo Client Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:52
+#: code:addons/web/static/src/js/fields/upgrade_fields.js:86
#, python-format
msgid "Odoo Enterprise"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:118
+#: code:addons/web/static/src/js/services/crash_manager.js:118
#, python-format
msgid "Odoo Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:58
+#: code:addons/web/static/src/js/services/crash_manager.js:58
#, python-format
msgid "Odoo Session Expired"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:108
-#: code:addons/web/static/src/js/framework/crash_manager.js:195
+#: code:addons/web/static/src/js/services/crash_manager.js:108
+#: code:addons/web/static/src/js/services/crash_manager.js:195
#, python-format
msgid "Odoo Warning"
msgstr ""
#. module: web
-#: model:ir.ui.view,arch_db:web.qunit_suite
-msgid "Odoo Web Tests"
-msgstr ""
-
-#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:716
+#: code:addons/web/static/src/js/fields/basic_fields.js:1497
#, python-format
msgid "Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:41
-#: code:addons/web/static/src/js/framework/dialog.js:159
-#: code:addons/web/static/src/js/framework/dialog.js:177
-#: code:addons/web/static/src/xml/base.xml:1298
+#: code:addons/web/static/src/js/core/dialog.js:41
+#: code:addons/web/static/src/js/core/dialog.js:167
+#: code:addons/web/static/src/js/core/dialog.js:185
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:264
+#: code:addons/web/static/src/xml/base.xml:1152
#, python-format
msgid "Ok"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:51
+#: code:addons/web/static/src/xml/base.xml:53
#, python-format
msgid "Old Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:714
+#: code:addons/web/static/src/js/fields/basic_fields.js:1496
#, python-format
msgid "On"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:75
+#: code:addons/web/static/src/xml/base_common.xml:77
#, python-format
msgid "On change:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/progress_bar.js:79
+#: code:addons/web/static/src/js/fields/basic_fields.js:1698
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
#. module: web
+#: code:addons/web/controllers/main.py:488
+#, 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:473
+#: code:addons/web/static/src/xml/base.xml:373
#, python-format
msgid "Only you"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:707
+#: code:addons/web/static/src/js/fields/basic_fields.js:1489
#, python-format
msgid "Open"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:104
+#: code:addons/web/static/src/xml/base.xml:105
#, python-format
msgid "Open Developer Tools"
msgstr ""
@@ -1703,10 +1774,10 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:154
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:922
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1105
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1322
+#: code:addons/web/static/src/js/fields/relational_fields.js:460
+#: code:addons/web/static/src/js/views/calendar/calendar_controller.js:265
+#: code:addons/web/static/src/js/views/form/form_controller.js:468
+#: code:addons/web/static/src/js/views/form/form_controller.js:487
#, python-format
msgid "Open: "
msgstr ""
@@ -1718,28 +1789,28 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:549
+#: code:addons/web/static/src/xml/base.xml:449
#, python-format
msgid "Pie Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:218
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:214
#, 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_widget.js:210
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:206
#, python-format
msgid "Pie chart cannot mix positive and negative numbers. Try to change your domain to only display positive results"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot_view.js:30
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:23
#, python-format
msgid "Pivot"
msgstr ""
@@ -1753,35 +1824,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1286
+#: code:addons/web/static/src/xml/base.xml:1140
#, 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:1285
+#: code:addons/web/static/src/xml/base.xml:1139
#, python-format
msgid "Please pay attention that all records matching your search filter will be exported. Not only the selected ids."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:441
+#: code:addons/web/static/src/js/widgets/data_export.js:455
#, python-format
msgid "Please select fields to export..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:427
+#: code:addons/web/static/src/js/widgets/data_export.js:441
#, python-format
msgid "Please select fields to save export list..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:36
+#: code:addons/web/static/src/xml/base.xml:38
#, python-format
msgid "Please use the copy button to report the error to your support service."
msgstr ""
@@ -1798,77 +1869,83 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1426
+#: code:addons/web/static/src/xml/base.xml:1253
#, python-format
msgid "Preferences"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:22
+#: code:addons/web/static/src/js/chrome/sidebar.js:33
#, python-format
msgid "Print"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:154
+#: code:addons/web/static/src/xml/base.xml:153
#, python-format
msgid "Print Workflow"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:594
+#: code:addons/web/static/src/xml/base.xml:491
#, python-format
msgid "Quarter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:40
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:454
#, python-format
msgid "Relation not allowed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:79
+#: code:addons/web/static/src/xml/base_common.xml:81
#, python-format
msgid "Relation:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1268
+#: code:addons/web/static/src/xml/base.xml:1122
#, python-format
msgid "Remove"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1269
+#: code:addons/web/static/src/xml/base.xml:1123
#, python-format
msgid "Remove All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:327
+#: code:addons/web/static/src/xml/web_calendar.xml:57
#, python-format
-msgid "Render"
+msgid "Remove this favorite from the list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:701
-#: code:addons/web/static/src/js/views/list_view.js:290
+#: code:addons/web/static/src/js/fields/basic_fields.js:1485
#, python-format
msgid "Restore"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/kanban.xml:26
+#, python-format
+msgid "Restore Records"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:113
#, python-format
msgid "Run JS Tests"
@@ -1876,113 +1953,106 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:874
+#: code:addons/web/static/src/js/views/view_dialogs.js:125
#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:25
-#: code:addons/web/static/src/xml/base.xml:345
-#: code:addons/web/static/src/xml/base.xml:422
-#: code:addons/web/static/src/xml/base.xml:1236
+#: code:addons/web/static/src/xml/base.xml:300
+#: code:addons/web/static/src/xml/base.xml:322
+#: code:addons/web/static/src/xml/base.xml:1090
#, python-format
msgid "Save"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:889
+#: code:addons/web/static/src/js/views/view_dialogs.js:134
#, python-format
msgid "Save & New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1202
+#: code:addons/web/static/src/js/fields/basic_fields.js:1170
#, python-format
msgid "Save As..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1298
+#: code:addons/web/static/src/xml/base.xml:1152
#, python-format
msgid "Save as:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1224
+#: code:addons/web/static/src/xml/base.xml:1078
#, python-format
msgid "Save current search"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1123
-#, python-format
-msgid "Save default"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1275
+#: code:addons/web/static/src/xml/base.xml:1129
#, python-format
msgid "Save fields list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1301
+#: code:addons/web/static/src/xml/base.xml:1155
#, python-format
msgid "Saved exports:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:361
+#: code:addons/web/static/src/js/chrome/search_inputs.js:362
#, python-format
msgid "Search %(field)s at: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:193
-#: code:addons/web/static/src/js/views/search_inputs.js:212
-#: code:addons/web/static/src/js/views/search_inputs.js:403
+#: 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:403
#, python-format
msgid "Search %(field)s for: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:212
+#: code:addons/web/static/src/js/fields/relational_fields.js:333
#, python-format
msgid "Search More..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1069
+#: code:addons/web/static/src/xml/base.xml:922
#, python-format
msgid "Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:281
+#: code:addons/web/static/src/js/fields/relational_fields.js:395
#, python-format
msgid "Search: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:40
+#: code:addons/web/static/src/xml/base.xml:42
#, python-format
msgid "See details"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1055
-#: code:addons/web/static/src/xml/base.xml:997
-#: code:addons/web/static/src/xml/base.xml:998
+#: code:addons/web/static/src/js/views/view_dialogs.js:366
+#: code:addons/web/static/src/xml/base.xml:852
+#: code:addons/web/static/src/xml/base.xml:853
#, python-format
msgid "Select"
msgstr ""
@@ -1994,235 +2064,215 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:685
+#: code:addons/web/static/src/xml/base.xml:542
#, python-format
msgid "Select a model to add a filter."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:164
+#: code:addons/web/static/src/js/widgets/debug_manager.js:169
#, python-format
msgid "Select a view"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:513
+#: code:addons/web/static/src/js/fields/basic_fields.js:2099
#, python-format
msgid "Selected records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:83
+#: code:addons/web/static/src/xml/base_common.xml:85
#, python-format
msgid "Selection:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1120
-#, python-format
-msgid "Set Default"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:151
+#: code:addons/web/static/src/xml/base.xml:150
#, python-format
msgid "Set Defaults"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:941
-#, python-format
-msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1233
+#: code:addons/web/static/src/xml/base.xml:1087
#, python-format
msgid "Share with all users"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/apps.js:149
+#: code:addons/web/static/src/js/apps.js:148
#, python-format
msgid "Showing locally available modules"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:55
+#: code:addons/web/static/src/xml/base_common.xml:57
#, python-format
msgid "Size:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1070
+#: code:addons/web/controllers/main.py:1084
#, python-format
msgid "Something horrible happened"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:107
+#: code:addons/web/static/src/xml/base_common.xml:122
#, python-format
msgid "Special:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:14
+#: code:addons/web/static/src/js/core/misc.js:14
#, python-format
msgid "Still loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:15
+#: code:addons/web/static/src/js/core/misc.js:15
#, python-format
msgid "Still loading...<br />Please be patient."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1424
+#: code:addons/web/static/src/xml/web_calendar.xml:80
+#, python-format
+msgid "Summary:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
#, python-format
msgid "Support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:715
+#: code:addons/web/static/src/js/fields/basic_fields.js:1498
#, python-format
msgid "Switch Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:717
+#: code:addons/web/static/src/js/fields/basic_fields.js:1499
#, python-format
msgid "Switch On"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:264
+#: code:addons/web/static/src/js/widgets/domain_selector.js:548
#, python-format
msgid "Syntax error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:18
+#: code:addons/web/static/src/js/core/misc.js:18
#, python-format
msgid "Take a minute to get a coffee,<br />because it's loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:132
+#: code:addons/web/static/src/xml/base.xml:131
#, python-format
msgid "Technical Translation"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/domain_selector.js:264
+#: code:addons/web/static/src/js/widgets/domain_selector.js:502
+#: code:addons/web/static/src/js/widgets/domain_selector.js:548
#, python-format
msgid "The domain you entered is not properly formed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1202
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:393
#, python-format
-msgid "The field is empty, there's nothing to save !"
+msgid "The field chain is not valid. Did you maybe use a non-existing field name or followed a non-relational field?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:882
+#: code:addons/web/static/src/js/fields/basic_fields.js:1170
#, python-format
-msgid "The following fields are invalid:"
+msgid "The field is empty, there's nothing to save !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view_editable.js:123
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:391
#, python-format
-msgid "The line has been modified, your changes will be discarded. Are you sure you want to discard the changes ?"
+msgid "The following fields are invalid:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:756
+#: code:addons/web/controllers/main.py:774
#, python-format
msgid "The new password and its confirmation must be identical."
msgstr ""
#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1124
-#, python-format
-msgid "The o2m record must be saved before an action can be used"
-msgstr ""
-
-#. module: web
-#: code:addons/web/controllers/main.py:761
+#: code:addons/web/controllers/main.py:779
#, python-format
msgid "The old password you provided is incorrect, your password was not changed."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:301
-#, python-format
-msgid "The record could not be found in the database."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:751
+#: code:addons/web/static/src/js/views/basic/basic_controller.js:77
#, python-format
-msgid "The record has been modified, your changes will be discarded. Are you sure you want to leave this page ?"
+msgid "The record has been modified, your changes will be discarded. Are you sure you want to ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1164
+#: code:addons/web/static/src/js/fields/basic_fields.js:1013
#, python-format
msgid "The selected file exceed the maximum file size of %s."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1581
+#: code:addons/web/static/src/js/fields/relational_fields.js:1200
#, python-format
msgid "The type of the field '%s' must be a many2many field with a relation to 'ir.attachment' model."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1185
+#: code:addons/web/static/src/js/fields/basic_fields.js:1034
#, python-format
msgid "There was a problem while uploading your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:249
+#: code:addons/web/static/src/js/chrome/search_menus.js:250
#, python-format
msgid "This filter is global and will be removed for everybody if you continue."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1242
+#: code:addons/web/static/src/xml/base.xml:1096
#, 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."
@@ -2230,13 +2280,20 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:929
+#: code:addons/web/static/src/js/fields/special_fields.js:93
#, 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."
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/xml/web_calendar.xml:67
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base.xml:117
#, python-format
msgid "Toggle Timelines"
@@ -2244,178 +2301,148 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot_view.js:543
-#: code:addons/web/static/src/js/views/pivot_view.js:572
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:447
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:557
#, python-format
msgid "Total"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:127
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:167
#, python-format
msgid "Traceback:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/tree_view.js:18
+#: code:addons/web/static/src/js/fields/field_utils.js:44
#, python-format
-msgid "Tree"
+msgid "True"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:221
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:261
#, python-format
msgid "Trying to reconnect..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:47
+#: code:addons/web/static/src/xml/base_common.xml:49
#, python-format
msgid "Type:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:80
-#: code:addons/web/static/src/js/views/list_view.js:1389
-#: code:addons/web/static/src/js/views/list_view.js:1395
-#: code:addons/web/static/src/js/views/list_view.js:1413
-#: code:addons/web/static/src/js/views/pivot_view.js:525
+#: code:addons/web/static/src/js/views/list/list_controller.js:131
#, python-format
-msgid "Undefined"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:617
-#, python-format
-msgid "Unhandled widget"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:868
-#, python-format
-msgid "Unknown"
+msgid "Unarchive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1077
+#: code:addons/web/static/src/js/views/graph/graph_model.js:172
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:64
+#: code:addons/web/static/src/js/views/kanban/kanban_column.js:67
+#: code:addons/web/static/src/js/views/list/list_renderer.js:379
+#: code:addons/web/static/src/js/views/list/list_renderer.js:382
+#: code:addons/web/static/src/js/views/pivot/pivot_model.js:660
#, python-format
-msgid "Unknown field %s in domain %s"
+msgid "Undefined"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1096
+#: code:addons/web/static/src/xml/base.xml:512
#, python-format
-msgid "Unknown m2m command %s"
+msgid "Unhandled widget"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:992
+#: code:addons/web/static/src/js/core/pyeval.js:1001
#, python-format
msgid "Unknown nonliteral type "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1069
-#, python-format
-msgid "Unknown operator %s in domain %s"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1132
+#: code:addons/web/static/src/js/_deprecated/data.js:736
#, python-format
msgid "Unnamed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1115
+#: code:addons/web/static/src/js/views/pivot/pivot_view.js:95
#, python-format
-msgid "Unsupported operator %s in domain %s"
+msgid "Untitled"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1411
+#: code:addons/web/static/src/xml/base.xml:1238
#, python-format
msgid "Update translations"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:35
+#: code:addons/web/static/src/js/fields/upgrade_fields.js:69
#, python-format
msgid "Upgrade now"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1441
+#: code:addons/web/static/src/xml/base.xml:1268
#, python-format
msgid "Upgrade to future versions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:997
+#: code:addons/web/static/src/xml/base.xml:852
#, python-format
msgid "Upload your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1641
-#: code:addons/web/static/src/js/widgets/sidebar.js:175
+#: code:addons/web/static/src/js/fields/relational_fields.js:1358
#, python-format
msgid "Uploading Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:201
-#: code:addons/web/static/src/xml/base.xml:971
-#: code:addons/web/static/src/xml/base.xml:1001
-#: code:addons/web/static/src/xml/base.xml:1058
+#: code:addons/web/static/src/xml/base.xml:825
+#: code:addons/web/static/src/xml/base.xml:856
+#: code:addons/web/static/src/xml/base.xml:911
#, python-format
msgid "Uploading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1230
+#: code:addons/web/static/src/xml/base.xml:1084
#, python-format
msgid "Use by default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:17
+#: code:addons/web/static/src/js/services/crash_manager.js:17
#, python-format
msgid "Validation Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/priority.js:51
-#, python-format
-msgid "Very High"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1940
-#: code:addons/web/static/src/xml/base.xml:159
+#: code:addons/web/static/src/xml/base.xml:158
#, python-format
msgid "View"
msgstr ""
@@ -2429,185 +2456,173 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:153
+#: code:addons/web/static/src/xml/base.xml:152
#, python-format
msgid "View Metadata"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:741
+#: 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:80
#, python-format
-msgid "View type '%s' is not supported in X2Many."
+msgid "Warning"
msgstr ""
#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:13
-#: code:addons/web/static/src/js/framework/crash_manager.js:14
-#: code:addons/web/static/src/js/views/form_view.js:756
-#: code:addons/web/static/src/js/views/list_view.js:677
-#: code:addons/web/static/src/js/widgets/sidebar.js:132
-#, python-format
-msgid "Warning"
+#: model:ir.ui.view,arch_db:web.benchmark_suite
+msgid "Web Benchmarks"
msgstr ""
#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:592
-#, python-format
-msgid "Week"
+#: model:ir.ui.view,arch_db:web.qunit_suite
+msgid "Web Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1303
+#: code:addons/web/static/src/xml/base.xml:489
+#: code:addons/web/static/src/xml/web_calendar.xml:72
#, python-format
-msgid "Widget type '%s' is not implemented"
+msgid "Week"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:51
+#: code:addons/web/static/src/xml/base_common.xml:53
#, python-format
msgid "Widget:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:477
+#: code:addons/web/controllers/main.py:485
#, python-format
msgid "Wrong login/password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/progress_bar.js:79
+#: code:addons/web/static/src/js/fields/basic_fields.js:1698
#, python-format
msgid "Wrong value entered!"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:171
+#: code:addons/web/static/src/xml/base.xml:170
#, python-format
msgid "XML ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:595
+#: code:addons/web/static/src/xml/base.xml:492
#, python-format
msgid "Year"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:331
-#: code:addons/web/static/src/xml/base_common.xml:71
+#: code:addons/web/static/src/js/chrome/search_inputs.js:332
+#: code:addons/web/static/src/xml/base_common.xml:73
#, python-format
msgid "Yes"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/abstract_web_client.js:230
+#: code:addons/web/static/src/js/chrome/abstract_web_client.js:270
#, python-format
msgid "You are back online"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:48
+#: code:addons/web/static/src/js/fields/relational_fields.js:72
#, python-format
msgid "You are creating a new %s, are you sure it does not exist yet?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/model_field_selector.js:40
+#: code:addons/web/static/src/js/widgets/model_field_selector.js:454
#, python-format
msgid "You cannot follow relations for this field chain construction"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:754
+#: code:addons/web/controllers/main.py:772
#, python-format
msgid "You cannot leave any password empty."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1409
+#: code:addons/web/static/src/xml/base.xml:1236
#, python-format
msgid "You have updated"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:17
+#: code:addons/web/static/src/js/core/misc.js:17
#, python-format
msgid "You may not believe it,<br />but the application is actually loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:132
+#: code:addons/web/static/src/js/services/crash_manager.js:58
#, python-format
-msgid "You must choose at least one record."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:677
-#, python-format
-msgid "You must select at least one record."
+msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:58
+#: code:addons/web/static/src/js/views/kanban/kanban_record.js:196
#, python-format
-msgid "Your Odoo session expired. Please refresh the current web page."
+msgid "[No widget %s]"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:102
+#: code:addons/web/static/src/js/core/translation.js:102
#, python-format
msgid "a day ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:98
+#: code:addons/web/static/src/js/core/translation.js:98
#, python-format
msgid "about a minute ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:104
+#: code:addons/web/static/src/js/core/translation.js:104
#, python-format
msgid "about a month ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:106
+#: code:addons/web/static/src/js/core/translation.js:106
#, python-format
msgid "about a year ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:100
+#: code:addons/web/static/src/js/core/translation.js:100
#, python-format
msgid "about an hour ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:715
+#: code:addons/web/static/src/xml/base.xml:571
#, python-format
msgid "all records"
msgstr ""
@@ -2621,7 +2636,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:162
+#: code:addons/web/static/src/js/chrome/search_filters.js:163
#: code:addons/web/static/src/js/widgets/domain_selector.js:23
#, python-format
msgid "contains"
@@ -2629,25 +2644,23 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:163
+#: code:addons/web/static/src/js/chrome/search_filters.js:164
#, python-format
msgid "doesn't contain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:261
-#: code:addons/web/static/src/js/views/search_filters.js:290
-#: code:addons/web/static/src/js/widgets/domain_selector.js:19
+#: code:addons/web/static/src/js/chrome/search_filters.js:263
+#: code:addons/web/static/src/js/chrome/search_filters.js:292
#, python-format
msgid "greater than"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:263
-#: code:addons/web/static/src/js/views/search_filters.js:292
-#: code:addons/web/static/src/js/widgets/domain_selector.js:21
+#: code:addons/web/static/src/js/chrome/search_filters.js:265
+#: code:addons/web/static/src/js/chrome/search_filters.js:294
#, python-format
msgid "greater than or equal to"
msgstr ""
@@ -2661,79 +2674,77 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:282
-#: code:addons/web/static/src/js/views/search_filters.js:317
-#: code:addons/web/static/src/js/widgets/domain_selector.js:503
-#: code:addons/web/static/src/xml/base.xml:797
+#: code:addons/web/static/src/js/chrome/search_filters.js:284
+#: code:addons/web/static/src/js/chrome/search_filters.js:319
+#: code:addons/web/static/src/js/widgets/domain_selector.js:828
+#: code:addons/web/static/src/xml/base.xml:659
#, python-format
msgid "is"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:182
+#: code:addons/web/static/src/js/chrome/search_filters.js:183
#, python-format
msgid "is after"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:183
+#: code:addons/web/static/src/js/chrome/search_filters.js:184
#, python-format
msgid "is before"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:184
+#: code:addons/web/static/src/js/chrome/search_filters.js:185
#, python-format
msgid "is between"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:164
-#: code:addons/web/static/src/js/views/search_filters.js:180
-#: code:addons/web/static/src/js/views/search_filters.js:259
-#: code:addons/web/static/src/js/views/search_filters.js:288
-#: code:addons/web/static/src/js/widgets/domain_selector.js:17
+#: 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:261
+#: code:addons/web/static/src/js/chrome/search_filters.js:290
#, python-format
msgid "is equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:336
+#: code:addons/web/static/src/js/chrome/search_filters.js:338
#, python-format
msgid "is false"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:318
-#: code:addons/web/static/src/js/widgets/domain_selector.js:504
+#: code:addons/web/static/src/js/chrome/search_filters.js:320
+#: code:addons/web/static/src/js/widgets/domain_selector.js:829
#, python-format
msgid "is not"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:165
-#: code:addons/web/static/src/js/views/search_filters.js:181
-#: code:addons/web/static/src/js/views/search_filters.js:260
-#: code:addons/web/static/src/js/views/search_filters.js:289
-#: code:addons/web/static/src/js/widgets/domain_selector.js:18
+#: 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:262
+#: code:addons/web/static/src/js/chrome/search_filters.js:291
#, python-format
msgid "is not equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:167
-#: code:addons/web/static/src/js/views/search_filters.js:186
-#: code:addons/web/static/src/js/views/search_filters.js:266
-#: code:addons/web/static/src/js/views/search_filters.js:295
-#: code:addons/web/static/src/js/views/search_filters.js:320
+#: 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:268
+#: code:addons/web/static/src/js/chrome/search_filters.js:297
+#: code:addons/web/static/src/js/chrome/search_filters.js:322
#: code:addons/web/static/src/js/widgets/domain_selector.js:37
#, python-format
msgid "is not set"
@@ -2741,11 +2752,11 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:166
-#: code:addons/web/static/src/js/views/search_filters.js:185
-#: code:addons/web/static/src/js/views/search_filters.js:265
-#: code:addons/web/static/src/js/views/search_filters.js:294
-#: code:addons/web/static/src/js/views/search_filters.js:319
+#: 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:267
+#: code:addons/web/static/src/js/chrome/search_filters.js:296
+#: code:addons/web/static/src/js/chrome/search_filters.js:321
#: code:addons/web/static/src/js/widgets/domain_selector.js:36
#, python-format
msgid "is set"
@@ -2753,60 +2764,59 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:335
+#: code:addons/web/static/src/js/chrome/search_filters.js:337
#, python-format
msgid "is true"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/utils.js:336
+#: code:addons/web/static/src/js/core/utils.js:97
#, python-format
msgid "kMGTPE"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:262
-#: code:addons/web/static/src/js/views/search_filters.js:291
-#: code:addons/web/static/src/js/widgets/domain_selector.js:20
+#: code:addons/web/static/src/js/chrome/search_filters.js:264
+#: code:addons/web/static/src/js/chrome/search_filters.js:293
#, python-format
msgid "less than"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/translation.js:97
+#: code:addons/web/static/src/js/core/translation.js:97
#, python-format
msgid "less than a minute ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:264
-#: code:addons/web/static/src/js/views/search_filters.js:293
-#: code:addons/web/static/src/js/widgets/domain_selector.js:22
+#: code:addons/web/static/src/js/chrome/search_filters.js:266
+#: code:addons/web/static/src/js/chrome/search_filters.js:295
#, python-format
msgid "less than or equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/js/widgets/domain_selector.js:18
+#: code:addons/web/static/src/xml/base.xml:661
#, python-format
msgid "not"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:231
+#: code:addons/web/static/src/js/chrome/search_inputs.js:232
#, python-format
msgid "not a valid integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:246
+#: code:addons/web/static/src/js/chrome/search_inputs.js:247
#, python-format
msgid "not a valid number"
msgstr ""
@@ -2827,22 +2837,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:724
+#: code:addons/web/static/src/xml/base.xml:580
#, python-format
msgid "of the following rules:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:736
+#: code:addons/web/static/src/xml/base.xml:595
#, python-format
msgid "of:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:790
-#: code:addons/web/static/src/xml/base.xml:1164
+#: code:addons/web/static/src/xml/base.xml:652
+#: code:addons/web/static/src/xml/base.xml:1019
#, python-format
msgid "or"
msgstr ""
@@ -2856,14 +2866,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:679
+#: code:addons/web/static/src/xml/base.xml:536
#, python-format
msgid "record(s)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:799
+#: 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:661
#, python-format
msgid "set"
msgstr ""
diff --git a/addons/web_diagram/i18n/web_diagram.pot b/addons/web_diagram/i18n/web_diagram.pot
index d20293bc525..e043bdfb6d6 100644
--- a/addons/web_diagram/i18n/web_diagram.pot
+++ b/addons/web_diagram/i18n/web_diagram.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,55 +17,43 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:237
-#: code:addons/web_diagram/static/src/js/diagram.js:262
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:73
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:160
#, python-format
msgid "Activity"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:267
-#: code:addons/web_diagram/static/src/js/diagram.js:308
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:192
#, python-format
-msgid "Create:"
+msgid "Are you sure you want to remove this node ? This will remove its connected transitions as well."
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:208
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:172
#, python-format
-msgid "Deleting this node cannot be undone.\n"
-"It will also delete all connected transitions.\n"
-"\n"
-"Are you sure ?"
+msgid "Are you sure you want to remove this transition?"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:226
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:73
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:110
#, python-format
-msgid "Deleting this transition cannot be undone.\n"
-"\n"
-"Are you sure ?"
+msgid "Create:"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:19
+#: code:addons/web_diagram/static/src/js/diagram_view.js:16
#, python-format
msgid "Diagram"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:112
-#, python-format
-msgid "New"
-msgstr ""
-
-#. module: web_diagram
-#. openerp-web
#: code:addons/web_diagram/static/src/xml/base_diagram.xml:5
#, python-format
msgid "New Node"
@@ -73,16 +61,16 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:242
-#: code:addons/web_diagram/static/src/js/diagram.js:292
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:143
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:160
#, python-format
-msgid "Open: "
+msgid "Open:"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:287
-#: code:addons/web_diagram/static/src/js/diagram.js:303
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:110
+#: code:addons/web_diagram/static/src/js/diagram_controller.js:143
#, python-format
msgid "Transition"
msgstr ""
diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot
index 61380192763..3dcdc820bfa 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,18 @@ msgid "Active"
msgstr ""
#. module: website_customer
-#: code:addons/website_customer/controllers/main.py:64
+#: code:addons/website_customer/controllers/main.py:80
#, python-format
msgid "All Countries"
msgstr ""
#. module: website_customer
+#: code:addons/website_customer/controllers/main.py:61
+#, python-format
+msgid "All Sectors of Activity"
+msgstr ""
+
+#. module: website_customer
#: model:ir.model.fields,help:website_customer.field_res_partner_tag_classname
msgid "Bootstrap class to customize the color"
msgstr ""
@@ -140,6 +146,11 @@ msgid "References by Country"
msgstr ""
#. module: website_customer
+#: model:ir.ui.view,arch_db:website_customer.opt_industry_list
+msgid "References by Sectors of Activity"
+msgstr ""
+
+#. module: website_customer
#: model:ir.ui.view,arch_db:website_customer.opt_tag_list
msgid "References by Tag"
msgstr ""
@@ -169,6 +180,7 @@ 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"
msgstr ""
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 8598ee5695e..6d9a61c6836 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:47+0000\n"
-"PO-Revision-Date: 2017-04-18 14:47+0000\n"
+"POT-Creation-Date: 2017-07-25 10:05+0000\n"
+"PO-Revision-Date: 2017-07-25 10:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,26 @@ msgid "(Free)"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<b>End of Registration</b>"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<b>Price</b>"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<b>Quantity</b>"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<b>Ticket Type</b>"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.country_events_list
msgid "<b>Upcoming Events</b>"
msgstr ""
@@ -32,13 +52,14 @@ msgid "<br/>\n"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "<em>Configure and Launch Event Registration</em>"
+#: model:ir.ui.view,arch_db:website_event.event_description_full
+msgid "<i class=\"fa fa-clock-o\"/> From"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.event_description_full
-msgid "<i class=\"fa fa-clock-o\"/> From"
+#: 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>"
msgstr ""
#. module: website_event
@@ -58,6 +79,25 @@ msgid "<span class=\"oe_snippet_thumbnail_title\">Local Events</span>"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.ticket
+msgid "<span itemprop=\"availability\" content=\"http://schema.org/SoldOut\">\n"
+" Sold Out\n"
+" </span>"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<span itemprop=\"name\">Event Registration</span>"
+msgstr ""
+
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "<span itemprop=\"price\" content=\"0\">\n"
+" Free\n"
+" </span>"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_location
msgid "<span>Online Events</span>"
msgstr ""
@@ -93,6 +133,11 @@ msgid "<strong>Phone</strong> <span class=\"text-muted\">(Optional)</span>"
msgstr ""
#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.ticket
+msgid "<strong>Ticket Type:</strong>"
+msgstr ""
+
+#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "<strong>Use this tag:</strong>"
msgstr ""
@@ -208,7 +253,7 @@ msgid "Edit Badges"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
+#: model:ir.ui.view,arch_db:website_event.ticket
msgid "End of Registration"
msgstr ""
@@ -243,11 +288,6 @@ msgid "Event Menu"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "Event Registration"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.404
msgid "Event not found!"
msgstr ""
@@ -302,12 +342,8 @@ msgid "Find out what people see and say about this event,\n"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "Free"
-msgstr ""
-
-#. module: website_event
#: code:addons/website_event/models/event.py:63
+#: code:addons/website_event/models/event.py:70
#, python-format
msgid "Introduction"
msgstr ""
@@ -318,7 +354,8 @@ msgid "Is Participating"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:64
+#: code:addons/website_event/models/event.py:63
+#: code:addons/website_event/models/event.py:71
#, python-format
msgid "Location"
msgstr ""
@@ -335,7 +372,7 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/controllers/main.py:185
+#: code:addons/website_event/controllers/main.py:182
#: code:addons/website_event/static/src/js/website_event.editor.js:14
#: model:ir.ui.view,arch_db:website_event.content_new_event
#, python-format
@@ -420,12 +457,12 @@ msgid "Photos of Past Events"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
+#: model:ir.ui.view,arch_db:website_event.ticket
msgid "Price"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
+#: model:ir.ui.view,arch_db:website_event.ticket
msgid "Quantity"
msgstr ""
@@ -440,7 +477,8 @@ msgid "Reference"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:65
+#: code:addons/website_event/models/event.py:63
+#: code:addons/website_event/models/event.py:72
#, python-format
msgid "Register"
msgstr ""
@@ -471,11 +509,6 @@ msgid "Social Stream"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "Sold Out"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.404
msgid "Sorry, the requested event is not available anymore."
msgstr ""
@@ -493,11 +526,6 @@ msgid "This month"
msgstr ""
#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "Ticket Type"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_attendee_details
msgid "Ticket Type #"
msgstr ""
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index 0aab7417a55..e4dfe644f77 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 10.saas~14\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-15 09:50+0000\n"
-"PO-Revision-Date: 2017-02-15 09:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,27 +21,85 @@ msgid "$15k"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "1/5"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "10 / 40 people"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "2/5"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "3 months"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "3/5"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "4/5"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "5/5"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "50% YoY"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "<i class=\"fa fa-bolt\"/> Bolts"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "<i class=\"fa fa-heart\"/> Hearts"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "<i class=\"fa fa-star\"/> Stars"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "<i class=\"fa fa-tasks\"/> Bar"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "<span class=\"btn btn-primary btn-lg o_website_form_send\">Submit</span>\n"
" <span id=\"o_website_form_result\"/>"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+msgid "<span>\n"
+" We usually reply between one and three days.<br/>\n"
+" Feel free to contact him/her if you have further questions.\n"
+" </span>"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+msgid "<span>In the meantime</span>"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "<strong>Challenges</strong>"
msgstr ""
@@ -122,6 +180,11 @@ msgid "Company Maturity:"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+msgid "Congratulations!"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
msgid "Contact us"
msgstr ""
@@ -188,6 +251,7 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating
msgid "Job Security:"
msgstr ""
@@ -222,6 +286,11 @@ msgid "Large apps scope: CRM, MRP, Accounting, Inventory, HR, Project Mgt, etc."
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
+msgid "Look around on our website."
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "Need More Info?"
msgstr ""
@@ -287,6 +356,16 @@ msgid "Profitable"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "Rating type"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.s_hr_rating_options
+msgid "Rating value"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "Resume"
msgstr ""
@@ -336,11 +415,6 @@ msgid "Team / Company Size:"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
-msgid "Thank you!"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
msgid "The culture"
msgstr ""
@@ -412,8 +486,7 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.thankyou
-msgid "Your job application has been successfully registered,\n"
-" we will get back to you soon."
+msgid "Your application has been sent to:"
msgstr ""
#. module: website_hr_recruitment
diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot
index 3906e660495..0235f03c803 100644
--- a/addons/website_partner/i18n/website_partner.pot
+++ b/addons/website_partner/i18n/website_partner.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,44 @@ msgid "Short Description for List View"
msgstr ""
#. module: website_partner
+#: model:ir.model.fields,help:website_partner.field_res_users_website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_partner
#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_description
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_description
msgid "Website Partner Full Description"
msgstr ""
#. module: website_partner
#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_short_description
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_short_description
msgid "Website Partner Short Description"
msgstr ""
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: website_partner
+#: model:ir.model.fields,field_description:website_partner.field_res_users_website_meta_title
+msgid "Website meta title"
+msgstr ""
+
diff --git a/addons/website_portal/i18n/website_portal.pot b/addons/website_portal/i18n/website_portal.pot
index 8efdd356448..8edcdf00636 100644
--- a/addons/website_portal/i18n/website_portal.pot
+++ b/addons/website_portal/i18n/website_portal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,33 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_portal
+#: model:mail.template,body_html:website_portal.mail_template_data_portal_welcome
+msgid "\n"
+"<p>\n"
+" Dear ${object.user_id.name or ''},\n"
+"</p>\n"
+"<p>\n"
+" You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.\n"
+"</p>\n"
+"<p>\n"
+" Your login account data is:\n"
+"</p>\n"
+"<ul>\n"
+" <li>Username: ${object.user_id.login or ''}</li>\n"
+" <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
+" <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
+"</ul>\n"
+"<p>\n"
+" You can set or change your password via the following url:\n"
+"</p>\n"
+"<ul>\n"
+" <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
+"</ul>\n"
+"<p>\n"
+"${object.wizard_id.welcome_message or ''}"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
" <span class=\"icon-bar\"/>\n"
@@ -28,11 +55,21 @@ msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>"
msgstr ""
#. module: website_portal
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "Apply"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.portal_archive_groups
msgid "Archives"
msgstr ""
#. module: website_portal
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "Cancel"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "Change"
msgstr ""
@@ -54,11 +91,21 @@ msgid "Confirm\n"
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_partner_id
+msgid "Contact"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.details
msgid "Contact Details"
msgstr ""
#. module: website_portal
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "Contacts"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.details
msgid "Country"
msgstr ""
@@ -69,6 +116,18 @@ msgid "Country..."
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_create_uid
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_create_date
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.custom_panel
msgid "Custom Panel"
msgstr ""
@@ -79,17 +138,69 @@ msgid "Details"
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_display_name
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_email
#: model:ir.ui.view,arch_db:website_portal.details
msgid "Email"
msgstr ""
#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:130
+#, python-format
+msgid "Group %s is not a portal"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_id
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_id
+msgid "ID"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_in_portal
+msgid "In Portal"
+msgstr ""
+
+#. module: website_portal
#: code:addons/website_portal/controllers/main.py:118
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_welcome_message
+msgid "Invitation Message"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard___last_update
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_write_uid
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_write_date
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_user_id
+msgid "Login User"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.my_account_link
#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "My Account"
@@ -106,8 +217,50 @@ msgid "Place your content here."
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_portal_id
+msgid "Portal"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.actions.act_window,name:website_portal.partner_wizard_action
+#: model:ir.model,name:website_portal.model_portal_wizard
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "Portal Access Management"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model,name:website_portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.contact
-msgid "Saleman"
+msgid "Salesperson"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "Select which contacts should belong to the portal in the list below.\n"
+" The email address of each selected contact must be valid and unique.\n"
+" If necessary, you can fix any contact's email address directly in the list."
+msgstr ""
+
+#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:106
+#, python-format
+msgid "Several contacts have the same email: "
+msgstr ""
+
+#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:103
+#, python-format
+msgid "Some contacts don't have a valid email: "
+msgstr ""
+
+#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:109
+#, python-format
+msgid "Some contacts have the same email as an existing portal user:"
msgstr ""
#. module: website_portal
@@ -127,11 +280,50 @@ msgid "Street"
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,help:website_portal.field_portal_wizard_portal_id
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: website_portal
+#: model:ir.ui.view,arch_db:website_portal.wizard_view
+msgid "This text is included in the email sent to new portal users."
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,help:website_portal.field_portal_wizard_welcome_message
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:112
+#, python-format
+msgid "To resolve this error, you can: \n"
+"- Correct the emails of the relevant contacts\n"
+"- Grant access only to contacts with unique emails"
+msgstr ""
+
+#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_ids
+msgid "Users"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.details
msgid "VAT Number"
msgstr ""
#. module: website_portal
+#: model:ir.model.fields,field_description:website_portal.field_portal_wizard_user_wizard_id
+msgid "Wizard"
+msgstr ""
+
+#. module: website_portal
+#: code:addons/website_portal/wizard/portal_wizard.py:182
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "Your Details"
msgstr ""
@@ -142,6 +334,11 @@ msgid "Your Name"
msgstr ""
#. module: website_portal
+#: model:mail.template,subject:website_portal.mail_template_data_portal_welcome
+msgid "Your Odoo account at ${user.company_id.name}"
+msgstr ""
+
+#. module: website_portal
#: model:ir.ui.view,arch_db:website_portal.details
msgid "Zip / Postal Code"
msgstr ""
diff --git a/addons/website_portal_purchase/i18n/website_portal_purchase.pot b/addons/website_portal_purchase/i18n/website_portal_purchase.pot
new file mode 100644
index 00000000000..6e5ed69c358
--- /dev/null
+++ b/addons/website_portal_purchase/i18n/website_portal_purchase.pot
@@ -0,0 +1,158 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_portal_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_orders
+msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Subtotal</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Total:</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "<strong>Unit Price</strong>"
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:54
+#, python-format
+msgid "All"
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:56
+#, python-format
+msgid "Cancelled"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.model.fields,help:website_portal_purchase.field_purchase_order_line_product_image
+msgid "Image of the product variant (Big-sized image of product template if false). It is automatically resized as a 1024x1024px image, with aspect ratio preserved."
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:57
+#, python-format
+msgid "Locked"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "My Purchase Orders"
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:45
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:44
+#, python-format
+msgid "Newest"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_orders
+msgid "Order Date"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.model.fields,field_description:website_portal_purchase.field_purchase_order_line_product_image
+msgid "Product Image"
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:55
+#: model:ir.model,name:website_portal_purchase.model_purchase_order
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+#, python-format
+msgid "Purchase Order"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.model,name:website_portal_purchase.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_home_menu_purchase
+msgid "Purchase Orders"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_orders
+msgid "Purchase Orders #"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "Taxes:"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.model.fields,help:website_portal_purchase.field_purchase_order_website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: website_portal_purchase
+#: code:addons/website_portal_purchase/controllers/website_portal.py:46
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_orders
+#, python-format
+msgid "Total"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_order
+msgid "Untaxed Amount:"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.model.fields,field_description:website_portal_purchase.field_purchase_order_website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: website_portal_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_home_purchase
+#: model:ir.ui.view,arch_db:website_portal_purchase.portal_my_purchase_orders
+msgid "Your Purchase Orders"
+msgstr ""
+
diff --git a/addons/website_portal_sale/i18n/website_portal_sale.pot b/addons/website_portal_sale/i18n/website_portal_sale.pot
index 59568ac5d39..5cc1d858aed 100644
--- a/addons/website_portal_sale/i18n/website_portal_sale.pot
+++ b/addons/website_portal_sale/i18n/website_portal_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,13 +31,13 @@ msgid "<span class=\"h3\">Your Invoices</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
-msgid "<span class=\"h3\">Your Orders</span>"
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
+msgid "<span class=\"h3\">Your Quotations</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
-msgid "<span class=\"h3\">Your Quotations</span>"
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
+msgid "<span class=\"h3\">Your Sales Orders</span>"
msgstr ""
#. module: website_portal_sale
@@ -172,19 +172,19 @@ msgid "Awaiting Payment"
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:228
+#: code:addons/website_portal_sale/controllers/main.py:247
#, 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: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:231
+#: code:addons/website_portal_sale/controllers/main.py:250
#, python-format
msgid "Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation."
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:183
+#: code:addons/website_portal_sale/controllers/main.py:184
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
#, python-format
msgid "Due Date"
@@ -206,25 +206,25 @@ msgid "Invoice #"
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:182
+#: code:addons/website_portal_sale/controllers/main.py:183
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
#, python-format
msgid "Invoice Date"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_invoice
msgid "Invoices"
msgstr ""
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.orders_followup
-msgid "My Orders"
+msgid "My Quotations"
msgstr ""
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.orders_followup
-msgid "My Quotations"
+msgid "My Sales Orders"
msgstr ""
#. module: website_portal_sale
@@ -243,8 +243,8 @@ msgid "Order"
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:58
-#: code:addons/website_portal_sale/controllers/main.py:109
+#: code:addons/website_portal_sale/controllers/main.py:56
+#: code:addons/website_portal_sale/controllers/main.py:107
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
#, python-format
@@ -252,11 +252,6 @@ msgid "Order Date"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_sale
-msgid "Orders"
-msgstr ""
-
-#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Pay Now"
msgstr ""
@@ -297,9 +292,9 @@ msgid "Quotations"
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:59
-#: code:addons/website_portal_sale/controllers/main.py:110
-#: code:addons/website_portal_sale/controllers/main.py:184
+#: code:addons/website_portal_sale/controllers/main.py:57
+#: code:addons/website_portal_sale/controllers/main.py:108
+#: code:addons/website_portal_sale/controllers/main.py:185
#, python-format
msgid "Reference"
msgstr ""
@@ -321,7 +316,12 @@ msgid "Sales Order Line"
msgstr ""
#. module: website_portal_sale
-#: code:addons/website_portal_sale/controllers/main.py:185
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_sale
+msgid "Sales Orders"
+msgstr ""
+
+#. module: website_portal_sale
+#: code:addons/website_portal_sale/controllers/main.py:186
#, python-format
msgid "Status"
msgstr ""
@@ -342,11 +342,6 @@ msgid "There are currently no invoices and payments for your account."
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
-msgid "There are currently no invoices and payments."
-msgstr ""
-
-#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "There are currently no orders for your account."
msgstr ""
@@ -362,11 +357,6 @@ msgid "There are currently no quotations for your account."
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
-msgid "There are currently no quotations."
-msgstr ""
-
-#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "Total"
@@ -388,18 +378,18 @@ msgid "Website URL"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
-msgid "Your Invoices"
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_invoice
+msgid "Your Invoices and Payments"
msgstr ""
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
-msgid "Your Orders"
+msgid "Your Quotations"
msgstr ""
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
-msgid "Your Quotations"
+msgid "Your Sales Orders"
msgstr ""
#. module: website_portal_sale
diff --git a/addons/website_project/i18n/website_project.pot b/addons/website_project/i18n/website_project.pot
index 5bfc4aa1b0d..02a2a8fac4f 100644
--- a/addons/website_project/i18n/website_project.pot
+++ b/addons/website_project/i18n/website_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,6 +123,36 @@ msgid "Projects"
msgstr ""
#. module: website_project
+#: code:addons/website_project/controllers/main.py:91
+#, python-format
+msgid "Search <span class=\"nolabel\"> (in Content)</span>"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:95
+#, python-format
+msgid "Search in All"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:93
+#, python-format
+msgid "Search in Customer"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:92
+#, python-format
+msgid "Search in Messages"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:94
+#, python-format
+msgid "Search in Stages"
+msgstr ""
+
+#. module: website_project
#: code:addons/website_project/controllers/main.py:84
#: model:ir.ui.view,arch_db:website_project.my_tasks
#, python-format
@@ -151,16 +181,6 @@ msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_project
-#: model:ir.ui.view,arch_db:website_project.portal_my_home
-msgid "There are currently no projects."
-msgstr ""
-
-#. module: website_project
-#: model:ir.ui.view,arch_db:website_project.portal_my_home
-msgid "There are currently no tasks."
-msgstr ""
-
-#. module: website_project
#: model:ir.ui.view,arch_db:website_project.my_projects
msgid "There are no projects."
msgstr ""
diff --git a/addons/website_project_issue/i18n/website_project_issue.pot b/addons/website_project_issue/i18n/website_project_issue.pot
index ce0fb8732f9..32b591cb843 100644
--- a/addons/website_project_issue/i18n/website_project_issue.pot
+++ b/addons/website_project_issue/i18n/website_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "<strong>Reported by</strong>"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:39
+#: code:addons/website_project_issue/controllers/main.py:38
#, python-format
msgid "All"
msgstr ""
@@ -88,7 +88,7 @@ msgid "Issues"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:36
+#: code:addons/website_project_issue/controllers/main.py:35
#, python-format
msgid "Last Stage Update"
msgstr ""
@@ -104,7 +104,7 @@ msgid "My Issues"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:33
+#: code:addons/website_project_issue/controllers/main.py:32
#, python-format
msgid "Newest"
msgstr ""
@@ -115,7 +115,7 @@ msgid "Project Issue"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:42
+#: code:addons/website_project_issue/controllers/main.py:41
#, python-format
msgid "Search <span class=\"nolabel\"> (in Content)</span>"
msgstr ""
@@ -127,19 +127,25 @@ msgid "Search in All"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:44
+#: code:addons/website_project_issue/controllers/main.py:43
#, python-format
msgid "Search in Customer"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:43
+#: code:addons/website_project_issue/controllers/main.py:42
#, python-format
msgid "Search in Messages"
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:35
+#: code:addons/website_project_issue/controllers/main.py:44
+#, python-format
+msgid "Search in Stages"
+msgstr ""
+
+#. module: website_project_issue
+#: code:addons/website_project_issue/controllers/main.py:34
#: model:ir.ui.view,arch_db:website_project_issue.my_issues
#, python-format
msgid "Stage"
@@ -151,17 +157,12 @@ msgid "The full URL to access the document through the website."
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_my_home
-msgid "There are currently no issues."
-msgstr ""
-
-#. module: website_project_issue
#: model:ir.ui.view,arch_db:website_project_issue.my_issues
msgid "There are no issues."
msgstr ""
#. module: website_project_issue
-#: code:addons/website_project_issue/controllers/main.py:34
+#: code:addons/website_project_issue/controllers/main.py:33
#: model:ir.ui.view,arch_db:website_project_issue.my_issues
#, python-format
msgid "Title"
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 3c28cd87d68..43c48ffdaeb 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:46+0000\n"
-"PO-Revision-Date: 2017-04-18 14:46+0000\n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -220,6 +220,11 @@ msgid "<strong>Total:</strong>"
msgstr ""
#. module: website_quote
+#: model:ir.model.fields,help:website_quote.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 ""
+
+#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "About us"
msgstr ""
@@ -324,11 +329,19 @@ msgid "Description"
msgstr ""
#. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_delivery_carrier_website_description
+msgid "Description for Online Quotations"
+msgstr ""
+
+#. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_delivery_carrier_quote_description
+#: model:ir.model.fields,field_description:website_quote.field_product_product_quote_description
#: model:ir.model.fields,field_description:website_quote.field_product_template_quote_description
msgid "Description for the quote"
msgstr ""
#. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_product_product_website_description
#: model:ir.model.fields,field_description:website_quote.field_product_template_website_description
msgid "Description for the website"
msgstr ""
@@ -409,8 +422,8 @@ msgid "If edit a quotation from the 'Preview' of a quotation, you will\n"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:77
-#: code:addons/website_quote/controllers/main.py:216
+#: code:addons/website_quote/controllers/main.py:80
+#: code:addons/website_quote/controllers/main.py:219
#, python-format
msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
@@ -512,13 +525,13 @@ msgid "Optional Products Lines"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/models/sale_order.py:188
+#: code:addons/website_quote/models/sale_order.py:195
#, python-format
msgid "Order paid by %s. Transaction: %s. Amount: %s."
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:93
+#: code:addons/website_quote/controllers/main.py:96
#, python-format
msgid "Order signed by %s"
msgstr ""
@@ -544,8 +557,8 @@ msgid "Our Service"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:66
-#: code:addons/website_quote/controllers/main.py:209
+#: code:addons/website_quote/controllers/main.py:69
+#: code:addons/website_quote/controllers/main.py:212
#, python-format
msgid "Pay & Confirm"
msgstr ""
@@ -679,7 +692,7 @@ msgid "Quotation Viewed"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:27
+#: code:addons/website_quote/controllers/main.py:29
#, python-format
msgid "Quotation viewed by customer"
msgstr ""
@@ -900,7 +913,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:137
+#: code:addons/website_quote/controllers/main.py:140
#, 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 37b736949aa..cf9c02ab6d0 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 10.saas~15\n"
+"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-18 14:45+0000\n"
-"PO-Revision-Date: 2017-04-18 14:45+0000\n"
+"POT-Creation-Date: 2017-07-25 10:03+0000\n"
+"PO-Revision-Date: 2017-07-25 10:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgid "! Some processing fees will be applied"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "&amp; Shipping"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "&amp;nbsp;"
msgstr ""
@@ -551,6 +556,7 @@ msgid "Abandoned Carts"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_accessory_product_ids
#: model:ir.model.fields,help:website_sale.field_product_product_accessory_product_ids
#: model:ir.model.fields,help:website_sale.field_product_template_accessory_product_ids
msgid "Accessories show up when the customer reviews the cart before paying (cross-sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm figures out a list of accessories based on all the products added to cart."
@@ -562,17 +568,13 @@ msgid "Accessories: screen, mouse"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_accessory_product_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_accessory_product_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_accessory_product_ids
msgid "Accessory Products"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Add a step to request some extra customer data (picking preferences, etc.)"
msgstr ""
@@ -593,6 +595,7 @@ msgid "Address"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_availability
#: model:ir.model.fields,help:website_sale.field_product_product_availability
#: model:ir.model.fields,help:website_sale.field_product_template_availability
msgid "Adds an availability status on the web product page."
@@ -620,6 +623,7 @@ msgid "Allow to use on"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_alternative_product_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_alternative_product_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_alternative_product_ids
msgid "Alternative Products"
@@ -687,12 +691,14 @@ msgid "Attributes and Variants"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_availability
#: model:ir.model.fields,field_description:website_sale.field_product_product_availability
#: model:ir.model.fields,field_description:website_sale.field_product_template_availability
msgid "Availability"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_availability_warning
#: model:ir.model.fields,field_description:website_sale.field_product_product_availability_warning
#: model:ir.model.fields,field_description:website_sale.field_product_template_availability_warning
msgid "Availability Warning"
@@ -719,13 +725,13 @@ msgid "Bill To:"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Billing Address"
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "Billing"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Billing<span class=\"chevron\"/>"
+#: model:ir.ui.view,arch_db:website_sale.checkout
+msgid "Billing Address"
msgstr ""
#. module: website_sale
@@ -770,12 +776,23 @@ msgid "Catalog"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sort
+msgid "Catalog price: decreasing order"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sort
+msgid "Catalog price: increasing order"
+msgstr ""
+
+#. module: website_sale
#: model:ir.actions.act_window,help:website_sale.product_public_category_action
msgid "Categories are used to browse your products through the\n"
" touchscreen interface."
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_public_categ_ids
#: model:ir.model.fields,help:website_sale.field_product_product_public_categ_ids
#: model:ir.model.fields,help:website_sale.field_product_template_public_categ_ids
msgid "Categories can be published on the Shop page (online catalog grid) to help customers find all the items within a category. To publish them, go to the Shop page, hit Customize and turn *Product Categories* on. A product can belong to several categories."
@@ -953,11 +970,6 @@ msgid "Country..."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.reduction_code
-msgid "Coupon Code"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Create your product items"
msgstr ""
@@ -1048,16 +1060,7 @@ msgid "Delivery methods are selectable on the website: the customer pays for shi
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_quote_description
-msgid "Description for the quote"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_website_description
-msgid "Description for the website"
-msgstr ""
-
-#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_website_sequence
#: 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"
@@ -1167,15 +1170,6 @@ msgid "Enter a name for your new product"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_product_split_method
-msgid "Equal : Cost will be equally divided.\n"
-"By Quantity : Cost will be divided according to product's quantity.\n"
-"By Current cost : Cost will be divided according to product's current cost.\n"
-"By Weight : Cost will be divided depending on its weight.\n"
-"By Volume : Cost will be divided depending on its volume."
-msgstr ""
-
-#. module: website_sale
#: code:addons/website_sale/models/product.py:89
#, python-format
msgid "Error ! You cannot create recursive categories."
@@ -1224,11 +1218,6 @@ msgid "Free delivery (see Delivery Strategy section)"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
-msgid "From Website"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:12
#, python-format
@@ -1241,11 +1230,6 @@ msgid "Give us your feedback..."
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_public_category_sequence
msgid "Gives the sequence order when displaying a list of product categories."
msgstr ""
@@ -1261,11 +1245,6 @@ msgid "Go to the Sales module settings page to configure eBay."
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_hs_code
-msgid "HS Code"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_style_html_class
msgid "HTML Classes"
msgstr ""
@@ -1283,7 +1262,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
#: model:ir.ui.view,arch_db:website_sale.reduction_code
-msgid "Have a coupon code? Fill in this field and apply."
+msgid "Have a promo code? Fill in this field and apply."
msgstr ""
#. module: website_sale
@@ -1335,6 +1314,7 @@ msgid "Image Name"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_product_image_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_product_image_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_product_image_ids
#: model:ir.ui.view,arch_db:website_sale.product_template_form_view
@@ -1382,7 +1362,7 @@ msgid "Internal Categories"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:478
+#: code:addons/website_sale/controllers/main.py:484
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
@@ -1414,11 +1394,6 @@ msgid "It's difficult to recommend one over the others. So, simply pick the one
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_landed_cost_ok
-msgid "Landed Costs"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_image___last_update
#: model:ir.model.fields,field_description:website_sale.field_product_public_category___last_update
#: model:ir.model.fields,field_description:website_sale.field_product_style___last_update
@@ -1432,10 +1407,16 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_partner_last_website_so_id
+#: model:ir.model.fields,field_description:website_sale.field_res_users_last_website_so_id
msgid "Last Online Sales Order"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_tx_id
+msgid "Last Transaction"
+msgstr ""
+
+#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_image_write_uid
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_write_uid
#: model:ir.model.fields,field_description:website_sale.field_product_style_write_uid
@@ -1575,7 +1556,7 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/controllers/main.py:975
+#: code:addons/website_sale/controllers/main.py:984
#: code:addons/website_sale/static/src/js/website_sale.editor.js:18
#: model:ir.ui.view,arch_db:website_sale.content_new_product
#, python-format
@@ -1724,8 +1705,8 @@ msgid "Parent Category"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:732
-#: code:addons/website_sale/controllers/main.py:842
+#: code:addons/website_sale/controllers/main.py:741
+#: code:addons/website_sale/controllers/main.py:851
#, python-format
msgid "Pay Now"
msgstr ""
@@ -1767,19 +1748,19 @@ msgid "Payment must be reconciled manually"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:766
+#: code:addons/website_sale/controllers/main.py:775
#, python-format
msgid "Payment transaction (%s) failed : <%s>"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:760
+#: code:addons/website_sale/controllers/main.py:769
#, python-format
msgid "Payment transaction failed (%s)"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:767
+#: code:addons/website_sale/controllers/main.py:776
#, python-format
msgid "Payment transaction failed (Contact Administrator)"
msgstr ""
@@ -1823,19 +1804,19 @@ msgid "Prefered by some customers"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:110
+#: code:addons/website_sale/controllers/backend.py:111
#, python-format
msgid "Previous Month"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:108
+#: code:addons/website_sale/controllers/backend.py:109
#, python-format
msgid "Previous Week"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/backend.py:112
+#: code:addons/website_sale/controllers/backend.py:113
#, python-format
msgid "Previous Year"
msgstr ""
@@ -1847,16 +1828,6 @@ msgid "Price"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sort
-msgid "Catalog price: decreasing order"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.sort
-msgid "Catalog price: increasing order"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_ids
msgid "Price list available for this Ecommerce/Website"
msgstr ""
@@ -1889,11 +1860,6 @@ msgid "Pricing &amp; Discounts"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_purchase_requisition
-msgid "Procurement"
-msgstr ""
-
-#. module: website_sale
#. openerp-web
#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:114
#: model:ir.model,name:website_sale.model_product_product
@@ -1996,6 +1962,11 @@ msgid "Products"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.reduction_code
+msgid "Promo Code"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_sale
msgid "Promote"
msgstr ""
@@ -2079,31 +2050,37 @@ msgstr ""
#. module: website_sale
#: model:ir.model,name:website_sale.model_rating_rating
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_ids
msgid "Rating"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_feedback
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_feedback
msgid "Rating Last Feedback"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_image
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_image
msgid "Rating Last Image"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_last_value
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_value
msgid "Rating Last Value"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_rating_count
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_count
msgid "Rating count"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_rating_last_feedback
#: model:ir.model.fields,help:website_sale.field_product_product_rating_last_feedback
msgid "Reason of the rating"
msgstr ""
@@ -2337,11 +2314,6 @@ msgid "Shipping"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Shipping &amp;"
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_group_delivery_invoice_address
#: model:ir.ui.view,arch_db:website_sale.address
#: model:ir.ui.view,arch_db:website_sale.checkout
@@ -2436,12 +2408,14 @@ msgid "Size"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_size_x
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_size_x
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_size_x
msgid "Size X"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_size_y
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_size_y
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_size_y
msgid "Size Y"
@@ -2471,7 +2445,7 @@ msgid "Some acquirers like Authorize.net and Ingenico can be used as payment gat
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:489
+#: code:addons/website_sale/controllers/main.py:495
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -2492,16 +2466,6 @@ msgid "Sorting by :"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_split_method
-msgid "Split Method"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_product_hs_code
-msgid "Standardized code for international shipping and goods declaration"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Start your online shop by creating 3 products pages.<br/>"
msgstr ""
@@ -2532,6 +2496,7 @@ msgid "Style Name"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_style_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_style_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_style_ids
#: model:ir.ui.view,arch_db:website_sale.website_sale
@@ -2549,6 +2514,7 @@ msgid "Subtotal:"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_alternative_product_ids
#: model:ir.model.fields,help:website_sale.field_product_product_alternative_product_ids
#: model:ir.model.fields,help:website_sale.field_product_template_alternative_product_ids
msgid "Suggest more expensive alternatives to your customers (upsell strategy). Those products show up on the product page."
@@ -2630,6 +2596,7 @@ msgid "The first step is to set up your company's information. This is used in s
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_delivery_carrier_website_url
#: model:ir.model.fields,help:website_sale.field_product_product_website_url
msgid "The full URL to access the document through the website."
msgstr ""
@@ -2698,11 +2665,6 @@ msgid "Total"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_tx_id
-msgid "Transaction"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm
msgid "Transaction processing ..."
msgstr ""
@@ -2769,6 +2731,7 @@ msgid "View Cart ("
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_published
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_published
msgid "Visible in Website"
msgstr ""
@@ -2796,6 +2759,7 @@ msgid "Website Categories"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_message_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_message_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_message_ids
msgid "Website Comments"
@@ -2808,6 +2772,7 @@ msgstr ""
#. module: website_sale
#: model:ir.model,name:website_sale.model_product_public_category
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_public_categ_ids
#: model:ir.model.fields,field_description:website_sale.field_product_product_public_categ_ids
#: model:ir.model.fields,field_description:website_sale.field_product_template_public_categ_ids
msgid "Website Product Category"
@@ -2819,6 +2784,7 @@ msgid "Website Public Categories"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_sequence
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_sequence
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_sequence
msgid "Website Sequence"
@@ -2830,32 +2796,38 @@ msgid "Website Shop"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_url
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_url
msgid "Website URL"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_description
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_keywords
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_meta_title
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_title
msgid "Website meta title"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_price
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_price
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_price
msgid "Website price"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_delivery_carrier_website_public_price
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_public_price
#: model:ir.model.fields,field_description:website_sale.field_product_template_website_public_price
msgid "Website public price"
@@ -3016,11 +2988,6 @@ msgid "items)"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.products
-msgid "pagination form-inline o_website_sale_search"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "product's availability (In Stock, Not Available, etc.)"
msgstr ""
diff --git a/addons/website_sale_comparison/i18n/website_sale_comparison.pot b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
new file mode 100644
index 00000000000..fefedbe944d
--- /dev/null
+++ b/addons/website_sale_comparison/i18n/website_sale_comparison.pot
@@ -0,0 +1,170 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_sale_comparison
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.recommended_product
+msgid "<i class=\"fa fa-exchange\"/> Compare"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
+msgid "<i class=\"fa fa-shopping-cart\"/>&amp;nbsp;Add to Cart"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.recommended_product
+msgid "<span class=\"h3\">Suggested alternatives: </span>"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
+msgid "<strong>Price:</strong>"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_id_11698
+msgid "Category"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_name
+msgid "Category Name"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
+msgid "Comparator"
+msgstr ""
+
+#. module: website_sale_comparison
+#. openerp-web
+#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:8
+#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:20
+#: model:ir.ui.view,arch_db:website_sale_comparison.add_to_compare
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_add_to_compare
+#, python-format
+msgid "Compare"
+msgstr ""
+
+#. module: website_sale_comparison
+#. openerp-web
+#: code:addons/website_sale_comparison/static/src/js/website_sale_comparison.js:44
+#, python-format
+msgid "Compare Products"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_id
+msgid "ID"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model,name:website_sale_comparison.model_product_attribute
+msgid "Product Attribute"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model,name:website_sale_comparison.model_product_attribute_category
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_attribute_category_tree_view
+msgid "Product Attribute Category"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model,name:website_sale_comparison.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_product
+msgid "Remove"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,field_description:website_sale_comparison.field_product_attribute_category_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.model.fields,help:website_sale_comparison.field_product_attribute_category_id_11698
+msgid "Set a category to regroup similar attributes under the same section in the Comparison page of eCommerce"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_compare
+msgid "Shop Comparator"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_attributes_body
+msgid "Specifications for"
+msgstr ""
+
+#. module: website_sale_comparison
+#: code:addons/website_sale_comparison/controllers/main.py:23
+#: code:addons/website_sale_comparison/models/website_sale_comparison.py:30
+#, python-format
+msgid "Uncategorized"
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.actions.act_window,name:website_sale_comparison.product_attribute_category_action
+#: model:ir.ui.menu,name:website_sale_comparison.menu_attribute_category_action
+msgid "Website attribute categories"
+msgstr ""
+
+#. module: website_sale_comparison
+#. openerp-web
+#: code:addons/website_sale_comparison/static/src/xml/comparison.xml:15
+#, python-format
+msgid "You can compare max 4 products."
+msgstr ""
+
+#. module: website_sale_comparison
+#: model:ir.ui.view,arch_db:website_sale_comparison.product_attributes_body
+msgid "or"
+msgstr ""
+
diff --git a/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
new file mode 100644
index 00000000000..e4e9981ef56
--- /dev/null
+++ b/addons/website_sale_wishlist/i18n/website_sale_wishlist.pot
@@ -0,0 +1,160 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_sale_wishlist
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.saas~16\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-25 10:04+0000\n"
+"PO-Revision-Date: 2017-07-25 10:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.header
+msgid "<i class=\"fa fa-heart\"/>\n"
+" Wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "<small><i class=\"fa fa-trash-o\"/> Remove</small>"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_active
+msgid "Active"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "Add <span class=\"hidden-xs\">to Cart</span>"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "Add product to my cart but keep it in my wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.add_to_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_add_to_wishlist
+msgid "Add to Wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_create_date
+msgid "Added Date"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model,name:website_sale_wishlist.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_price_new
+msgid "Current price"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_price_new
+msgid "Current price of this product, using same pricelist, ..."
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_id
+msgid "ID"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "My Wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_partner_id
+msgid "Owner"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_price
+msgid "Price"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_price
+msgid "Price of the product when it has been added in the wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_pricelist_id
+msgid "Pricelist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,help:website_sale_wishlist.field_product_wishlist_pricelist_id
+msgid "Pricelist when added"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_product_id
+msgid "Product"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.ui.view,arch_db:website_sale_wishlist.product_wishlist
+msgid "Shop Wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_product_wishlist_website_id
+msgid "Website"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_res_partner_wishlist_ids
+#: model:ir.model.fields,field_description:website_sale_wishlist.field_res_users_wishlist_ids
+msgid "Wishlist"
+msgstr ""
+
+#. module: website_sale_wishlist
+#: model:ir.model,name:website_sale_wishlist.model_product_wishlist
+msgid "product.wishlist"
+msgstr ""
+
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index d5bd0f2def6..7cc018a6be5 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.saas~16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-28 10:50+0000\n"
-"PO-Revision-Date: 2017-06-28 10:50+0000\n"
+"POT-Creation-Date: 2017-07-25 10:18+0000\n"
+"PO-Revision-Date: 2017-07-25 10:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -2309,10 +2309,6 @@ msgid "\n"
"It will generate a PDF / send emails / set manual actions according to the the different levels \n"
"of recall defined. You can define different policies for different companies. \n"
"\n"
-"Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:\n"
-"------------------------------------------------------------------------------------------------------------------\n"
-" Reporting / Accounting / **Follow-ups Analysis\n"
-"\n"
""
msgstr ""
@@ -4448,8 +4444,8 @@ msgstr ""
#: code:addons/base/ir/ir_filters.py:38
#: code:addons/base/res/res_partner.py:332
#: code:addons/base/res/res_users.py:144
-#: code:addons/base/res/res_users.py:404
-#: code:addons/base/res/res_users.py:406
+#: code:addons/base/res/res_users.py:400
+#: code:addons/base/res/res_users.py:402
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -4465,7 +4461,7 @@ msgid "%y - Year without century [00,99].\""
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1367
+#: code:addons/base/ir/ir_model.py:1394
#, 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 ""
@@ -5362,9 +5358,9 @@ msgid "Administrative divisions of a country. E.g. Fed. State, Departement, Cant
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:887
-#: code:addons/base/ir/ir_model.py:999
-#: code:addons/base/ir/ir_model.py:1497
+#: code:addons/base/ir/ir_model.py:900
+#: code:addons/base/ir/ir_model.py:1012
+#: code:addons/base/ir/ir_model.py:1510
#, python-format
msgid "Administrator access is required to uninstall a module"
msgstr ""
@@ -5555,7 +5551,7 @@ msgid "Appears by default on the top right corner of your printed documents (rep
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:719
+#: code:addons/base/res/res_users.py:716
#: model:ir.model,name:base.model_ir_module_category
#: model:ir.model.fields,field_description:base.field_ir_module_module_application
#: model:ir.model.fields,field_description:base.field_res_groups_category_id
@@ -5580,7 +5576,7 @@ msgid "Apply"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:557
+#: code:addons/base/module/module.py:565
#: 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
@@ -5836,7 +5832,7 @@ msgid "Automatic Installation"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:649
+#: code:addons/base/module/module.py:658
#, python-format
msgid "Automatic install of downloaded Apps is currently disabled."
msgstr ""
@@ -6219,11 +6215,6 @@ msgid "British Indian Ocean Territory"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_6
-msgid "Bronze"
-msgstr ""
-
-#. module: base
#: model:res.country,name:base.bn
msgid "Brunei Darussalam"
msgstr ""
@@ -6339,13 +6330,13 @@ msgid "Can not create Many-To-One records indirectly, import the field separatel
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:540
+#: code:addons/base/module/module.py:548
#, python-format
msgid "Can not upgrade module '%s'. It is not installed."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:662
+#: code:addons/base/ir/ir_model.py:661
#, python-format
msgid "Can only rename one field at a time!"
msgstr ""
@@ -6402,7 +6393,7 @@ msgid "Cannot duplicate configuration!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:560
+#: code:addons/base/ir/ir_model.py:561
#, python-format
msgid "Cannot rename/delete fields that are still present in views:"
msgstr ""
@@ -6482,19 +6473,19 @@ msgid "Change the way addresses are displayed in reports"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:339
+#: code:addons/base/res/res_partner.py:345
#, 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/ir/ir_model.py:649
+#: code:addons/base/ir/ir_model.py:648
#, python-format
msgid "Changing the model of a field is forbidden!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:652
+#: code:addons/base/ir/ir_model.py:651
#, python-format
msgid "Changing the type of a field is not yet supported. Please drop it and create it again!"
msgstr ""
@@ -6862,11 +6853,6 @@ msgid "Company"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_17
-msgid "Company Contact"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_res_company_logo
msgid "Company Logo"
msgstr ""
@@ -6928,11 +6914,6 @@ msgid "Complete Name"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_9
-msgid "Components Buyer"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_fields_compute
msgid "Compute"
msgstr ""
@@ -7053,11 +7034,6 @@ msgid "Construction"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_8
-msgid "Consultancy Services"
-msgstr ""
-
-#. module: base
#: model:ir.model,name:base.model_res_partner
#: model:ir.ui.view,arch_db:base.view_partner_simple_form
#: selection:res.partner,type:0
@@ -7175,7 +7151,7 @@ msgid "Costa Rica - Accounting"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:619
+#: code:addons/base/res/res_partner.py:625
#, python-format
msgid "Couldn't create contact without email address!"
msgstr ""
@@ -7633,7 +7609,7 @@ msgid "Custom Shortcuts"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:359
+#: code:addons/base/ir/ir_model.py:367
#, python-format
msgid "Custom fields must have a name that starts with 'x_' !"
msgstr ""
@@ -7742,7 +7718,7 @@ msgid "Database Structure"
msgstr ""
#. module: base
-#: code:addons/models.py:2675
+#: code:addons/models.py:2674
#, python-format
msgid "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a type incoherence in a previous request"
msgstr ""
@@ -8175,11 +8151,6 @@ msgid "Display format to use for addresses belonging to this country.\n"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_13
-msgid "Distributor"
-msgstr ""
-
-#. module: base
#: model:res.country,name:base.dj
msgid "Djibouti"
msgstr ""
@@ -8195,8 +8166,8 @@ msgid "Document Management"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1140
-#: code:addons/base/ir/ir_model.py:1143
+#: code:addons/base/ir/ir_model.py:1167
+#: code:addons/base/ir/ir_model.py:1170
#, python-format
msgid "Document model"
msgstr ""
@@ -8369,7 +8340,7 @@ msgid "Electronic Accounting for Mexico and Fiscal Reports\n"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:619
+#: code:addons/base/ir/ir_ui_view.py:622
#, python-format
msgid "Element '%s' cannot be located in parent view"
msgstr ""
@@ -8408,7 +8379,6 @@ msgstr ""
#: 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
-#: model:res.partner.category,name:base.res_partner_category_3
msgid "Employee"
msgstr ""
@@ -8485,32 +8455,32 @@ msgid "Eritrea"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:86
+#: code:addons/base/res/res_partner.py:91
#, python-format
msgid "Error ! You can not create recursive tags."
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:342
+#: code:addons/base/res/res_company.py:355
#, python-format
msgid "Error ! You cannot create recursive companies."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:475
+#: code:addons/base/ir/ir_ui_view.py:478
#, python-format
msgid "Error context:\n"
"View `%(view_name)s`"
msgstr ""
#. module: base
-#: code:addons/models.py:956
+#: code:addons/models.py:946
#, python-format
msgid "Error details:"
msgstr ""
#. module: base
-#: code:addons/models.py:969
+#: code:addons/models.py:959
#, python-format
msgid "Error while validating constraint"
msgstr ""
@@ -8870,19 +8840,19 @@ msgid "Field"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:197
+#: code:addons/base/ir/ir_model.py:193
#, python-format
msgid "Field \"Model\" cannot be modified on models."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:201
+#: code:addons/base/ir/ir_model.py:197
#, python-format
msgid "Field \"Transient Model\" cannot be modified on models."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:199
+#: code:addons/base/ir/ir_model.py:195
#, python-format
msgid "Field \"Type\" cannot be modified on models."
msgstr ""
@@ -8914,7 +8884,7 @@ msgid "Field Type"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:911
+#: code:addons/base/ir/ir_ui_view.py:913
#, python-format
msgid "Field `%(field_name)s` does not exist"
msgstr ""
@@ -8948,7 +8918,7 @@ msgid "Fields Description"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:561
+#: code:addons/base/ir/ir_model.py:562
#, python-format
msgid "Fields:"
msgstr ""
@@ -9139,7 +9109,7 @@ msgid "For selection fields, the Selection Options must be given!"
msgstr ""
#. module: base
-#: code:addons/models.py:2813
+#: code:addons/models.py:2812
#, python-format
msgid "For this kind of document, you may only access records you created yourself.\n"
"\n"
@@ -9415,11 +9385,6 @@ msgid "Go to the configuration panel"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_4
-msgid "Gold"
-msgstr ""
-
-#. module: base
#: model:ir.module.module,shortdesc:base.module_google_calendar
msgid "Google Calendar"
msgstr ""
@@ -10051,11 +10016,6 @@ msgid "ISO code"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_7
-msgid "IT Services"
-msgstr ""
-
-#. module: base
#: model:res.partner.industry,name:base.res_partner_industry_J
msgid "IT/Communication"
msgstr ""
@@ -10377,7 +10337,7 @@ msgid "Input View"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:400
+#: code:addons/base/module/module.py:408
#: model:ir.ui.view,arch_db:base.module_form
#: model:ir.ui.view,arch_db:base.module_view_kanban
#, python-format
@@ -10419,13 +10379,13 @@ msgid "Instant Messaging Bus allow you to send messages to users, in live."
msgstr ""
#. module: base
-#: code:addons/models.py:1193
+#: code:addons/models.py:1183
#, python-format
msgid "Insufficient fields for Calendar View!"
msgstr ""
#. module: base
-#: code:addons/models.py:1203
+#: code:addons/models.py:1193
#, python-format
msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay"
msgstr ""
@@ -10522,13 +10482,13 @@ msgid "Introspection report on objects"
msgstr ""
#. module: base
-#: code:addons/models.py:3485
+#: code:addons/models.py:3484
#, 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/res/res_users.py:315
+#: code:addons/base/res/res_users.py:312
#, python-format
msgid "Invalid 'group by' parameter"
msgstr ""
@@ -10558,7 +10518,7 @@ msgid "Invalid model name %r in action definition."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:610
+#: code:addons/base/ir/ir_ui_view.py:613
#, python-format
msgid "Invalid position attribute: '%s'"
msgstr ""
@@ -10570,13 +10530,13 @@ msgid "Invalid prefix or suffix for sequence '%s'"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:323
+#: code:addons/base/res/res_users.py:320
#, python-format
msgid "Invalid search criterion"
msgstr ""
#. module: base
-#: code:addons/base/res/ir_property.py:68
+#: code:addons/base/res/ir_property.py:69
#, python-format
msgid "Invalid type"
msgstr ""
@@ -11477,13 +11437,13 @@ msgid "Madam"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:472
+#: code:addons/base/ir/ir_mail_server.py:476
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:470
+#: code:addons/base/ir/ir_mail_server.py:474
#, python-format
msgid "Mail delivery failed via SMTP server '%s'.\n"
"%s: %s"
@@ -11599,11 +11559,6 @@ msgid "Manual: Launched manually.\n"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_14
-msgid "Manufacturer"
-msgstr ""
-
-#. module: base
#: model:ir.module.category,name:base.module_category_manufacturing
#: model:ir.module.module,shortdesc:base.module_mrp
#: model:res.partner.industry,name:base.res_partner_industry_C
@@ -11863,12 +11818,18 @@ msgid "Missing document(s)"
msgstr ""
#. module: base
-#: code:addons/models.py:5101
+#: code:addons/models.py:5102
#, python-format
msgid "Missing required value for the field '%s' (%s)"
msgstr ""
#. module: base
+#: code:addons/base/ir/ir_ui_view.py:379
+#, python-format
+msgid "Missing view architecture."
+msgstr ""
+
+#. module: base
#: model:res.partner.title,name:base.res_partner_title_mister
msgid "Mister"
msgstr ""
@@ -11918,7 +11879,7 @@ msgid "Model %s does not exist!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:172
+#: code:addons/base/ir/ir_model.py:173
#, python-format
msgid "Model '%s' contains module data and cannot be removed!"
msgstr ""
@@ -11974,8 +11935,8 @@ msgid "Model name of the object to open in the view window"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:749
-#: code:addons/base/ir/ir_ui_view.py:859
+#: code:addons/base/ir/ir_ui_view.py:752
+#: code:addons/base/ir/ir_ui_view.py:865
#, python-format
msgid "Model not found: %(model)s"
msgstr ""
@@ -12352,7 +12313,7 @@ msgid "Niue"
msgstr ""
#. module: base
-#: code:addons/models.py:1283
+#: code:addons/models.py:1272
#, python-format
msgid "No default view of type '%s' could be found !"
msgstr ""
@@ -12363,7 +12324,7 @@ msgid "No gap"
msgstr ""
#. module: base
-#: code:addons/fields.py:2229
+#: code:addons/fields.py:2228
#, python-format
msgid "No inverse field %r found for %r"
msgstr ""
@@ -12578,11 +12539,6 @@ msgid "Odoo will automatically adds some '0' on the left of the 'Next Number' to
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_12
-msgid "Office Supplies"
-msgstr ""
-
-#. module: base
#: model:ir.module.module,description:base.module_payment_ogone
#: model:ir.module.module,shortdesc:base.module_payment_ogone
msgid "Ogone Payment Acquirer"
@@ -12610,19 +12566,19 @@ msgid "On delete property for many2one fields"
msgstr ""
#. module: base
-#: code:addons/models.py:2782
+#: code:addons/models.py:2781
#, 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:3105
+#: code:addons/models.py:3104
#, 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/res/res_partner.py:389
+#: code:addons/base/res/res_partner.py:395
#, python-format
msgid "One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`"
msgstr ""
@@ -12648,7 +12604,7 @@ msgid "Online Proposals"
msgstr ""
#. module: base
-#: code:addons/base/res/res_config.py:516
+#: code:addons/base/res/res_config.py:517
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -12679,7 +12635,7 @@ msgid "Only one currency rate per day allowed!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1154
+#: code:addons/base/ir/ir_model.py:1167
#, python-format
msgid "Only users with the following access level are currently allowed to do that"
msgstr ""
@@ -12753,8 +12709,8 @@ msgid "Original View"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:733
-#: code:addons/base/res/res_users.py:891
+#: code:addons/base/res/res_users.py:730
+#: code:addons/base/res/res_users.py:888
#, python-format
msgid "Other"
msgstr ""
@@ -12961,7 +12917,6 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_res_company_partner_id
#: model:ir.ui.view,arch_db:base.view_partner_address_form
-#: model:res.partner.category,name:base.res_partner_category_0
#: model:res.request.link,name:base.req_link_partner
msgid "Partner"
msgstr ""
@@ -12999,7 +12954,7 @@ msgid "Partners Geolocation"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:762
+#: code:addons/base/res/res_partner.py:768
#, python-format
msgid "Partners: "
msgstr ""
@@ -13176,7 +13131,7 @@ msgid "Plano de contas SNC para Portugal"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1143
+#: code:addons/base/ir/ir_model.py:1170
#, python-format
msgid "Please contact your system administrator if you think this is an error."
msgstr ""
@@ -13193,7 +13148,7 @@ msgid "Please set the Model to Create before choosing values"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:248
+#: code:addons/base/res/res_users.py:249
#, python-format
msgid "Please use the change password wizard (in User Preferences or User menu) to change your own password."
msgstr ""
@@ -13379,7 +13334,7 @@ msgid "Priority"
msgstr ""
#. module: base
-#: code:addons/models.py:107
+#: code:addons/models.py:109
#, python-format
msgid "Private methods (such as %s) cannot be called remotely."
msgstr ""
@@ -13469,7 +13424,7 @@ msgid "Properties"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:644
+#: code:addons/base/ir/ir_model.py:643
#, 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 ""
@@ -13480,11 +13435,6 @@ msgid "Propose to install a theme on website installation"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_2
-msgid "Prospect"
-msgstr ""
-
-#. module: base
#: model:ir.model.fields,help:base.field_ir_act_server_link_field_id
#: model:ir.model.fields,help:base.field_ir_cron_link_field_id
msgid "Provide the field used to link the newly created recordon the record on used by the server action."
@@ -13753,14 +13703,14 @@ msgid "Record Rules"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_cron.py:234
+#: code:addons/base/ir/ir_cron.py:236
#, python-format
msgid "Record cannot be modified right now: This cron task is currently being executed and may not be modified Please try again in a few minutes"
msgstr ""
#. module: base
#: code:addons/base/ir/ir_actions.py:352
-#: code:addons/models.py:3871
+#: code:addons/models.py:3873
#, python-format
msgid "Record does not exist or has been deleted."
msgstr ""
@@ -13782,7 +13732,7 @@ msgid "Recruitment Process"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:322
+#: code:addons/base/module/module.py:327
#, python-format
msgid "Recursion error in modules dependencies !"
msgstr ""
@@ -13794,7 +13744,7 @@ msgid "Recursion found in child server actions"
msgstr ""
#. module: base
-#: code:addons/models.py:3211
+#: code:addons/models.py:3210
#, python-format
msgid "Recursivity Detected."
msgstr ""
@@ -13832,13 +13782,13 @@ msgid "Related Server Action"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:400
+#: code:addons/base/ir/ir_model.py:401
#, python-format
msgid "Related field '%s' does not have comodel '%s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:398
+#: code:addons/base/ir/ir_model.py:399
#, python-format
msgid "Related field '%s' does not have type '%s'"
msgstr ""
@@ -13972,7 +13922,7 @@ msgid "Resellers"
msgstr ""
#. module: base
-#: code:addons/models.py:785
+#: code:addons/models.py:775
#, python-format
msgid "Resolve other errors first"
msgstr ""
@@ -14030,11 +13980,6 @@ msgid "Restrict to lists"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_16
-msgid "Retailer"
-msgstr ""
-
-#. module: base
#: model:res.country,name:base.re
msgid "Reunion (French)"
msgstr ""
@@ -14465,7 +14410,7 @@ msgid "Selectable"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:28
+#: code:addons/base/res/res_partner.py:33
#, python-format
msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
msgstr ""
@@ -14620,11 +14565,6 @@ msgid "Server action"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_11
-msgid "Services"
-msgstr ""
-
-#. module: base
#: selection:ir.model.fields,on_delete:0
msgid "Set NULL"
msgstr ""
@@ -14646,7 +14586,7 @@ msgid "Set the font into the report header, it will be used as default font in t
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:524
+#: code:addons/base/res/res_users.py:521
#, python-format
msgid "Setting empty passwords is not allowed for security reasons!"
msgstr ""
@@ -14724,11 +14664,6 @@ msgid "Signup"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_5
-msgid "Silver"
-msgstr ""
-
-#. module: base
#: model:ir.module.module,summary:base.module_pos_discount
msgid "Simple Discounts in the Point of Sale "
msgstr ""
@@ -14823,25 +14758,25 @@ msgstr ""
#. module: base
#: code:addons/base/ir/ir_attachment.py:338
-#: code:addons/base/ir/ir_model.py:1134
+#: code:addons/base/ir/ir_model.py:1161
#, python-format
msgid "Sorry, you are not allowed to access this document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1136
+#: code:addons/base/ir/ir_model.py:1163
#, python-format
msgid "Sorry, you are not allowed to create this kind of document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1137
+#: code:addons/base/ir/ir_model.py:1164
#, python-format
msgid "Sorry, you are not allowed to delete this document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1135
+#: code:addons/base/ir/ir_model.py:1162
#, python-format
msgid "Sorry, you are not allowed to modify this document."
msgstr ""
@@ -14852,7 +14787,7 @@ msgid "Sort"
msgstr ""
#. module: base
-#: code:addons/models.py:3618
+#: code:addons/models.py:3617
#, python-format
msgid "Sorting field %s not found on model %s"
msgstr ""
@@ -15302,7 +15237,7 @@ msgid "Tag Name"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_id_889
+#: model:ir.model.fields,field_description:base.field_res_partner_category_id_903
#: model:ir.model.fields,field_description:base.field_res_users_category_id
msgid "Tags"
msgstr ""
@@ -15378,7 +15313,7 @@ msgid "Technical Settings"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:738
+#: code:addons/base/ir/ir_translation.py:750
#, python-format
msgid "Technical Translations"
msgstr ""
@@ -15452,7 +15387,7 @@ msgid "The ISO country code in two chars. \n"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:352
+#: code:addons/base/ir/ir_model.py:360
#, python-format
msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format."
msgstr ""
@@ -15469,13 +15404,13 @@ msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:675
+#: code:addons/base/module/module.py:684
#, python-format
msgid "The `%s` module appears to be unavailable at the moment, please try again later."
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:511
+#: code:addons/base/module/module.py:519
#, python-format
msgid "The `base` module cannot be uninstalled"
msgstr ""
@@ -15486,7 +15421,7 @@ msgid "The active field allows you to hide the category without removing it."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:285
+#: code:addons/base/res/res_users.py:282
#, python-format
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
@@ -15537,7 +15472,7 @@ msgid "The database object this attachment will be attached to."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:548
+#: code:addons/base/ir/ir_model.py:549
#, python-format
msgid "The field '%s' cannot be removed because the field '%s' depends on it."
msgstr ""
@@ -15604,13 +15539,13 @@ msgid "The menu action this filter applies to. When left empty the filter applie
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:128
+#: code:addons/base/ir/ir_model.py:129
#, python-format
msgid "The model name can only contain lowercase characters, digits, underscores and dots."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:126
+#: code:addons/base/ir/ir_model.py:127
#, python-format
msgid "The model name must start with 'x_'."
msgstr ""
@@ -15626,7 +15561,7 @@ msgid "The name of the country must be unique !"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:150
+#: code:addons/base/res/res_users.py:151
#, python-format
msgid "The name of the group can not start with \"-\""
msgstr ""
@@ -15704,15 +15639,15 @@ msgid "The record id this is attached to."
msgstr ""
#. module: base
-#: code:addons/models.py:2688
+#: code:addons/models.py:2687
#, 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:2468
-#: code:addons/models.py:2684
-#: code:addons/models.py:2772
+#: code:addons/models.py:2467
+#: code:addons/models.py:2683
+#: code:addons/models.py:2771
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -15740,7 +15675,7 @@ msgid "The state code."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:484
+#: code:addons/base/ir/ir_model.py:485
#, python-format
msgid "The table %r if used for other, possibly incompatible fields."
msgstr ""
@@ -15756,13 +15691,13 @@ msgid "The user this filter is private to. When left empty the filter is public
msgstr ""
#. module: base
-#: code:addons/models.py:5133
+#: code:addons/models.py:5134
#, 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:5139
+#: code:addons/models.py:5140
#, python-format
msgid "The values for the fields '%s' already exist (they are probably '%s' in the current model)."
msgstr ""
@@ -15789,7 +15724,7 @@ msgid "This Window"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:576
+#: code:addons/base/ir/ir_model.py:577
#, python-format
msgid "This column contains module data and cannot be removed!"
msgstr ""
@@ -16103,7 +16038,7 @@ msgid "Translation comments"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:626
+#: code:addons/base/ir/ir_translation.py:638
#, python-format
msgid "Translation features are unavailable until you install an extra translation."
msgstr ""
@@ -16114,7 +16049,7 @@ msgid "Translation in Progress"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:547
+#: code:addons/base/ir/ir_translation.py:559
#, python-format
msgid "Translation is not valid:\n"
"%s"
@@ -16293,25 +16228,25 @@ msgid "Ukraine"
msgstr ""
#. module: base
-#: code:addons/models.py:2848
+#: code:addons/models.py:2847
#, python-format
msgid "Unable to delete this document because it is used as a default property"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:312
+#: code:addons/base/module/module.py:317
#, python-format
msgid "Unable to install module \"%s\" because an external dependency is not met: %s"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:316
+#: code:addons/base/module/module.py:321
#, python-format
msgid "Unable to process module \"%s\" because an external dependency is not met: %s"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:314
+#: code:addons/base/module/module.py:319
#, python-format
msgid "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
msgstr ""
@@ -16322,7 +16257,7 @@ msgid "Uncategorized"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:514
+#: code:addons/base/module/module.py:522
#: model:ir.ui.view,arch_db:base.module_form
#, python-format
msgid "Uninstall"
@@ -16362,29 +16297,30 @@ 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:923
+#: code:addons/models.py:913
#, python-format
msgid "Unknown database identifier '%s'"
msgstr ""
#. module: base
-#: code:addons/models.py:784
+#: code:addons/models.py:774
#, python-format
msgid "Unknown error during import:"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:429
+#: code:addons/base/ir/ir_model.py:430
#, python-format
msgid "Unknown field %r in dependency %r"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:386
+#: code:addons/base/ir/ir_model.py:387
#, python-format
msgid "Unknown field name '%s' in related field '%s'"
msgstr ""
@@ -16724,11 +16660,6 @@ msgid "Vehicle, leasing, insurances, costs"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_1
-msgid "Vendor"
-msgstr ""
-
-#. module: base
#: model:ir.actions.act_window,name:base.action_partner_supplier_form
#: model:ir.ui.view,arch_db:base.view_res_partner_filter
msgid "Vendors"
@@ -16824,7 +16755,7 @@ msgid "View type: Tree type to use for the tree view, set to 'tree' for a hierar
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:562
+#: code:addons/base/ir/ir_model.py:563
#, python-format
msgid "View:"
msgstr ""
@@ -16902,10 +16833,10 @@ msgid "Warehouse Management: Waves"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:482
-#: code:addons/base/ir/ir_model.py:408
-#: code:addons/base/ir/ir_model.py:483
-#: code:addons/base/res/res_partner.py:338
+#: code:addons/base/ir/ir_mail_server.py:486
+#: code:addons/base/ir/ir_model.py:409
+#: code:addons/base/ir/ir_model.py:484
+#: code:addons/base/res/res_partner.py:344
#, python-format
msgid "Warning"
msgstr ""
@@ -16917,7 +16848,7 @@ msgid "Warning!"
msgstr ""
#. module: base
-#: code:addons/models.py:4837
+#: code:addons/models.py:4838
#, python-format
msgid "Warnings"
msgstr ""
@@ -17192,11 +17123,6 @@ msgid "Wholesale/Retail"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_15
-msgid "Wholesaler"
-msgstr ""
-
-#. module: base
#: model:ir.actions.act_window,name:base.ir_action_window
#: model:ir.ui.menu,name:base.menu_ir_action_window
msgid "Window Actions"
@@ -17286,7 +17212,7 @@ msgid "You can either upload a file from your computer or copy/paste an internet
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:503
+#: code:addons/base/res/res_partner.py:509
#, python-format
msgid "You can not change the company as the partner/user has multiple user linked with different companies."
msgstr ""
@@ -17302,13 +17228,13 @@ msgid "You can not register two fonts with the same name"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:381
+#: code:addons/base/res/res_users.py:378
#, 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/res/res_partner.py:321
+#: code:addons/base/res/res_partner.py:327
#, python-format
msgid "You cannot create recursive Partner hierarchies."
msgstr ""
@@ -17320,13 +17246,13 @@ msgid "You cannot create recursive inherited views."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:340
+#: code:addons/base/res/res_users.py:337
#, python-format
msgid "You cannot deactivate the admin user."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:342
+#: code:addons/base/res/res_users.py:339
#, python-format
msgid "You cannot deactivate the user you're currently logged in as."
msgstr ""
@@ -17356,20 +17282,20 @@ msgid "You should try other search criteria."
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:332
+#: code:addons/base/module/module.py:337
#, 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/module/module.py:284
+#: code:addons/base/module/module.py:289
#, python-format
msgid "You try to remove a module that is installed or will be installed"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:552
+#: code:addons/base/module/module.py:560
#, 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."
@@ -17387,7 +17313,7 @@ msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTL
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:483
+#: code:addons/base/ir/ir_mail_server.py:487
#, python-format
msgid "Your server does not seem to support SSL, you may want to try STARTTLS instead"
msgstr ""
@@ -17936,7 +17862,7 @@ msgid "monetary"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:472
+#: code:addons/base/ir/ir_ui_view.py:475
#, python-format
msgid "n/a"
msgstr ""