diff --git a/.tx/config b/.tx/config
index 0ad26d8dfe222a259f9b2ddc2ed5e6ea7bcf43de..3de3a8d10e278fff6540d366d00a0c26f5fcc52d 100644
--- a/.tx/config
+++ b/.tx/config
@@ -292,6 +292,11 @@ file_filter = addons/hr_recruitment/i18n/<lang>.po
source_file = addons/hr_recruitment/i18n/hr_recruitment.pot
source_lang = en
+[odoo-master.hr_recruitment_survey]
+file_filter = addons/hr_recruitment_survey/i18n/<lang>.po
+source_file = addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
+source_lang = en
+
[odoo-master.hr_timesheet]
file_filter = addons/hr_timesheet/i18n/<lang>.po
source_file = addons/hr_timesheet/i18n/hr_timesheet.pot
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 93e364594b5118fd543571a65893b40ae56c3bfa..76792a10342e60883d1e3c82377089f598888df7 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,29 +19,37 @@ msgstr ""
#: model:mail.template,body_html:account.email_template_edi_invoice
msgid "\n"
"% set access_action = object.get_access_action()\n"
-"% set access_name = 'View invoice' if access_action and access_action['type'] == 'ir.actions.act_url' else 'See invoice'\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"
"\n"
-"<p>Dear\n"
-"% if object.partner_id.is_company and object.child_ids:\n"
-" ${object.partner_id.child_ids[0].name}\n"
-"% else :\n"
-" ${object.partner_id.name}\n"
+"<p>Dear ${object.partner_id.name} \n"
+"% if object.partner_id.parent_id:\n"
+" (<i>${object.partner_id.parent_id.name}</i>)\n"
"% endif\n"
",</p>\n"
-"<p>Thank you for your inquiry. Here is your invoice <strong>${object.number}</strong>\n"
+"<p>Here is your invoice <strong>${object.number}</strong>\n"
"% if object.origin:\n"
"(with reference: ${object.origin} )\n"
"% endif\n"
-"amounting <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
+"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
-"<p style=\"margin-left: 30px;\">\n"
-" <a href=\"${access_url}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${access_name}</a>\n"
-"</p>\n"
-"<p>If you have any question, do not hesitate to contact us.</p>\n"
-"<p>Best regards,</p>\n"
+" <br/><br/>\n"
+" <center>\n"
+" <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">View Invoice</a>\n"
+" </center>\n"
+" <br/><br/>\n"
+"\n"
+"% if object.state=='paid':\n"
+" <p>This invoice is already paid.</p>\n"
+"% else:\n"
+" <p>Please remit payment at your earliest convenience.</p>\n"
+"% endif\n"
+"\n"
+"<p>Thank you,</p>\n"
+"% if object.user_id and object.user_id.signature:\n"
+" ${object.user_id.signature | safe}\n"
+"% endif\n"
""
msgstr ""
@@ -56,7 +64,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1502
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1517
#, python-format
msgid " seconds"
msgstr ""
@@ -84,13 +92,18 @@ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:322
+#: model:mail.template,subject:account.mail_template_data_notification_email_account_invoice
+msgid "${object.subject}"
+msgstr ""
+
+#. module: account
+#: 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:575
+#: code:addons/account/models/account.py:577
#, python-format
msgid "%s (Copy)"
msgstr ""
@@ -124,7 +137,7 @@ msgid "-> View partially reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:323
+#: code:addons/account/models/account_bank_statement.py:467
#, python-format
msgid "1 transaction was automatically reconciled."
msgstr ""
@@ -139,11 +152,6 @@ msgstr ""
msgid "30 Net Days"
msgstr ""
-#. module: account
-#: model:account.payment.term,name:account.account_payment_term_advance
-msgid "30% Advance End of Following Month"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "5) For setup, you will need the following information:"
@@ -159,6 +167,80 @@ msgstr ""
msgid ": Trial Balance"
msgstr ""
+#. module: account
+#: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice
+msgid "<html>\n"
+" <head></head>\n"
+" <body style=\"margin: 0; padding: 0;\">\n"
+" <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" class=\"o_mail_notification\">\n"
+" <tbody>\n"
+"\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#a24689\" style=\"min-width: 590px; background-color: rgb(162, 70, 137); padding: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"middle\">\n"
+" <span style=\"font-size:20px; color:white; font-weight: bold;\">\n"
+" Invoice ${object.record_name}\n"
+" </span>\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
+" <tbody>\n"
+" <td valign=\"top\" style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
+" ${object.body | safe}\n"
+" </td>\n"
+" </tbody>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#a24689\" style=\"min-width: 590px; background-color: rgb(162, 70, 137); padding: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
+" ${user.company_id.name}<br/>\n"
+" ${user.company_id.phone or ''}\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
+" % if user.company_id.email:\n"
+" <a href=\"mailto:${user.company_id.email}\" style=\"text-decoration:none; color: white;\">${user.company_id.email}</a><br/>\n"
+" % endif\n"
+" % if user.company_id.website:\n"
+" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: white;\">\n"
+" ${user.company_id.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 href=\"https://www.odoo.com\">Odoo</a>.\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" </body>\n"
+" </html>\n"
+" "
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "<span class=\"fa fa-arrow-circle-o-down\"/> Install Now"
@@ -370,7 +452,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "<strong>Banking interface:</strong> with live bank feed synchronization and bank statement importation."
+msgid "<strong>Banking interface:</strong> with live bank feed synchronization and bank statement import."
msgstr ""
#. module: account
@@ -615,7 +697,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_overdue_document
-msgid "<strong>Sub-Total :</strong>"
+msgid "<strong>Subtotal :</strong>"
msgstr ""
#. module: account
@@ -669,19 +751,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:1312
+#: code:addons/account/models/account_invoice.py:1335
#, python-format
msgid "A Payment Term should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1315
+#: code:addons/account/models/account_invoice.py:1338
#, python-format
msgid "A Payment Term should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:502
+#: code:addons/account/models/account.py:503
#, python-format
msgid "A bank account can only belong to one journal."
msgstr ""
@@ -728,20 +810,20 @@ msgid "A product in Odoo is something you sell or buy \n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:732
+#: code:addons/account/models/account_move.py:750
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:836
-#: code:addons/account/models/account_bank_statement.py:839
+#: code:addons/account/models/account_bank_statement.py:867
+#: code:addons/account/models/account_bank_statement.py:870
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:226
+#: code:addons/account/models/account_bank_statement.py:218
#, python-format
msgid "A statement cannot be canceled when its lines are reconciled."
msgstr ""
@@ -752,7 +834,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:388
+#: code:addons/account/models/account_bank_statement.py:379
#, python-format
msgid "A transaction can't have a 0 amount."
msgstr ""
@@ -764,12 +846,17 @@ msgid "A typical company may use one journal per payment method (cash,\n"
" and one for miscellaneous information."
msgstr ""
+#. module: account
+#: model:res.groups,name:account.group_warning_account
+msgid "A warning can be set on a partner (Account)"
+msgstr ""
+
#. module: account
#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:95
#: code:addons/account/static/src/js/account_reconciliation_widgets.js:100
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:105
-#: code:addons/account/static/src/xml/account_reconciliation.xml:140
-#: code:addons/account/static/src/xml/account_reconciliation.xml:266
+#: code:addons/account/static/src/xml/account_reconciliation.xml:141
+#: code:addons/account/static/src/xml/account_reconciliation.xml:267
#: 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
@@ -777,12 +864,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move_dummy_account_id
#: model:ir.model.fields,field_description:account.field_account_move_line_account_id
#: model:ir.model.fields,field_description:account.field_account_operation_template_account_id
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_account_id
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
#: model:ir.ui.view,arch_db:account.view_account_form
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
#: model:ir.ui.view,arch_db:account.view_account_search
#, python-format
msgid "Account"
@@ -1131,6 +1218,7 @@ msgstr ""
#: selection:account.account.tag,applicability:0
#: selection:account.financial.report,type:0
#: model:ir.model.fields,field_description:account.field_account_financial_report_account_ids
+#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Accounts"
msgstr ""
@@ -1150,6 +1238,12 @@ msgstr ""
msgid "Accounts Mapping"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,name:account.account_tag_action
+#: model:ir.ui.menu,name:account.account_tag_menu
+msgid "Accounts Tags"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Activate the option in the"
@@ -1197,6 +1291,11 @@ msgstr ""
msgid "Address"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_tax_id
+msgid "Adjustment Tax"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
#: model:ir.ui.view,arch_db:account.view_tax_form
@@ -1247,7 +1346,7 @@ msgstr ""
#: 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:297
+#: code:addons/account/static/src/xml/account_reconciliation.xml:298
#, python-format
msgid "All"
msgstr ""
@@ -1304,8 +1403,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:309
-#: code:addons/account/static/src/xml/account_reconciliation.xml:316
+#: code:addons/account/static/src/xml/account_reconciliation.xml:310
+#: code:addons/account/static/src/xml/account_reconciliation.xml:317
#, python-format
msgid "All invoices and payments have been matched, your accounts' balances are clean."
msgstr ""
@@ -1326,11 +1425,16 @@ 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:248
+#: code:addons/account/models/account_bank_statement.py:240
#, python-format
msgid "All the account entries lines must be processed in order to close the statement."
msgstr ""
+#. module: account
+#: selection:account.config.settings,group_warning_account:0
+msgid "All the partners can be used in invoices"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal_update_posted
msgid "Allow Cancelling Entries"
@@ -1383,22 +1487,22 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:140
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:144
-#: code:addons/account/static/src/xml/account_reconciliation.xml:149
-#: code:addons/account/static/src/xml/account_reconciliation.xml:265
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:135
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:139
+#: code:addons/account/static/src/xml/account_reconciliation.xml:150
+#: code:addons/account/static/src/xml/account_reconciliation.xml:266
#: 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
#: model:ir.model.fields,field_description:account.field_account_move_amount
#: model:ir.model.fields,field_description:account.field_account_operation_template_amount
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_amount
#: model:ir.model.fields,field_description:account.field_account_tax_amount
#: model:ir.model.fields,field_description:account.field_account_tax_template_amount
#: model:ir.model.fields,field_description:account.field_cash_box_in_amount
#: model:ir.model.fields,field_description:account.field_cash_box_out_amount
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_amount
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
#: model:ir.ui.view,arch_db:account.view_move_line_form
#, python-format
msgid "Amount"
@@ -1406,9 +1510,18 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_residual
+#: model:ir.ui.view,arch_db:account.invoice_tree
+msgid "Amount Due"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_residual_company_signed
+msgid "Amount Due in Company Currency"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_residual_signed
-msgid "Amount Due"
+msgid "Amount Due in Invoice Currency"
msgstr ""
#. module: account
@@ -1435,7 +1548,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_operation_template_amount_type
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount_type
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
msgid "Amount type"
msgstr ""
@@ -1470,6 +1583,11 @@ msgid "An account type is used to determine how an account is used in\n"
" (profit/loss or balance sheet)."
msgstr ""
+#. module: account
+#: selection:account.config.settings,group_warning_account:0
+msgid "An informative or blocking warning can be set on a partner"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_move_line_form
msgid "Analytic"
@@ -1477,8 +1595,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:152
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:158
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:147
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:153
#, python-format
msgid "Analytic Acc."
msgstr ""
@@ -1488,12 +1606,13 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move_line_analytic_account_id
#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_analytic_id
#: model:ir.model.fields,field_description:account.field_account_operation_template_analytic_account_id
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_analytic_account_id
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
msgid "Analytic Account"
msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
msgid "Analytic Accounting"
msgstr ""
@@ -1505,22 +1624,39 @@ msgstr ""
msgid "Analytic Accounts"
msgstr ""
+#. module: account
+#: model:ir.ui.menu,name:account.account_analytic_tag_menu
+msgid "Analytic Accounts Tags"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax_template_analytic
msgid "Analytic Cost"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.analytic_line_reporting_pivot
+#: model:ir.ui.menu,name:account.menu_action_analytic_lines_reporting
#: model:ir.ui.menu,name:account.menu_action_analytic_lines_tree
msgid "Analytic Entries"
msgstr ""
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_move_line_form
#: model:ir.ui.view,arch_db:account.view_move_line_form2
msgid "Analytic Lines"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_line_analytic_tag_ids
+msgid "Analytic Tags"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_account_analytic_id
msgid "Analytic account"
@@ -1536,6 +1672,16 @@ msgstr ""
msgid "Analytic lines"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_analytic_tag_ids
+msgid "Analytic tags"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_tax_exigible
+msgid "Appears in VAT report"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_tag_applicability
msgid "Applicability"
@@ -1629,7 +1775,14 @@ msgid "Automatic formatting"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:328
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:15
+#, python-format
+msgid "Automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:472
#, python-format
msgid "Automatically reconciled items"
msgstr ""
@@ -1646,7 +1799,7 @@ msgid "Awaiting payments"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:178
+#: code:addons/account/models/chart_template.py:183
#, python-format
msgid "BILL"
msgstr ""
@@ -1687,7 +1840,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:643
+#: code:addons/account/models/chart_template.py:650
#: 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
#, python-format
@@ -1750,7 +1903,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1118
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1111
#, python-format
msgid "Bank Reconciliation"
msgstr ""
@@ -1821,14 +1974,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:204
+#: code:addons/account/static/src/xml/account_reconciliation.xml:205
#, python-format
msgid "Bank statements are fully reconciled."
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"
msgstr ""
@@ -1890,6 +2042,11 @@ msgstr ""
msgid "Bills to pay"
msgstr ""
+#. module: account
+#: selection:res.partner,invoice_warn:0
+msgid "Blocking Message"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_type_include_initial_balance
msgid "Bring Accounts Balance Forward"
@@ -1959,6 +2116,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.account_unreconcile_view
#: model:ir.ui.view,arch_db:account.cash_box_in_form
#: model:ir.ui.view,arch_db:account.cash_box_out_form
+#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
#: model:ir.ui.view,arch_db:account.validate_account_move_view
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_cashbox
#: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_check
@@ -2024,33 +2182,33 @@ msgid "Cancelled Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1045
+#: code:addons/account/models/account_move.py:1062
#, python-format
msgid "Cannot create an automatic sequence for this piece.\n"
"Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:167
+#: code:addons/account/models/account_move.py:176
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:199
+#: code:addons/account/models/account_move.py:208
#, python-format
msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:464
+#: code:addons/account/models/account_invoice.py:466
#, 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_move.py:314
+#: code:addons/account/models/account_move.py:335
#, python-format
msgid "Cannot find any account journal of \"%s\" type for this company, You should create one.\n"
" Please go to Journal Configuration"
@@ -2063,7 +2221,7 @@ msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:422
+#: code:addons/account/models/account.py:423
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
@@ -2083,7 +2241,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:643
+#: code:addons/account/models/chart_template.py:650
#, python-format
msgid "Cash"
msgstr ""
@@ -2095,7 +2253,7 @@ msgid "Cash Accounts Prefix"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:211
+#: code:addons/account/models/account_bank_statement.py:203
#: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox
#, python-format
msgid "Cash Control"
@@ -2260,7 +2418,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:141
+#: code:addons/account/models/chart_template.py:146
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#, python-format
msgid "Choose Accounting Template"
@@ -2268,7 +2426,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1867
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1882
#, python-format
msgid "Choose counterpart"
msgstr ""
@@ -2283,6 +2441,11 @@ msgstr ""
msgid "Click to add a journal."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.account_tag_action
+msgid "Click to add a new tag."
+msgstr ""
+
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
msgid "Click to add an account."
@@ -2336,14 +2499,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:40
+#: code:addons/account/static/src/xml/account_reconciliation.xml:41
#, python-format
msgid "Close"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:226
+#: code:addons/account/static/src/xml/account_reconciliation.xml:227
#, python-format
msgid "Close the statement"
msgstr ""
@@ -2451,6 +2614,18 @@ msgstr ""
msgid "Company"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_company_currency_id
+#: model:ir.model.fields,field_description:account.field_account_invoice_line_company_currency_id
+#: model:ir.model.fields,field_description:account.field_account_move_line_company_currency_id
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_company_currency_id
+msgid "Company currency id"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_has_chart_of_accounts
msgid "Company has a chart of accounts"
@@ -2484,7 +2659,7 @@ msgid "Complete set of taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:397
+#: code:addons/account/models/account_invoice.py:399
#, python-format
msgid "Compose Email"
msgstr ""
@@ -2506,14 +2681,14 @@ msgid "Configuration"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
-#: code:addons/account/models/account_payment.py:452
+#: code:addons/account/models/account_payment.py:455
+#: code:addons/account/models/account_payment.py:457
#, python-format
msgid "Configuration Error !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:338
+#: code:addons/account/models/account_invoice.py:339
#, 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?"
@@ -2589,7 +2764,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1506
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1521
#, python-format
msgid "Congrats, you're all done !"
msgstr ""
@@ -2621,7 +2796,7 @@ msgid "Cost of Revenue"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:388
+#: code:addons/account/models/account_payment.py:393
#: model:ir.model.fields,field_description:account.field_account_move_line_counterpart
#, python-format
msgid "Counterpart"
@@ -2664,7 +2839,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1864
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1879
#, python-format
msgid "Create Write-off"
msgstr ""
@@ -2675,20 +2850,32 @@ msgid "Create a draft refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:247
+#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
+msgid "Create and post move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_journal_dashboard.py:248
#, python-format
msgid "Create cash statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:233
+#: code:addons/account/models/account_journal_dashboard.py:234
#, python-format
msgid "Create invoice/bill"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2466
+#: code:addons/account/static/src/xml/account_reconciliation.xml:81
+#, python-format
+msgid "Create model"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2481
#, python-format
msgid "Create writeoff"
msgstr ""
@@ -2754,6 +2941,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_create_uid
#: model:ir.model.fields,field_description:account.field_cash_box_in_create_uid
#: model:ir.model.fields,field_description:account.field_cash_box_out_create_uid
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_create_uid
#: model:ir.model.fields,field_description:account.field_validate_account_move_create_uid
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_create_uid
msgid "Created by"
@@ -2815,6 +3003,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_create_date
#: model:ir.model.fields,field_description:account.field_cash_box_in_create_date
#: model:ir.model.fields,field_description:account.field_cash_box_out_create_date
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_create_date
#: model:ir.model.fields,field_description:account.field_validate_account_move_create_date
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_create_date
msgid "Created on"
@@ -2830,11 +3019,21 @@ msgstr ""
msgid "Credit"
msgstr ""
+#. module: account
+#: model:account.account.type,name:account.data_account_type_credit_card
+msgid "Credit Card"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_invoice_refund
msgid "Credit Note"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id
+msgid "Credit account"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_credit
msgid "Credit amount"
@@ -2862,15 +3061,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_currency_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_currency_id
#: model:ir.model.fields,field_description:account.field_account_chart_template_currency_id
-#: model:ir.model.fields,field_description:account.field_account_invoice_company_currency_id
#: model:ir.model.fields,field_description:account.field_account_invoice_currency_id
-#: model:ir.model.fields,field_description:account.field_account_invoice_line_company_currency_id
#: model:ir.model.fields,field_description:account.field_account_invoice_line_currency_id
#: model:ir.model.fields,field_description:account.field_account_invoice_report_currency_id
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_currency_id
#: model:ir.model.fields,field_description:account.field_account_journal_currency_id
#: model:ir.model.fields,field_description:account.field_account_move_currency_id
-#: model:ir.model.fields,field_description:account.field_account_move_line_company_currency_id
#: model:ir.model.fields,field_description:account.field_account_move_line_currency_id
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_company_currency_id
#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_company_id
@@ -2898,8 +3094,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1337
-#: code:addons/account/models/account_move.py:1347
+#: code:addons/account/models/account_move.py:1361
+#: code:addons/account/models/account_move.py:1371
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -2944,7 +3140,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:177
+#: code:addons/account/models/chart_template.py:182
#: 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
@@ -2953,7 +3149,7 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:481
+#: code:addons/account/models/account_payment.py:486
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -2966,7 +3162,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:483
+#: code:addons/account/models/account_payment.py:488
#, python-format
msgid "Customer Refund"
msgstr ""
@@ -2983,7 +3179,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:294
+#: code:addons/account/static/src/xml/account_reconciliation.xml:295
#: model:ir.ui.menu,name:account.menu_account_customer
#, python-format
msgid "Customers"
@@ -2999,14 +3195,15 @@ 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:142
-#: code:addons/account/static/src/xml/account_reconciliation.xml:261
+#: code:addons/account/static/src/xml/account_reconciliation.xml:143
+#: code:addons/account/static/src/xml/account_reconciliation.xml:262
#: model:ir.model.fields,field_description:account.field_account_bank_statement_date
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_date
#: model:ir.model.fields,field_description:account.field_account_invoice_report_date
#: model:ir.model.fields,field_description:account.field_account_move_date
#: model:ir.model.fields,field_description:account.field_account_move_line_date
#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_writeoff_date_p
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_date
#: model:ir.ui.view,arch_db:account.report_generalledger
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.report_overdue_document
@@ -3057,6 +3254,11 @@ msgstr ""
msgid "Debit Methods"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_debit_account_id
+msgid "Debit account"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_debit
msgid "Debit amount"
@@ -3175,7 +3377,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:264
+#: code:addons/account/static/src/xml/account_reconciliation.xml:265
#: 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
@@ -3306,13 +3508,14 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_display_name
#: model:ir.model.fields,field_description:account.field_cash_box_in_display_name
#: model:ir.model.fields,field_description:account.field_cash_box_out_display_name
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_journal_display_name
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_partnerledger_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_financial_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger_display_name
+#: model:ir.model.fields,field_description:account.field_report_account_report_journal_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue_display_name
+#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance_display_name
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_display_name
#: model:ir.model.fields,field_description:account.field_validate_account_move_display_name
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_display_name
msgid "Display Name"
@@ -3355,10 +3558,7 @@ msgid "Don't hesitate to"
msgstr ""
#. module: account
-#. openerp-web
#: selection:account.invoice.report,state:0
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2453
-#, python-format
msgid "Done"
msgstr ""
@@ -3416,7 +3616,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:143
+#: code:addons/account/static/src/xml/account_reconciliation.xml:144
#: 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
@@ -3451,7 +3651,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:821
+#: code:addons/account/models/account_invoice.py:845
#, python-format
msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund."
msgstr ""
@@ -3462,26 +3662,31 @@ msgid "Duplicates"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:157
-#: code:addons/account/models/chart_template.py:170
-#: code:addons/account/models/chart_template.py:180
+#: code:addons/account/models/chart_template.py:162
+#: code:addons/account/models/chart_template.py:175
+#: code:addons/account/models/chart_template.py:185
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1510
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1525
#, python-format
msgid "Efficiency at its finest"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:885
+#: code:addons/account/models/account_move.py:903
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
+#. module: account
+#: selection:account.payment,payment_type:0
+msgid "Electronically receive money"
+msgstr ""
+
#. module: account
#: model:ir.model,name:account.model_mail_compose_message
msgid "Email composition wizard"
@@ -3522,11 +3727,6 @@ msgstr ""
msgid "End Date"
msgstr ""
-#. module: account
-#: model:account.payment.term,name:account.account_payment_term
-msgid "End of Following Month"
-msgstr ""
-
#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_balance_end_real
msgid "Ending Balance"
@@ -3553,7 +3753,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:850
+#: code:addons/account/models/account_move.py:868
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -3564,7 +3764,7 @@ msgid "Entries to Review"
msgstr ""
#. module: account
-#: code:addons/account/models/account_analytic_line.py:58
+#: code:addons/account/models/account_analytic_line.py:52
#, python-format
msgid "Entries: "
msgstr ""
@@ -3602,7 +3802,7 @@ msgid "Excel template"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:180
+#: code:addons/account/models/chart_template.py:185
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -3667,7 +3867,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1517
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1532
#, python-format
msgid "Fast reconciler"
msgstr ""
@@ -3714,7 +3914,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:68
+#: code:addons/account/static/src/xml/account_reconciliation.xml:69
#, python-format
msgid "Filter..."
msgstr ""
@@ -3962,6 +4162,12 @@ msgid "Get your bank statements from you bank and import them through plaid.com.
"-This installs the module account_plaid."
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_account_config_settings_module_account_bank_statement_import_csv
+msgid "Get your bank statements from your bank and import them in Odoo in the .CSV format.\n"
+"-This installs the module account_bank_statement_import_csv."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_module_account_bank_statement_import_ofx
msgid "Get your bank statements from your bank and import them in Odoo in the .OFX format.\n"
@@ -4002,14 +4208,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:225
+#: code:addons/account/static/src/xml/account_reconciliation.xml:226
#, python-format
msgid "Go to bank statements"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:465
-#: code:addons/account/models/account_move.py:315
+#: code:addons/account/models/account_invoice.py:467
+#: code:addons/account/models/account_move.py:336
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -4021,9 +4227,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:204
-#: code:addons/account/static/src/xml/account_reconciliation.xml:308
-#: code:addons/account/static/src/xml/account_reconciliation.xml:315
+#: code:addons/account/static/src/xml/account_reconciliation.xml:205
+#: code:addons/account/static/src/xml/account_reconciliation.xml:309
+#: code:addons/account/static/src/xml/account_reconciliation.xml:316
#, python-format
msgid "Good Job!"
msgstr ""
@@ -4148,26 +4354,27 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_id
#: model:ir.model.fields,field_description:account.field_cash_box_in_id
#: model:ir.model.fields,field_description:account.field_cash_box_out_id
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_journal_id
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_partnerledger_id
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance_id
#: model:ir.model.fields,field_description:account.field_report_account_report_financial_id
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger_id
+#: model:ir.model.fields,field_description:account.field_report_account_report_journal_id
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue_id
+#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger_id
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance_id
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_id
#: model:ir.model.fields,field_description:account.field_validate_account_move_id
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_id
msgid "ID"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:177
+#: code:addons/account/models/chart_template.py:182
#, python-format
msgid "INV"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:394
+#: code:addons/account/models/account_bank_statement.py:385
#, python-format
msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
msgstr ""
@@ -4286,6 +4493,11 @@ msgstr ""
msgid "Import .qif files"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_csv
+msgid "Import in .csv format"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_bank_statement_import_ofx
msgid "Import in .ofx format"
@@ -4307,13 +4519,13 @@ msgid "In Odoo,"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:414
+#: code:addons/account/models/account_bank_statement.py:405
#, 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:200
+#: code:addons/account/models/account_bank_statement.py:192
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
@@ -4377,7 +4589,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1790
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1805
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -4425,7 +4637,6 @@ msgid "Intermediary account used when moving money from a liquidity account to a
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_narration
#: model:ir.model.fields,field_description:account.field_account_move_narration
msgid "Internal Note"
msgstr ""
@@ -4441,6 +4652,11 @@ msgstr ""
msgid "Internal Transfer"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_account_internal_type
+msgid "Internal Type"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_template_form
msgid "Internal notes..."
@@ -4458,9 +4674,10 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:870
+#: code:addons/account/models/account_invoice.py:895
#: 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_res_partner_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
@@ -4523,6 +4740,11 @@ msgstr ""
msgid "Invoice Tax"
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"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id
msgid "Invoice id"
@@ -4540,7 +4762,7 @@ msgid "Invoice refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1401
+#: code:addons/account/models/account_invoice.py:1424
#, python-format
msgid "Invoice sent"
msgstr ""
@@ -4579,7 +4801,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2099
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2114
#, python-format
msgid "Invoices & Payments Matching"
msgstr ""
@@ -4648,14 +4870,26 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:883
+#: code:addons/account/models/account_move.py:901
#, 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:322
+#, 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:212
+#: code:addons/account/static/src/xml/account_reconciliation.xml:213
#, python-format
msgid "It took you"
msgstr ""
@@ -4697,9 +4931,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2135
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2140
-#: code:addons/account/static/src/xml/account_reconciliation.xml:141
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2150
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2155
+#: code:addons/account/static/src/xml/account_reconciliation.xml:142
#: 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
@@ -4708,11 +4942,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move_journal_id
#: model:ir.model.fields,field_description:account.field_account_move_line_journal_id
#: model:ir.model.fields,field_description:account.field_account_operation_template_journal_id
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_journal_id
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_journal_id
#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#: model:ir.ui.view,arch_db:account.view_bank_statement_search
#, python-format
@@ -4742,12 +4977,18 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_move_id
-#: model:ir.model.fields,field_description:account.field_account_invoice_move_name
#: model:ir.model.fields,field_description:account.field_account_move_line_move_id
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Journal Entry"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_move_name
+#: model:ir.model.fields,field_description:account.field_account_invoice_move_name
+#: model:ir.model.fields,field_description:account.field_account_payment_move_name
+msgid "Journal Entry Name"
+msgstr ""
+
#. module: account
#: selection:account.print.journal,sort_selection:0
#: model:ir.ui.view,arch_db:account.report_journal
@@ -4763,13 +5004,13 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_operation_template_label
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_label
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:261
-#: code:addons/account/models/account_payment.py:268
+#: code:addons/account/models/account_bank_statement.py:253
+#: code:addons/account/models/account_payment.py:271
#: 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
@@ -4781,7 +5022,6 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_move_line_select
#: model:ir.actions.act_window,name:account.action_move_line_select_by_partner
#: model:ir.actions.act_window,name:account.action_move_line_select_by_type
-#: model:ir.actions.act_window,name:account.action_move_line_select_posted
#: 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
@@ -4790,6 +5030,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.view_account_payment_form
#: model:ir.ui.view,arch_db:account.view_bank_statement_form
#: model:ir.ui.view,arch_db:account.view_move_form
+#: model:ir.ui.view,arch_db:account.view_move_line_pivot
#: model:ir.ui.view,arch_db:account.view_move_line_tree
#, python-format
msgid "Journal Items"
@@ -4797,7 +5038,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2098
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2113
#: model:ir.actions.client,name:account.action_manual_reconcile
#, python-format
msgid "Journal Items to Reconcile"
@@ -4844,6 +5085,11 @@ msgstr ""
msgid "June"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_reason
+msgid "Justification"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard
msgid "Kanban dashboard"
@@ -4876,8 +5122,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:114
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:118
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:109
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:113
#: model:ir.model.fields,field_description:account.field_account_move_line_name
#: model:ir.ui.view,arch_db:account.report_journal
#, python-format
@@ -4947,13 +5193,14 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report___last_update
#: model:ir.model.fields,field_description:account.field_cash_box_in___last_update
#: model:ir.model.fields,field_description:account.field_cash_box_out___last_update
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_journal___last_update
-#: model:ir.model.fields,field_description:account.field_report_account_extra_reports_report_partnerledger___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_financial___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger___last_update
+#: model:ir.model.fields,field_description:account.field_report_account_report_journal___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_overdue___last_update
+#: model:ir.model.fields,field_description:account.field_report_account_report_partnerledger___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_trialbalance___last_update
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard___last_update
#: model:ir.model.fields,field_description:account.field_validate_account_move___last_update
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts___last_update
msgid "Last Modified on"
@@ -4961,7 +5208,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:329
+#: code:addons/account/static/src/xml/account_reconciliation.xml:330
#, python-format
msgid "Last Reconciliation :"
msgstr ""
@@ -5022,6 +5269,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_write_uid
#: model:ir.model.fields,field_description:account.field_cash_box_in_write_uid
#: model:ir.model.fields,field_description:account.field_cash_box_out_write_uid
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_write_uid
#: model:ir.model.fields,field_description:account.field_validate_account_move_write_uid
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_write_uid
msgid "Last Updated by"
@@ -5083,6 +5331,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_accounting_report_write_date
#: model:ir.model.fields,field_description:account.field_cash_box_in_write_date
#: model:ir.model.fields,field_description:account.field_cash_box_out_write_date
+#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_write_date
#: model:ir.model.fields,field_description:account.field_validate_account_move_write_date
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_write_date
msgid "Last Updated on"
@@ -5135,6 +5384,13 @@ msgstr ""
msgid "Less Payment"
msgstr ""
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:15
+#, python-format
+msgid "Let odoo try to reconcile entries for the user"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_report_level
msgid "Level"
@@ -5207,7 +5463,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:179
+#: code:addons/account/models/chart_template.py:184
#, python-format
msgid "MISC"
msgstr ""
@@ -5336,11 +5592,21 @@ msgstr ""
msgid "Memo:"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn_msg
+msgid "Message for Invoice"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Minus Cost of Revenue"
msgstr ""
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Minus Credit Card Accounts"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Minus Current Liabilities"
@@ -5369,7 +5635,7 @@ msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:179
+#: code:addons/account/models/chart_template.py:184
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -5377,9 +5643,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:81
+#: code:addons/account/static/src/xml/account_reconciliation.xml:82
#, python-format
-msgid "Modify presets"
+msgid "Modify models"
msgstr ""
#. module: account
@@ -5394,7 +5660,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:104
+#: code:addons/account/static/src/xml/account_reconciliation.xml:105
#, python-format
msgid "More"
msgstr ""
@@ -5404,6 +5670,11 @@ msgstr ""
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
+msgid "More Info"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Most currencies are already created by default. If you plan\n"
@@ -5430,11 +5701,16 @@ msgid "Move line ids"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1172
+#: code:addons/account/models/account_move.py:1187
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
+msgid "Multi Currencies"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Multi Currency"
@@ -5480,6 +5756,11 @@ msgstr ""
msgid "Name:"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_narration
+msgid "Narration"
+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
@@ -5491,13 +5772,6 @@ msgstr ""
msgid "New"
msgstr ""
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:88
-#, python-format
-msgid "New Operation"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "New Statement"
@@ -5509,18 +5783,11 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1149
+#: code:addons/account/models/account_move.py:1164
#, python-format
msgid "New expected payment date: "
msgstr ""
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:80
-#, python-format
-msgid "New preset"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Next, register any unmatched payments:<br/>"
@@ -5537,7 +5804,12 @@ msgid "No Follow-up"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:988
+#: selection:res.partner,invoice_warn:0
+msgid "No Message"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:1019
#, python-format
msgid "No appropriate payment method enabled on journal %s"
msgstr ""
@@ -5549,7 +5821,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:123
+#: code:addons/account/static/src/xml/account_reconciliation.xml:124
#, python-format
msgid "No result matching '"
msgstr ""
@@ -5610,7 +5882,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:267
+#: code:addons/account/static/src/xml/account_reconciliation.xml:268
#: model:ir.model.fields,field_description:account.field_account_account_template_note
#, python-format
msgid "Note"
@@ -5663,7 +5935,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:192
+#: code:addons/account/static/src/xml/account_reconciliation.xml:193
#, python-format
msgid "OK"
msgstr ""
@@ -5762,20 +6034,20 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:331
+#: code:addons/account/models/account_payment.py:336
#, 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:736
+#: code:addons/account/models/chart_template.py:743
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1511
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1526
#, python-format
msgid "Only use the ctrl-enter shortcut to validate reconciliations."
msgstr ""
@@ -5801,9 +6073,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1870
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1902
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2037
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1885
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1917
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2052
#, python-format
msgid "Open balance"
msgstr ""
@@ -5818,6 +6090,12 @@ msgstr ""
msgid "Operation Templates"
msgstr ""
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:985
+#, python-format
+msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
+msgstr ""
+
#. module: account
#: code:addons/account/wizard/account_reconcile.py:66
#: code:addons/account/wizard/account_reconcile.py:125
@@ -5845,6 +6123,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_option
+#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
#: model:ir.ui.view,arch_db:account.view_account_config_settings
msgid "Options"
msgstr ""
@@ -5872,7 +6151,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:296
+#: code:addons/account/static/src/xml/account_reconciliation.xml:297
#, python-format
msgid "OtherAccounts"
msgstr ""
@@ -5950,7 +6229,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:280
+#: code:addons/account/models/account_payment.py:283
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -5990,8 +6269,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1731
-#: code:addons/account/static/src/xml/account_reconciliation.xml:262
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1746
+#: code:addons/account/static/src/xml/account_reconciliation.xml:263
#: model:ir.model,name:account.model_res_partner
#: 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
@@ -6037,11 +6316,6 @@ msgstr ""
msgid "Partner Ledger: Receivable"
msgstr ""
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_ref
-msgid "Partner Reference"
-msgstr ""
-
#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_name
msgid "Partner name"
@@ -6123,10 +6397,21 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_abstract_payment_journal_id
#: model:ir.model.fields,field_description:account.field_account_payment_journal_id
#: model:ir.model.fields,field_description:account.field_account_register_payments_journal_id
+msgid "Payment Journal"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Payment Method"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_abstract_payment_payment_method_id
+#: model:ir.model.fields,field_description:account.field_account_payment_payment_method_id
+#: model:ir.model.fields,field_description:account.field_account_register_payments_payment_method_id
+msgid "Payment Method Type"
+msgstr ""
+
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:60
@@ -6140,6 +6425,11 @@ msgstr ""
msgid "Payment Methods"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_payment_move_line_ids
+msgid "Payment Move Lines"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_reference_type
msgid "Payment Reference"
@@ -6171,11 +6461,8 @@ msgid "Payment Terms"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_abstract_payment_payment_method_id
#: model:ir.model.fields,field_description:account.field_account_abstract_payment_payment_type
-#: model:ir.model.fields,field_description:account.field_account_payment_payment_method_id
#: model:ir.model.fields,field_description:account.field_account_payment_payment_type
-#: model:ir.model.fields,field_description:account.field_account_register_payments_payment_method_id
#: model:ir.model.fields,field_description:account.field_account_register_payments_payment_type
msgid "Payment Type"
msgstr ""
@@ -6205,16 +6492,6 @@ msgstr ""
msgid "Payment term: 30 Net Days"
msgstr ""
-#. module: account
-#: model:account.payment.term,note:account.account_payment_term_advance
-msgid "Payment term: 30% Advance End of Following Month"
-msgstr ""
-
-#. module: account
-#: model:account.payment.term,note:account.account_payment_term
-msgid "Payment term: End of Following Month"
-msgstr ""
-
#. module: account
#: model:account.payment.term,note:account.account_payment_term_immediate
msgid "Payment term: Immediate Payment"
@@ -6235,7 +6512,6 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_payments_payable
#: model:ir.model,name:account.model_account_payment
#: model:ir.model.fields,field_description:account.field_account_invoice_payment_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_payment_move_line_ids
#: model:ir.ui.menu,name:account.menu_action_account_payments_payable
#: model:ir.ui.menu,name:account.menu_action_account_payments_receivable
#: model:ir.ui.view,arch_db:account.partner_view_buttons
@@ -6266,28 +6542,6 @@ msgstr ""
msgid "Payments widget"
msgstr ""
-#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company_paypal_account
-msgid "Paypal Account"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_config_settings_paypal_account
-msgid "Paypal account"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_account_config_settings_paypal_account
-msgid "Paypal account (email) for receiving online payments (credit card, etc.)\n"
-" If you set a paypal account, the customer will be able to pay your invoices or quotations\n"
-" with a button \"Pay with Paypal\" in automated emails or through the Odoo portal."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_res_company_paypal_account
-msgid "Paypal username (usually email) for receiving online payments."
-msgstr ""
-
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
msgid "Pending Invoice"
@@ -6326,7 +6580,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1383
+#: code:addons/account/models/account_invoice.py:1406
#, python-format
msgid "Percentages for Payment Term Line must be between 0 and 100."
msgstr ""
@@ -6364,19 +6618,19 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:725
+#: code:addons/account/models/account_invoice.py:749
#, python-format
msgid "Please create some invoice lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:136
+#: code:addons/account/models/account_move.py:145
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:723
+#: code:addons/account/models/account_invoice.py:747
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -6478,11 +6732,6 @@ msgstr ""
msgid "Preset to create journal entries during a invoices and payments matching"
msgstr ""
-#. module: account
-#: model:ir.ui.view,arch_db:account.report_invoice_document
-msgid "Price"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
#: model:ir.ui.view,arch_db:account.account_common_report_view
@@ -6577,12 +6826,6 @@ msgstr ""
msgid "Proforma"
msgstr ""
-#. module: account
-#: code:addons/account/models/account_bank_statement.py:593
-#, python-format
-msgid "Programmation error : domain_maker_move_line_amount requires comparator '=' or '<'"
-msgstr ""
-
#. module: account
#: code:addons/account/models/account_payment.py:123
#, python-format
@@ -6602,6 +6845,7 @@ msgstr ""
#. module: account
#: selection:account.journal,type:0
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_tax_search
#: model:ir.ui.view,arch_db:account.view_account_tax_template_search
@@ -6705,9 +6949,9 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1852
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2450
-#: code:addons/account/static/src/xml/account_reconciliation.xml:322
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1867
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2465
+#: code:addons/account/static/src/xml/account_reconciliation.xml:323
#: 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
@@ -6751,6 +6995,11 @@ msgstr ""
msgid "Reconciled Entries"
msgstr ""
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_move_form
+msgid "Reconciled entries"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
msgid "Reconciliation"
@@ -6780,7 +7029,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2163
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2178
#, python-format
msgid "Reconciling "
msgstr ""
@@ -6814,6 +7063,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
+#: model:ir.model.fields,field_description:account.field_account_move_line_ref
#: model:ir.model.fields,field_description:account.field_account_move_ref
#: model:ir.model.fields,field_description:account.field_cash_box_in_ref
msgid "Reference"
@@ -6846,7 +7096,7 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:872
+#: code:addons/account/models/account_invoice.py:897
#: 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
@@ -6972,13 +7222,9 @@ msgstr ""
msgid "Report Value"
msgstr ""
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_reports
-msgid "Reporting"
-msgstr ""
-
#. module: account
#: model:ir.ui.menu,name:account.account_report_folder
+#: model:ir.ui.menu,name:account.menu_finance_reports
msgid "Reports"
msgstr ""
@@ -6989,7 +7235,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:149
+#: code:addons/account/static/src/xml/account_reconciliation.xml:150
#, python-format
msgid "Residual"
msgstr ""
@@ -7010,6 +7256,11 @@ msgstr ""
msgid "Responsible"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_deferred_revenue
+msgid "Revenue Recognition"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_reversal_date
msgid "Reversal date"
@@ -7070,6 +7321,7 @@ msgstr ""
#. module: account
#: selection:account.journal,type:0
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
#: model:ir.ui.view,arch_db:account.view_account_journal_search
#: model:ir.ui.view,arch_db:account.view_account_tax_search
#: model:ir.ui.view,arch_db:account.view_account_tax_template_search
@@ -7115,6 +7367,13 @@ msgstr ""
msgid "Salesperson"
msgstr ""
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:89
+#, python-format
+msgid "Save and New"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_journal_search
msgid "Search Account Journal"
@@ -7170,6 +7429,41 @@ msgstr ""
msgid "Search Taxes"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_account_id
+msgid "Second Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount
+msgid "Second Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_amount_type
+msgid "Second Amount type"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_analytic_account_id
+msgid "Second Analytic Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_journal_id
+msgid "Second Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_label
+msgid "Second Journal Item Label"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_operation_template_second_tax_id
+msgid "Second Tax"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_journal_type
msgid "Select 'Sale' for customer invoices journals.\n"
@@ -7180,14 +7474,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1759
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1774
#, python-format
msgid "Select Partner"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:234
+#: code:addons/account/static/src/xml/account_reconciliation.xml:235
#, python-format
msgid "Select a partner or choose a counterpart"
msgstr ""
@@ -7209,6 +7503,16 @@ msgstr ""
msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state."
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_res_partner_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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_product_template_action
+msgid "Sellable Products"
+msgstr ""
+
#. module: account
#: selection:account.abstract.payment,payment_type:0
#: selection:account.payment,payment_type:0
@@ -7265,6 +7569,11 @@ msgstr ""
msgid "Set the default Sales and Purchase taxes"
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_account_tax_tax_adjustment
+msgid "Set this field to true if this tax can be used in the tax adjustment wizard, used to manually fill some data in the tax declaration"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_chart_template_visible
msgid "Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."
@@ -7293,7 +7602,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:289
+#: code:addons/account/static/src/xml/account_reconciliation.xml:290
#, python-format
msgid "Show"
msgstr ""
@@ -7310,7 +7619,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:19
+#: code:addons/account/static/src/xml/account_reconciliation.xml:20
#, python-format
msgid "Show more... ("
msgstr ""
@@ -7325,6 +7634,13 @@ msgstr ""
msgid "Simplify your cash, checks, or credit cards deposits with an integrated batch payment function."
msgstr ""
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2468
+#, python-format
+msgid "Skip"
+msgstr ""
+
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
@@ -7379,7 +7695,7 @@ msgid "Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:252
+#: code:addons/account/models/account_bank_statement.py:244
#, python-format
msgid "Statement %s confirmed, journal items were created."
msgstr ""
@@ -7447,6 +7763,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_tag_ids
#: model:ir.model.fields,field_description:account.field_account_tax_tag_ids
+#: model:ir.ui.view,arch_db:account.account_tag_view_form
msgid "Tags"
msgstr ""
@@ -7458,7 +7775,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1518
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1533
#, python-format
msgid "Take on average less than 5 seconds to reconcile a transaction."
msgstr ""
@@ -7479,22 +7796,21 @@ msgstr ""
#. module: account
#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:121
#: code:addons/account/static/src/js/account_reconciliation_widgets.js:126
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:131
#: model:ir.model,name:account.model_account_tax
#: model:ir.model.fields,field_description:account.field_account_invoice_amount_tax
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_tax_id
-#: model:ir.model.fields,field_description:account.field_account_operation_template_second_tax_id
#: model:ir.model.fields,field_description:account.field_account_operation_template_tax_id
-#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
#: model:ir.ui.view,arch_db:account.view_account_tax_search
#, python-format
msgid "Tax"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:717
-#: code:addons/account/models/chart_template.py:720
+#: code:addons/account/models/chart_template.py:724
+#: code:addons/account/models/chart_template.py:727
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -7512,6 +7828,12 @@ msgstr ""
msgid "Tax Account on Refunds"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,name:account.tax_adjustments_form
+#: model:ir.ui.menu,name:account.menu_action_tax_adjustment
+msgid "Tax Adjustments"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.report_journal
msgid "Tax Amount"
@@ -7543,6 +7865,11 @@ msgstr ""
msgid "Tax Description"
msgstr ""
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_invoice_document
+msgid "Tax Excluded Price"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_tax_tax_group_id
#: model:ir.model.fields,field_description:account.field_account_tax_template_tax_group_id
@@ -7600,6 +7927,12 @@ msgstr ""
msgid "Tax Templates"
msgstr ""
+#. module: account
+#: 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
+msgid "Tax adjustment"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_tax_calculation_rounding_method
msgid "Tax calculation rounding method"
@@ -7672,6 +8005,12 @@ msgstr ""
msgid "Technical field holding the number given to the invoice, automatically set when the invoice is validated then stored to set the same number again if the invoice is cancelled, set to draft and re-validated."
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement_line_move_name
+#: model:ir.model.fields,help:account.field_account_payment_move_name
+msgid "Technical field holding the number given to the journal entry, automatically set when the statement line is reconciled then stored to set the same number again if the line is cancelled, set to draft and re-processed again."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_refund_refund_only
msgid "Technical field to hide filter_refund in case invoice is partially paid"
@@ -7702,6 +8041,11 @@ msgstr ""
msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'"
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_account_move_line_tax_exigible
+msgid "Technical field used to mark a tax line as exigible in the vat report or not (only exigible journal items are displayed). By default all new journal items are directly exigible, but with the module account_tax_cash_basis, some will become exigible only when the payment is recorded."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_chart_template_id
msgid "Template"
@@ -7765,7 +8109,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:212
+#: code:addons/account/static/src/xml/account_reconciliation.xml:213
#, python-format
msgid "That's on average"
msgstr ""
@@ -7788,7 +8132,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:852
+#: code:addons/account/models/account_move.py:870
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -7810,13 +8154,13 @@ msgid "The amount expressed in the related account currency if not equal to the
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:421
+#: code:addons/account/models/account_move.py:445
#, 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:571
+#: code:addons/account/models/account.py:573
#, python-format
msgid "The application scope of taxes in a group must be either the same as the group or \"None\"."
msgstr ""
@@ -7897,7 +8241,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:455
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -7951,7 +8295,7 @@ msgid "The partner has at least one unreconciled debit and credit since last tim
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:854
+#: code:addons/account/models/account_move.py:872
#, python-format
msgid "The partner has to be the same on all lines for receivable and payable accounts!"
msgstr ""
@@ -7962,7 +8306,7 @@ msgid "The partner reference of this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:334
+#: code:addons/account/models/account_payment.py:339
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -7978,13 +8322,13 @@ msgid "The residual amount on a journal item expressed in the company currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:406
+#: code:addons/account/models/account_move.py:430
#, 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:1245
+#: code:addons/account/models/account_invoice.py:1268
#, python-format
msgid "The selected unit of measure is not compatible with the unit of measure of the product."
msgstr ""
@@ -7996,7 +8340,7 @@ msgid "The sequence field is used to define order in which the tax lines are app
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:452
+#: code:addons/account/models/account_payment.py:457
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
@@ -8015,15 +8359,15 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:308
-#: code:addons/account/static/src/xml/account_reconciliation.xml:315
+#: code:addons/account/static/src/xml/account_reconciliation.xml:309
+#: code:addons/account/static/src/xml/account_reconciliation.xml:316
#, python-format
msgid "There is nothing to reconcile."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1494
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1509
#, python-format
msgid "There you go, it's all done !"
msgstr ""
@@ -8038,6 +8382,12 @@ msgstr ""
msgid "These users handle billing specifically."
msgstr ""
+#. module: account
+#: code:addons/account/models/account_invoice.py:996
+#, python-format
+msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>"
+msgstr ""
+
#. module: account
#: code:addons/account/models/account_journal_dashboard.py:101
#, python-format
@@ -8097,6 +8447,12 @@ msgid "This allows you to group received checks before you deposit them to the b
"-This installs the module account_batch_deposit."
msgstr ""
+#. module: account
+#: model:ir.model.fields,help:account.field_account_config_settings_module_account_deferred_revenue
+msgid "This allows you to manage the revenue recognition on selling products. It keeps track of the installments occurred on those revenue recognitions, and creates account moves for those installment lines\n"
+"-This installs the module account_deferred_revenue."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_complete_tax_set
msgid "This boolean helps you to choose if you want to propose to the user to encode\n"
@@ -8186,14 +8542,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:205
+#: code:addons/account/static/src/xml/account_reconciliation.xml:206
#, 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:153
+#: code:addons/account/static/src/xml/account_reconciliation.xml:154
#, python-format
msgid "This payment is registered but not reconciled."
msgstr ""
@@ -8241,7 +8597,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:20
+#: code:addons/account/static/src/xml/account_reconciliation.xml:21
#, python-format
msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
msgstr ""
@@ -8272,7 +8628,7 @@ msgid "To manage the tax applied when invoicing a Company, Odoo uses the concept
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:848
+#: code:addons/account/models/account_move.py:866
#, python-format
msgid "To reconcile the entries company should be the same for all entries!"
msgstr ""
@@ -8284,10 +8640,10 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:145
+#: code:addons/account/static/src/xml/account_reconciliation.xml:146
#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total
-#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total_company_signed
-#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total_signed
+#: 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
@@ -8359,6 +8715,16 @@ msgstr ""
msgid "Total amount you have to pay to this vendor."
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total_company_signed
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_amount_total_signed
+msgid "Total in Invoice Currency"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_bank_statement_total_entry_encoding
msgid "Total of transaction lines."
@@ -8366,7 +8732,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:263
+#: code:addons/account/static/src/xml/account_reconciliation.xml:264
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#, python-format
msgid "Transaction"
@@ -8394,19 +8760,19 @@ msgid "Transfer To"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:218
+#: code:addons/account/models/account_payment.py:221
#, python-format
msgid "Transfer account not defined on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:423
+#: code:addons/account/models/account_payment.py:428
#, python-format
msgid "Transfer from %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:506
+#: code:addons/account/models/account_payment.py:511
#, python-format
msgid "Transfer to %s"
msgstr ""
@@ -8429,7 +8795,6 @@ msgid "Trial Balance Report"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_account_internal_type
#: model:ir.model.fields,field_description:account.field_account_account_template_user_type_id
#: model:ir.model.fields,field_description:account.field_account_account_type_type
#: model:ir.model.fields,field_description:account.field_account_account_user_type_id
@@ -8444,7 +8809,7 @@ msgid "Type"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:775
+#: code:addons/account/models/chart_template.py:782
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
@@ -8463,11 +8828,17 @@ msgid "Unit of Measure"
msgstr ""
#. module: account
-#: code:addons/account/report/account_aged_partner_balance.py:264
+#: code:addons/account/report/account_aged_partner_balance.py:185
#, python-format
msgid "Unknown Partner"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_ledger_payable_no_partner
+#: model:ir.actions.act_window,name:account.act_account_partner_ledger_receivable_no_partner
+msgid "Unknown Partner Ledger"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Unless you are starting a new business, you probably have a list of customers and vendors you'd like to import."
@@ -8530,10 +8901,14 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_amount_untaxed
-#: model:ir.model.fields,field_description:account.field_account_invoice_amount_untaxed_signed
msgid "Untaxed Amount"
msgstr ""
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_amount_untaxed_signed
+msgid "Untaxed Amount in Company Currency"
+msgstr ""
+
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Use"
@@ -8631,7 +9006,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1869
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1884
#: 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
@@ -8676,7 +9051,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:871
+#: code:addons/account/models/account_invoice.py:896
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -8684,7 +9059,7 @@ msgid "Vendor Bill"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:178
+#: code:addons/account/models/chart_template.py:183
#: 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
@@ -8698,7 +9073,7 @@ msgid "Vendor Flow"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:488
+#: code:addons/account/models/account_payment.py:493
#, python-format
msgid "Vendor Payment"
msgstr ""
@@ -8717,8 +9092,8 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:873
-#: code:addons/account/models/account_payment.py:486
+#: code:addons/account/models/account_invoice.py:898
+#: code:addons/account/models/account_payment.py:491
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
msgid "Vendor Refund"
@@ -8731,7 +9106,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:295
+#: code:addons/account/static/src/xml/account_reconciliation.xml:296
#: model:ir.ui.menu,name:account.menu_account_supplier
#, python-format
msgid "Vendors"
@@ -8742,11 +9117,6 @@ msgstr ""
msgid "View"
msgstr ""
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_move_form
-msgid "View reconciled entries"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_config_settings
msgid "View supported banks"
@@ -8758,8 +9128,25 @@ msgid "Volume"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1183
-#: code:addons/account/models/account_invoice.py:1244
+#: model:ir.model.fields,field_description:account.field_account_config_settings_group_warning_account
+#: selection:res.partner,invoice_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:486
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.partner_view_buttons
+msgid "Warning on the Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_invoice.py:1208
+#: code:addons/account/models/account_invoice.py:1267
#, python-format
msgid "Warning!"
msgstr ""
@@ -8803,7 +9190,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1505
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1520
#, python-format
msgid "Whew, that was fast !"
msgstr ""
@@ -8843,7 +9230,12 @@ msgid "With tax"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:889
+#: model:ir.model,name:account.model_tax_adjustments_wizard
+msgid "Wizard for Tax Adjustments"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:907
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#, python-format
msgid "Write-Off"
@@ -8875,7 +9267,7 @@ msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:846
+#: code:addons/account/models/account_move.py:864
#, python-format
msgid "You are trying to reconcile some entries that are already reconciled!"
msgstr ""
@@ -8892,7 +9284,7 @@ msgid "You can control the invoice from your vendor according to\n"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config.py:238
+#: code:addons/account/models/res_config.py:245
#, python-format
msgid "You can not change a company chart of account once it has been installed"
msgstr ""
@@ -8904,7 +9296,7 @@ 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:317
+#: code:addons/account/models/account_payment.py:320
#, python-format
msgid "You can not delete a payment that is already posted"
msgstr ""
@@ -8921,19 +9313,19 @@ msgid "You can set up here the format you want this record to be displayed. If y
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:179
+#: code:addons/account/models/account_move.py:188
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:181
+#: code:addons/account/models/account_move.py:190
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:852
+#: code:addons/account/models/account_invoice.py:877
#, python-format
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
msgstr ""
@@ -8945,25 +9337,19 @@ msgid "You cannot change the owner company of an account that already contains j
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1138
-#, python-format
-msgid "You cannot change the tax, you should remove and recreate lines."
-msgstr ""
-
-#. module: account
-#: code:addons/account/models/account_move.py:413
+#: code:addons/account/models/account_move.py:437
#, 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:438
+#: code:addons/account/models/account_invoice.py:440
#, 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:436
+#: code:addons/account/models/account_invoice.py:438
#, python-format
msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead."
msgstr ""
@@ -8975,14 +9361,14 @@ msgid "You cannot do that on an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1174
+#: code:addons/account/models/account_move.py:1189
#, 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:1176
+#: code:addons/account/models/account_move.py:1191
#, 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."
@@ -9009,13 +9395,13 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1791
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1806
#, python-format
msgid "You cannot mix items from receivable and payable accounts."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:146
+#: code:addons/account/models/account_move.py:155
#, python-format
msgid "You cannot modify a posted entry of this journal.\n"
"First you should set the journal to allow cancelling entries."
@@ -9034,14 +9420,14 @@ 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:1013
-#: code:addons/account/models/account_move.py:1140
+#: code:addons/account/models/account_move.py:1031
+#: code:addons/account/models/account_move.py:1155
#, python-format
msgid "You cannot use deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1069
+#: code:addons/account/models/account_move.py:1086
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
@@ -9059,7 +9445,7 @@ msgid "You must define a Start Date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1184
+#: code:addons/account/models/account_invoice.py:1209
#, python-format
msgid "You must first select a partner!"
msgstr ""
@@ -9077,19 +9463,19 @@ msgid "You must set a start date."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1321
+#: code:addons/account/models/account_move.py:1345
#, 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:1323
+#: code:addons/account/models/account_move.py:1347
#, 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:1325
+#: code:addons/account/models/account_move.py:1349
#, 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 ""
@@ -9103,7 +9489,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:214
+#: code:addons/account/static/src/xml/account_reconciliation.xml:215
#, python-format
msgid "You validated"
msgstr ""
@@ -9166,11 +9552,6 @@ msgstr ""
msgid "Zip Range To"
msgstr ""
-#. module: account
-#: model:ir.model,name:account.model_account_analytic_line
-msgid "account analytic line"
-msgstr ""
-
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
@@ -9198,7 +9579,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:297
+#: code:addons/account/static/src/xml/account_reconciliation.xml:298
#, python-format
msgid "all"
msgstr ""
@@ -9210,11 +9591,6 @@ msgstr ""
msgid "assign to invoice"
msgstr ""
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_bank_statement_form
-msgid "auto..."
-msgstr ""
-
#. module: account
#: model:ir.model,name:account.model_cash_box_in
msgid "cash.box.in"
@@ -9237,19 +9613,19 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:294
+#: code:addons/account/static/src/xml/account_reconciliation.xml:295
#, python-format
msgid "customers"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
-msgid "e.g. Bank Fees"
+#: model:ir.ui.view,arch_db:account.view_payment_term_line_form
+msgid "days"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_config_settings
-msgid "e.g. sales@odoo.com"
+#: model:ir.ui.view,arch_db:account.view_account_operation_template_form
+msgid "e.g. Bank Fees"
msgstr ""
#. module: account
@@ -9275,12 +9651,13 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
#: model:ir.ui.view,arch_db:account.account_common_report_view
+#: model:ir.ui.view,arch_db:account.tax_adjustments_wizard
msgid "or"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:296
+#: code:addons/account/static/src/xml/account_reconciliation.xml:297
#, python-format
msgid "others"
msgstr ""
@@ -9297,14 +9674,14 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:214
+#: code:addons/account/static/src/xml/account_reconciliation.xml:215
#, python-format
msgid "reconciliations with the ctrl-enter shortcut."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:19
+#: code:addons/account/static/src/xml/account_reconciliation.xml:20
#, python-format
msgid "remaining)"
msgstr ""
@@ -9325,34 +9702,34 @@ msgid "report.account.report_generalledger"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_report_account_report_overdue
-msgid "report.account.report_overdue"
+#: model:ir.model,name:account.model_report_account_report_journal
+msgid "report.account.report_journal"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_report_account_report_trialbalance
-msgid "report.account.report_trialbalance"
+#: model:ir.model,name:account.model_report_account_report_overdue
+msgid "report.account.report_overdue"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_report_account_extra_reports_report_journal
-msgid "report.account_extra_reports.report_journal"
+#: model:ir.model,name:account.model_report_account_report_partnerledger
+msgid "report.account.report_partnerledger"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_report_account_extra_reports_report_partnerledger
-msgid "report.account_extra_reports.report_partnerledger"
+#: model:ir.model,name:account.model_report_account_report_trialbalance
+msgid "report.account.report_trialbalance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:209
+#: code:addons/account/models/account_move.py:218
#, python-format
msgid "reversal of: "
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:212
+#: code:addons/account/static/src/xml/account_reconciliation.xml:213
#, python-format
msgid "seconds per transaction."
msgstr ""
@@ -9374,7 +9751,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:295
+#: code:addons/account/static/src/xml/account_reconciliation.xml:296
#, python-format
msgid "suppliers"
msgstr ""
@@ -9401,7 +9778,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:212
+#: code:addons/account/static/src/xml/account_reconciliation.xml:213
#, python-format
msgid "to reconcile"
msgstr ""
@@ -9413,7 +9790,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:212
+#: code:addons/account/static/src/xml/account_reconciliation.xml:213
#, python-format
msgid "transactions."
msgstr ""
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index c495d7816ea10cfdd64c3b7796524b301aea2ac1..81ef227f6ed59ff1c0378ba2f7186189504438ce 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -1,12 +1,13 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
+# * account_accountant
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -14,3 +15,31 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: account_accountant
+#. openerp-web
+#: code:addons/account_accountant/static/src/js/tour.js:18
+#, python-format
+msgid "Let's start with a new customer invoice."
+msgstr ""
+
+#. module: account_accountant
+#. openerp-web
+#: code:addons/account_accountant/static/src/js/tour.js:13
+#, python-format
+msgid "Ready to discover your new favorite <b>accounting app</b>? Get started by clicking here."
+msgstr ""
+
+#. module: account_accountant
+#. openerp-web
+#: code:addons/account_accountant/static/src/js/tour.js:23
+#, python-format
+msgid "Use the path to quickly click back to <b>previous screens</b>, without reloading the page."
+msgstr ""
+
+#. module: account_accountant
+#. openerp-web
+#: code:addons/account_accountant/static/src/js/tour.js:27
+#, python-format
+msgid "Your reports are available in real time. <i>No need to close a fiscal year to get a Profit & Loss statement or view the Balance Sheet.</i>"
+msgstr ""
+
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 47dc1d3776f0c9b70f3c865f4e5fd8dec13e13b1..c5f8b34baf21bc1e12049243cb5bac60ae33fbb5 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:347
+#: code:addons/account_asset/models/account_asset.py:376
#, python-format
msgid " (copy)"
msgstr ""
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:511
+#, python-format
+msgid " (grouped)"
+msgstr ""
+
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_entry_count
msgid "# Asset Entries"
@@ -46,6 +52,21 @@ msgstr ""
msgid "Account Entry"
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_category_account_depreciation_id
+msgid "Account used in the depreciation entries, to decrease the asset value."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_category_account_depreciation_expense_id
+msgid "Account used in the periodical entries, to record a part of the asset as expense."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_category_account_asset_id
+msgid "Account used to record the purchase of the asset at its original price."
+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
@@ -53,7 +74,12 @@ msgid "Active"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:484
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
+msgid "Additional Options"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:568
#, python-format
msgid "Amount"
msgstr ""
@@ -75,7 +101,6 @@ msgstr ""
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_asset_id
-#: model:ir.model.fields,field_description:account_asset.field_account_move_asset_id
#: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_asset_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
@@ -84,6 +109,7 @@ msgid "Asset"
msgstr ""
#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_asset_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
msgid "Asset Account"
msgstr ""
@@ -142,7 +168,7 @@ msgid "Asset category"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:235
+#: code:addons/account_asset/models/account_asset.py:263
#, python-format
msgid "Asset created"
msgstr ""
@@ -153,7 +179,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:268
+#: code:addons/account_asset/models/account_asset.py:296
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -181,6 +207,11 @@ msgstr ""
msgid "Assets Analysis"
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_move_asset_depreciation_ids
+msgid "Assets Depreciation Lines"
+msgstr ""
+
#. module: account_asset
#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets and Revenues"
@@ -206,6 +237,11 @@ msgstr ""
msgid "Assets in running state"
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_open_asset
+msgid "Auto-confirm Assets"
+msgstr ""
+
#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.asset_modify_form
#: model:ir.ui.view,arch_db:account_asset.view_asset_depreciation_confirmation_wizard
@@ -229,6 +265,11 @@ msgstr ""
msgid "Check this if you want to automatically confirm the assets of this category when created by invoices."
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_category_group_entries
+msgid "Check this if you want to group the generated entries by categories."
+msgstr ""
+
#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset_method
#: model:ir.model.fields,help:account_asset.field_account_asset_category_method
@@ -291,13 +332,13 @@ msgid "Confirm"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/wizard/wizard_asset_compute.py:18
+#: code:addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py:20
#, python-format
msgid "Created Asset Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/wizard/wizard_asset_compute.py:20
+#: code:addons/account_asset/wizard/asset_depreciation_confirmation_wizard.py:20
#, python-format
msgid "Created Revenue Moves"
msgstr ""
@@ -326,7 +367,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:484
+#: code:addons/account_asset/models/account_asset.py:568
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id
#, python-format
msgid "Currency"
@@ -401,11 +442,6 @@ msgstr ""
msgid "Depreciation"
msgstr ""
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_depreciation_id
-msgid "Depreciation Account"
-msgstr ""
-
#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Depreciation Asset Account"
@@ -422,6 +458,16 @@ msgstr ""
msgid "Depreciation Date"
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_depreciation_id
+msgid "Depreciation Entries: Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_depreciation_expense_id
+msgid "Depreciation Entries: Expense Account"
+msgstr ""
+
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_id
msgid "Depreciation Entry"
@@ -459,13 +505,13 @@ msgid "Depreciation Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/wizard/account_asset_change_duration.py:82
+#: code:addons/account_asset/wizard/asset_modify.py:85
#, python-format
msgid "Depreciation board modified"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:487
+#: code:addons/account_asset/models/account_asset.py:571
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -481,19 +527,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:271
+#: code:addons/account_asset/models/account_asset.py:299
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:274
+#: code:addons/account_asset/models/account_asset.py:302
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:466
+#: code:addons/account_asset/models/account_asset.py:550
#, python-format
msgid "Document closed."
msgstr ""
@@ -518,21 +564,6 @@ msgstr ""
msgid "Ending date"
msgstr ""
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_account_move_ids
-msgid "Entries"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
-msgid "Every"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_asset_id
-msgid "Expense Account"
-msgstr ""
-
#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search
msgid "Extended Filters..."
@@ -580,6 +611,11 @@ msgstr ""
msgid "Group By..."
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_group_entries
+msgid "Group Journal Entries"
+msgstr ""
+
#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_id
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_id
@@ -590,11 +626,6 @@ msgstr ""
msgid "ID"
msgstr ""
-#. module: account_asset
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
-msgid "Income Account"
-msgstr ""
-
#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset_prorata
msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year"
@@ -633,7 +664,7 @@ msgid "Journal"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:374
+#: code:addons/account_asset/models/account_asset.py:410
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
@@ -673,6 +704,11 @@ msgstr ""
msgid "Linear"
msgstr ""
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_check
+msgid "Linked"
+msgstr ""
+
#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.asset_modify_form
msgid "Modify"
@@ -730,7 +766,12 @@ msgid "Number of Months in a Period"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:486
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
+msgid "One Entry Every"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:570
#: 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
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
@@ -754,15 +795,10 @@ msgstr ""
msgid "Post Depreciation Lines"
msgstr ""
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_open_asset
-msgid "Post Journal Entries"
-msgstr ""
-
#. module: account_asset
#. openerp-web
-#: code:addons/account_asset/static/src/js/account_asset.js:24
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_check
+#: code:addons/account_asset/static/src/js/account_asset.js:28
+#: 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
#, python-format
@@ -791,7 +827,7 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:313
+#: code:addons/account_asset/models/account_asset.py:342
#, python-format
msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
msgstr ""
@@ -817,7 +853,12 @@ msgid "Reason"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_income_recognition_id
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
+msgid "Recognition Account"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Recognition Income Account"
msgstr ""
@@ -918,6 +959,7 @@ msgid "Time Method"
msgstr ""
#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Time Method Based On"
msgstr ""
@@ -931,7 +973,7 @@ msgstr ""
#. module: account_asset
#. openerp-web
-#: code:addons/account_asset/static/src/js/account_asset.js:24
+#: code:addons/account_asset/static/src/js/account_asset.js:28
#, python-format
msgid "Unposted"
msgstr ""
@@ -961,25 +1003,25 @@ msgid "Year"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:96
+#: code:addons/account_asset/models/account_asset.py:107
#, python-format
msgid "You cannot delete a document is in %s state."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:98
+#: code:addons/account_asset/models/account_asset.py:110
#, python-format
msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:495
+#: code:addons/account_asset/models/account_asset.py:579
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:497
+#: code:addons/account_asset/models/account_asset.py:581
#, python-format
msgid "You cannot delete posted installment lines."
msgstr ""
diff --git a/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot b/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
index 9cb3e7f9765c300f11a11ed472d7502fb379f75e..2393e3e23cc7550862e902c8200d4ec9880bbeaa 100644
--- a/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
+++ b/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
#. module: account_tax_cash_basis
#: model:ir.model.fields,help:account_tax_cash_basis.field_account_tax_cash_basis_account
-msgid "Account use when creating entry for tax cash basis"
+msgid "Account use when creating entry for tax cash basis"
msgstr ""
#. module: account_tax_cash_basis
@@ -30,6 +30,11 @@ msgstr ""
msgid "Companies"
msgstr ""
+#. module: account_tax_cash_basis
+#: model:ir.model,name:account_tax_cash_basis.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
#. module: account_tax_cash_basis
#: model:ir.model,name:account_tax_cash_basis.model_account_partial_reconcile
msgid "Partial Reconcile"
@@ -37,7 +42,7 @@ msgstr ""
#. module: account_tax_cash_basis
#: model:ir.model.fields,help:account_tax_cash_basis.field_account_tax_use_cash_basis
-msgid "Select this if the tax should use cash basis, which will create an entry for this tax on a given account during reconciliation"
+msgid "Select this if the tax should use cash basis,which will create an entry for this tax on a given account during reconciliation"
msgstr ""
#. module: account_tax_cash_basis
@@ -63,11 +68,11 @@ msgstr ""
#. module: account_tax_cash_basis
#: model:ir.model.fields,help:account_tax_cash_basis.field_account_move_tax_cash_basis_rec_id
-msgid "Technical field used to keep track of the tax cash basis reconciliation. This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
+msgid "Technical field used to keep track of the tax cash basis reconciliation.This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
msgstr ""
#. module: account_tax_cash_basis
-#: code:addons/account_tax_cash_basis/tax_cash_basis.py:82
+#: code:addons/account_tax_cash_basis/models/account_partial_reconcile.py:80
#, python-format
msgid "There is no tax cash basis journal defined for this company: \"%s\" \n"
"Configure it in Accounting/Configuration/Settings"
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 5080123917b6518b37089d0a08ba952a65013b34..8732641674d4e880f7760a819161b38591a0bb03 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,11 @@ msgstr ""
msgid "Account Date"
msgstr ""
+#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_account_date
+msgid "Accounting Date"
+msgstr ""
+
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_voucher
msgid "Accounting Voucher"
@@ -56,7 +61,9 @@ msgid "Are you sure you want to cancel this receipt?"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_date
#: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form
+#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_vendor
msgid "Bill Date"
msgstr ""
@@ -86,7 +93,7 @@ msgid "Cancelled"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:147
+#: code:addons/account_voucher/models/account_voucher.py:165
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
msgstr ""
@@ -139,9 +146,7 @@ msgid "Customer"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_date
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
-#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_vendor
msgid "Date"
msgstr ""
@@ -177,7 +182,7 @@ msgid "Due Date"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_date
+#: model:ir.model.fields,help:account_voucher.field_account_voucher_account_date
msgid "Effective date for accounting entries"
msgstr ""
@@ -294,13 +299,13 @@ msgid "Payment Reference"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:183
+#: code:addons/account_voucher/models/account_voucher.py:201
#, python-format
msgid "Please activate the sequence of selected journal !"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:186
+#: code:addons/account_voucher/models/account_voucher.py:204
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
@@ -488,7 +493,7 @@ msgid "Vendor Voucher"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:31
+#: code:addons/account_voucher/models/account_voucher.py:97
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line_voucher_id
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale
@@ -537,7 +542,7 @@ msgid "When the sale receipt is confirmed, you can record the customer\n"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/models/account_voucher.py:367
#, python-format
msgid "You must first select a partner!"
msgstr ""
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index 903480240403478714fc57395eca65978a387318..ef7898fac668a73693a76bdf336debbb3e19edf1 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,24 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: analytic
-#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
-msgid "(Keep empty to open the current situation)"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model,name:analytic.model_account_analytic_chart
-msgid "Account Analytic Chart"
-msgstr ""
-
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_currency_id
msgid "Account Currency"
msgstr ""
#. module: analytic
-#: selection:account.analytic.account,account_type:0
-#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_active
msgid "Active"
msgstr ""
@@ -52,11 +41,6 @@ msgstr ""
msgid "Analytic Account"
msgstr ""
-#. module: analytic
-#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
-msgid "Analytic Account Charts"
-msgstr ""
-
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
msgid "Analytic Accounting"
@@ -68,6 +52,13 @@ msgstr ""
msgid "Analytic Accounts"
msgstr ""
+#. module: analytic
+#: model:ir.actions.act_window,name:analytic.account_analytic_tag_action
+#: model:ir.ui.view,arch_db:analytic.account_analytic_tag_form_view
+#: model:ir.ui.view,arch_db:analytic.account_analytic_tag_tree_view
+msgid "Analytic Accounts Tags"
+msgstr ""
+
#. module: analytic
#: model:ir.actions.act_window,name:analytic.account_analytic_line_action_entries
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_graph
@@ -81,6 +72,11 @@ msgstr ""
msgid "Analytic Entry"
msgstr ""
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_line_ids
msgid "Analytic Lines"
@@ -97,7 +93,7 @@ msgid "Analytic Tags"
msgstr ""
#. module: analytic
-#: selection:account.analytic.account,account_type:0
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
msgid "Archived"
msgstr ""
@@ -112,14 +108,13 @@ msgid "Balance"
msgstr ""
#. module: analytic
-#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
-msgid "Cancel"
+#: model:ir.actions.act_window,name:analytic.action_analytic_account_form
+msgid "Chart of Analytic Accounts"
msgstr ""
#. module: analytic
-#: model:ir.actions.act_window,name:analytic.action_account_analytic_chart
-#: model:ir.actions.act_window,name:analytic.action_analytic_account_form
-msgid "Chart of Analytic Accounts"
+#: model:ir.actions.act_window,help:analytic.account_analytic_tag_action
+msgid "Click to add a new tag."
msgstr ""
#. module: analytic
@@ -157,7 +152,6 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_create_uid
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_create_uid
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_create_uid
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_create_uid
msgid "Created by"
@@ -165,7 +159,6 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_create_date
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_create_date
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_create_date
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_create_date
msgid "Created on"
@@ -203,17 +196,11 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_display_name
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_display_name
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_display_name
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_display_name
msgid "Display Name"
msgstr ""
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_from_date
-msgid "From"
-msgstr ""
-
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_filter
@@ -222,12 +209,16 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_id
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_id
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_id
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_id
msgid "ID"
msgstr ""
+#. module: analytic
+#: model:ir.model.fields,help:analytic.field_account_analytic_account_active
+msgid "If the active field is set to False, it will allow you to hide the account without removing it."
+msgstr ""
+
#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action_entries
@@ -238,7 +229,6 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account___last_update
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart___last_update
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line___last_update
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag___last_update
msgid "Last Modified on"
@@ -246,7 +236,6 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_write_uid
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_write_uid
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_write_uid
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_write_uid
msgid "Last Updated by"
@@ -254,7 +243,6 @@ msgstr ""
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_write_date
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_write_date
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_write_date
#: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_write_date
msgid "Last Updated on"
@@ -270,11 +258,6 @@ msgstr ""
msgid "No activity yet."
msgstr ""
-#. module: analytic
-#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
-msgid "Open Charts"
-msgstr ""
-
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_partner_id
msgid "Partner"
@@ -305,16 +288,6 @@ msgstr ""
msgid "Search Analytic Lines"
msgstr ""
-#. module: analytic
-#: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view
-msgid "Select the Period for Analysis"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_account_type
-msgid "State"
-msgstr ""
-
#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_tag_ids
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_tag_ids
@@ -331,11 +304,6 @@ msgstr ""
msgid "The related account currency if not equal to the company one."
msgstr ""
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_to_date
-msgid "To"
-msgstr ""
-
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_tree
msgid "Total"
@@ -346,11 +314,6 @@ msgstr ""
msgid "User"
msgstr ""
-#. module: analytic
-#: model:ir.model,name:analytic.model_account_analytic_line
-msgid "account analytic line"
-msgstr ""
-
#. module: analytic
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form
msgid "e.g. Project XYZ"
diff --git a/addons/anonymization/i18n/anonymization.pot b/addons/anonymization/i18n/anonymization.pot
index ea54afe950c38386fd0e5f5d625b898c08d2fbfa..02eff8a68db0d941632f6e309ec1a48f5c928230 100644
--- a/addons/anonymization/i18n/anonymization.pot
+++ b/addons/anonymization/i18n/anonymization.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,19 +53,19 @@ msgid "Anonymized Fields"
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:434
+#: code:addons/anonymization/wizard/anonymize_wizard.py:194
#, python-format
msgid "Anonymized value can not be empty."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:284
+#: code:addons/anonymization/wizard/anonymize_wizard.py:69
#, python-format
msgid "Before executing the anonymization process, you should make a backup of your database."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:430
+#: code:addons/anonymization/wizard/anonymize_wizard.py:191
#, python-format
msgid "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
msgstr ""
@@ -126,8 +126,8 @@ msgid "Done"
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:373
-#: code:addons/anonymization/anonymization.py:434
+#: code:addons/anonymization/wizard/anonymize_wizard.py:139
+#: code:addons/anonymization/wizard/anonymize_wizard.py:263
#, python-format
msgid "Error !"
msgstr ""
@@ -150,7 +150,7 @@ msgstr ""
#. module: anonymization
#: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_field_name
-msgid "Field Name"
+msgid "Field name"
msgstr ""
#. module: anonymization
@@ -183,7 +183,7 @@ msgid "Import"
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:521
+#: code:addons/anonymization/wizard/anonymize_wizard.py:263
#, python-format
msgid "It is not possible to reverse the anonymization process without supplying the anonymization export file."
msgstr ""
@@ -229,6 +229,12 @@ msgstr ""
msgid "New"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/wizard/anonymize_wizard.py:153
+#, python-format
+msgid "No fields are going to be anonymized."
+msgstr ""
+
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
msgid "Not Existing"
@@ -267,6 +273,7 @@ msgstr ""
#. module: anonymization
#: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_history_state
+#: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_state
#: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymize_wizard_state
msgid "Status"
msgstr ""
@@ -282,38 +289,38 @@ msgid "Target Version"
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:75
+#: code:addons/anonymization/models/anonymization.py:55
#, python-format
msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:342
+#: code:addons/anonymization/wizard/anonymize_wizard.py:120
#, python-format
msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:375
-#: code:addons/anonymization/anonymization.py:514
+#: code:addons/anonymization/wizard/anonymize_wizard.py:143
+#: code:addons/anonymization/wizard/anonymize_wizard.py:259
#, python-format
msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:373
+#: code:addons/anonymization/wizard/anonymize_wizard.py:141
#, python-format
msgid "The database is currently anonymized, you cannot anonymize it again."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:73
+#: code:addons/anonymization/models/anonymization.py:53
#, python-format
msgid "The database is currently anonymized, you cannot create, modify or delete fields."
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:512
+#: code:addons/anonymization/wizard/anonymize_wizard.py:257
#, python-format
msgid "The database is not currently anonymized, you cannot reverse the anonymization."
msgstr ""
@@ -329,7 +336,7 @@ msgid "Unstable"
msgstr ""
#. module: anonymization
-#: code:addons/anonymization/anonymization.py:49
+#: code:addons/anonymization/models/anonymization.py:32
#: sql_constraint:ir.model.fields.anonymization:0
#, python-format
msgid "You cannot have two fields with the same name on the same object!"
@@ -375,8 +382,3 @@ msgstr ""
msgid "sql"
msgstr ""
-#. module: anonymization
-#: model:ir.model.fields,field_description:anonymization.field_ir_model_fields_anonymization_state
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot
index 24d5c55afcd4cdf6ae0c66fee06d3ba7d94a78f3..0515abca15778e987db376eb2c8f7ed723f6dcf8 100644
--- a/addons/auth_oauth/i18n/auth_oauth.pot
+++ b/addons/auth_oauth/i18n/auth_oauth.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,18 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
-msgid "<br/>\n"
-" - Create a new project<br/>\n"
-" - Go to Api Access<br/>\n"
-" - Create an oauth client_id<br/>\n"
-" - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.<br/>\n"
-" <br/>\n"
-" Now copy paste the client_id here:"
-msgstr ""
-
-#. module: auth_oauth
-#: code:addons/auth_oauth/controllers/main.py:98
+#: code:addons/auth_oauth/controllers/main.py:99
#, python-format
msgid "Access Denied"
msgstr ""
@@ -44,6 +33,7 @@ msgstr ""
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_auth_oauth_google_enabled
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
msgid "Allow users to sign in with Google"
msgstr ""
@@ -52,6 +42,11 @@ msgstr ""
msgid "Allowed"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Authentication"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_auth_endpoint
msgid "Authentication URL"
@@ -72,6 +67,23 @@ msgstr ""
msgid "CSS class"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Check that the application type is set on <b>Web Application</b>. \n"
+" Now configure the allowed pages on which you will be redirected."
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Click on <b>Create Project</b> and enter the project name and \n"
+" other details."
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Click on <b>Use Google APIs</b>"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_client_id
#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_auth_oauth_google_client_id
@@ -83,6 +95,11 @@ msgstr ""
msgid "Companies that refers to partner"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Connect to your Google account and go to"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_contract_ids
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_contracts_count
@@ -124,6 +141,12 @@ msgstr ""
msgid "Display Name"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Fill in your address, email and the product name (for example odoo) \n"
+" and then save."
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_property_account_position_id
msgid "Fiscal Position"
@@ -131,7 +154,7 @@ msgstr ""
#. module: auth_oauth
#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
-msgid "Google APIs console"
+msgid "Google Client ID:"
msgstr ""
#. module: auth_oauth
@@ -144,6 +167,11 @@ msgstr ""
msgid "ID"
msgstr ""
+#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_warn
+msgid "Invoice"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_ids
msgid "Invoices"
@@ -180,6 +208,11 @@ msgstr ""
msgid "Latest Invoices & Payments Matching Date"
msgstr ""
+#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_res_users_invoice_warn_msg
+msgid "Message for Invoice"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_oauth_access_token
msgid "OAuth Access Token"
@@ -220,6 +253,19 @@ msgstr ""
msgid "Oauth Provider user_id"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "On the left side menu, select the sub menu <b>Credentials</b> \n"
+" (from <b>API Manager</b>) then select <b>OAuth consent screen</b>."
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Once done, you receive two information (your <b>Client ID</b> and <b>\n"
+" Client Secret</b>). You have to insert your <b>Client ID</b> in \n"
+" the field below."
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_debit_limit
msgid "Payable Limit"
@@ -235,13 +281,43 @@ msgstr ""
msgid "Providers"
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Return to Top"
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_scope
msgid "Scope"
msgstr ""
#. module: auth_oauth
-#: code:addons/auth_oauth/controllers/main.py:96
+#: model:ir.model.fields,help:auth_oauth.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 ""
+
+#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_server_uri_google
+msgid "Server uri"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Show Tutorial"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_base_config_settings_auth_oauth_tutorial_enabled
+msgid "Show tutorial"
+msgstr ""
+
+#. module: auth_oauth
+#: code:addons/auth_oauth/controllers/main.py:97
#, python-format
msgid "Sign up is not allowed on this database."
msgstr ""
@@ -256,6 +332,17 @@ msgstr ""
msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed."
msgstr ""
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Then click on <b>Add Credentials</b> and select the second option \n"
+" (OAuth 2.0 Client ID)."
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "Then click on <b>Create</b>."
+msgstr ""
+
#. module: auth_oauth
#: model:ir.model.fields,help:auth_oauth.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"
@@ -278,9 +365,14 @@ msgstr ""
#. module: auth_oauth
#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
-msgid "To setup the signin process with Google, first you have to perform the following steps:<br/>\n"
-" <br/>\n"
-" - Go to the"
+msgid "To achieve this, complete the field <b>Authorized redirect URIs</b>.\n"
+" Copy paste the following link in the box"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "To setup the sign in process with Google, you have to perform \n"
+" the following steps first."
msgstr ""
#. module: auth_oauth
@@ -329,24 +421,14 @@ msgid "Vendor Payment Term"
msgstr ""
#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_res_users_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: auth_oauth
-#: model:ir.model.fields,help:auth_oauth.field_res_users_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: auth_oauth
-#: code:addons/auth_oauth/controllers/main.py:100
+#: code:addons/auth_oauth/controllers/main.py:101
#, python-format
msgid "You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email."
msgstr ""
#. module: auth_oauth
#: model:ir.ui.view,arch_db:auth_oauth.view_oauth_provider_form
-#: model:ir.ui.view,arch_db:auth_oauth.view_oauth_provider_list
+#: model:ir.ui.view,arch_db:auth_oauth.view_oauth_provider_tree
msgid "arch"
msgstr ""
@@ -361,12 +443,12 @@ msgid "e.g. 1234-xyz.apps.googleusercontent.com"
msgstr ""
#. module: auth_oauth
-#: model:ir.model,name:auth_oauth.model_ir_config_parameter
-msgid "ir.config_parameter"
+#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
+msgid "https://console.developers.google.com/"
msgstr ""
#. module: auth_oauth
-#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_sequence
-msgid "unknown"
+#: model:ir.model,name:auth_oauth.model_ir_config_parameter
+msgid "ir.config_parameter"
msgstr ""
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index c87b529a2aec6a6538d409e4c2f20818ca35bfca..18d2fed9d2c4979df1622009a22facfe8c099950 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -93,11 +93,6 @@ msgstr ""
msgid "<strong>An invitation email containing the following subscription link has been sent:</strong>"
msgstr ""
-#. module: auth_signup
-#: selection:res.users,state:0
-msgid "Activated"
-msgstr ""
-
#. module: auth_signup
#: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_uninvited
msgid "Allow external users to sign up"
@@ -143,6 +138,11 @@ msgstr ""
msgid "Confirm Password"
msgstr ""
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Confirmed"
+msgstr ""
+
#. module: auth_signup
#: code:addons/auth_signup/controllers/main.py:41
#, python-format
@@ -202,11 +202,6 @@ msgstr ""
msgid "Reset password: invalid username or email"
msgstr ""
-#. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_self
-msgid "Self"
-msgstr ""
-
#. module: auth_signup
#: model:ir.ui.view,arch_db:auth_signup.res_users_form_view
msgid "Send Reset Password Instructions"
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index 80eac5bf9a2776a0a2d48243a5aea69d2108b214..b5b0a226e1581bdf451365b530928540e819ef1d 100644
--- a/addons/barcodes/i18n/barcodes.pot
+++ b/addons/barcodes/i18n/barcodes.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,25 +16,25 @@ msgstr ""
"Plural-Forms: \n"
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:223
+#: code:addons/barcodes/models/barcodes.py:202
#, python-format
msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?"
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:221
+#: code:addons/barcodes/models/barcodes.py:200
#, python-format
msgid ": a rule can only contain one pair of braces."
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:217
+#: code:addons/barcodes/models/barcodes.py:196
#, python-format
msgid ": braces can only contain N's followed by D's."
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:219
+#: code:addons/barcodes/models/barcodes.py:198
#, python-format
msgid ": empty braces."
msgstr ""
@@ -53,7 +53,8 @@ msgid "A barcode nomenclature defines how the point of sale identify and interpr
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:191
+#: code:addons/barcodes/models/barcodes.py:183
+#: selection:barcode.rule,type:0
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias
#, python-format
msgid "Alias"
@@ -75,7 +76,8 @@ msgid "An internal identification of the barcode nomenclature"
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:183
+#: code:addons/barcodes/models/barcodes.py:177
+#: selection:barcode.rule,encoding:0
#, python-format
msgid "Any"
msgstr ""
@@ -107,11 +109,21 @@ msgstr ""
msgid "Barcode Scanned"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Cashier"
+msgstr ""
+
#. module: barcodes
#: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
msgid "Click to add a Barcode Nomenclature ."
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Client"
+msgstr ""
+
#. module: barcodes
#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_uid
@@ -124,6 +136,16 @@ msgstr ""
msgid "Created on"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Credit Card"
+msgstr ""
+
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Discounted Product"
+msgstr ""
+
#. module: barcodes
#: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_display_name
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_display_name
@@ -131,11 +153,21 @@ msgstr ""
msgid "Display Name"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,encoding:0
+msgid "EAN-13"
+msgstr ""
+
#. module: barcodes
#: selection:barcode.nomenclature,upc_ean_conv:0
msgid "EAN-13 to UPC-A"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,encoding:0
+msgid "EAN-8"
+msgstr ""
+
#. module: barcodes
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_encoding
msgid "Encoding"
@@ -181,6 +213,16 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Location"
+msgstr ""
+
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Lot"
+msgstr ""
+
#. module: barcodes
#: selection:barcode.nomenclature,upc_ean_conv:0
msgid "Never"
@@ -191,6 +233,11 @@ msgstr ""
msgid "Nomenclature Name"
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Package"
+msgstr ""
+
#. module: barcodes
#: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
msgid "Patterns can also define how numerical values, such as weight or price, can be\n"
@@ -201,6 +248,11 @@ msgid "Patterns can also define how numerical values, such as weight or price, c
" zeroes."
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Priced Product"
+msgstr ""
+
#. module: barcodes
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name
msgid "Rule Name"
@@ -244,9 +296,9 @@ msgid "The matched pattern will alias to this barcode"
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:217
-#: code:addons/barcodes/barcodes.py:219
-#: code:addons/barcodes/barcodes.py:221
+#: code:addons/barcodes/models/barcodes.py:196
+#: code:addons/barcodes/models/barcodes.py:198
+#: code:addons/barcodes/models/barcodes.py:200
#, python-format
msgid "There is a syntax error in the barcode pattern "
msgstr ""
@@ -280,6 +332,11 @@ msgstr ""
msgid "UPC Codes can be converted to EAN by prefixing them with a zero. This setting determines if a UPC/EAN barcode should be automatically converted in one way or another when trying to match a rule with the other encoding."
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,encoding:0
+msgid "UPC-A"
+msgstr ""
+
#. module: barcodes
#: selection:barcode.nomenclature,upc_ean_conv:0
msgid "UPC-A to EAN-13"
@@ -291,7 +348,8 @@ msgid "UPC/EAN Conversion"
msgstr ""
#. module: barcodes
-#: code:addons/barcodes/barcodes.py:191
+#: code:addons/barcodes/models/barcodes.py:184
+#: selection:barcode.rule,type:0
#, python-format
msgid "Unit Product"
msgstr ""
@@ -306,6 +364,11 @@ msgstr ""
msgid "Value of the last barcode scanned."
msgstr ""
+#. module: barcodes
+#: selection:barcode.rule,type:0
+msgid "Weighted Product"
+msgstr ""
+
#. module: barcodes
#: model:ir.model,name:barcodes.model_barcode_nomenclature
msgid "barcode.nomenclature"
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index 7ae682295ca2b30c67fb0a52f6d6e740afb3d697..9779b671b50c861c3d35b18d3e8f312751de4974 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -113,11 +113,6 @@ msgstr ""
msgid "Conditions"
msgstr ""
-#. module: base_action_rule
-#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_create_date
-msgid "Create Date"
-msgstr ""
-
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_create_uid
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_create_uid
@@ -126,6 +121,7 @@ msgid "Created by"
msgstr ""
#. module: base_action_rule
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_create_date
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_create_date
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_create_date
msgid "Created on"
@@ -143,7 +139,9 @@ msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,help:base_action_rule.field_base_action_rule_trg_date_range
-msgid "Delay after the trigger date.You can put a negative number if you need a delay before thetrigger date, like sending a reminder 15 minutes before a meeting."
+msgid "Delay after the trigger date.\n"
+" You can put a negative number if you need a delay before the\n"
+" trigger date, like sending a reminder 15 minutes before a meeting."
msgstr ""
#. module: base_action_rule
@@ -244,11 +242,6 @@ msgstr ""
msgid "Last Modified on"
msgstr ""
-#. module: base_action_rule
-#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_last_run
-msgid "Last Run"
-msgstr ""
-
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_write_uid
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_write_uid
@@ -263,11 +256,21 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
+#. module: base_action_rule
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_last_run
+msgid "Last run"
+msgstr ""
+
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_lead_id
msgid "Lead id"
msgstr ""
+#. module: base_action_rule
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_line_ids
+msgid "Line ids"
+msgstr ""
+
#. module: base_action_rule
#: selection:base.action.rule,trg_date_range_type:0
msgid "Minutes"
@@ -384,21 +387,6 @@ msgstr ""
msgid "Subject"
msgstr ""
-#. module: base_action_rule
-#: model:ir.filters,name:base_action_rule.test_filter_done
-msgid "Test lead in state 'done'"
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.filters,name:base_action_rule.test_filter_draft
-msgid "Test lead in state 'draft'"
-msgstr ""
-
-#. module: base_action_rule
-#: model:ir.filters,name:base_action_rule.test_filter_open
-msgid "Test lead in state 'open'"
-msgstr ""
-
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_trg_date_id
msgid "Trigger Date"
@@ -430,7 +418,8 @@ msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,help:base_action_rule.field_base_action_rule_trg_date_id
-msgid "When should the condition be triggered. If present, will be checked by the scheduler. If empty, will be checked at creation and update."
+msgid "When should the condition be triggered.\n"
+" If present, will be checked by the scheduler. If empty, will be checked at creation and update."
msgstr ""
#. module: base_action_rule
@@ -448,8 +437,3 @@ msgstr ""
msgid "You may also use filters instead of choosing records. In order to create a new filter:"
msgstr ""
-#. module: base_action_rule
-#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_line_ids
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot
index 3d514faef713e7bdfe85d8df6cab10f2156d0717..78f1be4362a6bc9ecb7e0840a8b7af7b3999166e 100644
--- a/addons/base_gengo/i18n/base_gengo.pot
+++ b/addons/base_gengo/i18n/base_gengo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,6 +50,11 @@ msgstr ""
msgid "Check this box if you're using the sandbox mode of Gengo, mainly used for testing purpose."
msgstr ""
+#. module: base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
+msgid "Click here to Configure Gengo Parameters"
+msgstr ""
+
#. module: base_gengo
#: model:ir.model.fields,field_description:base_gengo.field_res_company_gengo_comment
msgid "Comments"
@@ -110,6 +115,11 @@ msgstr ""
msgid "Gengo Public Key"
msgstr ""
+#. module: base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
+msgid "Gengo Public or Private keys are wrong or missing."
+msgstr ""
+
#. module: base_gengo
#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
msgid "Gengo Request Form"
@@ -126,13 +136,13 @@ msgid "Gengo Translation Service Level"
msgstr ""
#. module: base_gengo
-#: code:addons/base_gengo/wizard/base_gengo_translations.py:63
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:84
#, python-format
msgid "Gengo `Public Key` or `Private Key` are missing. Enter your Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."
msgstr ""
#. module: base_gengo
-#: code:addons/base_gengo/wizard/base_gengo_translations.py:74
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:95
#, python-format
msgid "Gengo connection failed with this message:\n"
"``%s``"
@@ -230,18 +240,23 @@ msgid "Sync Type"
msgstr ""
#. module: base_gengo
-#: code:addons/base_gengo/wizard/base_gengo_translations.py:95
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
#, python-format
msgid "The number of terms to sync should be between 1 to 200 to work with Gengo translation services."
msgstr ""
+#. module: base_gengo
+#: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_authorized_credentials
+msgid "The private and public keys are valid"
+msgstr ""
+
#. module: base_gengo
#: model:ir.model.fields,help:base_gengo.field_res_company_gengo_comment
msgid "This comment will be automatically be enclosed in each an every request sent to Gengo"
msgstr ""
#. module: base_gengo
-#: code:addons/base_gengo/wizard/base_gengo_translations.py:90
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
#, python-format
msgid "This language is not supported by the Gengo translation services."
msgstr ""
@@ -256,11 +271,6 @@ msgstr ""
msgid "Translation By Machine"
msgstr ""
-#. module: base_gengo
-#: model:ir.ui.view,arch_db:base_gengo.view_translation_search
-msgid "Translations"
-msgstr ""
-
#. module: base_gengo
#: selection:ir.translation,gengo_translation:0
msgid "Ultra"
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index 49192d8a8b1f502c8f459bab4d06b6f990d7d412..0ee3324f2d62d7706e3c8d7b6dbb3fa9835f060d 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,182 +17,45 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:474
+#: code:addons/base_import/static/src/js/base_import.js:595
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:287
+#: code:addons/base_import/static/src/js/base_import.js:373
#, python-format
msgid "A single column was found in the file, this often means the file separator is incorrect"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:161
-#, python-format
-msgid "According to your need, you should use \n"
-" one of these 3 ways to reference records in relations. \n"
-" Here is when you should use one or the other, \n"
-" according to your need:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:234
-#, python-format
-msgid "As an example, here is \n"
-" purchase.order_functional_error_line_cant_adpat.CSV \n"
-" file of some quotations you can import, based on demo \n"
-" data."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:299
-#, python-format
-msgid "As an example, suppose you have a SQL database \n"
-" with two tables you want to import: companies and \n"
-" persons. Each person belong to one company, so you \n"
-" will have to recreate the link between a person and \n"
-" the company he work for. (If you want to test this \n"
-" example, here is a"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:331
-#, python-format
-msgid "As you can see in this file, Fabien and Laurence \n"
-" are working for the Bigees company (company_1) and \n"
-" Eric is working for the Organi company. The relation \n"
-" between persons and companies is done using the \n"
-" External ID of the companies. We had to prefix the \n"
-" \"External ID\" by the name of the table to avoid a \n"
-" conflict of ID between persons and companies (person_1 \n"
-" and company_1 who shared the same ID 1 in the orignial \n"
-" database)."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:87
-#, python-format
-msgid "Because CSV files are used internally and in\n"
-" multiple external processes, interoperability is a\n"
-" significant issue. To limit incorrect\n"
-" interpretation of data, they are strictly limited\n"
-" to dates following"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:106
-#, python-format
-msgid "By default the Import preview is set on commas as \n"
-" field separators and quotation marks as text \n"
-" delimiters. If your csv file does not have these \n"
-" settings, you can modify the File Format Options \n"
-" (displayed under the Browse CSV file bar after you \n"
-" select your file)."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:21
-#, python-format
-msgid "CSV Format Options…"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:217
-#, python-format
-msgid "CSV file for Manufacturer, Retailer"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:181
-#, python-format
-msgid "CSV file for Products"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:180
-#, python-format
-msgid "CSV file for categories"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:250
-#, python-format
-msgid "Can I import several times the same record?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:358
+#: code:addons/base_import/static/src/xml/base_import.xml:89
#, python-format
msgid "Cancel"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:205
-#: code:addons/base_import/static/src/js/import.js:216
-#, python-format
-msgid "Comma"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:159
-#, python-format
-msgid "Country/Database \n"
-" ID: 21"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:153
-#, python-format
-msgid "Country/Database ID: the unique Odoo ID for a \n"
-" record, defined by the ID postgresql column"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:160
-#, python-format
-msgid "Country/External ID: base.be"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:155
+#: code:addons/base_import/models/base_import.py:608
#, python-format
-msgid "Country/External ID: the ID of this record \n"
-" referenced in another application (or the .XML file \n"
-" that imported it)"
+msgid "Column %s contains incorrect values (value: %s does not match date format"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:159
+#: code:addons/base_import/models/base_import.py:590
#, python-format
-msgid "Country: Belgium"
+msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:152
+#: code:addons/base_import/static/src/js/base_import.js:244
+#: code:addons/base_import/static/src/js/base_import.js:255
+#: code:addons/base_import/static/src/js/base_import.js:262
+#: code:addons/base_import/static/src/js/base_import.js:274
#, python-format
-msgid "Country: the name or code of the country"
+msgid "Comma"
msgstr ""
#. module: base_import
@@ -231,18 +94,25 @@ msgstr ""
msgid "Created on"
msgstr ""
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:151
+#: code:addons/base_import/models/base_import.py:156
+#, python-format
+msgid "Database ID"
+msgstr ""
+
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:244
+#: code:addons/base_import/static/src/js/base_import.js:125
#, python-format
-msgid "Customers and their respective contacts"
+msgid "Date Format:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models.py:149
-#: code:addons/base_import/models.py:155
+#. openerp-web
+#: code:addons/base_import/static/src/js/base_import.js:127
#, python-format
-msgid "Database ID"
+msgid "Decimal Separator:"
msgstr ""
#. module: base_import
@@ -265,54 +135,44 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:321
+#: code:addons/base_import/static/src/js/base_import.js:416
#, python-format
msgid "Don't import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:91
+#: code:addons/base_import/static/src/js/base_import.js:263
+#: code:addons/base_import/static/src/js/base_import.js:281
#, python-format
-msgid "Encoding:"
-msgstr ""
-
-#. module: base_import
-#: code:addons/base_import/models.py:228
-#, python-format
-msgid "Error cell found while reading XLS/XLSX file: %s"
+msgid "Dot"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:451
+#: code:addons/base_import/static/src/js/base_import.js:120
#, python-format
-msgid "Everything seems valid."
+msgid "Encoding:"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/models.py:114
-#: code:addons/base_import/models.py:148
-#: code:addons/base_import/static/src/xml/import.xml:69
-#: code:addons/base_import/static/src/xml/import.xml:74
+#: code:addons/base_import/models/base_import.py:233
#, python-format
-msgid "External ID"
+msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:325
+#: code:addons/base_import/static/src/js/base_import.js:572
#, python-format
-msgid "External ID,Name,Is a \n"
-" Company,Related Company/External ID"
+msgid "Everything seems valid."
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:313
+#: code:addons/base_import/models/base_import.py:116
+#: code:addons/base_import/models/base_import.py:150
#, python-format
-msgid "External ID,Name,Is a Company"
+msgid "External ID"
msgstr ""
#. module: base_import
@@ -330,13 +190,6 @@ msgstr ""
msgid "File Type"
msgstr ""
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:238
-#, python-format
-msgid "File for some Quotations"
-msgstr ""
-
#. module: base_import
#: model:ir.model.fields,help:base_import.field_base_import_import_file
msgid "File to check and/or import, raw binary (not base64)"
@@ -344,120 +197,40 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:12
-#, python-format
-msgid "File:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:384
+#: code:addons/base_import/static/src/xml/base_import.xml:115
#, python-format
msgid "For CSV files, the issue could be an incorrect encoding."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:149
-#, python-format
-msgid "For example, to \n"
-" reference the country of a contact, Odoo proposes \n"
-" you 3 different fields to import:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:93
-#, python-format
-msgid "For more familiar or\n"
-" flexible formatting, use Excel files, date cells\n"
-" are stored as genuine dates and the familiar and\n"
-" locale-aware display of dates is independent from\n"
-" the way it is stored."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:157
-#, python-format
-msgid "For the country \n"
-" Belgium, you can use one of these 3 ways to import:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:60
+#: code:addons/base_import/static/src/js/base_import.js:619
#, python-format
-msgid "Frequently Asked Questions"
+msgid "Get all possible values"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:498
+#: code:addons/base_import/static/src/xml/base_import.xml:11
#, python-format
-msgid "Get all possible values"
+msgid "Help"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:485
+#: code:addons/base_import/static/src/js/base_import.js:606
#, python-format
msgid "Here are the possible values:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:385
+#: code:addons/base_import/static/src/xml/base_import.xml:116
#, python-format
msgid "Here is the start of the file we could not import:"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:120
-#, python-format
-msgid "How can I change the CSV file format options when \n"
-" saving in my spreadsheet application?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:208
-#, python-format
-msgid "How can I import a many2many relationship field \n"
-" (e.g. a customer that has multiple tags)?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:223
-#, python-format
-msgid "How can I import a one2many relationship (e.g. several \n"
-" Order Lines of a Sales Order)?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:282
-#, python-format
-msgid "How to export/import different tables from an SQL \n"
-" application to Odoo?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:199
-#, python-format
-msgid "However if you do not wish to change your \n"
-" configuration of product categories, we recommend you \n"
-" use make use of the external ID for this field \n"
-" 'Category'."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:69
-#: code:addons/base_import/static/src/xml/import.xml:74
#: model:ir.model.fields,field_description:base_import.field_base_import_import_id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_id
@@ -472,29 +245,12 @@ msgstr ""
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_id
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_id
-#, python-format
msgid "ID"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:190
-#, python-format
-msgid "If for example you have two product categories \n"
-" with the child name \"Sellable\" (ie. \"Misc. \n"
-" Products/Sellable\" & \"Other Products/Sellable\"),\n"
-" your validation is halted but you may still import \n"
-" your data. However, we recommend you do not import the \n"
-" data because they will all be linked to the first \n"
-" 'Sellable' category found in the Product Category list \n"
-" (\"Misc. Products/Sellable\"). We recommend you modify \n"
-" one of the duplicates' values or your product category \n"
-" hierarchy."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:51
+#: code:addons/base_import/static/src/xml/base_import.xml:73
#, python-format
msgid "If the file contains\n"
" the column names, Odoo can try auto-detecting the\n"
@@ -504,114 +260,33 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:40
+#: code:addons/base_import/static/src/xml/base_import.xml:60
#, python-format
msgid "If the model uses openchatter, history tracking will set up subscriptions and send notifications during the import, but lead to a slower import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:272
-#, python-format
-msgid "If you do not set all fields in your CSV file, \n"
-" Odoo will assign the default value for every non \n"
-" defined fields. But if you\n"
-" set fields with empty values in your CSV file, Odoo \n"
-" will set the EMPTY value in the field, instead of \n"
-" assigning the default value."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:124
-#, python-format
-msgid "If you edit and save CSV files in speadsheet \n"
-" applications, your computer's regional settings will \n"
-" be applied for the separator and delimiter. \n"
-" We suggest you use OpenOffice or LibreOffice Calc \n"
-" as they will allow you to modify all three options \n"
-" (in 'Save As' dialog box > Check the box 'Edit filter \n"
-" settings' > Save)."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:253
-#, python-format
-msgid "If you import a file that contains one of the \n"
-" column \"External ID\" or \"Database ID\", records that \n"
-" have already been imported will be modified instead of \n"
-" being created. This is very usefull as it allows you \n"
-" to import several times the same CSV file while having \n"
-" made some changes in between two imports. Odoo will \n"
-" take care of creating or modifying each record \n"
-" depending if it's new or not."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:286
-#, python-format
-msgid "If you need to import data from different tables, \n"
-" you will have to recreate relations between records \n"
-" belonging to different tables. (e.g. if you import \n"
-" companies and persons, you will have to recreate the \n"
-" link between each person and the company they work \n"
-" for)."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:227
-#, python-format
-msgid "If you want to import sales order having several \n"
-" order lines; for each order line, you need to reserve \n"
-" a specific row in the CSV file. The first order line \n"
-" will be imported on the same row as the information \n"
-" relative to order. Any additional lines will need an \n"
-" addtional row that does not have any information in \n"
-" the fields relative to the order."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:357
-#: code:addons/base_import/static/src/xml/import.xml:417
+#: code:addons/base_import/static/src/xml/base_import.xml:88
+#: code:addons/base_import/static/src/xml/base_import.xml:147
#, python-format
msgid "Import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:147
+#: code:addons/base_import/static/src/js/base_import.js:181
#, python-format
msgid "Import a File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:383
+#: code:addons/base_import/static/src/xml/base_import.xml:114
#, python-format
msgid "Import preview failed due to:"
msgstr ""
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:66
-#, python-format
-msgid "In order to re-create relationships between\n"
-" different records, you should use the unique\n"
-" identifier from the original application and\n"
-" map it to the"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:324
-#, python-format
-msgid "It will produce the following CSV file:"
-msgstr ""
-
#. module: base_import
#: model:ir.model.fields,field_description:base_import.field_base_import_import___last_update
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char___last_update
@@ -668,19 +343,16 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:37
+#: code:addons/base_import/static/src/xml/base_import.xml:19
#, python-format
-msgid "Map your data to Odoo"
+msgid "Load File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:130
+#: code:addons/base_import/static/src/xml/base_import.xml:56
#, python-format
-msgid "Microsoft Excel will allow \n"
-" you to modify only the encoding when saving \n"
-" (in 'Save As' dialog box > click 'Tools' dropdown \n"
-" list > Encoding tab)."
+msgid "Map your columns to import"
msgstr ""
#. module: base_import
@@ -695,27 +367,23 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:63
+#: code:addons/base_import/static/src/xml/base_import.xml:15
#, python-format
-msgid "Need to import data from an other application?"
+msgid "No file chosen..."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:369
+#: code:addons/base_import/static/src/js/base_import.js:482
#, python-format
msgid "Normal Fields"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:111
+#: code:addons/base_import/static/src/xml/base_import.xml:30
#, python-format
-msgid "Note that if your CSV file \n"
-" has a tabulation as separator, Odoo will not \n"
-" detect the separations. You will need to change the \n"
-" file format options in your spreadsheet application. \n"
-" See the following question."
+msgid "Options…"
msgstr ""
#. module: base_import
@@ -724,319 +392,144 @@ msgid "Other Variable"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:241
-#, python-format
-msgid "Purchase orders with their respective purchase order lines"
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_parent_id
+msgid "Parent id"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:93
+#: code:addons/base_import/static/src/js/base_import.js:122
#, python-format
msgid "Quoting:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:370
+#: code:addons/base_import/static/src/js/base_import.js:483
#, python-format
msgid "Relation Fields"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:17
+#: code:addons/base_import/static/src/xml/base_import.xml:24
#, python-format
-msgid "Reload data to check changes."
+msgid "Reload File"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:9
+#: code:addons/base_import/static/src/xml/base_import.xml:11
#, python-format
-msgid "Select the file to import. If you need a sample importable file, you\n"
-" can use the export tool to generate one."
+msgid "Select a CSV or Excel file to import."
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:206
+#: code:addons/base_import/static/src/js/base_import.js:245
#, python-format
msgid "Semicolon"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:92
+#: code:addons/base_import/static/src/js/base_import.js:121
#, python-format
msgid "Separator:"
msgstr ""
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue
-msgid "Some Value"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:142
-#, python-format
-msgid "Some fields define a relationship with another \n"
-" object. For example, the country of a contact is a \n"
-" link to a record of the 'Country' object. When you \n"
-" want to import such fields, Odoo will have to \n"
-" recreate links between the different records. \n"
-" To help you import such fields, Odoo provides 3 \n"
-" mechanisms. You must use one and only one mechanism \n"
-" per field you want to import."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:208
-#, python-format
-msgid "Space"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:207
-#, python-format
-msgid "Tab"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:74
-#, python-format
-msgid "The"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:49
-#, python-format
-msgid "The first row of the\n"
-" file contains the label of the column"
-msgstr ""
-
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:242
+#: code:addons/base_import/static/src/xml/base_import.xml:72
#, python-format
-msgid "The following CSV file shows how to import \n"
-" customers and their respective contacts"
+msgid "Show all fields for completion (advanced)"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:239
-#, python-format
-msgid "The following CSV file shows how to import purchase \n"
-" orders with their respective purchase order lines:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid "The tags should be separated by a comma without any \n"
-" spacing. For example, if you want your customer to be \n"
-" linked to both tags 'Manufacturer' and 'Retailer' \n"
-" then you will encode \"Manufacturer,\n"
-" Retailer\" in the same column of your CSV file."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:340
-#, python-format
-msgid "The two files produced are ready to be imported in \n"
-" Odoo without any modifications. After having \n"
-" imported these two CSV files, you will have 4 contacts \n"
-" and 3 companies. (the firsts two contacts are linked \n"
-" to the first company). You must first import the \n"
-" companies and then the persons."
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview_somevalue
+msgid "Some Value"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:312
+#: code:addons/base_import/static/src/js/base_import.js:247
#, python-format
-msgid "This SQL command will create the following CSV file:"
+msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:260
+#: code:addons/base_import/static/src/js/base_import.js:246
#, python-format
-msgid "This feature \n"
-" allows you to use the Import/Export tool of Odoo to \n"
-" modify a batch of records in your favorite spreadsheet \n"
-" application."
+msgid "Tab"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:317
+#: code:addons/base_import/static/src/xml/base_import.xml:68
#, python-format
-msgid "To create the CSV file for persons, linked to \n"
-" companies, we will use the following SQL command in \n"
-" PSQL:"
+msgid "The first row\n"
+" contains the label of the column"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:291
+#: code:addons/base_import/static/src/js/base_import.js:126
#, python-format
-msgid "To manage relations between tables, \n"
-" you can use the \"External ID\" facilities of Odoo. \n"
-" The \"External ID\" of a record is the unique identifier \n"
-" of this record in another application. This \"External \n"
-" ID\" must be unique accoss all the records of all \n"
-" objects, so it's a good practice to prefix this \n"
-" \"External ID\" with the name of the application or \n"
-" table. (like 'company_1', 'person_1' instead of '1')"
+msgid "Thousand Separator:"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:43
+#: code:addons/base_import/static/src/xml/base_import.xml:62
#, python-format
msgid "Track history during import"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models.py:195
+#: code:addons/base_import/models/base_import.py:198
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models.py:196
+#: code:addons/base_import/models/base_import.py:199
#, python-format
msgid "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:166
-#, python-format
-msgid "Use \n"
-" Country/Database ID: You should rarely use this \n"
-" notation. It's mostly used by developers as it's main \n"
-" advantage is to never have conflicts (you may have \n"
-" several records with the same name, but they always \n"
-" have a unique Database ID)"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:171
-#, python-format
-msgid "Use \n"
-" Country/External ID: Use External ID when you import \n"
-" data from a third party application."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:164
-#, python-format
-msgid "Use Country: This is \n"
-" the easiest way when your data come from CSV files \n"
-" that have been created manually."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:355
+#: code:addons/base_import/static/src/xml/base_import.xml:86
#, python-format
msgid "Validate"
msgstr ""
#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:306
-#, python-format
-msgid "We will first export all companies and their \n"
-" \"External ID\". In PSQL, write the following command:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:186
-#, python-format
-msgid "What can I do if I have multiple matches for a field?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:102
-#, python-format
-msgid "What can I do when the Import preview table isn't\n"
-" displayed correctly?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:268
-#, python-format
-msgid "What happens if I do not provide a value for a \n"
-" specific field?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:138
-#, python-format
-msgid "What's the difference between Database ID and \n"
-" External ID?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:174
-#, python-format
-msgid "When you use External IDs, you can import CSV files \n"
-" with the \"External ID\" column to define the External \n"
-" ID of each record you import. Then, you will be able \n"
-" to make a reference to that record with columns like \n"
-" \"Field/External ID\". The following two CSV files give \n"
-" you an example for Products and their Categories."
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:83
-#, python-format
-msgid "Why don't CSV file use my date format?"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:72
-#, python-format
-msgid "XXX/External ID"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:72
-#, python-format
-msgid "XXX/ID"
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_value
+#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_value
+msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models.py:406
+#: code:addons/base_import/models/base_import.py:528
#, python-format
msgid "You must configure at least one field to import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:468
+#: code:addons/base_import/static/src/js/base_import.js:589
#, python-format
msgid "at row %d"
msgstr ""
@@ -1113,136 +606,8 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/import.js:470
+#: code:addons/base_import/static/src/js/base_import.js:591
#, python-format
msgid "between rows %d and %d"
msgstr ""
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:69
-#, python-format
-msgid "column in Odoo. When you\n"
-" import an other record that links to the first\n"
-" one, use"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:314
-#, python-format
-msgid "company_1,Bigees,True"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:315
-#, python-format
-msgid "company_2,Organi,True"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:316
-#, python-format
-msgid "company_3,Boum,True"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:308
-#, python-format
-msgid "copy \n"
-" (select 'company_'||id as \"External ID\",company_name \n"
-" as \"Name\",'True' as \"Is a Company\" from companies) TO \n"
-" '/tmp/company.csv' with CSV HEADER;"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:319
-#, python-format
-msgid "copy (select \n"
-" 'person_'||id as \"External ID\",person_name as \n"
-" \"Name\",'False' as \"Is a Company\",'company_'||company_id\n"
-" as \"Related Company/External ID\" from persons) TO \n"
-" '/tmp/person.csv' with CSV"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:304
-#, python-format
-msgid "dump of such a PostgreSQL database"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:327
-#, python-format
-msgid "person_1,Fabien,False,company_1"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:328
-#, python-format
-msgid "person_2,Laurence,False,company_1"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:329
-#, python-format
-msgid "person_3,Eric,False,company_2"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:330
-#, python-format
-msgid "person_4,Ramsy,False,company_3"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:92
-#, python-format
-msgid "the\n"
-" ISO 8601 format"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:72
-#, python-format
-msgid "to the original unique identifier."
-msgstr ""
-
-#. module: base_import
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_readonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_states_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_stillreadonly_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_related_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_required_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_m2o_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_parent_id
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child_value
-#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_value
-msgid "unknown"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:74
-#, python-format
-msgid "will also be used to update the original\n"
-" import if you need to re-import modified data\n"
-" later, it's thus good practice to specify it\n"
-" whenever possible"
-msgstr ""
-
diff --git a/addons/base_import_module/i18n/base_import_module.pot b/addons/base_import_module/i18n/base_import_module.pot
index a72a3b9c98c69ac1c212030fa8cb7fea5dbe4325..fa915d79dc893a42acae07914341b90fea8cf977 100644
--- a/addons/base_import_module/i18n/base_import_module.pot
+++ b/addons/base_import_module/i18n/base_import_module.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,12 @@ msgstr ""
msgid "Close"
msgstr ""
+#. module: base_import_module
+#: code:addons/base_import_module/controllers/main.py:31
+#, python-format
+msgid "Could not select database '%s'"
+msgstr ""
+
#. module: base_import_module
#: model:ir.model.fields,field_description:base_import_module.field_base_import_module_create_uid
msgid "Created by"
@@ -41,13 +47,13 @@ msgid "Display Name"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:94
+#: code:addons/base_import_module/models/ir_module.py:96
#, python-format
msgid "File '%s' exceed maximum allowed file size"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:86
+#: code:addons/base_import_module/models/ir_module.py:88
#, python-format
msgid "File is not a zip file!"
msgstr ""
@@ -120,6 +126,18 @@ msgstr ""
msgid "Module .ZIP file"
msgstr ""
+#. module: base_import_module
+#: code:addons/base_import_module/models/ir_module.py:86
+#, python-format
+msgid "No file sent."
+msgstr ""
+
+#. module: base_import_module
+#: code:addons/base_import_module/controllers/main.py:25
+#, python-format
+msgid "Only administrators can upload a module"
+msgstr ""
+
#. module: base_import_module
#: model:ir.ui.view,arch_db:base_import_module.view_base_module_import
msgid "Open Modules"
@@ -136,7 +154,7 @@ msgid "Status"
msgstr ""
#. module: base_import_module
-#: code:addons/base_import_module/models/ir_module.py:33
+#: code:addons/base_import_module/models/ir_module.py:35
#, python-format
msgid "Unmet module dependencies: %s"
msgstr ""
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index a588ae83a922073cf25f8d38624caca11843015c..5963fe189bf727c96355069f876597de418122a3 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,7 +47,6 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_sale_config_settings
msgid "Apply"
msgstr ""
@@ -63,21 +62,9 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-#: model:ir.ui.view,arch_db:base_setup.view_sale_config_settings
msgid "Cancel"
msgstr ""
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Client"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_sale_config
-#: model:ir.ui.view,arch_db:base_setup.view_sale_config_settings
-msgid "Configure Sales"
-msgstr ""
-
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
msgid "Configure outgoing email servers"
@@ -90,33 +77,22 @@ msgstr ""
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_uid
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_create_uid
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_create_uid
msgid "Created by"
msgstr ""
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_create_date
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_create_date
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_create_date
msgid "Created on"
msgstr ""
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Customer"
-msgstr ""
-
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_display_name
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_display_name
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_display_name
msgid "Display Name"
msgstr ""
#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Donor"
+#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+msgid "Edit default access rights for new users"
msgstr ""
#. module: base_setup
@@ -150,20 +126,8 @@ msgstr ""
msgid "Google Integration"
msgstr ""
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Guest"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_partner
-msgid "How do you call a Customer"
-msgstr ""
-
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_id
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_id
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_id
msgid "ID"
msgstr ""
@@ -179,22 +143,16 @@ msgstr ""
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology___last_update
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings___last_update
msgid "Last Modified on"
msgstr ""
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_write_uid
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_write_uid
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_write_uid
msgid "Last Updated by"
msgstr ""
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_write_date
-#: model:ir.model.fields,field_description:base_setup.field_base_setup_terminology_write_date
-#: model:ir.model.fields,field_description:base_setup.field_sale_config_settings_write_date
msgid "Last Updated on"
msgstr ""
@@ -208,11 +166,6 @@ msgstr ""
msgid "Manage multiple companies"
msgstr ""
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Member"
-msgstr ""
-
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
msgid "Multi Company"
@@ -225,17 +178,12 @@ msgstr ""
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
-msgid "Once installed, you can configure your API credentials for \"Google calendar\""
+msgid "New users access rights"
msgstr ""
#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Partner"
-msgstr ""
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Patient"
+#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
+msgid "Once installed, you can configure your API credentials for \"Google calendar\""
msgstr ""
#. module: base_setup
@@ -265,16 +213,6 @@ msgstr ""
msgid "Shared resources"
msgstr ""
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_setup_terminology_form
-msgid "Specify Your Terminology"
-msgstr ""
-
-#. module: base_setup
-#: selection:base.setup.terminology,partner:0
-msgid "Tenant"
-msgstr ""
-
#. module: base_setup
#: model:ir.model.fields,help:base_setup.field_base_config_settings_module_google_calendar
msgid "This installs the module google_calendar."
@@ -291,14 +229,9 @@ msgid "This installs the module inter_company_rules.\n"
" Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company."
msgstr ""
-#. module: base_setup
-#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
-msgid "Use another word to say \"Customer\""
-msgstr ""
-
#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth
-msgid "Use external authentication providers, sign in with Google..."
+msgid "Use external authentication providers (OAuth)"
msgstr ""
#. module: base_setup
@@ -315,11 +248,6 @@ msgstr ""
msgid "Work in multi-company environments, with appropriate security access between companies."
msgstr ""
-#. module: base_setup
-#: model:ir.ui.view,arch_db:base_setup.base_setup_terminology_form
-msgid "You can use this wizard to change the terminologies for customers in the whole application."
-msgstr ""
-
#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
msgid "You will find more options in your company details: address for the header and footer, overdue payments texts, etc."
@@ -330,13 +258,3 @@ msgstr ""
msgid "base.config.settings"
msgstr ""
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_terminology
-msgid "base.setup.terminology"
-msgstr ""
-
-#. module: base_setup
-#: model:ir.model,name:base_setup.model_sale_config_settings
-msgid "sale.config.settings"
-msgstr ""
-
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 0cc82cd069cc1e809f3baf4e55ad7d2eb690ce7d..b8e3ec159b76a787929db5462029205466525ef8 100644
--- a/addons/calendar/i18n/calendar.pot
+++ b/addons/calendar/i18n/calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,19 +50,19 @@ msgid "\n"
" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
" <p style=\"font-size: 20px; text-align: center;\"><strong>${object.event_id.name} date updated</strong></p>\n"
" <p>\n"
-" <strong>Dear ${object.cn}</strong>,<br />\n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
" The date of the meeting has been upated. The meeting ${object.event_id.name} created by ${object.event_id.user_id.partner_id.name} is now scheduled for ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.\n"
-" </p> \n"
+" </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:#a24689;padding-top: 4px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\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 #a24689;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
+" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
+" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td width=\"20px;\"/>\n"
" <td>\n"
@@ -84,8 +84,8 @@ msgid "\n"
" % for attendee in object.event_id.attendee_ids:\n"
" <li>\n"
" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
" % else:\n"
" <span style=\"margin-left:5px\">You</span>\n"
" % endif\n"
@@ -136,18 +136,18 @@ msgid "\n"
" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
" <p style=\"font-size: 20px; text-align: center;\">Invitation to <strong>${object.event_id.name}</strong></p>\n"
" <p>\n"
-" <strong>Dear ${object.cn}</strong>,<br />\n"
-" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p> \n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
+" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>\n"
" <table style=\"margin-top: 20px;\"><tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\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 #a24689;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
+" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
+" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td width=\"20px;\"/>\n"
" <td>\n"
@@ -169,8 +169,8 @@ msgid "\n"
" % for attendee in object.event_id.attendee_ids:\n"
" <li>\n"
" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
" % else:\n"
" <span style=\"margin-left:5px\">You</span>\n"
" % endif\n"
@@ -221,19 +221,19 @@ msgid "\n"
" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
" <p style=\"font-size: 20px; text-align: center;\">Reminder for <strong>${object.event_id.name}</strong></p>\n"
" <p>\n"
-" <strong>Dear ${object.cn}</strong>,<br />\n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
" This is a reminder for the below event :\n"
-" </p> \n"
+" </p>\n"
" <table style=\"margin-top: 20px;\"><tr>\n"
" <td>\n"
" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\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 #a24689;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" ${object.event_id.get_interval('day', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
-" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}</div>\n"
+" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#a24689'>${object.event_id.get_interval('month', tz=object.partner_id.tz if not object.event_id.allday else None)}</div>\n"
+" <div style=\"border-collapse:separate;color: #5F5F5F;text-align:center;width: 130px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid #a24689;border-bottom-left-radius:3px;\">${not object.event_id.allday and object.event_id.get_interval('time', tz=object.partner_id.tz) or ''}</div>\n"
" </td>\n"
" <td width=\"20px;\"/>\n"
" <td>\n"
@@ -255,8 +255,8 @@ msgid "\n"
" % for attendee in object.event_id.attendee_ids:\n"
" <li>\n"
" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
" % else:\n"
" <span style=\"margin-left:5px\">You</span>\n"
" % endif\n"
@@ -274,7 +274,7 @@ msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:35
+#: code:addons/calendar/static/src/js/base_calendar.js:95
#, python-format
msgid " [Me]"
msgstr ""
@@ -295,26 +295,26 @@ msgid "${object.event_id.name}: Date updated"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:776
+#: code:addons/calendar/models/calendar.py:639
#, python-format
msgid "%s at %s To\n"
" %s at %s (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:774
+#: code:addons/calendar/models/calendar.py:637
#, python-format
msgid "%s at (%s To %s) (%s)"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:263
+#: code:addons/calendar/models/calendar.py:191
#, python-format
msgid "%s has accepted invitation"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:278
+#: code:addons/calendar/models/calendar.py:199
#, python-format
msgid "%s has declined invitation"
msgstr ""
@@ -337,13 +337,14 @@ msgid "Accepted"
msgstr ""
#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_contacts_active
#: model:ir.model.fields,field_description:calendar.field_calendar_event_active
msgid "Active"
msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:132
+#: code:addons/calendar/static/src/js/base_calendar.js:75
#, python-format
msgid "Add Favorite Calendar"
msgstr ""
@@ -354,7 +355,7 @@ msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:771
+#: code:addons/calendar/models/calendar.py:634
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -380,8 +381,8 @@ msgid "Attendee information"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_attendee_ids
#: model:ir.model.fields,field_description:calendar.field_calendar_event_partner_ids
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup
msgid "Attendees"
@@ -393,7 +394,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1714
+#: code:addons/calendar/models/calendar.py:1475
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -420,9 +421,7 @@ msgid "Calendar Alarm"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:43
-#, python-format
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
msgid "Calendar Invitation"
msgstr ""
@@ -442,7 +441,7 @@ msgid "Color index of creator"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_attendee_cn
+#: model:ir.model.fields,field_description:calendar.field_calendar_attendee_common_name
msgid "Common name"
msgstr ""
@@ -476,6 +475,7 @@ msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_display_start
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
msgid "Date"
msgstr ""
@@ -536,9 +536,9 @@ msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:168
+#: code:addons/calendar/static/src/js/base_calendar.js:156
#, python-format
-msgid "Do you really want to delete this filter from favorite?"
+msgid "Do you really want to delete this filter from favorites ?"
msgstr ""
#. module: calendar
@@ -559,12 +559,6 @@ msgstr ""
msgid "Email"
msgstr ""
-#. module: calendar
-#: code:addons/calendar/calendar.py:1365
-#, python-format
-msgid "Email addresses not found"
-msgstr ""
-
#. module: calendar
#: model:ir.model,name:calendar.model_mail_compose_message
msgid "Email composition wizard"
@@ -607,8 +601,15 @@ msgid "Ending at"
msgstr ""
#. module: calendar
-#: constraint:calendar.event:0
-msgid "Error ! End date cannot be set before start date."
+#: code:addons/calendar/models/calendar.py:821
+#, python-format
+msgid "Ending date cannot be set before starting date."
+msgstr ""
+
+#. module: calendar
+#: code:addons/calendar/models/calendar.py:819
+#, python-format
+msgid "Ending datetime cannot be set before starting datetime."
msgstr ""
#. module: calendar
@@ -627,20 +628,20 @@ msgid "Event alarm"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1239
+#: code:addons/calendar/models/calendar.py:1058
#, python-format
msgid "Event recurrence interval cannot be negative."
msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:45
+#: code:addons/calendar/static/src/js/base_calendar.js:96
#, python-format
msgid "Everybody's calendars"
msgstr ""
#. module: calendar
-#: selection:calendar.event,class:0
+#: selection:calendar.event,privacy:0
msgid "Everyone"
msgstr ""
@@ -655,7 +656,7 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:143
+#: code:addons/calendar/models/calendar.py:860
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
@@ -692,7 +693,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1656
+#: code:addons/calendar/models/calendar.py:1423
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -737,6 +738,11 @@ msgstr ""
msgid "Invitation details"
msgstr ""
+#. module: calendar
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
+msgid "Invitation for"
+msgstr ""
+
#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Invitations"
@@ -792,6 +798,7 @@ msgstr ""
#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_location
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
msgid "Location"
msgstr ""
@@ -900,9 +907,7 @@ msgid "Needs Action"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:36
-#, python-format
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
msgid "No I'm not going."
msgstr ""
@@ -924,12 +929,12 @@ msgid "OK"
msgstr ""
#. module: calendar
-#: selection:calendar.event,class:0
+#: selection:calendar.event,privacy:0
msgid "Only internal users"
msgstr ""
#. module: calendar
-#: selection:calendar.event,class:0
+#: selection:calendar.event,privacy:0
msgid "Only me"
msgstr ""
@@ -948,19 +953,24 @@ msgstr ""
msgid "Owner"
msgstr ""
+#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_attendee_ids
+msgid "Participant"
+msgstr ""
+
#. module: calendar
#: model:ir.model,name:calendar.model_res_partner
msgid "Partner"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1252
+#: code:addons/calendar/models/calendar.py:1071
#, python-format
msgid "Please select a proper day of the month."
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_class
+#: model:ir.model.fields,field_description:calendar.field_calendar_event_privacy
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
msgid "Privacy"
msgstr ""
@@ -1170,12 +1180,6 @@ msgid "The calendar is shared between employees and fully integrated with\n"
" opportunities."
msgstr ""
-#. module: calendar
-#: code:addons/calendar/calendar.py:1361
-#, python-format
-msgid "The following contacts have no email address :"
-msgstr ""
-
#. module: calendar
#: selection:calendar.event,byday:0
msgid "Third"
@@ -1263,50 +1267,22 @@ msgstr ""
msgid "Weekday"
msgstr ""
-#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:48
-#, python-format
-msgid "When"
-msgstr ""
-
-#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:52
-#, python-format
-msgid "Where"
-msgstr ""
-
-#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:56
-#, python-format
-msgid "Who"
-msgstr ""
-
#. module: calendar
#: selection:calendar.event,rrule_type:0
msgid "Year(s)"
msgstr ""
#. module: calendar
-#. openerp-web
-#: code:addons/calendar/static/src/xml/base_calendar.xml:35
-#, python-format
+#: model:ir.ui.view,arch_db:calendar.invitation_page_anonymous
msgid "Yes I'm going."
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:106
+#: code:addons/calendar/models/calendar.py:124
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
-#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_contacts_active
-msgid "active"
-msgstr ""
-
#. module: calendar
#: model:ir.model,name:calendar.model_calendar_alarm_manager
msgid "calendar.alarm_manager"
@@ -1323,7 +1299,7 @@ msgid "e.g. Business Lunch"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1237
+#: code:addons/calendar/models/calendar.py:1056
#, python-format
msgid "interval cannot be negative."
msgstr ""
@@ -1333,8 +1309,3 @@ msgstr ""
msgid "ir.attachment"
msgstr ""
-#. module: calendar
-#: model:ir.model,name:calendar.model_ir_values
-msgid "ir.values"
-msgstr ""
-
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 7e5c7bb9b0f80b40eaf8fbb8afd1764b9d488815..d96129b037808633f29183b0f17b3ea0386c0b8a 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "\n"
" <td style=\"padding:15px 10px;font-size:20px\">\n"
" <p style=\"color:#a24689;margin:0\" >Hooray!</p><br>\n"
" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Your Odoo CRM application is up and running</span></p><br>\n"
+" <span>Your Odoo CRM application is up and running.</span></p><br>\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
" <span style=\"font-size:13px;font-weight:bold; \">What’s next?</span></p>\n"
" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
@@ -97,14 +97,14 @@ msgid "\n"
" <span style=\"font-style:italic;\">You’re not alone</span>\n"
" </p>\n"
" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>We would be delighted to assist you along the way. Contact us at \n"
+" <span>We would be delighted to assist you along the way. Contact us at\n"
" <a href=\"mailto:help@odoo.com\"><span style=\"text-decoration:underline;\">\n"
-" help@odoo.com</span></a> if you have any question. You can also discover \n"
+" help@odoo.com</span></a> if you have any question. You can also discover\n"
" how to get the best out of Odoo CRM with our </span>\n"
" <a href=\"https://www.odoo.com/documentation/user/9.0/crm.html\">\n"
" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
" </span><span> or with our </span>\n"
-" <a href=\"https://www.odoo.com/documentation/9.0/\">\n"
+" <a href=\"https://www.odoo.com/documentation\">\n"
" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
" </p>\n"
" <br>\n"
@@ -158,6 +158,20 @@ msgstr ""
msgid ", if accounting or purchase is installed"
msgstr ""
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:34
+#, python-format
+msgid "<b>Drag & drop opportunities</b> between columns as you progress in your sales cycle."
+msgstr ""
+
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:75
+#, python-format
+msgid "<b>Invite coworkers</b> via email.<br/><i>Enter one email per line.</i>"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
msgid "<i class=\"fa fa-envelope-o\"/>&nbsp;"
@@ -169,14 +183,17 @@ msgid "<i class=\"fa fa-question-circle\"> view examples</i>"
msgstr ""
#. module: crm
-#: model:ir.actions.server,body_html:crm.action_email_reminder_lead
-msgid "<p>Hello ${object.user_id and object.user_id.name or ''},</p>\n"
-"<p>The opportunity <strong>${object.name}</strong> did not have any activity since at least 5 days.</p>\n"
-"%if object.description:\n"
-"<p>Here is the description about the opportunity : </p><p><i>${object.description}</i>\n"
-"%endif\n"
-"</p><p>Thank you!</p>\n"
-""
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:61
+#, python-format
+msgid "<p><b>Send messages</b> to your prospect and get replies automatically attached to this opportunity.</p><p class=\"mb0\">Type <i>'@'</i> to mention people - it's like cc-ing on emails.</p>"
+msgstr ""
+
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:45
+#, python-format
+msgid "<p>You will be able to customize your followup activities. Examples:</p><ol><li>introductory email</li><li>call 10 days after</li><li>second call 3 days after, ...</li></ol><p class='mb0'><i>Select a standard activity for now on.</i></p>"
msgstr ""
#. module: crm
@@ -394,16 +411,6 @@ msgid "<span class=\"panel-title\"><span data-icon=\"\"/><strong> Exerci
" <span>(Sales Manager)</span>"
msgstr ""
-#. module: crm
-#: model:web.tip,description:crm.crm_tip_4
-msgid "<span><b>This is a business opportunity.</b> Drag and drop it to another column while you move forward in the sales cycle. Click to zoom in the opportunity.</span>"
-msgstr ""
-
-#. module: crm
-#: model:web.tip,description:crm.crm_tip_6
-msgid "<span><strong>Click to register a new business opportunity</strong>. Once the opportunity is created, you will be able to drag and drop it in your sales pipeline.</span>"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "<span><strong>Contact us to customize your application:</strong><br/>\n"
@@ -655,6 +662,7 @@ msgid "Activated by default when subscribing."
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_active
#: model:ir.model.fields,field_description:crm.field_crm_lead_active
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason_active
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_active
@@ -663,10 +671,14 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_activity_action
+#: 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_menu
#: model:ir.ui.menu,name:crm.crm_activity_report_menu
#: model:ir.ui.view,arch_db:crm.crm_activity_view_form
#: model:ir.ui.view,arch_db:crm.crm_activity_view_tree
+#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1
msgid "Activities"
msgstr ""
@@ -692,7 +704,7 @@ msgid "Activity"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_activity_log.py:75
+#: code:addons/crm/wizard/crm_activity_log.py:80
#, python-format
msgid "Activity Done"
msgstr ""
@@ -751,16 +763,17 @@ msgid "Aligning your sales organization on a systematic\n"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:312
+#: code:addons/crm/wizard/base_partner_merge.py:310
#, python-format
msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:865
+#: code:addons/crm/models/crm_lead.py:880
#, python-format
-msgid "All email incoming to %(link)s will automatically create new opportunity.\n"
-"Update your business card, phone book, social media,... Send an email right now and see it here."
+msgid "All email incoming to %s will automatically\n"
+" create new opportunity. Update your business card, phone book, social media,...\n"
+" Send an email right now and see it here."
msgstr ""
#. module: crm
@@ -836,11 +849,6 @@ msgstr ""
msgid "Attach a qualification form to every house opportunity"
msgstr ""
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_report_author_id
-msgid "Author"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
msgid "Automatic Merge Wizard"
@@ -876,11 +884,6 @@ msgstr ""
msgid "Better visibility on team activities"
msgstr ""
-#. module: crm
-#: selection:crm.lead,kanban_state:0
-msgid "Blocked"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Boost your online sales with sleek product pages."
@@ -917,18 +920,6 @@ msgstr ""
msgid "Call"
msgstr ""
-#. module: crm
-#: model:crm.activity,name:crm.crm_activity_demo_call_demo
-#: model:mail.message.subtype,name:crm.crm_activity_demo_call_demo_mail_message_subtype
-msgid "Call for Demo"
-msgstr ""
-
-#. module: crm
-#: model:crm.activity,description:crm.crm_activity_demo_call_demo
-#: model:mail.message.subtype,description:crm.crm_activity_demo_call_demo_mail_message_subtype
-msgid "Call for a demo"
-msgstr ""
-
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_campaign_id
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -1001,7 +992,21 @@ msgid "Classify and analyze your lead/opportunity categories like: Training, Ser
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:870
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:23
+#, python-format
+msgid "Click here to <b>create your first opportunity</b> and add it to your pipeline."
+msgstr ""
+
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:54
+#, python-format
+msgid "Click on an opportunity to zoom to it."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:883
#, python-format
msgid "Click to add a new opportunity"
msgstr ""
@@ -1031,11 +1036,6 @@ msgstr ""
msgid "Click to set a new stage in your opportunity pipeline."
msgstr ""
-#. module: crm
-#: model:web.tip,description:crm.crm_tip_2
-msgid "Click to view the opportunities related to this customer."
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
msgid "Close"
@@ -1048,11 +1048,11 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_date_closed
-msgid "Closed"
+msgid "Closed Date"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:90
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:87
#, python-format
msgid "Closed/Dead leads cannot be converted into opportunities."
msgstr ""
@@ -1088,6 +1088,13 @@ msgstr ""
msgid "Competition Matrix comparing prices"
msgstr ""
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:71
+#, python-format
+msgid "Configuration options are available in the Settings app."
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Configure the stages of your sales pipeline"
@@ -1187,11 +1194,21 @@ msgstr ""
msgid "Country"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "Create"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Create Customers"
msgstr ""
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead_create_date
+msgid "Create Date"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
msgid "Create Opportunity"
@@ -1209,6 +1226,12 @@ msgstr ""
msgid "Create a new customer"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,name:crm.create_opportunity_simplified
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "Create an Opportunity"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Create sleek and attractive event pages. Sell online and organize on site."
@@ -1237,6 +1260,12 @@ msgstr ""
msgid "Create your templates of offers"
msgstr ""
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_author_id
+#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
+msgid "Created By"
+msgstr ""
+
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_create_uid
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_create_uid
@@ -1271,7 +1300,6 @@ msgid "Created on"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_create_date
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_create_date
msgid "Creation Date"
msgstr ""
@@ -1299,10 +1327,11 @@ msgid "Current Line"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:945
+#: code:addons/crm/models/crm_lead.py:1101
#: 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
+#: model:ir.model.fields,field_description:crm.field_crm_lead_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding_partner_id
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -1314,7 +1343,7 @@ msgid "Customer"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:947
+#: code:addons/crm/models/crm_lead.py:1103
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1427,6 +1456,11 @@ msgstr ""
msgid "Destination Contact"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "Discard"
+msgstr ""
+
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_display_name
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_display_name
@@ -1479,11 +1513,6 @@ msgstr ""
msgid "Download the"
msgstr ""
-#. module: crm
-#: model:ir.filters,name:crm.filter_draft_lead
-msgid "Draft Leads"
-msgstr ""
-
#. module: crm
#: selection:sale.config.settings,group_use_lead:0
msgid "Each mail sent to the alias creates a new opportunity"
@@ -1599,19 +1628,18 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_date_deadline
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_date_deadline
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Expected Closing"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_log_planned_revenue
-#: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
-msgid "Expected Revenue"
+#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
+msgid "Expected Closing Date"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_expected_revenue
-msgid "Probable Turnover"
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_planned_revenue
+#: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue
+msgid "Expected Revenue"
msgstr ""
#. module: crm
@@ -1659,25 +1687,13 @@ msgstr ""
msgid "Folded in Pipeline"
msgstr ""
-#. module: crm
-#: model:crm.activity,name:crm.crm_activity_demo_followup_quote
-#: model:mail.message.subtype,name:crm.crm_activity_demo_followup_quote_mail_message_subtype
-msgid "Follow-up Quote"
-msgstr ""
-
-#. module: crm
-#: model:crm.activity,description:crm.crm_activity_demo_followup_quote
-#: model:mail.message.subtype,description:crm.crm_activity_demo_followup_quote_mail_message_subtype
-msgid "Follow-up quote"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "For every deal, review the next action, the expected closing, the pain points, the expected revenues, the buying process, etc."
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:303
+#: code:addons/crm/wizard/base_partner_merge.py:299
#, python-format
msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
msgstr ""
@@ -1694,7 +1710,7 @@ msgid "Force assignation"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:504
+#: code:addons/crm/models/crm_lead.py:554
#, python-format
msgid "From %s : %s"
msgstr ""
@@ -1780,7 +1796,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_action_activities
msgid "Here is the list of your next activities. Those are linked to your opportunities.\n"
-" To set a next activity, go on an opportunity and add one. It will then appear in this list."
+" To set a next activity, go on an opportunity and add one. It will then appear in this list."
msgstr ""
#. module: crm
@@ -1991,12 +2007,12 @@ msgid "Last Updated on"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:780
+#: code:addons/crm/models/crm_lead.py:857
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
#: model:ir.model.fields,field_description:crm.field_crm_activity_log_lead_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead_lost_lead_id
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_lead_id
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_leads
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
@@ -2058,7 +2074,7 @@ msgid "Leads"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:60
+#: code:addons/crm/models/crm_lead.py:59
#, python-format
msgid "Leads / Opportunities"
msgstr ""
@@ -2102,11 +2118,6 @@ msgstr ""
msgid "Leads by Source"
msgstr ""
-#. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
msgid "Leads that are assigned to me"
@@ -2132,6 +2143,13 @@ msgstr ""
msgid "Leads/Opportunities"
msgstr ""
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:18
+#, python-format
+msgid "Let's have a look at your opportunities pipeline."
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Licences"
@@ -2216,12 +2234,6 @@ msgstr ""
msgid "Low"
msgstr ""
-#. module: crm
-#: model:crm.activity,name:crm.crm_activity_demo_make_quote
-#: model:mail.message.subtype,name:crm.crm_activity_demo_make_quote_mail_message_subtype
-msgid "Make Quote"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Mark Lost"
@@ -2260,7 +2272,7 @@ msgid "Medium"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1010
+#: code:addons/crm/models/crm_lead.py:899
#, python-format
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
msgstr ""
@@ -2337,31 +2349,31 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:489
+#: code:addons/crm/models/crm_lead.py:502
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:483
+#: code:addons/crm/models/crm_lead.py:536
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:485
+#: code:addons/crm/models/crm_lead.py:536
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:489
+#: code:addons/crm/models/crm_lead.py:502
#, python-format
msgid "Merged opportunity"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:334
+#: code:addons/crm/wizard/base_partner_merge.py:331
#, python-format
msgid "Merged with the following partners:"
msgstr ""
@@ -2416,6 +2428,11 @@ msgstr ""
msgid "Month"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_sale_config_settings
+msgid "More Info"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Motivation letter from the management"
@@ -2484,13 +2501,23 @@ msgid "Next Activity Summary"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_activity_log.py:56
+#: code:addons/crm/wizard/crm_activity_log.py:61
#, python-format
msgid "Next activity"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:966
+#: selection:crm.lead,kanban_state:0
+msgid "Next activity is planned"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,kanban_state:0
+msgid "Next activity late"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/models/crm_lead.py:1123
#, python-format
msgid "No Subject"
msgstr ""
@@ -2500,6 +2527,11 @@ msgstr ""
msgid "No activity"
msgstr ""
+#. module: crm
+#: selection:crm.lead,kanban_state:0
+msgid "No next activity planned"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -2507,7 +2539,6 @@ msgid "No salesperson"
msgstr ""
#. module: crm
-#: selection:crm.lead,kanban_state:0
#: selection:crm.lead,priority:0
#: selection:crm.opportunity.report,priority:0
msgid "Normal"
@@ -2571,15 +2602,10 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
-msgid "Odoo helps you keep track of your sales pipeline to follow\n"
-" up potential sales and better forecast your future revenues."
-msgstr ""
-
-#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_opportunities
#: model:ir.actions.act_window,help:crm.crm_lead_opportunities_tree_view
msgid "Odoo helps you keep track of your sales pipeline to follow\n"
-" up potential sales and better forecast your future revenues."
+" up potential sales and better forecast your future revenues."
msgstr ""
#. module: crm
@@ -2601,14 +2627,9 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_lead
-msgid "Once qualified, the lead can be converted into a business\n"
-" opportunity and/or a new customer in your address book."
-msgstr ""
-
-#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_all_leads
msgid "Once qualified, the lead can be converted into a business\n"
-" opportunity and/or a new customer in your address book."
+" opportunity and/or a new customer in your address book."
msgstr ""
#. module: crm
@@ -2617,7 +2638,7 @@ msgid "Once you’ve deployed your CRM, it’s time to grow your revenues. Start
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:324
+#: code:addons/crm/wizard/base_partner_merge.py:323
#, python-format
msgid "Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."
msgstr ""
@@ -2674,7 +2695,7 @@ msgid "Opportunities that are assigned to me"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:759
+#: code:addons/crm/models/crm_lead.py:832
#: selection:crm.activity.report,lead_type:0
#: selection:crm.lead,type:0
#: selection:crm.opportunity.report,type:0
@@ -2682,7 +2703,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_lead_name
#: model:ir.model.fields,field_description:crm.field_res_partner_opportunity_count
#: model:ir.model.fields,field_description:crm.field_res_users_opportunity_count
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
@@ -2702,6 +2722,11 @@ msgstr ""
msgid "Opportunity Stage Changed"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "Opportunity Title"
+msgstr ""
+
#. module: crm
#: model:mail.message.subtype,name:crm.mt_lead_won
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
@@ -2785,7 +2810,6 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_res_partner
-#: model:ir.model.fields,field_description:crm.field_crm_lead_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_partner_id
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
msgid "Partner"
@@ -2867,7 +2891,7 @@ msgid "Planner"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:574
+#: code:addons/crm/models/crm_lead.py:608
#, python-format
msgid "Please select more than one element (lead or opportunity) from the list view."
msgstr ""
@@ -2913,6 +2937,7 @@ msgid "Priority Management Explanation"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_probability
#: model:ir.model.fields,field_description:crm.field_crm_lead_probability
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_probability
msgid "Probability"
@@ -2923,6 +2948,11 @@ msgstr ""
msgid "Probability (%)"
msgstr ""
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_expected_revenue
+msgid "Probable Turnover"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Products"
@@ -2954,8 +2984,10 @@ msgid "Rating"
msgstr ""
#. module: crm
-#: selection:crm.lead,kanban_state:0
-msgid "Ready for next stage"
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:13
+#, python-format
+msgid "Ready to boost you sales? Your <b>sales pipeline</b> can be found here, under this app."
msgstr ""
#. module: crm
@@ -2997,12 +3029,6 @@ msgid "Relation field"
msgstr ""
#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_lead
-msgid "Reminder to User"
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_lead
#: model:mail.template,subject:crm.email_template_opportunity_reminder_mail
msgid "Reminder: Lead ${object.name} from ${object.partner_id != False and object.partner_id.name or object.contact_name}"
msgstr ""
@@ -3018,11 +3044,6 @@ msgstr ""
msgid "Requirements"
msgstr ""
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_report_user_id
-msgid "Responsible"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Retailers"
@@ -3060,7 +3081,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_activity_team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_team_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead_tag_team_id
#: model:ir.model.fields,field_description:crm.field_crm_lead_team_id
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity_team_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_team_id
@@ -3082,11 +3102,11 @@ msgid "Salesmen"
msgstr ""
#. module: crm
+#: 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
#: model:ir.model.fields,field_description:crm.field_crm_lead_user_id
#: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity_user_id
-#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -3108,6 +3128,11 @@ msgstr ""
msgid "Schedule Next Activity"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_activity_schedule_action
+msgid "Schedule an Activity"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
msgid "Search Leads"
@@ -3150,12 +3175,6 @@ msgstr ""
msgid "Selection"
msgstr ""
-#. module: crm
-#: model:crm.activity,description:crm.crm_activity_demo_make_quote
-#: model:mail.message.subtype,description:crm.crm_activity_demo_make_quote_mail_message_subtype
-msgid "Send a quotation"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Send an email to all opportunities in the \"Qualified\" stage for more than 20 days"
@@ -3167,11 +3186,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,name:crm.action_set_team_sales_department
-msgid "Set team to Sales Department"
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Set the sales manager as a follower of every opportunity above $20k"
@@ -3261,7 +3275,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_stage_form
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Stage"
msgstr ""
@@ -3347,14 +3360,10 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_log_title_action
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_subject
msgid "Summary"
msgstr ""
-#. module: crm
-#: model:web.tip,description:crm.crm_tip_5
-msgid "Switch to the graph view to get a clear reporting on your opportunities pipeline."
-msgstr ""
-
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Systematic organization is what makes the difference\n"
@@ -3464,12 +3473,12 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "There are several ways for your company to generate leads with Odoo CRM. \n"
-" One of them is using your company's generic email address as a trigger \n"
-" to create a new lead in the system. In Odoo, each one of your sales teams \n"
-" is linked to its own email address from which prospects can reach them. \n"
-" For example, if the personal email address of your Direct team is \n"
-" direct@mycompany.example.com, every email sent when a new prospect \n"
+msgid "There are several ways for your company to generate leads with Odoo CRM.\n"
+" One of them is using your company's generic email address as a trigger\n"
+" to create a new lead in the system. In Odoo, each one of your sales teams\n"
+" is linked to its own email address from which prospects can reach them.\n"
+" For example, if the personal email address of your Direct team is\n"
+" direct@mycompany.example.com, every email sent when a new prospect\n"
" contacts you will automatically create a new opportunity into the sales team.\n"
"\n"
" That's the easiest way to integrate Odoo with third party apps."
@@ -3501,6 +3510,13 @@ msgstr ""
msgid "This is the default configuration, there is nothing to setup."
msgstr ""
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:40
+#, python-format
+msgid "This opportunity has <b>no next activity scheduled</b>. <i>Click to set one.</i>"
+msgstr ""
+
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_stage_probability
msgid "This percentage depicts the default/average probability of the Case for this stage to be a success"
@@ -3518,7 +3534,7 @@ msgid "This stage is folded in the kanban view when there are no records in that
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1164
+#: code:addons/crm/models/crm_lead.py:1026
#, python-format
msgid "This target does not exist."
msgstr ""
@@ -3619,20 +3635,13 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_lead
+#: model:ir.actions.act_window,help:crm.crm_lead_all_leads
msgid "Use leads if you need a qualification step before creating an\n"
" opportunity or a customer. It can be a business card you received,\n"
" a contact form filled in your website, or a file of unqualified\n"
" prospects you import, etc."
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_all_leads
-msgid "Use leads if you need a qualification step before creating an\n"
-" opportunity or a customer. It can be a business card you received,\n"
-" a contact form filled in your website, or a file of unqualified\n"
-" prospects you import, etc."
-msgstr ""
-
#. module: crm
#: selection:sale.config.settings,group_use_lead:0
msgid "Use leads if you need a qualification step before creating an opportunity or a customer"
@@ -3657,11 +3666,23 @@ msgid "Use subscription for recurring billing.\n"
" subscription to a service, etc."
msgstr ""
+#. module: crm
+#. openerp-web
+#: code:addons/crm/static/src/js/tour.js:66
+#, python-format
+msgid "Use the breadcrumbs to <b>go back to your sales pipeline</b>."
+msgstr ""
+
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_team_resource_calendar_id
msgid "Used to compute open days"
msgstr ""
+#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_lead_user_login
+msgid "Used to log into the system"
+msgstr ""
+
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_stage_sequence
msgid "Used to order stages. Lower is better."
@@ -3708,6 +3729,11 @@ msgstr ""
msgid "VoIP integration"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_sale_config_settings
+msgid "Voip integration"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "We are here to help you. If you get stuck, do not hesitate to\n"
@@ -3843,7 +3869,7 @@ msgid "You can change the pricing method at anytime. We\n"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:309
+#: code:addons/crm/wizard/base_partner_merge.py:306
#, python-format
msgid "You cannot merge a contact with one of his parent."
msgstr ""
@@ -3857,7 +3883,7 @@ msgid "You don't need to review lost opportunities at every sales meeting, but i
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:453
+#: code:addons/crm/wizard/base_partner_merge.py:398
#, python-format
msgid "You have to specify a filter for your selection"
msgstr ""
@@ -3886,8 +3912,8 @@ msgstr ""
#: model:ir.actions.act_window,help:crm.crm_lead_opportunities
#: model:ir.actions.act_window,help:crm.crm_lead_opportunities_tree_view
msgid "You will be able to plan meetings and phone calls from\n"
-" opportunities, convert them into quotations, attach related\n"
-" documents, track all discussions, and much more."
+" opportunities, convert them into quotations, attach related\n"
+" documents, track all discussions, and much more."
msgstr ""
#. module: crm
@@ -3966,6 +3992,11 @@ msgstr ""
msgid "browse the documentation"
msgstr ""
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
+msgid "e.g. Customer Deal"
+msgstr ""
+
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form_schedule
@@ -3979,7 +4010,7 @@ msgid "e.g. Product Pricing"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/models/crm_lead.py:887
#, python-format
msgid "opportunities"
msgstr ""
@@ -4052,7 +4083,7 @@ msgid "to setup your own domain\n"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1004
+#: code:addons/crm/models/crm_lead.py:893
#, python-format
msgid "unknown"
msgstr ""
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index ecb7f9189734116beeb40358a301cc5a4c9b3358..729a2e90d4a8aa28911b9081166551fde6376362 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,6 +50,21 @@ msgstr ""
msgid "Display Name"
msgstr ""
+#. module: decimal_precision
+#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float
+msgid "Float"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_2
+msgid "Float 2"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_4
+msgid "Float 4"
+msgstr ""
+
#. module: decimal_precision
#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_id
#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_id
@@ -99,10 +114,3 @@ msgstr ""
msgid "ir.qweb.field.float"
msgstr ""
-#. module: decimal_precision
-#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float
-#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_2
-#: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision_test_float_4
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index ebae3972a1ed5836a94cad8b0c28550af677a55e..14e485b8650ce911f6f4522fe9689c77e9d0f999 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,11 @@ msgstr ""
msgid "# Manufacturing Orders"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_count
+msgid "# Product Variants"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_count
msgid "# Purchases"
@@ -51,8 +56,11 @@ msgid "# Sales"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_variant_count
-msgid "# of Product Variants"
+#: code:addons/delivery/models/delivery_carrier.py:74
+#, python-format
+msgid "<p class=\"oe_view_nocontent\">\n"
+" Buy Odoo Enterprise now to get more providers.\n"
+" </p>"
msgstr ""
#. module: delivery
@@ -72,12 +80,6 @@ msgstr ""
msgid "<strong>Weight</strong>"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_product_type
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_type
-msgid "A consumable is a product for which you don't manage stock, a service is a non-material product provided by a company or an individual."
-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 Sale Order, Delivery Order and Customer Invoice/Refund"
@@ -93,11 +95,25 @@ msgstr ""
msgid "A precise description of the Product, used only for internal information purposes."
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_product_type
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_type
+msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+"A consumable product, on the other hand, is a product for which stock is not managed.\n"
+"A service is a non-material product you provide.\n"
+"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_needaction
msgid "Action Needed"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_integration_level
+msgid "Action while validating Delivery Orders"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_active
msgid "Active"
@@ -133,6 +149,11 @@ msgstr ""
msgid "Available"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_available_in_pos
+msgid "Available in the Point of Sale"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_produce_delay
msgid "Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."
@@ -184,6 +205,11 @@ msgstr ""
msgid "Bulk Weight"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_can_be_expensed
+msgid "Can be Expensed"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_ok
msgid "Can be Purchased"
@@ -205,11 +231,6 @@ msgstr ""
msgid "Can be changed during the 'put in pack' to adjust the weight of the shipping."
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_can_be_expensed
-msgid "Can be expensed"
-msgstr ""
-
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Cancel"
@@ -237,13 +258,18 @@ msgid "Check if the product is eligible for membership."
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Click to define a new delivery method."
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_to_weight
+msgid "Check if the product should be weighted using the hardware scale integration"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_uos_coeff
-msgid "Coefficient to convert default Unit of Measure to Unit of Sale uos = uom * coeff"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_available_in_pos
+msgid "Check if you want this product to appear in the Point of Sale"
+msgstr ""
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Click to define a new delivery method."
msgstr ""
#. module: delivery
@@ -276,6 +302,11 @@ msgstr ""
msgid "Cost Price"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_cost_method
+msgid "Cost method"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_standard_price
msgid "Cost of the product template used for standard stock valuation in accounting and used as a base price on purchase orders. Expressed in the default unit of measure of the product."
@@ -291,6 +322,11 @@ msgstr ""
msgid "Countries"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_project_id
+msgid "Create a task under this project on sale order validation. This setting must be set for each company."
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_create_uid
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_create_uid
@@ -323,13 +359,13 @@ msgid "Customer Lead Time"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_taxes_id
-msgid "Customer Taxes"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_partner_ref
+msgid "Customer Ref"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_partner_ref
-msgid "Customer ref"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_taxes_id
+msgid "Customer Taxes"
msgstr ""
#. module: delivery
@@ -371,7 +407,7 @@ msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
-msgid "Delivery Carrier Search"
+msgid "Delivery Carrier"
msgstr ""
#. module: delivery
@@ -462,7 +498,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_event_ok
-msgid "Event Subscription"
+msgid "Event Registration"
msgstr ""
#. module: delivery
@@ -506,13 +542,13 @@ msgid "Expense Account"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_expense_policy
-msgid "Expense Invoice Policy"
+#: model:ir.model.fields,help:delivery.field_sale_order_carrier_id
+msgid "Fill this field if you plan to invoice the shipping based on picking."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_sale_order_carrier_id
-msgid "Fill this field if you plan to invoice the shipping based on picking."
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
+msgid "Filling this form allows you to filter delivery carriers according to the delivery address of your customer."
msgstr ""
#. module: delivery
@@ -560,6 +596,16 @@ msgstr ""
msgid "Free if Order total is more than"
msgstr ""
+#. module: delivery
+#: selection:delivery.carrier,integration_level:0
+msgid "Get Rate"
+msgstr ""
+
+#. module: delivery
+#: selection:delivery.carrier,integration_level:0
+msgid "Get Rate and Create Shipment"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_packaging_ids
msgid "Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."
@@ -622,11 +668,6 @@ msgstr ""
msgid "If unchecked, it will allow you to hide the product without removing it."
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_expense_policy
-msgid "If you invoice at cost, the expense will be invoiced on the sale order at the cost of the analytic line;if you invoice at sales price, the price of the product will be used instead."
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_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."
@@ -652,6 +693,16 @@ msgstr ""
msgid "Incoming"
msgstr ""
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
+msgid "Install more Providers"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_integration_level
+msgid "Integration Level"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_categ_id
msgid "Internal Category"
@@ -703,11 +754,6 @@ msgstr ""
msgid "Is a Delivery"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_is_product_variant
-msgid "Is a product variant"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_fixed_price
msgid "Keep empty if the pricing depends on the advanced pricing per destination"
@@ -833,6 +879,16 @@ msgstr ""
msgid "Membership Start Date"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_line_warn_msg
+msgid "Message for Purchase Order Line"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_line_warn_msg
+msgid "Message for Sales Order Line"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_ids
msgid "Messages"
@@ -877,12 +933,6 @@ msgstr ""
msgid "Normal Cost - Total Cost"
msgstr ""
-#. module: delivery
-#: model:delivery.carrier,name:delivery.normal_delivery_carrier
-#: model:product.product,name:delivery.normal_delivery_carrier_product_product
-msgid "Normal Delivery Charges"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_needaction_counter
msgid "Number of Actions"
@@ -905,8 +955,8 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_method
-msgid "On ordered quantities: Invoice this product based on ordered quantities.\n"
-"On received quantities: Invoice this product based on received quantity."
+msgid "On ordered quantities: control bills based on ordered quantities.\n"
+"On received quantities: control bills based on received quantity."
msgstr ""
#. module: delivery
@@ -917,8 +967,7 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_invoice_policy
msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n"
-"Delivered Quantity: Invoiced based on the quantity the vendor delivered.\n"
-"Reinvoice Costs: Invoice with some additional charges (product transfer, labour charges,...)"
+"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)."
msgstr ""
#. module: delivery
@@ -968,6 +1017,11 @@ msgstr ""
msgid "Physical Packages"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_pos_categ_id
+msgid "Point of Sale Category"
+msgstr ""
+
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
@@ -975,13 +1029,6 @@ msgstr ""
msgid "Price"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
-#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
-msgid "Price Computation"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_property_account_creditor_price_difference
msgid "Price Difference Account"
@@ -1003,6 +1050,11 @@ msgstr ""
msgid "Pricelist Items"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_pricelist_item_ids
+msgid "Pricelist item ids"
+msgstr ""
+
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
msgid "Pricing"
@@ -1038,11 +1090,6 @@ msgstr ""
msgid "Product Life Time"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_product_manager
-msgid "Product Manager"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_removal_time
msgid "Product Removal Time"
@@ -1075,6 +1122,18 @@ msgstr ""
msgid "Products"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_project_id
+msgid "Project"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_type
+#: model:ir.model.fields,field_description:delivery.field_stock_picking_delivery_type
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
+msgid "Provider"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_description_purchase
msgid "Purchase Description"
@@ -1085,6 +1144,11 @@ msgstr ""
msgid "Purchase Gap"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_line_warn
+msgid "Purchase Order Line"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uom_po_id
msgid "Purchase Unit of Measure"
@@ -1118,6 +1182,11 @@ msgid "Quantity of products that are planned to leave.\n"
"Otherwise, this includes goods leaving any Stock Location with 'internal' type."
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_expense_policy
+msgid "Re-Invoice Expenses"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reception_count
msgid "Receipt"
@@ -1128,6 +1197,16 @@ msgstr ""
msgid "Reordering Rules"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_max_qty
+msgid "Reordering max qty"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_min_qty
+msgid "Reordering min qty"
+msgstr ""
+
#. module: delivery
#: model:ir.model,name:delivery.model_stock_return_picking
msgid "Return Picking"
@@ -1169,6 +1248,7 @@ msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_sale_order_line
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_sale_line_warn
msgid "Sales Order Line"
msgstr ""
@@ -1183,14 +1263,15 @@ msgid "Select category for the current product"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_event_type_id
-msgid "Select event types so when we use this product in sales order lines, it will filter events of this type only."
+#: code:addons/delivery/models/delivery_carrier.py:296
+#, python-format
+msgid "Selected product in the delivery method doesn't fulfill any of the delivery carrier(s) criteria."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:284
-#, python-format
-msgid "Selected product in the delivery method doesn't fulfill any of the delivery carrier(s) criteria."
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_line_warn
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_line_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 ""
#. module: delivery
@@ -1230,21 +1311,11 @@ msgstr ""
msgid "Shipping Weight"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_shipping_enabled
-msgid "Shipping enabled"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_small
msgid "Small-sized image"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_uos_id
-msgid "Specify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure."
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_product_sale_ok
#: model:ir.model.fields,help:delivery.field_delivery_carrier_sale_ok
@@ -1259,8 +1330,8 @@ msgstr ""
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_cost_method
msgid "Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).\n"
-" Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
-" Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
+" Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
+" Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
msgstr ""
#. module: delivery
@@ -1289,6 +1360,16 @@ msgstr ""
msgid "Stock Output Account"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_stock_move_ids
+msgid "Stock move ids"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_stock_quant_ids
+msgid "Stock quant ids"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_normal_cost
msgid "Sum of Multiplication of Cost price and quantity of Vendor Bills"
@@ -1320,14 +1401,14 @@ msgid "Sum of Quantity in Vendor Bills"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_name_template
-msgid "Template Name"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_pricelist_id
+msgid "Technical field. Used for searching on pricelists, not stored in database."
msgstr ""
#. module: delivery
-#: model:delivery.carrier,name:delivery.delivery_carrier
-#: model:product.product,name:delivery.delivery_carrier_product_product
-msgid "The Poste"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_stock_move_ids
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_stock_quant_ids
+msgid "Technical: used to compute quantities."
msgstr ""
#. module: delivery
@@ -1342,8 +1423,8 @@ msgid "The order state have to be draft to add delivery lines."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_partner_id
-msgid "The partner that is doing the delivery service."
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_lst_price
+msgid "The sale price is managed from the product template. Click on the 'Variant Prices' button to set the extra attribute prices."
msgstr ""
#. module: delivery
@@ -1413,6 +1494,16 @@ msgstr ""
msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_pos_categ_id
+msgid "Those categories are used to group similar products for point of sale."
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_to_weight
+msgid "To Weigh With Scale"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_total_cost
msgid "Total Cost"
@@ -1454,11 +1545,6 @@ msgstr ""
msgid "Transfer"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_partner_id
-msgid "Transporter Company"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_turnover
msgid "Turnover"
@@ -1469,19 +1555,8 @@ msgstr ""
msgid "Turnover - Standard price"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_event_type_id
-msgid "Type of Event"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_shipping_enabled
-msgid "Uncheck this box to disable package shipping while validating Delivery Orders"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uom_id
-#: model:ir.model.fields,field_description:delivery.field_stock_move_weight_uom_id
#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight_uom_id
msgid "Unit of Measure"
msgstr ""
@@ -1491,16 +1566,6 @@ msgstr ""
msgid "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uos_coeff
-msgid "Unit of Measure -> UOS Coeff"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_uos_id
-msgid "Unit of Sale"
-msgstr ""
-
#. module: delivery
#: model:ir.model.fields,help:delivery.field_stock_picking_weight_uom_id
msgid "Unit of measurement for Weight"
@@ -1516,6 +1581,11 @@ msgstr ""
msgid "Unread Messages Counter"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_valuation
+msgid "Valuation"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_variable
msgid "Variable"
@@ -1527,13 +1597,13 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_extra
-msgid "Variant Extra Price"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_variant
+msgid "Variant Image"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_variant
-msgid "Variant Image"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_extra
+msgid "Variant Price Extra"
msgstr ""
#. module: delivery
@@ -1564,16 +1634,6 @@ msgstr ""
msgid "Warranty"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
@@ -1591,6 +1651,11 @@ msgstr ""
msgid "Weight * Volume"
msgstr ""
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_stock_move_weight_uom_id
+msgid "Weight Unit of Measure"
+msgstr ""
+
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking_shipping_weight
msgid "Weight for Shipping"
@@ -1669,11 +1734,3 @@ msgstr ""
msgid "e.g. UPS Express"
msgstr ""
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_cost_method
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_max_qty
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_min_qty
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_valuation
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index ad438ea837fb8fa7ad040814ecfdb3c6755feef2..8b37b9bd69ef023404656a3100d063a7107bcc8b 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,35 +16,260 @@ msgstr ""
"Plural-Forms: \n"
#. module: event
-#: model:mail.template,body_html:event.event_registration_mail_template_badge
+#: model:mail.template,body_html:event.event_reminder
msgid "\n"
-"<p>Dear ${object.name},</p>\n"
-"<p>Thank you for your inquiry.</p>\n"
-"<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
+"% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
+"% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+" <table style=\"width:600px;margin:5px auto;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td>\n"
+" <a href=\"/\">\n"
+" <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
+" </a>\n"
+" </td>\n"
+" <td style=\"text-align:right;vertical-align:middle;\">\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">More Events</a>\n"
+" % endif\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:15px 20px 0px 20px;\">\n"
+" <h2 style=\"font-weight:300;\">\n"
+" Hi ${object.name},\n"
+" </h2>\n"
+" <p style=\"font-size:16px;\">\n"
+" Please keep in mind that the event\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <a href=\"${object.event_id.website_url}\" style=\"color:#a24689;text-decoration:none;\">${object.event_id.name}</a>\n"
+" % else:\n"
+" <strong>${object.event_id.name}</strong>\n"
+" % endif\n"
+" takes place on\n"
+" <strong>${object.get_date_range_str()}</strong>\n"
+" </p>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"padding:15px 20px 0px 20px;\">\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:25px 0px;vertical-align:top;\">\n"
+" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\">\n"
+" </td>\n"
+" <td style=\"padding:30px 10px 25px 10px;width:50%;vertical-align:top;\">\n"
+" % if object.event_id.address_id.street:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street},</p>\n"
+" % set location = object.event_id.address_id.street\n"
+" % endif\n"
+" % if object.event_id.address_id.street2:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street2},</p>\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n"
+" % endif\n"
+" % if object.event_id.address_id.city:\n"
+" ${object.event_id.address_id.city},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n"
+" % endif\n"
+" % if object.event_id.address_id.state_id.name:\n"
+" ${object.event_id.address_id.state_id.name},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n"
+" % endif\n"
+" % if object.event_id.address_id.zip:\n"
+" ${object.event_id.address_id.zip},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n"
+" % endif\n"
+" % if object.event_id.address_id.country_id.name:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.country_id.name}</p>\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n"
+" % endif\n"
+" </td>\n"
+" <td style=\"padding:25px 0px;vertical-align:top;\">\n"
+" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\">\n"
+" </td>\n"
+" <td style=\"padding:25px 10px 25px 10px;width:50%;line-height:20px;vertical-align:top;\">\n"
+" <div><strong>From</strong> ${object.event_id.date_begin_located}</div>\n"
+" <div><strong>To</strong> ${object.event_id.date_end_located}</div>\n"
+" <div style=\"font-size:12px;color:#9e9e9e\"><i><strong>TZ</strong> ${object.event_id.date_tz}</i></div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % if object.event_id.organizer_id.email:\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:10px 0px 25px 0px;\">\n"
+" <h2 style=\"font-weight:300;margin:10px 0px\">Questions about this event?</h2>\n"
+" <div>Please contact the organizer at <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#a24689;\">${object.event_id.organizer_id.email}</a></div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endif\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:25px 0px;\">\n"
+" <strong>Add this event to your calendar</strong>\n"
+" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&text=${object.event_id.name}&dates=${date_begin}/${date_end}&location=${location}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Google</a>\n"
+" <a href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&summary=${object.event_id.name}&dtstart=${date_begin}&dtend=${date_end}&location=${location}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Outlook</a>\n"
+" <a href=\"https://calendar.yahoo.com/?v=60&view=d&type=20&title=${object.event_id.name}&in_loc=${location}&st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&et=${format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Yahoo</a>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
+" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x100&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\" />\n"
+" </a>\n"
+" </div>\n"
+" <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding-top:10px;font-size: 12px;\">\n"
+" <div>This email was sent to <a href=\"mailto:${object.email}\" style=\"text-decoration:none;color:#a24689;\">${object.email}</a></div>\n"
+" <p style=\"margin:0px 0px 9px 0px;padding-top:10px;\">Copyright © ${object.company_id.name}</p>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+"</div>\n"
+" "
msgstr ""
#. module: event
#: model:mail.template,body_html:event.event_subscription
msgid "\n"
-"<p>Dear ${object.name},</p>\n"
-"<p>Thank you for your inquiry.</p>\n"
-"<p>We confirm your subscription to the event <b>${object.event_id.name}</b>. You will receive emails with practical information.</p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
+"% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
+"% set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ')\n"
+"<div style=\"background:#F3F5F6;color:#515166;padding:25px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+" <table style=\"width:600px;margin:5px auto;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td>\n"
+" <a href=\"/\">\n"
+" <img src=\"/logo\" alt=\"${object.company_id.name}\" style=\"vertical-align:baseline;max-width:100px;\" />\n"
+" </a>\n"
+" </td>\n"
+" <td style=\"text-align:right;vertical-align:middle;\">\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">More Events</a>\n"
+" % endif\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:15px 20px 0px 20px;\">\n"
+" <h2 style=\"font-weight:300;\">\n"
+" Hi ${object.name}, here is your order confirmation for\n"
+" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
+" <a href=\"${object.event_id.website_url}\" style=\"color:#a24689;text-decoration:none;\">${object.event_id.name}</a>\n"
+" % else:\n"
+" <strong>${object.event_id.name}</strong>\n"
+" % endif\n"
+" </h2>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"padding:15px 20px 0px 20px;\">\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:25px 0px;vertical-align:top;\">\n"
+" <img src=\"/web_editor/font_to_img/61505/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\">\n"
+" </td>\n"
+" <td style=\"padding:30px 10px 25px 10px;width:50%;vertical-align:top;\">\n"
+" % if object.event_id.address_id.street:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street},</p>\n"
+" % set location = object.event_id.address_id.street\n"
+" % endif\n"
+" % if object.event_id.address_id.street2:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.street2},</p>\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.street2)\n"
+" % endif\n"
+" % if object.event_id.address_id.city:\n"
+" ${object.event_id.address_id.city},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.city)\n"
+" % endif\n"
+" % if object.event_id.address_id.state_id.name:\n"
+" ${object.event_id.address_id.state_id.name},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.state_id.name)\n"
+" % endif\n"
+" % if object.event_id.address_id.zip:\n"
+" ${object.event_id.address_id.zip},\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.zip)\n"
+" % endif\n"
+" % if object.event_id.address_id.country_id.name:\n"
+" <p style=\"margin:0px 0px 0px 0px;\">${object.event_id.address_id.country_id.name}</p>\n"
+" % set location = '%s, %s' % (location, object.event_id.address_id.country_id.name)\n"
+" % endif\n"
+" </td>\n"
+" <td style=\"padding:25px 0px;vertical-align:top;\">\n"
+" <img src=\"/web_editor/font_to_img/61555/rgb(81,81,102)/34\" style=\"padding:4px;max-width:inherit;\" height=\"34\">\n"
+" </td>\n"
+" <td style=\"padding:25px 10px 25px 10px;width:50%;line-height:20px;vertical-align:top;\">\n"
+" <div><strong>From</strong> ${object.event_id.date_begin_located}</div>\n"
+" <div><strong>To</strong> ${object.event_id.date_end_located}</div>\n"
+" <div style=\"font-size:12px;color:#9e9e9e\"><i><strong>TZ</strong> ${object.event_id.date_tz}</i></div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % if object.event_id.organizer_id.email:\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:10px 0px 25px 0px;\">\n"
+" <h2 style=\"font-weight:300;margin:10px 0px\">Questions about this event?</h2>\n"
+" <div>Please contact the organizer at <a href=\"mailto:${object.event_id.organizer_id.email}\" style=\"text-decoration:none;color:#a24689;\">${object.event_id.organizer_id.email}</a></div>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" % endif\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"padding:25px 0px;\">\n"
+" <strong>Add this event to your calendar</strong>\n"
+" <a href=\"https://www.google.com/calendar/render?action=TEMPLATE&text=${object.event_id.name}&dates=${date_begin}/${date_end}&location=${location}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Google</a>\n"
+" <a href=\"https://bay02.calendar.live.com/calendar/calendar.aspx?rru=addevent&summary=${object.event_id.name}&dtstart=${date_begin}&dtend=${date_end}&location=${location}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Outlook</a>\n"
+" <a href=\"https://calendar.yahoo.com/?v=60&view=d&type=20&title=${object.event_id.name}&in_loc=${location}&st=${format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%S')}&et=${format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%S')}\" style=\"padding:3px 5px;border:1px solid #a24689;color:#a24689;text-decoration:none;border-radius:3px;\" target=\"new\"><img src=\"/web_editor/font_to_img/61525/rgb(162,70,137)/16\" style=\"vertical-align:middle;\" height=\"16\"> Yahoo</a>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <div style=\"width:598px;margin:0px auto;border-left:1px solid #dddddd;border-right:1px solid #dddddd;border-bottom:1px solid #dddddd;\">\n"
+" <a href=\"https://maps.google.com/maps?q=${location}\" target=\"new\">\n"
+" <img src=\"http://maps.googleapis.com/maps/api/staticmap?autoscale=1&size=598x100&maptype=roadmap&format=png&visual_refresh=true&markers=size:mid%7Ccolor:0xa5117d%7Clabel:%7C${location}\" style=\"vertical-align:bottom;\" />\n"
+" </a>\n"
+" </div>\n"
+" <table style=\"width:600px;margin:0px auto;text-align:center;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding-top:10px;font-size: 12px;\">\n"
+" <div>This email was sent to <a href=\"mailto:${object.email}\" style=\"text-decoration:none;color:#a24689;\">${object.email}</a></div>\n"
+" <p style=\"margin:0px 0px 9px 0px;padding-top:10px;\">Copyright © ${object.company_id.name}</p>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+"</div>\n"
+" "
msgstr ""
#. module: event
-#: model:mail.template,body_html:event.event_reminder
+#: model:mail.template,body_html:event.event_registration_mail_template_badge
msgid "\n"
"<p>Dear ${object.name},</p>\n"
-"<p>Thank you for your registration to the event ${object.event_id.name}.</p>\n"
-"<p>The event will take place at ${object.event_id.address_id.city}\n"
-"% if object.event_id.address_id.street\n"
-", ${object.event_id.address_id.street}\n"
-"% endif\n"
-"from ${object.event_id.date_begin_located} to ${object.event_id.date_end_located}.</p>\n"
+"<p>Thank you for your inquiry.</p>\n"
+"<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
"<p>If you have any questions, please let us know.</p>\n"
"<p>Best regards,</p>"
msgstr ""
@@ -69,49 +294,12 @@ msgstr ""
msgid "(stats)"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-msgid "3 Intensive Days"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "5 Intensive Days"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "<em>(Chamber Works reserves the right to cancel, re-name or re-locate<br>the event or change the dates on which it is held.)</em>"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_kanban
msgid "<i class=\"fa fa-clock-o\"/>\n"
" <b>To</b>"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<i>You will be able to create dynamic page interacting with the ORM.</i>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<i>You will be able to develop a full application with backend and user interface.</i>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<i>You will be able to develop simple dynamic components in HTML pages.</i>"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.event_event_report_template_badge
#: model:ir.ui.view,arch_db:event.event_registration_report_template_badge
@@ -125,72 +313,14 @@ msgid "<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\"
" </span>"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<span style=\"text-align: -webkit-center; \">This course is dedicated to developers who need to grasp knowledge of the <strong>business applications development </strong>process. This course is for new developers or for IT professionals eager to learn more about technical aspects.</span>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "<strong>Conference on Business Apps</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<strong>Having attended this course, participants should be able to:</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_2
-#: model:event.event,description:event.event_3
-msgid "<strong>Objectives:</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<strong>Our prices include:</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "<strong>Program:</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "<strong>Requirements:</strong>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "<strong>Where to find us:</strong>"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_active
msgid "Active"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Advanced JQuery"
-msgstr ""
-
#. module: event
#: selection:event.mail,interval_type:0
-msgid "After each subscription"
+msgid "After each registration"
msgstr ""
#. module: event
@@ -205,7 +335,7 @@ msgstr ""
#. module: event
#: selection:event.config.settings,module_website_event_questions:0
-msgid "Allow adding extra questions on subscriptions"
+msgid "Allow adding extra questions on registrations"
msgstr ""
#. module: event
@@ -228,13 +358,6 @@ msgstr ""
msgid "Archived"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Arrays"
-msgstr ""
-
#. module: event
#: selection:event.registration,state:0
#: model:ir.ui.view,arch_db:event.view_event_registration_form
@@ -284,6 +407,11 @@ msgstr ""
msgid "Auto Confirmation"
msgstr ""
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_event_seats_available
+msgid "Available Seats"
+msgstr ""
+
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_badge_back
msgid "Badge Back"
@@ -305,10 +433,8 @@ msgid "Badge Inner Right"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Banner Odoo Image"
+#: model:ir.ui.view,arch_db:event.view_event_configuration
+msgid "Barcode Interface"
msgstr ""
#. module: event
@@ -316,39 +442,6 @@ msgstr ""
msgid "Before the event"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Best regards,"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Bootstrap CSS"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Bring your own laptop."
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Building a Full Application"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Calling the ORM"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_configuration
#: model:ir.ui.view,arch_db:event.view_event_confirm
@@ -379,18 +472,13 @@ msgstr ""
msgid "Category"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Chamber Works 60, Rosewood Court Detroit, MI 48212 (United States)"
-msgstr ""
-
#. module: event
#: model:ir.actions.act_window,help:event.action_event_view
msgid "Click to add a new event."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:206
+#: code:addons/event/models/event.py:218
#, python-format
msgid "Closing Date cannot be set before Beginning Date."
msgstr ""
@@ -404,21 +492,11 @@ msgid "Company"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:402
+#: code:addons/event/models/event.py:414
#, python-format
msgid "Compose Email"
msgstr ""
-#. module: event
-#: model:event.type,name:event.event_type_2
-msgid "Conference"
-msgstr ""
-
-#. module: event
-#: model:event.event,name:event.event_2
-msgid "Conference on Business Apps"
-msgstr ""
-
#. module: event
#: model:ir.ui.menu,name:event.menu_event_configuration
msgid "Configuration"
@@ -479,30 +557,11 @@ msgstr ""
msgid "Contact"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Controllers and Views"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_country_id
msgid "Country"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Course Summary"
-msgstr ""
-
-#. module: event
-#: model:web.tip,description:event.event_tip_1
-msgid "Create and manage registrations for this event, send emails to attendees and print identification badges."
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_config_settings_create_uid
#: model:ir.model.fields,field_description:event.field_event_confirm_create_uid
@@ -531,38 +590,17 @@ msgid "Creation Date"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:379
+#: code:addons/event/models/event.py:391
#, python-format
msgid "Customer"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:381
+#: code:addons/event/models/event.py:393
#, python-format
msgid "Customer Email"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Day 1"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Day 2"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Day 3"
-msgstr ""
-
#. module: event
#: selection:event.mail,interval_unit:0
msgid "Day(s)"
@@ -588,13 +626,6 @@ msgstr ""
msgid "Description"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Develop a new module for a particular application."
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_config_settings_display_name
#: model:ir.model.fields,field_description:event.field_event_confirm_display_name
@@ -612,13 +643,6 @@ msgstr ""
msgid "Display order"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Dive into Strings"
-msgstr ""
-
#. module: event
#: selection:event.event,state:0
#: selection:report.event.registration,event_state:0
@@ -631,11 +655,6 @@ msgstr ""
msgid "Draft"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "During this conference, our team will give a detailed overview of our business applications. You’ll know all the benefits of using it."
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration_email
msgid "Email"
@@ -646,11 +665,6 @@ msgstr ""
msgid "Email Schedule"
msgstr ""
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_group_email_scheduling
-msgid "Email Scheduling"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_mail_template_id
msgid "Email to Send"
@@ -686,6 +700,16 @@ msgstr ""
msgid "Event Beginning Date"
msgstr ""
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Event Categories"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.view,arch_db:event.view_event_search
+msgid "Event Category"
+msgstr ""
+
#. module: event
#: model:ir.actions.act_window,name:event.action_event_confirm
#: model:ir.ui.view,arch_db:event.view_event_confirm
@@ -765,13 +789,17 @@ msgstr ""
#: model:ir.model,name:event.model_event_type
#: model:ir.model.fields,field_description:event.field_event_type_name
#: model:ir.model.fields,field_description:event.field_report_event_registration_event_type_id
-#: model:ir.ui.view,arch_db:event.view_event_search
#: model:ir.ui.view,arch_db:event.view_event_type_form
#: model:ir.ui.view,arch_db:event.view_event_type_tree
#: model:ir.ui.view,arch_db:event.view_report_event_registration_search
msgid "Event Type"
msgstr ""
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type
+msgid "Event Types"
+msgstr ""
+
#. module: event
#: model:ir.ui.view,arch_db:event.report_event_registration_graph
#: model:ir.ui.view,arch_db:event.report_event_registration_pivot
@@ -801,11 +829,6 @@ msgstr ""
msgid "Events Mail Schedulers"
msgstr ""
-#. module: event
-#: model:ir.actions.act_window,name:event.action_event_type
-msgid "Events Types"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_search
msgid "Events in New state"
@@ -821,11 +844,6 @@ msgstr ""
msgid "Events which are in confirm state"
msgstr ""
-#. module: event
-#: model:event.type,name:event.event_type_1
-msgid "Exhibition"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Expected"
@@ -846,11 +864,6 @@ msgstr ""
msgid "Finish Event"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "For any additional information, please contact us at"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,help:event.field_event_event_seats_max
msgid "For each event you can define a maximum registration of seats(number of attendees), above this numbers the registrations are not accepted."
@@ -861,23 +874,6 @@ msgstr ""
msgid "For each event you can define a minimum reserved seats (number of attendees), if it does not reach the mentioned registrations the event can not be confirmed (keep 0 to ignore this rule)"
msgstr ""
-#. module: event
-#: model:event.event,name:event.event_1
-msgid "Functional Webinar"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Functional flow of the main applications;"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Functions"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_search
#: model:ir.ui.view,arch_db:event.view_registration_search
@@ -885,30 +881,11 @@ msgstr ""
msgid "Group By"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Having attended this conference, participants should be able to:"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Hello World"
-msgstr ""
-
#. module: event
#: selection:event.mail,interval_unit:0
msgid "Hour(s)"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "How to Debug"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_config_settings_id
#: model:ir.model.fields,field_description:event.field_event_confirm_id
@@ -932,10 +909,8 @@ msgid "Immediately"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Install and administer your own server;"
+#: model:ir.model.fields,help:event.field_event_config_settings_module_event_barcode
+msgid "Install the event_barcode module"
msgstr ""
#. module: event
@@ -953,44 +928,11 @@ msgstr ""
msgid "Install the website_event_questions module"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Integrated Help"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_mail_interval_nbr
msgid "Interval"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Introduction to JQuery"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Introduction to Javascript"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Introduction to QWeb"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Introduction, CRM, Sales Management"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,help:event.field_event_type_default_registration_max
msgid "It will select this default maximum value when you choose this event"
@@ -1050,18 +992,6 @@ msgstr ""
msgid "Location"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Loops"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Luigi Roni, Senior Event Manager"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_event_mail_ids
msgid "Mail Schedule"
@@ -1073,7 +1003,7 @@ msgid "Mail Scheduler"
msgstr ""
#. module: event
-#: model:ir.ui.menu,name:event.menu_event_type
+#: model:ir.ui.menu,name:event.menu_event_mail_schedulers
msgid "Mail Schedulers"
msgstr ""
@@ -1099,7 +1029,7 @@ msgstr ""
#. module: event
#: selection:event.config.settings,auto_confirmation:0
-msgid "Manually confirm every subscription"
+msgid "Manually confirm every registration"
msgstr ""
#. module: event
@@ -1109,7 +1039,6 @@ msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_seats_availability
-#: model:ir.model.fields,field_description:event.field_event_event_seats_available
msgid "Maximum Attendees"
msgstr ""
@@ -1123,13 +1052,6 @@ msgstr ""
msgid "Minimum Attendees"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Modules"
-msgstr ""
-
#. module: event
#: selection:event.mail,interval_unit:0
msgid "Month(s)"
@@ -1146,13 +1068,14 @@ msgid "New"
msgstr ""
#. module: event
-#: selection:event.config.settings,group_email_scheduling:0
-msgid "No automated emails"
+#: code:addons/event/models/event.py:441
+#, python-format
+msgid "Next month"
msgstr ""
#. module: event
#: selection:event.config.settings,module_website_event_questions:0
-msgid "No extra questions on subscriptions"
+msgid "No extra questions on registrations"
msgstr ""
#. module: event
@@ -1161,20 +1084,20 @@ msgid "No mini website per event"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:200
+#: code:addons/event/models/event.py:212
#, python-format
msgid "No more available seats."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:300
+#: code:addons/event/models/event.py:312
#, python-format
msgid "No more seats available for this event."
msgstr ""
#. module: event
#: selection:event.config.settings,auto_confirmation:0
-msgid "No validation step on subscription"
+msgid "No validation step on registration"
msgstr ""
#. module: event
@@ -1197,32 +1120,13 @@ msgstr ""
msgid "Number of Registrations"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Odoo Official Website"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Odoo Web Client"
-msgstr ""
-
#. module: event
#: model:ir.actions.act_window,help:event.action_event_view
msgid "Odoo helps you schedule and efficiently organize your events:\n"
-" track subscriptions and participations, automate the confirmation emails,\n"
+" track registrations and participations, automate the confirmation emails,\n"
" sell tickets, etc."
msgstr ""
-#. module: event
-#: model:event.event,name:event.event_0
-msgid "Open Days in Los Angeles"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_organizer_id
msgid "Organizer"
@@ -1238,20 +1142,6 @@ msgstr ""
msgid "Participant / Contact Name"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended."
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Participants preferably have a functional knowledge of our software (see Functional Training)."
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Partner"
@@ -1262,28 +1152,6 @@ msgstr ""
msgid "Phone"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Point of Sale (POS), Introduction to report customization."
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Project management, Human resources, Contract management."
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Purchase, Sales & Purchase management, Financial accounting."
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Python Objects"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,help:event.field_event_registration_origin
msgid "Reference of the document that created the registration, for example a sale order"
@@ -1342,6 +1210,11 @@ msgstr ""
msgid "Registration State"
msgstr ""
+#. module: event
+#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_questions
+msgid "Registration Survey"
+msgstr ""
+
#. module: event
#: model:ir.ui.view,arch_db:event.view_report_event_registration_search
msgid "Registration contact"
@@ -1359,7 +1232,7 @@ msgstr ""
#. module: event
#: model:mail.template,subject:event.event_reminder
-msgid "Reminder of event ${object.event_id.name}"
+msgid "Reminder for ${object.event_id.name}"
msgstr ""
#. module: event
@@ -1372,25 +1245,11 @@ msgstr ""
msgid "Reply-To Email"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Report Engine"
-msgstr ""
-
#. module: event
#: model:ir.ui.menu,name:event.menu_reporting_events
msgid "Reports"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Requirements"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_seats_reserved
msgid "Reserved Seats"
@@ -1403,13 +1262,8 @@ msgid "Responsible"
msgstr ""
#. module: event
-#: model:res.groups,name:event.group_email_scheduling
-msgid "Schedule Emails on Event Subscription"
-msgstr ""
-
-#. module: event
-#: selection:event.config.settings,group_email_scheduling:0
-msgid "Schedule emails to attendees and subscribers"
+#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_barcode
+msgid "Scan badges to confirm attendances"
msgstr ""
#. module: event
@@ -1422,11 +1276,6 @@ msgstr ""
msgid "Scheduled Time"
msgstr ""
-#. module: event
-#: model:event.type,name:event.event_type_0
-msgid "Seminar"
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_registration_form
msgid "Send by Email"
@@ -1452,11 +1301,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#. module: event
-#: model:event.type,name:event.event_type_3
-msgid "Show"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration_origin
msgid "Source Document"
@@ -1491,23 +1335,25 @@ msgid "Subscribe"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_questions
-msgid "Subscription Survey"
+#: model:ir.model.fields,help:event.field_event_event_reply_to
+msgid "The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."
msgstr ""
#. module: event
-#: model:event.event,name:event.event_3
-msgid "Technical Training"
+#: model:ir.model.fields,help:event.field_event_mail_template_id
+msgid "This field contains the template of the mail that will be automatically sent"
msgstr ""
#. module: event
-#: model:ir.model.fields,help:event.field_event_event_reply_to
-msgid "The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."
+#: code:addons/event/models/event.py:439
+#, python-format
+msgid "This month"
msgstr ""
#. module: event
-#: model:ir.model.fields,help:event.field_event_mail_template_id
-msgid "This field contains the template of the mail that will be automatically sent"
+#: code:addons/event/models/event.py:437
+#, python-format
+msgid "This week"
msgstr ""
#. module: event
@@ -1521,27 +1367,20 @@ msgid "Timezone"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "To get more information, visit the"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_track
-msgid "Tracks and Agenda"
+#: code:addons/event/models/event.py:433
+#, python-format
+msgid "Today"
msgstr ""
#. module: event
-#: model:event.type,name:event.event_type_4
-msgid "Training"
+#: code:addons/event/models/event.py:435
+#, python-format
+msgid "Tomorrow"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Training Center Module"
+#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_track
+msgid "Tracks and Agenda"
msgstr ""
#. module: event
@@ -1556,25 +1395,6 @@ msgstr ""
msgid "Unconfirmed Seat Reservations"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Underscore"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Understand the development concepts and architecture;"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Understand the various modules;"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_mail_interval_unit
msgid "Unit"
@@ -1593,7 +1413,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,help:event.field_event_config_settings_auto_confirmation
-msgid "Unselect this option to manually manage draft event and draft subscription"
+msgid "Unselect this option to manually manage draft event and draft registration"
msgstr ""
#. module: event
@@ -1611,18 +1431,6 @@ msgstr ""
msgid "User"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Variables & Operators"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Warehouse management, Manufacturing (MRP) & Sales, Import/Export."
-msgstr ""
-
#. module: event
#: model:ir.ui.view,arch_db:event.view_event_confirm
msgid "Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"
@@ -1633,42 +1441,23 @@ msgstr ""
msgid "Week(s)"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "What you will learn?"
-msgstr ""
-
#. module: event
#: model:ir.model.fields,field_description:event.field_event_mail_interval_type
msgid "When to Run "
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Workflows"
-msgstr ""
-
-#. module: event
-#: code:addons/event/models/event.py:232
+#: code:addons/event/models/event.py:244
#, 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:357
+#: code:addons/event/models/event.py:369
#, python-format
msgid "You must wait for the starting day of the event to do this action."
msgstr ""
-#. module: event
-#: model:ir.model.fields,help:event.field_event_config_settings_group_email_scheduling
-msgid "You will be able to configure emails, and to schedule them to be automatically sent to the attendees on subscription and/or attendance"
-msgstr ""
-
#. module: event
#: model:mail.template,subject:event.event_registration_mail_template_badge
msgid "Your badge for ${object.event_id.name}"
@@ -1676,7 +1465,7 @@ msgstr ""
#. module: event
#: model:mail.template,subject:event.event_subscription
-msgid "Your subscription at ${object.event_id.name}"
+msgid "Your registration at ${object.event_id.name}"
msgstr ""
#. module: event
@@ -1684,13 +1473,6 @@ msgstr ""
msgid "badge_of_${(object.event_id.name or '').replace('/','_')}"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "drinks and lunch;"
-msgstr ""
-
#. module: event
#: model:ir.model,name:event.model_event_config_settings
msgid "event.config.settings"
@@ -1706,35 +1488,8 @@ msgstr ""
msgid "event.mail"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "events@openerp.com"
-msgstr ""
-
#. module: event
#: model:ir.model,name:event.model_report_event_registration
msgid "report.event.registration"
msgstr ""
-#. module: event
-#: model:event.event,description:event.event_3
-msgid "to learn <i>business applications development</i>"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-msgid "to learn Odoo Programming"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_1
-msgid "to learn technical aspects"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "training material."
-msgstr ""
-
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index 2e481d36b998a03e7744505977d545910bf177b6..094df3dad69585619b06409c3ee0eadc1bca3d3e 100644
--- a/addons/event_sale/i18n/event_sale.pot
+++ b/addons/event_sale/i18n/event_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,12 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: event_sale
-#: code:addons/event_sale/models/event.py:170
-#, python-format
-msgid " with ticket %s"
-msgstr ""
-
#. module: event_sale
#: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
msgid "Apply"
@@ -61,12 +55,6 @@ msgstr ""
msgid "Choose an event ticket and it will automatically create a registration for this event ticket."
msgstr ""
-#. module: event_sale
-#: model:product.product,name:event_sale.event_2_product
-#: model:product.template,name:event_sale.event_2_product_product_template
-msgid "Conference on Business Applications"
-msgstr ""
-
#. module: event_sale
#: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_create_uid
#: model:ir.model.fields,field_description:event_sale.field_registration_editor_create_uid
@@ -94,6 +82,7 @@ msgstr ""
#. module: event_sale
#: model:ir.model.fields,help:event_sale.field_product_product_event_ok
#: model:ir.model.fields,help:event_sale.field_product_template_event_ok
+#: model:ir.model.fields,help:event_sale.field_sale_order_line_event_ok
msgid "Determine if a product needs to create automatically an event registration at the confirmation of a sales order line."
msgstr ""
@@ -123,16 +112,22 @@ msgid "Event"
msgstr ""
#. module: event_sale
-#: model:ir.actions.act_window,name:event_sale.action_sale_order_event_registration
-msgid "Event Registrations"
+#: model:ir.ui.view,arch_db:event_sale.event_ticket_form_view
+msgid "Event Name"
msgstr ""
#. module: event_sale
#: model:ir.model.fields,field_description:event_sale.field_product_product_event_ok
#: model:ir.model.fields,field_description:event_sale.field_product_template_event_ok
+#: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ok
#: model:product.product,name:event_sale.product_product_event
#: model:product.template,name:event_sale.product_product_event_product_template
-msgid "Event Subscription"
+msgid "Event Registration"
+msgstr ""
+
+#. module: event_sale
+#: model:ir.actions.act_window,name:event_sale.action_sale_order_event_registration
+msgid "Event Registrations"
msgstr ""
#. module: event_sale
@@ -150,9 +145,8 @@ msgid "Event Tickets"
msgstr ""
#. module: event_sale
-#: model:product.product,name:event_sale.event_1_product
-#: model:product.template,name:event_sale.event_1_product_product_template
-msgid "Functional Webinar"
+#: model:ir.ui.view,arch_db:event_sale.event_ticket_form_view
+msgid "Event's Ticket"
msgstr ""
#. module: event_sale
@@ -210,23 +204,17 @@ msgid "Name"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:131
+#: code:addons/event_sale/models/event.py:107
#, python-format
msgid "No more available seats for the ticket"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/models/event.py:153
+#: code:addons/event_sale/models/event.py:129
#, python-format
msgid "No more available seats for this ticket"
msgstr ""
-#. module: event_sale
-#: model:product.product,name:event_sale.event_0_product
-#: model:product.template,name:event_sale.event_0_product_product_template
-msgid "Open Days in Los Angeles"
-msgstr ""
-
#. module: event_sale
#: model:ir.ui.view,arch_db:event_sale.view_event_registration_ticket_form
msgid "Origin"
@@ -264,7 +252,9 @@ msgid "Product Template"
msgstr ""
#. module: event_sale
+#: code:addons/event_sale/models/event.py:19
#: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
+#, python-format
msgid "Registration"
msgstr ""
@@ -324,32 +314,6 @@ msgstr ""
msgid "Source Sale Order"
msgstr ""
-#. module: event_sale
-#: model:event.event.ticket,name:event_sale.event_0_ticket_1
-#: model:event.event.ticket,name:event_sale.event_1_ticket_1
-#: model:event.event.ticket,name:event_sale.event_2_ticket_1
-#: model:event.event.ticket,name:event_sale.event_3_ticket_1
-msgid "Standard"
-msgstr ""
-
-#. module: event_sale
-#: code:addons/event_sale/models/event.py:21
-#, python-format
-msgid "Subscription"
-msgstr ""
-
-#. module: event_sale
-#: model:product.product,name:event_sale.event_3_product
-#: model:product.template,name:event_sale.event_3_product_product_template
-msgid "Technical Training"
-msgstr ""
-
-#. module: event_sale
-#: code:addons/event_sale/models/event.py:168
-#, python-format
-msgid "The registration has been created for event %(event_name)s%(ticket)s from sale order %(order)s"
-msgstr ""
-
#. module: event_sale
#: model:ir.ui.view,arch_db:event_sale.event_event_report_template_badge
#: model:ir.ui.view,arch_db:event_sale.view_event_registration_ticket_search
@@ -371,18 +335,6 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#. module: event_sale
-#: model:event.event.ticket,name:event_sale.event_0_ticket_2
-#: model:event.event.ticket,name:event_sale.event_2_ticket_2
-#: model:event.event.ticket,name:event_sale.event_3_ticket_2
-msgid "VIP"
-msgstr ""
-
-#. module: event_sale
-#: model:ir.model.fields,field_description:event_sale.field_sale_order_line_event_ok
-msgid "event_ok"
-msgstr ""
-
#. module: event_sale
#: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
msgid "please give details about the registrations"
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 24ad9347c0ffe8472470ef2192172f537fa40774..f8d2f112cc1742da9b933a8e7f179c9b1c2f1973 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,24 +16,24 @@ msgstr ""
"Plural-Forms: \n"
#. module: fleet
-#: code:addons/fleet/fleet.py:367
+#: code:addons/fleet/models/fleet.py:307
#, python-format
msgid "%s %s has been added to the fleet!"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:643
+#: code:addons/fleet/models/fleet.py:652
#, python-format
msgid "%s contract(s) need(s) to be renewed and/or closed!"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "<span>g/km</span>"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "<span>kW</span>"
msgstr ""
@@ -68,19 +68,25 @@ msgid "Acquisition Date"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_tree
msgid "Activation Cost"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_active
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_active
+msgid "Active"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Additional Details"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Additional Properties"
msgstr ""
@@ -90,7 +96,7 @@ msgid "Air Filter Replacement"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "All vehicles"
msgstr ""
@@ -106,6 +112,12 @@ msgstr ""
msgid "Amount"
msgstr ""
+#. module: fleet
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+msgid "Archived"
+msgstr ""
+
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_9
msgid "Assistance"
@@ -180,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 "Car value"
msgstr ""
#. module: fleet
@@ -228,52 +240,57 @@ msgid "Choose wheter the service refer to contracts, vehicle services or both"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_tag_action
+msgid "Click to add a new tag."
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action
msgid "Click to create a new contract."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_action
msgid "Click to create a new cost."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_action
msgid "Click to create a new fuel log."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_action
msgid "Click to create a new make."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_action
msgid "Click to create a new model."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action
msgid "Click to create a new odometer log."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_action
msgid "Click to create a new service entry."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
msgid "Click to create a new type of service."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "Click to create a new vehicle."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_action
msgid "Click to create a vehicle status."
msgstr ""
@@ -302,11 +319,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#. module: fleet
-#: model:ir.model,name:fleet.model_fleet_contract_state
-msgid "Contains the different possible status of a leasing contract"
-msgstr ""
-
#. module: fleet
#: selection:fleet.service.type,category:0
#: selection:fleet.vehicle.cost,cost_type:0
@@ -318,7 +330,7 @@ msgid "Contract"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_graph
msgid "Contract Costs Per Month"
msgstr ""
@@ -337,11 +349,6 @@ msgstr ""
msgid "Contract Start Date"
msgstr ""
-#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_name
-msgid "Contract Status"
-msgstr ""
-
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_contract_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_contract_id
@@ -351,7 +358,7 @@ msgid "Contract attached to this cost"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Contract details"
msgstr ""
@@ -361,8 +368,8 @@ msgid "Contract information on a vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_tree
+#: 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 "Contract logs"
msgstr ""
@@ -374,7 +381,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_contract_count
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contracts
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Contracts"
msgstr ""
@@ -386,17 +393,17 @@ msgid "Cost"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
msgid "Cost Details"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Cost Subtype"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Cost Type"
msgstr ""
@@ -406,7 +413,7 @@ msgid "Cost related to a vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Cost that is paid only once at the creation of the contract"
msgstr ""
@@ -421,32 +428,31 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_count
#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Costs"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,name:fleet.fleet_costs_reporting_action
msgid "Costs Analysis"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_graph
msgid "Costs Per Month"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_cost_generated
-msgid "Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"
+msgid "Costs paid at regular intervals, depending on the cost frequency.If the cost frequency is set to unique, the cost will be logged at the start date"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Create a new contract automatically with all the same informations except for the date that will start at the end of current contract"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_create_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_create_uid
@@ -462,7 +468,6 @@ msgid "Created by"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_create_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_create_date
@@ -478,7 +483,7 @@ msgid "Created on"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_2976
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_2877
msgid "Current state of the vehicle"
msgstr ""
@@ -530,7 +535,6 @@ msgid "Diesel"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_display_name
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_display_name
@@ -566,24 +570,24 @@ msgid "Driver of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:384
+#: code:addons/fleet/models/fleet.py:325
#, python-format
msgid "Driver: from '%s' to '%s'"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+#: 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)."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_action
msgid "Each service can used in contracts, as a standalone service or both."
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Effective Costs"
msgstr ""
@@ -598,7 +602,7 @@ msgid "Emissions"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:31
+#: code:addons/fleet/models/fleet.py:37
#, python-format
msgid "Emptying the odometer value of a vehicle is not allowed."
msgstr ""
@@ -614,7 +618,7 @@ msgid "Engine Coolant Replacement"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Engine Options"
msgstr ""
@@ -654,12 +658,12 @@ msgstr ""
#. module: fleet
#: selection:fleet.vehicle.cost,cost_type:0
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Fuel"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_graph
msgid "Fuel Costs Per Month"
msgstr ""
@@ -671,8 +675,8 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_fuel_logs_count
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_tree
msgid "Fuel Logs"
msgstr ""
@@ -702,7 +706,7 @@ msgid "Gasoline"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "General Properties"
msgstr ""
@@ -712,21 +716,21 @@ msgid "Generated Costs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Generated Recurring Costs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Group By"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Has Alert(s)"
msgstr ""
@@ -766,14 +770,14 @@ msgid "Heater Hose Replacement"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+#: 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."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+#: 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."
@@ -795,14 +799,13 @@ msgid "Hybrid"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_id
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_id
#: 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_2925
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_2825
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id
@@ -825,31 +828,31 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_cost_ids
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_cost_ids
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_cost_ids
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Included Services"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Indicative Cost"
msgstr ""
#. module: fleet
#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Indicative Costs"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.actions.act_window,name:fleet.fleet_costs_reporting_non_effective_action
msgid "Indicative Costs Analysis"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_sum_cost
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Indicative Costs Total"
msgstr ""
@@ -864,7 +867,7 @@ msgid "Intake Manifold Gasket Replacement"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Invoice Date"
msgstr ""
@@ -880,7 +883,6 @@ msgid "Kilometers"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state___last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type___last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle___last_update
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost___last_update
@@ -901,7 +903,6 @@ msgid "Last Odometer"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_write_uid
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_write_uid
@@ -917,7 +918,6 @@ msgid "Last Updated by"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_contract_state_write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_service_type_write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_write_date
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_write_date
@@ -938,19 +938,19 @@ msgid "Leasing"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_license_plate
-msgid "License Plate"
+#: code:addons/fleet/models/fleet.py:332
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:391
-#, python-format
-msgid "License Plate: from '%s' to '%s'"
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_license_plate
+msgid "License plate"
msgstr ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_license_plate
-msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgid "License plate number of the vehicle (i = plate number for a car)"
msgstr ""
#. module: fleet
@@ -990,7 +990,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_name
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_search
msgid "Make"
msgstr ""
@@ -1000,7 +1000,7 @@ msgid "Make of the vehicle"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+#: 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."
@@ -1012,7 +1012,7 @@ msgid "Management Fee"
msgstr ""
#. module: fleet
-#: model:res.groups,name:fleet.group_fleet_manager
+#: model:res.groups,name:fleet.fleet_group_manager
msgid "Manager"
msgstr ""
@@ -1027,7 +1027,9 @@ msgid "Medium-sized image"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_image_medium
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_brand_image_medium
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_image_medium
msgid "Medium-sized logo of the brand. It is automatically resized as a 128x128px image, with aspect ratio preserved. Use this field in form views or some kanban views."
msgstr ""
@@ -1037,20 +1039,20 @@ msgid "Miles"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2958
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2858
+#: 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"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_brand_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_brand_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_brand_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_brand_view_tree
msgid "Model Make"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
msgid "Model make of Vehicle"
msgstr ""
@@ -1066,23 +1068,23 @@ msgid "Model of a vehicle"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2958
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2858
msgid "Model of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:380
+#: code:addons/fleet/models/fleet.py:321
#, python-format
msgid "Model: from '%s' to '%s'"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_tree
msgid "Models"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Month"
msgstr ""
@@ -1115,10 +1117,10 @@ msgid "No"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:379
-#: code:addons/fleet/fleet.py:383
-#: code:addons/fleet/fleet.py:387
-#: code:addons/fleet/fleet.py:390
+#: 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
#, python-format
msgid "None"
msgstr ""
@@ -1126,7 +1128,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_notes
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_notes
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Notes"
msgstr ""
@@ -1146,19 +1148,19 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_count
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Odometer"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Odometer Details"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_tree
msgid "Odometer Logs"
msgstr ""
@@ -1177,12 +1179,12 @@ msgid "Odometer Value"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_graph
msgid "Odometer Values Per Vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Odometer details"
msgstr ""
@@ -1205,28 +1207,28 @@ msgid "Odometer measure of the vehicle at the moment of this log"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+#: 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."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_action
msgid "Odoo helps you managing the costs for your different\n"
" vehicles. Costs are created automatically from services,\n"
" contracts (fixed or recurring) and fuel logs."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
-#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_action
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_non_effective_action
msgid "Odoo helps you managing the costs for your different vehicles\n"
" Costs are generally created from services and contract and appears here."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_action
msgid "Odoo will warn you when services or contract have to be\n"
" renewed."
msgstr ""
@@ -1271,7 +1273,7 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_parent_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_parent_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_parent_id
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Parent"
msgstr ""
@@ -1309,16 +1311,16 @@ msgid "Power in kW of the vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_tree
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Price"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_price_per_liter
-msgid "Price Per Liter"
+msgid "Price per liter"
msgstr ""
#. module: fleet
@@ -1348,14 +1350,14 @@ msgid "Refueling"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
msgid "Refueling Details"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:714
+#: code:addons/fleet/models/fleet.py:587
#: model:ir.actions.act_window,name:fleet.act_renew_contract
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
#, python-format
msgid "Renew Contract"
msgstr ""
@@ -1422,49 +1424,49 @@ msgstr ""
#. module: fleet
#: selection:fleet.service.type,category:0
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Service"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Service Type"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
msgid "Service Types"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_service_types_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_service_types_view_tree
msgid "Service types"
msgstr ""
#. module: fleet
#: selection:fleet.vehicle.cost,cost_type:0
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_service_count
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "Services"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_graph
msgid "Services Costs Per Month"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Services Details"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_tree
msgid "Services Logs"
msgstr ""
@@ -1474,7 +1476,7 @@ msgid "Services for vehicles"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Set Contract In Progress"
msgstr ""
@@ -1484,7 +1486,9 @@ msgid "Small-sized image"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_image_small
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_brand_image_small
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_image_small
msgid "Small-sized logo of the brand. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
msgstr ""
@@ -1504,8 +1508,8 @@ msgid "Starter Replacement"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_2976
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_state_tree
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_2877
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_state_view_tree
msgid "State"
msgstr ""
@@ -1515,14 +1519,14 @@ msgid "State name already exists"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:388
+#: code:addons/fleet/models/fleet.py:329
#, python-format
msgid "State: from '%s' to '%s'"
msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_state
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
msgid "Status"
msgstr ""
@@ -1548,7 +1552,7 @@ msgid "Tax roll"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Terminate Contract"
msgstr ""
@@ -1559,13 +1563,13 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_notes
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Terms and Conditions"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
-#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_action
+#: model:ir.actions.act_window,help:fleet.fleet_costs_reporting_non_effective_action
msgid "Thanks to the different filters, Odoo can only print the effective\n"
" costs, sort them by type and by vehicle."
msgstr ""
@@ -1576,7 +1580,9 @@ msgid "Thermostat Replacement"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_image
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_brand_image
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_image
msgid "This field holds the image used as logo for the brand, limited to 1024x1024px."
msgstr ""
@@ -1601,7 +1607,7 @@ msgid "To Close"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_tree
msgid "Total"
msgstr ""
@@ -1676,12 +1682,17 @@ 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_2991
+#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_2892
msgid "Unit"
msgstr ""
#. module: fleet
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer_unit
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer_unit
+#: 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_2892
msgid "Unit of the odometer "
msgstr ""
@@ -1691,7 +1702,7 @@ msgid "Used to order the note stages"
msgstr ""
#. module: fleet
-#: model:res.groups,name:fleet.group_fleet_user
+#: model:res.groups,name:fleet.fleet_group_user
msgid "User"
msgstr ""
@@ -1706,44 +1717,51 @@ msgstr ""
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_vehicle_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_vehicle_id
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_tree
msgid "Vehicle"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_tree
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_view_tree
msgid "Vehicle Costs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Vehicle Costs by Month"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
msgid "Vehicle Details"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
msgid "Vehicle Model"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
msgid "Vehicle Status"
msgstr ""
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_tag_action
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_tag_menu
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_tag_view_view_form
+msgid "Vehicle Tags"
+msgstr ""
+
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_vehicle_id
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_vehicle_id
@@ -1753,54 +1771,55 @@ msgid "Vehicle concerned by this log"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form
msgid "Vehicle costs"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
#: model:ir.ui.menu,name:fleet.fleet_vehicles
msgid "Vehicles"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
msgid "Vehicles Contracts"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_search
msgid "Vehicles Fuel Logs"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
msgid "Vehicles Odometer"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_action
#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
msgid "Vehicles Services Logs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_effective_costs_report
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_effective_costs_report_pivot
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_indicative_costs_report
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_indicative_costs_report_pivot
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_indicative_view_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_indicative_view_pivot
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_view_graph
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_cost_view_pivot
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_search
msgid "Vehicles costs"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_odometer_view_search
msgid "Vehicles odometers"
msgstr ""
@@ -1813,7 +1832,7 @@ msgstr ""
#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_vendors
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
msgid "Vendors"
msgstr ""
@@ -1848,7 +1867,7 @@ msgid "Windshield Wiper(s) Replacement"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "Write here all other information relative to this contract"
msgstr ""
@@ -1858,17 +1877,17 @@ msgid "Write here all supplementary information relative to this contract"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
msgid "Write here any other information"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
msgid "Write here any other information related to the service completed."
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_search
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_search
msgid "Year"
msgstr ""
@@ -1878,46 +1897,46 @@ msgid "Yearly"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+#: 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."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_action
msgid "You can define several models (e.g. A3, A4) for each make (Audi)."
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+#: 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."
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
msgid "amount"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_kanban
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
msgid "and"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "e.g. Model S"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "e.g. PAE 326"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form
msgid "e.g. Tesla"
msgstr ""
@@ -1932,32 +1951,32 @@ msgid "fleet.vehicle.tag"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_kanban
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban
msgid "other(s)"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "show all the costs for this vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "show the contract for this vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "show the fuel logs for this vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "show the odometer logs for this vehicle"
msgstr ""
#. module: fleet
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_form
+#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
msgid "show the services logs for this vehicle"
msgstr ""
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
index 88b3df2994f734c7a541f043267b0db042082adf..03a634fa8d89c7fe445a07811b3425b61ca4d140 100644
--- a/addons/gamification/i18n/gamification.pot
+++ b/addons/gamification/i18n/gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -116,19 +116,37 @@ msgid "\n"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:746
+#: code:addons/gamification/models/challenge.py:591
+#, python-format
+msgid "%s has joined the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:600
+#, python-format
+msgid "%s has refused the challenge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:657
+#, python-format
+msgid "<br/> %(rank)d. %(user_name)s - %(reward_name)s"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:654
#, 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:744
+#: code:addons/gamification/models/challenge.py:652
#, python-format
msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:753
+#: code:addons/gamification/models/challenge.py:662
#, python-format
msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
msgstr ""
@@ -136,31 +154,33 @@ msgstr ""
#. module: gamification
#: model:ir.ui.view,arch_db:gamification.challenge_form_view
msgid "<span class=\"o_stat_text\">Related</span>\n"
-" <span class=\"o_stat_text\">Goals</span>"
+" <span class=\"o_stat_text\">Goals</span>"
msgstr ""
#. module: gamification
#: model:ir.actions.act_window,help:gamification.badge_list_action
msgid "A badge is a symbolic token granted to a user as a sign of reward.\n"
-" It can be deserved automatically when some conditions are met or manually by users.\n"
-" Some badges are harder than others to get with specific conditions."
+" It can be deserved automatically when some conditions are met or manually by users.\n"
+" Some badges are harder than others to get with specific conditions."
msgstr ""
#. module: gamification
#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
msgid "A goal definition is a technical model of goal defining a condition to reach.\n"
-" The dates, values to reach or users are defined in goal instance."
+" The dates, values to reach or users are defined in goal instance."
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_3030
msgid "A goal is considered as completed when the current value is compared to the value to reach"
msgstr ""
#. module: gamification
#: model:ir.actions.act_window,help:gamification.goal_list_action
msgid "A goal is defined by a user and a goal definition.\n"
-" Goals can be created automatically by using challenges."
+" Goals can be created automatically by using challenges."
msgstr ""
#. module: gamification
@@ -168,11 +188,6 @@ msgstr ""
msgid "A selected list of users"
msgstr ""
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Accept"
-msgstr ""
-
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_action_id
msgid "Action"
@@ -211,8 +226,8 @@ msgstr ""
#. module: gamification
#: model:ir.actions.act_window,help:gamification.challenge_list_action
msgid "Assign a list of goals to chosen users to evaluate them.\n"
-" The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
-" The goals are created for the specified users or member of the group."
+" The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+" The goals are created for the specified users or member of the group."
msgstr ""
#. module: gamification
@@ -292,7 +307,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:461
+#: code:addons/gamification/models/goal.py:409
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -316,15 +331,9 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_challenge_id
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_challenge_id
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
msgid "Challenge"
msgstr ""
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr ""
-
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_line_id
msgid "Challenge Line"
@@ -332,7 +341,6 @@ msgstr ""
#. module: gamification
#: model:ir.ui.view,arch_db:gamification.challenge_line_list_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
msgid "Challenge Lines"
msgstr ""
@@ -410,21 +418,12 @@ msgid "Completeness"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_computation_mode
#: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
msgid "Computation Mode"
msgstr ""
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_computation_mode
-msgid "Computation mode"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition
-msgid "Condition"
-msgstr ""
-
#. module: gamification
#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
msgid "Create User"
@@ -499,17 +498,13 @@ msgid "Define the visibility of the challenge through menus"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_goal_computation_mode
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_computation_mode
msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3136
-msgid "Definition Condition"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3145
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
msgid "Definition Description"
msgstr ""
@@ -536,7 +531,6 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_visibility_mode
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
msgid "Display Mode"
msgstr ""
@@ -553,6 +547,7 @@ msgid "Display Name"
msgstr ""
#. module: gamification
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_display_mode
msgid "Displayed as"
msgstr ""
@@ -594,12 +589,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_batch_user_expression
-msgid "Evaluted expression for batch mode"
-msgstr ""
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgid "Evaluated expression for batch mode"
msgstr ""
#. module: gamification
@@ -706,7 +696,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_3147
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3041
#: 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"
@@ -735,7 +725,9 @@ msgid "Goal List"
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_3030
msgid "Goal Performance"
msgstr ""
@@ -756,7 +748,6 @@ msgstr ""
#: model:ir.ui.menu,name:gamification.gamification_goal_menu
#: model:ir.ui.view,arch_db:gamification.challenge_form_view
#: model:ir.ui.view,arch_db:gamification.view_challenge_kanban
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
msgid "Goals"
msgstr ""
@@ -824,6 +815,11 @@ msgstr ""
msgid "How to compute the goal?"
msgstr ""
+#. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Human Resources / Engagement"
+msgstr ""
+
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_id
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_id
@@ -843,7 +839,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
+msgid "If a maximum is set"
msgstr ""
#. module: gamification
@@ -887,21 +883,11 @@ msgid "Individual Goals"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:338
-#, python-format
-msgid "Invalid return content from the evaluation of code for definition %s"
-msgstr ""
-
-#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin3
#: model:gamification.goal.definition,name:gamification.definition_base_invite
msgid "Invite new Users"
msgstr ""
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Invited"
-msgstr ""
-
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
@@ -1071,7 +1057,7 @@ msgid "No one, assigned through challenges"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:756
+#: code:addons/gamification/models/challenge.py:669
#, python-format
msgid "Nobody reached the required conditions to receive special badges."
msgstr ""
@@ -1121,11 +1107,6 @@ msgstr ""
msgid "Owners"
msgstr ""
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Participating"
-msgstr ""
-
#. module: gamification
#: selection:gamification.badge,rule_auth:0
msgid "People having some badges"
@@ -1192,13 +1173,13 @@ msgid "Refresh Challenge"
msgstr ""
#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "Reject"
+#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
+msgid "Related Goals"
msgstr ""
#. module: gamification
-#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
-msgid "Related Goals"
+#: model:ir.model.fields,help:gamification.field_gamification_badge_user_wizard_user_id
+msgid "Related user name for the resource to manage its access."
msgstr ""
#. module: gamification
@@ -1242,14 +1223,13 @@ msgid "Responsible"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:551
+#: code:addons/gamification/models/challenge.py:489
#, python-format
msgid "Retrieving progress for personal challenge without user information"
msgstr ""
#. module: gamification
#: model:ir.ui.view,arch_db:gamification.challenge_form_view
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
msgid "Reward"
msgstr ""
@@ -1344,20 +1324,28 @@ msgid "Set the current value you have reached for this goal"
msgstr ""
#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin1
#: model:gamification.goal.definition,name:gamification.definition_base_company_data
msgid "Set your Company Data"
msgstr ""
#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_admin2
#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
msgid "Set your Company Logo"
msgstr ""
#. module: gamification
+#: model:gamification.challenge.line,name:gamification.line_base_discover1
#: model:gamification.goal.definition,name:gamification.definition_base_timezone
msgid "Set your Timezone"
msgstr ""
+#. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Settings / Gamification Tools"
+msgstr ""
+
#. module: gamification
#: model:gamification.challenge,name:gamification.challenge_base_configure
msgid "Setup your Company"
@@ -1400,7 +1388,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_3141
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
msgid "Suffix"
msgstr ""
@@ -1425,13 +1413,15 @@ msgid "The action that will be called to update the goal value."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:740
+#: code:addons/gamification/models/challenge.py:648
#, python-format
msgid "The challenge %s is finished."
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_3035
msgid "The currency and suffix field"
msgstr ""
@@ -1451,7 +1441,7 @@ msgid "The day a new challenge will be automatically started. If no periodicity
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:129
+#: code:addons/gamification/models/goal.py:90
#, python-format
msgid "The domain for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1494,7 +1484,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:146
+#: code:addons/gamification/models/goal.py:107
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1502,7 +1492,7 @@ msgid "The model configuration for the definition %s seems incorrect, please che
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:143
+#: code:addons/gamification/models/goal.py:104
#, python-format
msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1550,11 +1540,13 @@ msgid "The number of time this badge has been received."
msgstr ""
#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_monetary
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_monetary
msgid "The target and current value are defined in the company currency."
msgstr ""
#. module: gamification
+#: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_suffix
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix
msgid "The unit of the target and current values"
msgstr ""
@@ -1582,12 +1574,7 @@ msgstr ""
#. module: gamification
#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
msgid "There is no goals associated to this challenge matching your search.\n"
-" Make sure that your challenge is active and assigned to at least one user."
-msgstr ""
-
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "There is no reward upon completion of this challenge."
+" Make sure that your challenge is active and assigned to at least one user."
msgstr ""
#. module: gamification
@@ -1596,7 +1583,7 @@ msgid "These goals will not be recomputed."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:213
#, python-format
msgid "This badge can not be sent by users."
msgstr ""
@@ -1642,7 +1629,7 @@ msgid "Update"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:495
+#: code:addons/gamification/models/goal.py:444
#, python-format
msgid "Update %s"
msgstr ""
@@ -1661,11 +1648,15 @@ msgid "User domain"
msgstr ""
#. module: gamification
-#: model:ir.model,name:gamification.model_res_users
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_user_ids
msgid "Users"
msgstr ""
+#. module: gamification
+#: selection:gamification.challenge,category:0
+msgid "Website / Forum"
+msgstr ""
+
#. module: gamification
#: selection:gamification.challenge,period:0
#: selection:gamification.challenge,report_message_frequency:0
@@ -1699,19 +1690,19 @@ msgid "Yearly"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:215
#, python-format
msgid "You are not in the user allowed list."
msgstr ""
#. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:26
+#: code:addons/gamification/wizard/grant_badge.py:24
#, python-format
msgid "You can not grant a badge to yourself"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/challenge.py:235
+#: code:addons/gamification/models/challenge.py:195
#, python-format
msgid "You can not reset a challenge with unfinished goals."
msgstr ""
@@ -1727,13 +1718,13 @@ msgid "You did great at your job."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:217
#, python-format
msgid "You do not have the required badges."
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/models/badge.py:219
#, python-format
msgid "You have already sent this badge too many time this month."
msgstr ""
@@ -1766,7 +1757,7 @@ msgstr ""
#. module: gamification
#: model:ir.ui.view,arch_db:gamification.goal_definition_form_view
-msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
+msgid "e.g. result = env['mail.followers'].search_count([('res_model', '=', 'mail.channel'), ('partner_id', '=', object.user_id.partner_id.id)])"
msgstr ""
#. module: gamification
@@ -1794,11 +1785,6 @@ msgstr ""
msgid "refresh"
msgstr ""
-#. module: gamification
-#: model:ir.ui.view,arch_db:gamification.view_challenge_wizard
-msgid "reply later"
-msgstr ""
-
#. module: gamification
#: model:ir.ui.view,arch_db:gamification.goal_form_view
msgid "than the target."
diff --git a/addons/google_account/i18n/google_account.pot b/addons/google_account/i18n/google_account.pot
index e7cf4ce4fdae825f050f4493826a29c659586c0c..eca589bfc349dfd3829be3ccdec48408e67be619 100644
--- a/addons/google_account/i18n/google_account.pot
+++ b/addons/google_account/i18n/google_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,25 +51,31 @@ msgid "Last Updated on"
msgstr ""
#. module: google_account
-#: code:addons/google_account/google_account.py:98
+#: code:addons/google_account/models/google_service.py:169
+#, python-format
+msgid "Method not supported [%s] not in [GET, POST, PUT, PATCH or DELETE]!"
+msgstr ""
+
+#. module: google_account
+#: code:addons/google_account/models/google_service.py:117
#, python-format
msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid"
msgstr ""
#. module: google_account
-#: code:addons/google_account/google_account.py:37
+#: code:addons/google_account/models/google_service.py:52
#, python-format
msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"
msgstr ""
#. module: google_account
-#: code:addons/google_account/google_account.py:128
+#: code:addons/google_account/models/google_service.py:144
#, python-format
msgid "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired [%s]"
msgstr ""
#. module: google_account
-#: code:addons/google_account/google_account.py:173
+#: code:addons/google_account/models/google_service.py:193
#, python-format
msgid "Something went wrong with your request to google"
msgstr ""
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index 01c7d663e1998752dc66dc0179e21834bc841d40..302afe74183777de4902a1ed2dfba36e3db5ebaf 100644
--- a/addons/google_drive/i18n/google_drive.pot
+++ b/addons/google_drive/i18n/google_drive.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "Active"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:34
+#: code:addons/google_drive/models/google_drive.py:40
#, python-format
msgid "At least one key cannot be found in your Google Drive name pattern"
msgstr ""
@@ -67,16 +67,11 @@ msgid "Created on"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:141
+#: code:addons/google_drive/models/google_drive.py:159
#, python-format
msgid "Creating google drive may only be done by one at a time."
msgstr ""
-#. module: google_drive
-#: model:ir.filters,name:google_drive.filter_partner
-msgid "Customer"
-msgstr ""
-
#. module: google_drive
#: model:ir.model.fields,field_description:google_drive.field_google_drive_config_display_name
msgid "Display Name"
@@ -88,15 +83,15 @@ msgid "Filter"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:53
-#: code:addons/google_drive/google_drive.py:73
+#: code:addons/google_drive/models/google_drive.py:59
+#: code:addons/google_drive/models/google_drive.py:80
#, python-format
msgid "Go to the configuration panel"
msgstr ""
#. module: google_drive
#: model:ir.model.fields,field_description:google_drive.field_google_drive_config_google_drive_client_id
-msgid "Google Client "
+msgid "Google Client"
msgstr ""
#. module: google_drive
@@ -116,8 +111,8 @@ msgid "Google Drive Name Pattern"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:55
-#: code:addons/google_drive/google_drive.py:75
+#: code:addons/google_drive/models/google_drive.py:61
+#: code:addons/google_drive/models/google_drive.py:82
#, python-format
msgid "Google Drive is not yet configured. Please contact your administrator."
msgstr ""
@@ -153,20 +148,19 @@ msgid "Link your own google drive templates to any record of Odoo. If you have r
msgstr ""
#. module: google_drive
-#: model:ir.model.fields,field_description:google_drive.field_google_drive_config_model
#: model:ir.model.fields,field_description:google_drive.field_google_drive_config_model_id
msgid "Model"
msgstr ""
#. module: google_drive
-#: constraint:google.drive.config:0
-msgid "Model of selected filter is not matching with model of current template."
+#: code:addons/google_drive/models/google_drive.py:201
+#, python-format
+msgid "Please enter a valid Google Document URL."
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:173
-#, python-format
-msgid "Please enter a valid Google Document URL."
+#: model:ir.model.fields,field_description:google_drive.field_google_drive_config_model
+msgid "Related Model"
msgstr ""
#. module: google_drive
@@ -175,7 +169,7 @@ msgid "Resource Id"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:72
+#: code:addons/google_drive/models/google_drive.py:79
#, python-format
msgid "Something went wrong during the token generation. Please request again an authorization code ."
msgstr ""
@@ -197,7 +191,7 @@ msgid "Templates"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:90
+#: code:addons/google_drive/models/google_drive.py:97
#, python-format
msgid "The Google Template cannot be found. Maybe it has been deleted."
msgstr ""
@@ -216,7 +210,7 @@ msgid "The name of the attached document can use fixed or variable data. To dist
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:117
+#: code:addons/google_drive/models/google_drive.py:135
#, python-format
msgid "The permission 'reader' for 'anyone with the link' has not been written on the document"
msgstr ""
@@ -227,7 +221,7 @@ msgid "URI"
msgstr ""
#. module: google_drive
-#: code:addons/google_drive/google_drive.py:52
+#: code:addons/google_drive/models/google_drive.py:58
#, python-format
msgid "You haven't configured 'Authorization Code' generated from google, Please generate and configure it ."
msgstr ""
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 81d530d2685310cb7a097f1903942d07dd293508..ad4af4a94a5d7f47fe5180813649e5142fca55e0 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,48 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr
-#: code:addons/hr/hr.py:120
+#: code:addons/hr/models/hr.py:76
#, python-format
msgid "%s (copy)"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "<i>Work in a fun atmosphere</i>"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "<i>You are passionate</i>"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "<i>You autonomously and quickly learn</i>"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "<i>You easily manage them</i>"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "<span class=\"o_unfollow\">Unfollow</span>\n"
@@ -80,38 +43,13 @@ msgid "<span>To Do</span>"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "A full time job, with an attractive salary package in a small team of smart people. You will start contract with a full technical and functional training. If you are passionate, motivate and flexible apply for this job, you will certainly join the best company ever."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "A good job in a young and dynamic team"
-msgstr ""
-
-#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department_active
#: model:ir.model.fields,field_description:hr.field_hr_employee_active
msgid "Active"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Analyse needs, write specification documents and quotation"
-msgstr ""
-
-#. module: hr
+#: model:ir.ui.view,arch_db:hr.view_department_filter
#: model:ir.ui.view,arch_db:hr.view_employee_filter
msgid "Archived"
msgstr ""
@@ -121,40 +59,11 @@ msgstr ""
msgid "Bank Account Number"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-msgid "Because of our constant growth, we're now looking for people to reinforce our team of enthusiastic chief technical officer. So if working on an open source project in a friendly and cooperative atmosphere sounds like fun to you, read on..."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Because of our constant growth, we're now looking for people to reinforce our team of enthusiastic developers. So if working on an open source project in a friendly and cooperative atmosphere sounds like fun to you, read on..."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Because of our constant growth, we're now looking for people to reinforce our team of enthusiastic trainees. So if working on an open source project in a friendly and cooperative atmosphere sounds like fun to you, read on..."
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Birth"
msgstr ""
-#. module: hr
-#: model:hr.job,name:hr.job_ceo
-msgid "Chief Executive Officer"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,name:hr.job_cto
-msgid "Chief Technical Officer"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_child_ids
msgid "Child Departments"
@@ -170,11 +79,6 @@ msgstr ""
msgid "City"
msgstr ""
-#. module: hr
-#: model:web.tip,description:hr.hr_tip_2
-msgid "Click here to change the recruitment goal!"
-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
@@ -186,27 +90,11 @@ msgstr ""
msgid "Click to create a department."
msgstr ""
-#. module: hr
-#: model:ir.actions.act_window,help:hr.view_department_form_installer
-msgid "Click to define a new department."
-msgstr ""
-
#. module: hr
#: model:ir.actions.act_window,help:hr.action_hr_job
msgid "Click to define a new job position."
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Close to the perfection ..."
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_coach_id
#: model:ir.ui.view,arch_db:hr.view_employee_filter
@@ -244,28 +132,11 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#. module: hr
-#: model:hr.job,name:hr.job_consultant
-msgid "Consultant"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Contact Information"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Contributions to open source projects"
-msgstr ""
-
-#. module: hr
-#: model:ir.actions.act_window,name:hr.view_department_form_installer
-msgid "Create Your Departments"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_create_uid
#: model:ir.model.fields,field_description:hr.field_hr_employee_category_create_uid
@@ -292,25 +163,12 @@ msgstr ""
msgid "Date of Birth"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Define a clear communication strategy"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,help:hr.field_hr_employee_calendar_id
msgid "Define the schedule of resource"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Deliver generic Odoo functional training sessions"
-msgstr ""
-
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
#: model:ir.model.fields,field_description:hr.field_hr_employee_department_id
#: model:ir.model.fields,field_description:hr.field_hr_job_department_id
#: model:ir.ui.view,arch_db:hr.view_department_filter
@@ -408,15 +266,13 @@ msgid "Employees Tags"
msgstr ""
#. module: hr
-#: code:addons/hr/hr.py:294
-#: constraint:hr.department:0
+#: code:addons/hr/models/hr.py:254
#, python-format
msgid "Error! You cannot create recursive departments."
msgstr ""
#. module: hr
-#: code:addons/hr/hr.py:264
-#: constraint:hr.employee:0
+#: code:addons/hr/models/hr.py:167
#, python-format
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
@@ -431,11 +287,6 @@ msgstr ""
msgid "Expected number of employees for this job position after new recruitment."
msgstr ""
-#. module: hr
-#: model:hr.job,name:hr.job_developer
-msgid "Experienced Developer"
-msgstr ""
-
#. module: hr
#: selection:hr.employee,gender:0
msgid "Female"
@@ -446,11 +297,6 @@ msgstr ""
msgid "Follow"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Follow and check the development part"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "Followers"
@@ -461,51 +307,6 @@ msgstr ""
msgid "Gender"
msgstr ""
-#. module: hr
-#: model:web.tip,description:hr.hr_tip_1
-msgid "Get all applications related to this job position."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "Good knowledge of HTML and Javascript"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Good knowledge of object oriented programming"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Good knowledge of the latest web technologies"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Good knowledge of the programming language"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Good knowledge of web design"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Good language skills in another language"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_job_filter
@@ -517,26 +318,6 @@ msgstr ""
msgid "HR Settings"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Help with the configuration of the software"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_hrm
-msgid "Hire a team of great Human Resources people"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-msgid "Hire a team of great executive people"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Hire a team of great marketing people"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_job_no_of_hired_employee
msgid "Hired Employees"
@@ -548,13 +329,13 @@ msgid "Home Address"
msgstr ""
#. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_main
-msgid "Human Resources"
+#: model:ir.model,name:hr.model_hr_department
+msgid "Hr Department"
msgstr ""
#. module: hr
-#: model:hr.job,name:hr.job_hrm
-msgid "Human Resources Manager"
+#: model:ir.ui.menu,name:hr.menu_hr_main
+msgid "Human Resources"
msgstr ""
#. module: hr
@@ -575,13 +356,6 @@ msgstr ""
msgid "If the active field is set to False, it will allow you to hide the resource record without removing it."
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Improve our communication to customers"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_job_filter
msgid "In Position"
@@ -592,20 +366,6 @@ msgstr ""
msgid "In Recruitment"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Increase opportunities"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Increase the visibility of the product"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
@@ -619,21 +379,11 @@ msgstr ""
msgid "Job Description"
msgstr ""
-#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_job_name
-msgid "Job Name"
-msgstr ""
-
#. module: hr
#: model:ir.model,name:hr.model_hr_job
msgid "Job Position"
msgstr ""
-#. module: hr
-#: model:ir.ui.view,arch_db:hr.view_hr_job_form
-msgid "Job Position Name"
-msgstr ""
-
#. module: hr
#: model:ir.actions.act_window,name:hr.action_hr_job
#: model:ir.ui.menu,name:hr.menu_hr_job_position
@@ -651,6 +401,7 @@ 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 ""
@@ -694,21 +445,6 @@ msgstr ""
msgid "Launch Recruitment"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Launch new marketing campaigns and offers"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_hrm
-msgid "Launch new products, Human Resources campaigns and offers"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-msgid "Launch new products, marketing campaigns and offers"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_login
msgid "Login"
@@ -731,23 +467,11 @@ msgstr ""
msgid "Marital Status"
msgstr ""
-#. module: hr
-#: model:hr.job,name:hr.job_marketing
-msgid "Marketing and Community Manager"
-msgstr ""
-
#. module: hr
#: selection:hr.employee,marital:0
msgid "Married"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Master or engineer in computer science"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_image_medium
msgid "Medium-sized photo"
@@ -774,20 +498,7 @@ msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Must have ..."
-msgstr ""
-
-#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_complete_name
#: model:ir.model.fields,field_description:hr.field_hr_employee_name
-#: model:ir.model.fields,field_description:hr.field_hr_employee_name_related
msgid "Name"
msgstr ""
@@ -797,14 +508,8 @@ msgid "Nationality (Country)"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Nice to have"
+#: selection:hr.job,state:0
+msgid "Not Recruiting"
msgstr ""
#. module: hr
@@ -849,17 +554,6 @@ msgstr ""
msgid "Other Information ..."
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Our staff at work"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_parent_id
msgid "Parent Department"
@@ -870,11 +564,6 @@ msgstr ""
msgid "Partner"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "Passion for the Internet and its culture"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_passport_id
msgid "Passport No"
@@ -890,49 +579,16 @@ msgstr ""
msgid "Photo"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Pictures of smart and enthusiastic people"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Position"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Preferably 1 year of experience"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
msgid "Public Information"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Quantify and negotiate the resources required"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "Quick and autonomous learner"
-msgstr ""
-
-#. module: hr
-#: selection:hr.job,state:0
-msgid "Recruitment Closed"
-msgstr ""
-
#. module: hr
#: selection:hr.job,state:0
msgid "Recruitment in Progress"
@@ -969,19 +625,13 @@ msgid "Resource"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_employee_resource_type
-msgid "Resource Type"
+#: model:ir.model.fields,field_description:hr.field_hr_employee_name_related
+msgid "Resource Name"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Responsibilities"
+#: model:ir.model.fields,field_description:hr.field_hr_employee_resource_type
+msgid "Resource Type"
msgstr ""
#. module: hr
@@ -994,13 +644,6 @@ msgstr ""
msgid "SSN No"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Scale our events organization all around the world"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job_state
msgid "Set whether the recruitment process is open or closed for this job position."
@@ -1016,17 +659,6 @@ msgstr ""
msgid "Single"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "Skills"
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_image_small
msgid "Small-sized photo"
@@ -1079,16 +711,6 @@ msgstr ""
msgid "Tags"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Take part in the consulting services"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "Team spirit and good communication"
-msgstr ""
-
#. module: hr
#: sql_constraint:hr.job:0
msgid "The name of the job position must be unique per department in company!"
@@ -1109,16 +731,6 @@ msgstr ""
msgid "Total Forecasted Employees"
msgstr ""
-#. module: hr
-#: model:hr.job,name:hr.job_trainee
-msgid "Trainee"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Transform our product into a suite of well positioned business Apps"
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
#: model:ir.ui.view,arch_db:hr.view_department_filter
@@ -1127,6 +739,11 @@ msgstr ""
msgid "Unread Messages"
msgstr ""
+#. module: hr
+#: model:ir.model.fields,help:hr.field_hr_employee_login
+msgid "Used to log into the system"
+msgstr ""
+
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_user_id
msgid "User"
@@ -1137,58 +754,11 @@ msgstr ""
msgid "Users"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "We are looking for a motivated and results-driven Functional Consultant! You will take part in the consulting services we provide to our partners and customers, on the functional side. Your job start from the quotation to the customer to the delivery to the customer. You listen the customer and try to give him the best service. You report to the head of consulting service and will be coached by a senior consultant."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_hrm
-msgid "We are looking for a passionated Human Resources Manager to help us make products people love to use. We need someone who is ambitious, passionated, and ..... not afraid to start new things, a lot of new things and scale them."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-msgid "We are looking for a passionated executive manager to help us make products people love to use. We need someone who is ambitious, passionated, and ..... not afraid to start new things, a lot of new things and scale them."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_marketing
-msgid "We are looking for a passionated marketer manager to help us make products people love to use. We need someone who is ambitious, passionated, and ..... not afraid to start new things, a lot of new things and scale them."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "What we offer"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "What you will do ..."
-msgstr ""
-
#. module: hr
#: selection:hr.employee,marital:0
msgid "Widower"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "Will report to the Head of Professional Services"
-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
@@ -1197,17 +767,6 @@ msgid "With just a quick glance on the Odoo employee screen, you\n"
" contact data, job position, availability, etc."
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-#: model:hr.job,website_description:hr.job_trainee
-msgid "With our product, which is a suite of 3000 business apps. It is fully open source, full featured and it’s online offer is 3 times cheaper than traditional competitors. We have 2.000.000 users, and we're growing fast."
-msgstr ""
-
#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_work_email
msgid "Work Email"
@@ -1238,62 +797,6 @@ msgstr ""
msgid "Working Time"
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_marketing
-msgid "Write attractive content"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_hrm
-msgid "Write attractive content and build up Human Resources materials"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-msgid "Write attractive content and build up executive materials"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You are a quick and autonomous learner"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You are an excellent communicator and negotiator"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You are approachable, honest and fun team player"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You are available immediately"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You are creative"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You are ready to travel in US"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You are ready to work in a dynamic company"
-msgstr ""
-
#. module: hr
#: model:ir.actions.act_window,help:hr.action_hr_job
msgid "You can attach a survey to a job position. It will be used in\n"
@@ -1301,113 +804,6 @@ msgid "You can attach a survey to a job position. It will be used in\n"
" position."
msgstr ""
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You have 2 or 3 years of experience"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You have a Master degree in Business Management"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You have an affinity with the IT world"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You have an affinity with the product"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You have good knowledge in accounting"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You speak a third language"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_consultant
-msgid "You speak fluently French and English"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_trainee
-msgid "You will be responsible for developing and improving applications. You will work autonomously as well as coordinate and supervise small distributed development teams for specific projects. You will become a technical expert of the product."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "You will be responsible for developing and improving applications. You will work autonomously as well as coordinate and supervise small distributed development teams for specific projects. You will become a technical expert of the product."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_ceo
-#: model:hr.job,website_description:hr.job_hrm
-#: model:hr.job,website_description:hr.job_marketing
-msgid "You will be responsible for developing and improving product communication. You will work autonomously as well as coordinate and supervise small distributed development teams for specific projects. You will become a techinical expert of the product."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "You will become a technical expert of the product."
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "You will initially be coached by senior developers"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-msgid "You will initially be coached by senior technical officer"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_trainee
-msgid "You will initially be coached by senior trainees"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-#: model:hr.job,website_description:hr.job_developer
-#: model:hr.job,website_description:hr.job_trainee
-msgid "You will report to the head of R&D"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "You will work closely with all developers"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_cto
-msgid "You will work closely with all technical officer"
-msgstr ""
-
-#. module: hr
-#: model:hr.job,website_description:hr.job_trainee
-msgid "You will work closely with all trainees"
-msgstr ""
-
-#. module: hr
-#: model:ir.actions.act_window,help:hr.view_department_form_installer
-msgid "Your departments structure is used to manage all documents\n"
-" related to employees by departments: expenses and timesheets,\n"
-" leaves and holidays, recruitments, etc."
-msgstr ""
-
#. module: hr
#: model:ir.ui.view,arch_db:hr.view_department_form
msgid "department"
@@ -1418,3 +814,8 @@ msgstr ""
msgid "e.g. Part Time"
msgstr ""
+#. module: hr
+#: model:ir.ui.view,arch_db:hr.view_hr_job_form
+msgid "e.g. Sales Manager"
+msgstr ""
+
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index b01cf270bd5935fb7794cea33952dc9325657b4f..d0b61c617f7de9e00b7f7c6beb46c14a928e8e42 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,161 +16,200 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "(*) A positive delay means that the employee worked less than recorded.<br/>\n"
-"(*) A negative delay means that the employee worked more than encoded."
+#: code:addons/hr_attendance/models/hr_attendance.py:55
+#, python-format
+msgid "\"Check Out\" time cannot be earlier than \"Check In\" time."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "<strong>Total period</strong>"
+#: code:addons/hr_attendance/models/hr_attendance.py:29
+#, python-format
+msgid "%(empl_name)s from %(check_in)s"
msgstr ""
#. module: hr_attendance
-#: selection:hr.employee,state:0
-msgid "Absent"
+#: code:addons/hr_attendance/models/hr_attendance.py:34
+#, python-format
+msgid "%(empl_name)s from %(check_in)s to %(check_out)s"
msgstr ""
#. module: hr_attendance
-#: selection:hr.attendance,action:0
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_action
-msgid "Action"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:108
+#, python-format
+msgid "An apple a day keeps the doctor away"
msgstr ""
#. module: hr_attendance
-#: model:ir.model,name:hr_attendance.model_hr_action_reason
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_action_desc
-msgid "Action Reason"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:97
+#, python-format
+msgid "Another good day's work! See you soon!"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_action_type
-msgid "Action Type"
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+msgid "Apply"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,help:hr_attendance.field_hr_attendance_error_max_delay
-msgid "Allowed difference in minutes between the signin/signout and the timesheet computation for one sheet. Set this to 0 for no tolerance."
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_my_main_menu
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_attendance_state
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_graph
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_pivot
+msgid "Attendance"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_error
-msgid "Analysis Information"
+#: model:ir.actions.act_window,name:hr_attendance.hr_attendance_action_graph
+#: model:ir.actions.act_window,name:hr_attendance.hr_attendance_action_graph_filtered
+msgid "Attendance Analysis"
msgstr ""
#. module: hr_attendance
-#: model:ir.model,name:hr_attendance.model_hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_state
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_graph
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_pivot
-msgid "Attendance"
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_settings
+msgid "Attendance Settings"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_attendance_access
-msgid "Attendance Access"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_attendance_ids
+msgid "Attendance ids"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_graph
-#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_graph_filtered
-msgid "Attendance Analysis"
+#: model:ir.actions.act_window,name:hr_attendance.hr_attendance_action
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_main_menu
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_root
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_view_attendances
+#: model:ir.ui.view,arch_db:hr_attendance.hr_department_view_kanban
+msgid "Attendances"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
-#: model:ir.actions.report.xml,name:hr_attendance.action_report_hrattendanceerror
-msgid "Attendance Error Report"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_barcode
+msgid "Badge ID"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Attendance Errors:"
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+msgid "Cancel"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
-msgid "Attendance Reasons"
+#: code:addons/hr_attendance/models/hr_attendance.py:85
+#, python-format
+msgid "Cannot create new attendance record for %(empl_name)s, the employee hasn't checked out since %(datetime)s"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_attendance_reason
-msgid "Attendance reasons"
+#: code:addons/hr_attendance/models/hr_attendance.py:72
+#: code:addons/hr_attendance/models/hr_attendance.py:98
+#, python-format
+msgid "Cannot create new attendance record for %(empl_name)s, the employee was already checked in on %(datetime)s"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_root
-#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.hr_department_view_kanban
-msgid "Attendances"
+#: code:addons/hr_attendance/models/hr_employee.py:113
+#, python-format
+msgid "Cannot perform check in or check out on multiple employees."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_error
-msgid "Below the maximum tolerance, the attendance error will not be taken into account. Above the maximum tolerance, the error is considered to be voluntary and will be taken into account."
+#: code:addons/hr_attendance/models/hr_employee.py:131
+#, python-format
+msgid "Cannot perform check out on %(empl_name)s, could not find corresponding check in. Your attendances have probably been modified manually by human resources."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_error
-msgid "Cancel"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_check_in
+msgid "Check In"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_check_out
+msgid "Check Out"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/attendance.js:41
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:53
#, python-format
-msgid "Click to Sign In at %s."
+msgid "Check in"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_config
-msgid "Configuration"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:49
+#, python-format
+msgid "Check out"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_create_uid
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_create_uid
-msgid "Created by"
+#: selection:hr.employee,attendance_state:0
+msgid "Checked in"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_create_date
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_date
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_create_date
-msgid "Created on"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:109
+#, python-format
+msgid "Checked in at"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
-msgid "Current Month"
+#: selection:hr.employee,attendance_state:0
+msgid "Checked out"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_name
-msgid "Date"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:97
+#, python-format
+msgid "Checked out at"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Date Recorded"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:27
+#, python-format
+msgid "Click to check in"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Date Signed"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:31
+#, python-format
+msgid "Click to check out"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.edit_attendance_reason
-msgid "Define attendance reason"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:12
+#: model:ir.ui.view,arch_db:hr_attendance.print_employee_badge
+#, python-format
+msgid "Company Logo"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_settings
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
+msgid "Created by"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Delay"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "Current Month"
msgstr ""
#. module: hr_attendance
@@ -179,143 +218,303 @@ msgid "Department"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_display_name
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_display_name
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_display_name
-#: model:ir.model.fields,field_description:hr_attendance.field_report_hr_attendance_report_attendanceerrors_display_name
msgid "Display Name"
msgstr ""
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:114
+#, python-format
+msgid "Early to bed and early to rise, makes a man healthy, wealthy and wise"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:106
+#, python-format
+msgid "Eat breakfast as a king, lunch as a merchant and supper as a beggar"
+msgstr ""
+
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_employee
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_employee_id
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Employee"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_attendance_form
+#: model:ir.ui.view,arch_db:hr_attendance.print_employee_badge
+msgid "Employee Image"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_base_config_settings_group_attendance_use_pin
+msgid "Employee PIN"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_form
#: model:ir.ui.view,arch_db:hr_attendance.view_attendance_tree
-#: model:ir.ui.view,arch_db:hr_attendance.view_attendance_who
msgid "Employee attendances"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_end_date
-msgid "Ending Date"
+#: model:ir.ui.view,arch_db:hr_attendance.view_employee_form_inherit_hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.view_employee_kanban_inherit_hr_attendance
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.hr_employee_attendance_action_kanban
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_view_employees_kanban
+msgid "Employees"
msgstr ""
#. module: hr_attendance
-#: constraint:hr.attendance:0
-msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+#: selection:base.config.settings,group_attendance_use_pin:0
+msgid "Employees do not need to enter their PIN to check in manually in the \"Company Screen\"."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#: selection:base.config.settings,group_attendance_use_pin:0
+msgid "Employees must enter their PIN to check in manually in the \"Company Screen\"."
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,help:hr_attendance.field_base_config_settings_group_attendance_use_pin
+msgid "Enable or disable employee PIN identification at check in"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/my_main_menu.js:29
+#, python-format
+msgid "Error : Could not find employee linked to user"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:35
+#, python-format
+msgid "Error : Could not find employee linked to user."
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:81
+#, python-format
+msgid "Error: could not find corresponding employee."
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:61
+#, python-format
+msgid "First come, first served"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:77
+#, python-format
+msgid "Glad to have you back, it's been a while!"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:68
+#, python-format
+msgid "Good afternoon"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:70
+#, python-format
+msgid "Good evening"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:65
+#, python-format
+msgid "Good morning"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:55
+#: code:addons/hr_attendance/static/src/js/message.js:72
+#, python-format
+msgid "Good night"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:100
+#, python-format
+msgid "Goodbye"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Group By"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:111
+#, python-format
+msgid "Have a good afternoon"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:102
+#, python-format
+msgid "Have a good day!"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:116
+#, python-format
+msgid "Have a good evening"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:104
+#, python-format
+msgid "Have a nice lunch!"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Hr Attendance Search"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_id
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_id
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_id
-#: model:ir.model.fields,field_description:hr_attendance.field_report_hr_attendance_report_attendanceerrors_id
msgid "ID"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason___last_update
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance___last_update
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error___last_update
-#: model:ir.model.fields,field_description:hr_attendance.field_report_hr_attendance_report_attendanceerrors___last_update
-msgid "Last Modified on"
+#: model:ir.model.fields,help:hr_attendance.field_hr_employee_barcode
+msgid "ID used for employee identification."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_last_sign
-msgid "Last Sign"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:80
+#, python-format
+msgid "If a job is worth doing, it is worth doing well!"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:120
+#, python-format
+msgid "Invalid request, please return to the main menu."
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_Kiosk_mode
+msgid "Kiosk Mode"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance___last_update
+msgid "Last Modified on"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_write_uid
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_write_uid
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_write_uid
msgid "Last Updated by"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_write_date
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_write_date
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_write_date
msgid "Last Updated on"
msgstr ""
#. module: hr_attendance
-#. openerp-web
-#: code:addons/hr_attendance/static/src/js/attendance.js:39
-#, python-format
-msgid "Last sign in: %s,<br />%s.<br />Click to sign out."
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_last_attendance_id
+msgid "Last attendance id"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_manage_attendances
+msgid "Manage Attendances"
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_max_delay
-msgid "Maximum Tolerance (in minutes)"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_manual_attendance
+msgid "Manual Attendance"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Min Delay"
+#: model:ir.actions.client,name:hr_attendance.hr_attendance_action_message
+msgid "Message"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Month"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
-msgid "My Attendance"
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_my_attendances
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "My Attendances"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:34
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "No Check Out"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/models/hr_employee.py:74
#, python-format
-msgid "No records are found for your selection!"
+msgid "No employee corresponding to barcode %(barcode)s"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Operation"
+#: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_pin
+msgid "PIN"
msgstr ""
#. module: hr_attendance
-#: selection:hr.employee,state:0
-msgid "Present"
+#: model:ir.model.fields,help:hr_attendance.field_hr_employee_pin
+msgid "PIN used for Check In/Out in Attendance."
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_error
-msgid "Print"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:62
+#, python-format
+msgid "Please enter your PIN to check in"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_error
-msgid "Print Attendance Report Error"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:59
+#, python-format
+msgid "Please enter your PIN to check out"
msgstr ""
#. module: hr_attendance
-#: model:ir.model,name:hr_attendance.model_hr_attendance_error
-msgid "Print Error Attendance Report"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:82
+#, python-format
+msgid "Please return to the main menu."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_action_reason_name
-msgid "Reason"
+#: model:ir.actions.report.xml,name:hr_attendance.hr_employee_print_badge
+msgid "Print Badge"
msgstr ""
#. module: hr_attendance
@@ -324,68 +523,126 @@ msgid "Reports"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:156
-#: selection:hr.attendance,action:0
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:13
#, python-format
-msgid "Sign In"
+msgid "Scan your badge"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:156
-#: selection:hr.attendance,action:0
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:15
#, python-format
-msgid "Sign Out"
+msgid "Select Employee"
msgstr ""
#. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-msgid "Sign in"
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config
+msgid "Settings"
msgstr ""
#. module: hr_attendance
-#: selection:hr.action.reason,action_type:0
-msgid "Sign out"
+#: sql_constraint:hr.employee:0
+msgid "The Badge ID must be unique, this one is already assigned to another employee."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,help:hr_attendance.field_hr_attendance_action_desc
-msgid "Specifies the reason for Signing In/Signing Out in case of extra hours."
+#: code:addons/hr_attendance/models/hr_employee.py:65
+#, python-format
+msgid "The PIN must be a sequence of digits."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,help:hr_attendance.field_hr_action_reason_name
-msgid "Specifies the reason for Signing In/Signing Out."
+#: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
+msgid "The Time Tracking functionality aims to manage employee attendances from Check in/Check out actions. You can also link this feature to an attendance device using Odoo's web service features."
msgstr ""
#. module: hr_attendance
-#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_error_init_date
-msgid "Starting Date"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:59
+#, python-format
+msgid "The early bird catches the worm"
msgstr ""
#. module: hr_attendance
-#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
-msgid "The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using Odoo's web service features."
+#: model:ir.model.fields,help:hr_attendance.field_hr_employee_manual_attendance
+msgid "The employee will have access to the \"My Attendances\" menu to perform his check in and out from his session"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Today"
msgstr ""
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/message.js:94
+#, python-format
+msgid "Warning! Last check in was over 12 hours ago.<br/>If this isn't right, please contact Human Resources."
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:25
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:46
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:112
+#, python-format
+msgid "Welcome"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:11
+#, python-format
+msgid "Welcome to"
+msgstr ""
+
#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_worked_hours
msgid "Worked Hours"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:163
+#: code:addons/hr_attendance/models/hr_employee.py:81
+#, python-format
+msgid "Wrong PIN"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/models/hr_attendance.py:105
+#, python-format
+msgid "You cannot duplicate an attendance."
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/presence_widgets.js:18
+#: code:addons/hr_attendance/static/src/js/presence_widgets.js:37
+#, python-format
+msgid "employee presence<br/>green: checked in<br/>red: checked out"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model.fields,help:hr_attendance.field_hr_employee_attendance_ids
+msgid "list of attendances for the employee"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:123
#, python-format
-msgid "You tried to %s with a date anterior to another event !\n"
-"Try to contact the HR Manager to correct attendances."
+msgid "ok"
msgstr ""
#. module: hr_attendance
-#: model:ir.model,name:hr_attendance.model_report_hr_attendance_report_attendanceerrors
-msgid "report.hr_attendance.report_attendanceerrors"
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:14
+#, python-format
+msgid "or"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index bba9f01b1bca955b51e1ed64bcb5e158fa85a966..8870db8352dc35958ae979ccb40ffc25511e4723 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgstr ""
msgid "Basic Salary of the employee"
msgstr ""
+#. module: hr_contract
+#: model:ir.actions.act_window,help:hr_contract.action_hr_contract
+msgid "Click here to create new contracts."
+msgstr ""
+
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle
msgid "Company Vehicle"
@@ -48,7 +53,7 @@ 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_5678
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_5705
#: 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
@@ -74,6 +79,12 @@ msgstr ""
msgid "Contract expired"
msgstr ""
+#. module: hr_contract
+#: code:addons/hr_contract/models/hr_contract.py:84
+#, python-format
+msgid "Contract start date must be less than contract end date."
+msgstr ""
+
#. module: hr_contract
#: model:mail.message.subtype,name:hr_contract.mt_department_contract_pending
msgid "Contract to Renew"
@@ -148,11 +159,6 @@ msgstr ""
msgid "End Date"
msgstr ""
-#. module: hr_contract
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
#. module: hr_contract
#: selection:hr.contract,state:0
#: model:mail.message.subtype,name:hr_contract.mt_contract_close
@@ -190,6 +196,11 @@ msgstr ""
msgid "ID"
msgstr ""
+#. module: hr_contract
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
+msgid "Important Messages"
+msgstr ""
+
#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_employee_vehicle_distance
msgid "In kilometers"
@@ -337,11 +348,6 @@ msgstr ""
msgid "Trial Start Date"
msgstr ""
-#. module: hr_contract
-#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
-msgid "Unread Messages"
-msgstr ""
-
#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_base_action_rule_trg_date_resource_field_id
msgid "Use employee work schedule"
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index e7c55fe4ca3cd304936953d2cf65bbf72fc4c723..bd744032f2fe20e7ff6ad49d3dc38bf217328560 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,39 +16,131 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "<strong>Currency:</strong>"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "<b>Note:</b> Set the same email address on your employee form than\n"
+" the one you use are your \"From:\". Otherwise, your\n"
+" expenses will not be accepted by email."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "<strong>Employee:</strong>"
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "<i class=\"text-muted oe_edit_only\">Use [Reference] as a subject prefix for incoming receipts</i>"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:29
+#, python-format
+msgid "<p>Managers can validate or refuse expense reports.</p><p>If you refuse a report, explain the reason using the <i>New Message</i> button in the bottom.</p>"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:19
+#, python-format
+msgid "<p>Once completed, you can <b>submit the expense</b> for approval.</p><p><i>Tip: from the list view, select all expenses to submit them all at once, in a single report.</i>"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "<strong>Manager:</strong>"
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:33
+#, python-format
+msgid "<p>The accountant receive approved expense reports.</p><p>He can post journal entries in one click if taxes and accounts are right.</p>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "<strong class=\"text-info\">[PRODUCT CODE]</strong> Free Description <strong class=\"text-primary\">PRICE</strong>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "<strong>Description:</strong>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "<strong>Employee:</strong>"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "<strong>Status:</strong>"
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "<strong>Payment By:</strong>"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "<strong>Total</strong>"
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "<strong>Validated By:</strong>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "<strong>Your email gateway is not configured.</strong> Please configure your email\n"
+" gateway from the Settings app, menu <i>General Settings</i>."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:79
+#, python-format
+msgid "A payment of %s %s with the reference %s related to your expense %s has been made."
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.config.settings,alias_expense_open:0
+msgid "Accept expenses from any email address"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.config.settings,alias_expense_open:0
+msgid "Accept expenses from employee email addresses only"
+msgstr ""
+
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_account_id
msgid "Account"
msgstr ""
#. module: hr_expense
-#: model:product.product,name:hr_expense.air_ticket
-#: model:product.template,name:hr_expense.air_ticket_product_template
-msgid "Air Flight"
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_accounting_date
+msgid "Accounting Date"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Actual expense sheets, not the refused ones"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_domain
+msgid "Alias Domain"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_all
+msgid "All Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_all
+msgid "All Reports"
msgstr ""
#. module: hr_expense
@@ -58,114 +150,168 @@ msgid "Analytic Account"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
+msgid "Apply"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Approve"
msgstr ""
#. module: hr_expense
-#: selection:hr.expense,state:0
+#: selection:hr.expense.sheet,state:0
#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
msgid "Approved"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_bank_journal_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "Approved Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_bank_journal_id
msgid "Bank Journal"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_product_template_can_be_expensed
-msgid "Can be expensed"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_reference
+msgid "Bill Reference"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
-msgid "Cancel"
+#: model:ir.model.fields,field_description:hr_expense.field_product_template_can_be_expensed
+msgid "Can be Expensed"
msgstr ""
#. module: hr_expense
-#: model:product.product,name:hr_expense.car_travel
-#: model:product.template,name:hr_expense.car_travel_product_template
-msgid "Car Travel Expenses"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
+msgid "Cancel"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Certified honest and conform,<br/>(Date and signature).<br/><br/>"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_my_tree
-#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
-msgid "Click here to approve"
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_all
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_approve
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_pay
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_post
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_all
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_to_approve
+msgid "Click here to create a new expense report."
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense
-#: model:ir.actions.act_window,help:hr_expense.expense_all
+#: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense_sheet
+#: model:ir.actions.act_window,help:hr_expense.action_request_to_pay_expense_sheet
+#: model:ir.actions.act_window,help:hr_expense.action_request_to_post_expense_sheet
msgid "Click here to create new expenses."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_my_tree
-#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
-msgid "Click here to refuse"
+#: code:addons/hr_expense/models/hr_expense.py:284
+#, python-format
+msgid "Click to add a new expense,"
msgstr ""
#. module: hr_expense
-#: model:web.tip,description:hr_expense.expense_tip_2
-msgid "Click on Action to submit multiple expenses to your manager."
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_product
+msgid "Click to create a new expense category."
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.hr_expense_product
-msgid "Click to create a new expense category."
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:15
+#, python-format
+msgid "Click to try <b>submitting an expense by email</b>. You can attach a photo of the receipt to the mail."
msgstr ""
#. module: hr_expense
#: selection:hr.expense,payment_mode:0
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_company_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_company_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_company_id
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Company"
msgstr ""
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_register_payment_wizard_company_id
+msgid "Company related to this journal"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_configuration
msgid "Configuration"
msgstr ""
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_configuration
+msgid "Configure Expense"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Confirmed Expenses"
msgstr ""
#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Congratulations, you're done!"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+msgid "Create a new expense.<br>"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_create_uid
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_create_uid
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_create_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_create_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_create_uid
msgid "Created by"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_create_date
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_create_date
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_create_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_create_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_create_date
msgid "Created on"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_currency_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_currency_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_currency_id
msgid "Currency"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_date
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Date"
msgstr ""
#. module: hr_expense
-#: model:ir.model,name:hr_expense.model_hr_department
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_department_id
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_prefix
+msgid "Default Alias Name for Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_department_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Department"
msgstr ""
@@ -175,20 +321,35 @@ msgid "Description"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_display_name
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_display_name
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_display_name
-#: model:ir.model.fields,field_description:hr_expense.field_report_hr_expense_report_expense_display_name
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_display_name
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_display_name
msgid "Display Name"
msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Documents"
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Don't hesitate to"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+msgid "Draft Payment"
+msgstr ""
+
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_employee_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_employee_id
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Employee"
msgstr ""
@@ -198,14 +359,19 @@ msgid "Employee (to reimburse)"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_approved_expense
-#: model:ir.ui.menu,name:hr_expense.menu_expense_approved
-msgid "Employee Expenses"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_address_id
+msgid "Employee Home Address"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "End"
msgstr ""
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Expense"
msgstr ""
@@ -215,16 +381,65 @@ msgid "Expense Description"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_journal_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
+msgid "Expense Email Alias"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_journal_id
msgid "Expense Journal"
msgstr ""
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_expense_line_ids
+msgid "Expense Lines"
+msgstr ""
+
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.hr_expense_product
#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
msgid "Expense Products"
msgstr ""
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_sheet
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id
+msgid "Expense Report"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_state
+msgid "Expense Report State"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_name
+msgid "Expense Report Summary"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_department_view_kanban
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
+msgid "Expense Reports"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_department_filtered
+msgid "Expense Reports Analysis"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_department_to_approve
+msgid "Expense Reports to Approve"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
+msgid "Expense Sheet"
+msgstr ""
+
#. module: hr_expense
#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
msgid "Expense approved"
@@ -247,28 +462,43 @@ msgstr ""
#. module: hr_expense
#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_root
-#: model:ir.ui.view,arch_db:hr_expense.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_my_tree
#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
#: model:product.category,name:hr_expense.cat_expense
+#: model:product.product,name:hr_expense.product_product_fixed_cost
+#: model:product.template,name:hr_expense.product_product_fixed_cost_product_template
msgid "Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_filtered
#: model:ir.actions.act_window,name:hr_expense.hr_expense_action
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_graph
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_view_pivot
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_graph
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_pivot
msgid "Expenses Analysis"
msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Expenses Month"
msgstr ""
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.action_report_hr_expense_sheet
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "Expenses Report"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_sheets_to_approve_count
+msgid "Expenses Reports to Approve"
+msgstr ""
+
#. module: hr_expense
#: model:mail.message.subtype,name:hr_expense.mt_department_expense_confirmed
msgid "Expenses To Approve"
@@ -276,40 +506,47 @@ msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Expenses by Month"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:209
+#: code:addons/hr_expense/models/hr_expense.py:391
#, python-format
msgid "Expenses must belong to the same Employee."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:212
+#: code:addons/hr_expense/models/hr_expense.py:502
#, 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:395
+#, python-format
+msgid "Expenses must have been paid by the same entity (Company or employee)"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Expenses of Your Team Member"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.action_request_approve_expense
-#: model:ir.actions.act_window,name:hr_expense.hr_expense_action_from_department
-#: model:ir.model.fields,field_description:hr_expense.field_hr_department_expense_to_approve_count
-msgid "Expenses to Approve"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "Expenses to Invoice"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "Expenses to Invoice"
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+msgid "Expenses will go through these steps:"
msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Former Employees"
msgstr ""
@@ -319,29 +556,44 @@ msgid "From here the accountant will be able to approve as well as refuse the ex
msgstr ""
#. module: hr_expense
-#: model:ir.actions.server,name:hr_expense.hr_expense_entry_action_server
-msgid "Generate Accounting Entries"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "From: Your Email"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "General Information"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Get Mobile"
msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Group By"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.report.xml,name:hr_expense.action_report_hr_expense
-msgid "HR Expense"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Have a wonderful day,<br/>- The Odoo Team"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_hide_payment_method
+msgid "Hide payment method"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "HR Expenses"
+#: model:ir.model,name:hr_expense.model_hr_department
+msgid "Hr Department"
msgstr ""
#. module: hr_expense
-#: model:product.product,name:hr_expense.hotel_rent
-#: model:product.template,name:hr_expense.hotel_rent_product_template
-msgid "Hotel Accommodation"
+#: model:ir.model,name:hr_expense.model_hr_expense_register_payment_wizard
+msgid "Hr Expense Register Payment wizard"
msgstr ""
#. module: hr_expense
@@ -350,14 +602,16 @@ msgid "Hr Expense refuse Reason wizard"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_id
#: 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_report_hr_expense_report_expense_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_8838
msgid "ID"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_account_move_id
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_account_move_id
msgid "Journal Entry"
msgstr ""
@@ -368,43 +622,86 @@ msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense___last_update
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings___last_update
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard___last_update
-#: model:ir.model.fields,field_description:hr_expense.field_report_hr_expense_report_expense___last_update
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard___last_update
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet___last_update
msgid "Last Modified on"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_write_uid
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_write_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_write_uid
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_write_uid
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_write_uid
msgid "Last Updated by"
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_write_date
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_write_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_write_date
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_write_date
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_write_date
msgid "Last Updated on"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,name:hr_expense.expense_all
-#: model:ir.ui.menu,name:hr_expense.menu_expense_all
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_expense_open
+msgid "Mail Gateway"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:41
+#, python-format
+msgid "Managers can get all reports to approve from this menu."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_communication
+msgid "Memo"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "My Expenses"
msgstr ""
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_unsubmitted
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_unsubmitted
+msgid "My Expenses to Report"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_all
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_approve
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_pay
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_all_to_post
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_all
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_sheet_my_to_approve
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_reports
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "My Reports"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "My Team Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "Name"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "My Team Reports"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "New"
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "Name"
msgstr ""
#. module: hr_expense
@@ -414,27 +711,33 @@ msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "New Mail"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:276
+#: code:addons/hr_expense/models/hr_expense.py:232
#, python-format
msgid "No Expense account found for the product %s (or for it's category), please configure one."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:244
+#: code:addons/hr_expense/models/hr_expense.py:200
#, 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:240
+#: code:addons/hr_expense/models/hr_expense.py:196
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Not Refused"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
msgid "Notes..."
@@ -442,38 +745,107 @@ msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_attachment_number
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_attachment_number
msgid "Number of Attachments"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense
-#: model:ir.actions.act_window,help:hr_expense.expense_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
+msgid "Once approved, your expense report, goes to the accounting,"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+msgid "Once approved, your expenses report goes to the accounting,"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_all
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_approve
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_pay
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_all_to_post
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_all
+#: model:ir.actions.act_window,help:hr_expense.action_hr_expense_sheet_my_to_approve
+#: model:ir.actions.act_window,help:hr_expense.action_request_approve_expense_sheet
+#: model:ir.actions.act_window,help:hr_expense.action_request_to_pay_expense_sheet
+#: model:ir.actions.act_window,help:hr_expense.action_request_to_post_expense_sheet
msgid "Once you have created your expense, submit it to your manager who will validate it."
msgstr ""
#. module: hr_expense
-#: selection:hr.expense,state:0
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Once your email gateway is configured, come back to this screen\n"
+" to setup the next steps."
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.sheet,state:0
msgid "Paid"
msgstr ""
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_amount
+msgid "Payment Amount"
+msgstr ""
+
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_payment_mode
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_payment_mode
msgid "Payment By"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:280
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_payment_date
+msgid "Payment Date"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_journal_id
+msgid "Payment Method"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_payment_method_id
+msgid "Payment Type"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
+msgid "Periodically, you submit expenses report to your manager,"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_web_planner
+msgid "Planner"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:236
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Post Journal Entries"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: selection:hr.expense,state:0
+#: selection:hr.expense.sheet,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Price"
msgstr ""
@@ -483,13 +855,18 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "Product Name"
+msgstr ""
+
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_product_template
msgid "Product Template"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Qty"
msgstr ""
@@ -509,8 +886,13 @@ msgid "Reason to refuse expense."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "Ref."
+msgstr ""
+
+#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_refuse_wizard_view_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
msgid "Refuse"
msgstr ""
@@ -521,29 +903,101 @@ msgstr ""
#. module: hr_expense
#: selection:hr.expense,state:0
+#: selection:hr.expense.sheet,state:0
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
msgid "Refused"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_hr_expense
-msgid "Reporting"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Refused Expenses"
msgstr ""
#. module: hr_expense
-#: model:web.tip,description:hr_expense.expense_tip_1
-msgid "Select the lines you want to submit to be reimbursed."
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_register_payment_wizard_action
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "Register Payment"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:77
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Report"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense,state:0
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Reported"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_approve
+msgid "Reports To Approve"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_pay
+msgid "Reports To Pay"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_all_to_post
+msgid "Reports To Post"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_request_approve_expense_sheet
+msgid "Reports to Approve"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_request_to_pay_expense_sheet
+msgid "Reports to Pay"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.action_request_to_post_expense_sheet
+msgid "Reports to Post"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "Resubmit"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:25
+#, python-format
+msgid "Save the report, your manager will receive a notification by email to approve it."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:87
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
-msgid "Set to Draft"
+#: model:web.planner,tooltip_planner:hr_expense.planner_hr_expense
+msgid "Send receipts by email to create expenses efficiently."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_global_settings
+msgid "Settings"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Setup"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
+msgid "Setup your domain alias"
msgstr ""
#. module: hr_expense
@@ -552,24 +1006,34 @@ msgid "Specify whether the product can be selected in an HR expense."
msgstr ""
#. module: hr_expense
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_state
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_state
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "Status"
msgstr ""
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_state
+msgid "Status of the expense."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Subject:"
+msgstr ""
+
#. module: hr_expense
#: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server
-msgid "Submit Expenses"
+msgid "Submit To Manager"
msgstr ""
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_my_tree
-#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
msgid "Submit to Manager"
msgstr ""
#. module: hr_expense
-#: selection:hr.expense,state:0
+#: selection:hr.expense.sheet,state:0
msgid "Submitted"
msgstr ""
@@ -579,45 +1043,104 @@ msgid "Subtotal"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "Taxe(s)"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_tax_ids
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
+msgid "Taxes"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_register_payment_wizard_hide_payment_method
+msgid "Technical field used to hide the payment method if the selected journal has only one available which is 'manual'"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_tax_ids
-msgid "Taxes"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "The <strong class=\"text-info\">PRODUCT CODE</strong> is optional and should be the\n"
+" internal code of one of your expense product. This\n"
+" will set the right product automatically on your\n"
+" expense Odoo."
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:37
+#, python-format
+msgid "The accountant can register a payment to reimburse the employee directly."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
+msgid "The accountant validates entries and reimburse you."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+msgid "The accountant validates journal entries and reimburse you."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:478
+#, python-format
+msgid "The expense has been validated by %s"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_journal_id
+#: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_journal_id
msgid "The journal used when the expense is done."
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_bank_journal_id
+#: 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 ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "This document must be dated and signed for reimbursement."
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "The photo of the receipt and the description of the email will\n"
+" be attached to the expense. That way, you get everything attached\n"
+" to fill the remaining fields later on."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.menu,name:hr_expense.menu_expense_to_approve
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
+msgid "The steps to process expenses are:"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_sheet_my_to_approve
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
msgid "To Approve"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "To Pay"
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
+msgid "To Post"
+msgstr ""
+
#. module: hr_expense
#: selection:hr.expense,state:0
-msgid "To Submit"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "To Report"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "To create expenses by email, take photos of your\n"
+" receipts and send them by email with the following\n"
+" information:"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "To:"
msgstr ""
#. module: hr_expense
@@ -626,14 +1149,16 @@ msgid "Total"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.hr_expense_my_tree
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_total_amount
#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_tree
msgid "Total Amount"
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_unit_amount
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
+#: model:ir.ui.view,arch_db:hr_expense.report_expense_sheet
msgid "Unit Price"
msgstr ""
@@ -643,55 +1168,126 @@ msgid "Unit of Measure"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "UoM"
+#: model:ir.actions.act_window,name:hr_expense.action_approved_expense
+msgid "Unreported Expenses"
msgstr ""
#. module: hr_expense
-#: model:web.tip,description:hr_expense.expense_tip_3
-msgid "Use the messaging tool to log a note and attach a document to the expense. (e.g. scan of the bill)"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+msgid "Validate"
msgstr ""
#. module: hr_expense
-#: selection:hr.expense,state:0
-msgid "Waiting Payment"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_responsible_id
+msgid "Validation By"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_state
-msgid "When the expense request is created the status is 'To Submit'.\n"
-" It is submitted by the employee and request is sent to manager, the status is 'Submitted'. \n"
-"If the manager approve it, the status is 'Approved'.\n"
-" If the accountant genrate the accounting entries for the expense request, the status is 'Waiting Payment'."
+#: model:ir.ui.view,arch_db:hr_expense.view_expenses_tree
+msgid "View Attached Documents"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:111
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "View Attachments"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+msgid "View Report"
+msgstr ""
+
+#. module: hr_expense
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:11
#, python-format
-msgid "You can only delete draft or refused expenses!"
+msgid "Want to manage your employee expenses and receipts? <i>Start here</i>."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "We hope this feature helped you manage your expenses efficiently."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:206
+#: code:addons/hr_expense/models/hr_expense.py:499
#, python-format
msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:117
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "You can set an optionnal <strong class=\"text-primary\">PRICE</strong>\n"
+" at the end of the subject of your email."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration
+msgid "You can setup a generic email alias to create\n"
+" incoming expenses easily. Write an email with the receipt\n"
+" in attachment to create an expense line in one click. If the mail\n"
+" subject contains the product's internal reference between brackets,\n"
+" the product will be set automatically. Type the expense amount\n"
+" in the mail subject to set it on the expense too."
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:103
#, python-format
-msgid "You can only submit draft expenses!"
+msgid "You cannot report twice the same line!"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_all
+msgid "You record expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_all
+#: model:ir.actions.act_window,help:hr_expense.hr_expense_actions_my_unsubmitted
+msgid "You record expenses,"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "Your Email Address"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:128
+#: code:addons/hr_expense/models/hr_expense.py:473
+#: code:addons/hr_expense/models/hr_expense.py:485
#, 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 ""
+#. module: hr_expense
+#: model:mail.template,subject:hr_expense.mail_template_data_expense_unknown_email_address
+msgid "Your expense has not been created"
+msgstr ""
+
+#. module: hr_expense
+#: model:mail.template,body_html:hr_expense.mail_template_data_expense_unknown_email_address
+msgid "Your expense has not been created because your email address is not set on an employee or on a employee's user. Configure your employee's information correctly and try again."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "e.g. Lunch"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
-msgid "e.g. Business lunch with X"
+msgid "e.g. Lunch with Customer"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "e.g. Trip to NY"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_config_settings
+msgid "hr.expense.config.settings"
msgstr ""
#. module: hr_expense
@@ -700,7 +1296,18 @@ msgid "or"
msgstr ""
#. module: hr_expense
-#: model:ir.model,name:hr_expense.model_report_hr_expense_report_expense
-msgid "report.hr_expense.report_expense"
+#: code:addons/hr_expense/models/hr_expense.py:285
+#, python-format
+msgid "or send receipts by email to %s."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "send us an email"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "to describe<br/> your experience or to suggest improvements!"
msgstr ""
diff --git a/addons/hr_gamification/i18n/hr_gamification.pot b/addons/hr_gamification/i18n/hr_gamification.pot
index 37b945f5b7b1c178a55b2a899e4c33efc6cd329d..325132eb3480c525b065fe8eeaa77f1f1e68f0a3 100644
--- a/addons/hr_gamification/i18n/hr_gamification.pot
+++ b/addons/hr_gamification/i18n/hr_gamification.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgid "A goal is defined by a user and a goal type.\n"
" Goals can be created automatically by using challenges."
msgstr ""
+#. module: hr_gamification
+#: model:ir.model.fields,help:hr_gamification.field_hr_employee_badge_ids
+msgid "All employee badges, linked to the employee either directly or through the user"
+msgstr ""
+
#. module: hr_gamification
#: model:ir.actions.act_window,help:hr_gamification.challenge_list_action2
msgid "Assign a list of goals to chosen users to evaluate them.\n"
@@ -29,6 +34,7 @@ msgid "Assign a list of goals to chosen users to evaluate them.\n"
msgstr ""
#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_res_users_badge_ids
#: model:ir.ui.menu,name:hr_gamification.gamification_badge_menu_hr
msgid "Badges"
msgstr ""
@@ -38,6 +44,11 @@ msgstr ""
msgid "Badges are rewards of good work. Give them to people you believe deserve it."
msgstr ""
+#. module: hr_gamification
+#: model:ir.model.fields,help:hr_gamification.field_hr_employee_direct_badge_ids
+msgid "Badges directly linked to the employee"
+msgstr ""
+
#. module: hr_gamification
#: model:ir.ui.view,arch_db:hr_gamification.view_badge_wizard_reward
msgid "Cancel"
@@ -70,6 +81,11 @@ msgstr ""
msgid "Describe what they did and why it matters (will be public)"
msgstr ""
+#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_direct_badge_ids
+msgid "Direct badge ids"
+msgstr ""
+
#. module: hr_gamification
#: model:ir.model,name:hr_gamification.model_hr_employee
#: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_user_employee_id
@@ -97,6 +113,11 @@ msgstr ""
msgid "Gamification user badge"
msgstr ""
+#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_res_users_goal_ids
+msgid "Goal ids"
+msgstr ""
+
#. module: hr_gamification
#: model:ir.actions.act_window,name:hr_gamification.goals_menu_groupby_action2
#: model:ir.ui.menu,name:hr_gamification.gamification_goal_menu_hr
@@ -110,12 +131,22 @@ msgstr ""
#. module: hr_gamification
#: model:ir.ui.view,arch_db:hr_gamification.hr_badge_form_view
-msgid "Granted Employees"
+msgid "Granted"
+msgstr ""
+
+#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_granted_employees_count
+msgid "Granted employees count"
msgstr ""
#. module: hr_gamification
#: model:ir.model.fields,field_description:hr_gamification.field_hr_employee_has_badges
-msgid "Has Badges"
+msgid "Has badges"
+msgstr ""
+
+#. module: hr_gamification
+#: model:ir.model.fields,field_description:hr_gamification.field_res_users_calendar_last_notif_ack
+msgid "Last notification marked as read from base Calendar"
msgstr ""
#. module: hr_gamification
@@ -135,23 +166,29 @@ msgid "Reward Employee with"
msgstr ""
#. module: hr_gamification
-#: constraint:gamification.badge.user:0
+#: code:addons/hr_gamification/models/gamification.py:18
+#, python-format
msgid "The selected employee does not correspond to the selected user."
msgstr ""
+#. module: hr_gamification
+#: model:ir.model,name:hr_gamification.model_res_users
+msgid "Users"
+msgstr ""
+
#. module: hr_gamification
#: model:ir.ui.view,arch_db:hr_gamification.view_badge_wizard_reward
msgid "What are you thankful for?"
msgstr ""
#. module: hr_gamification
-#: code:addons/hr_gamification/wizard/grant_badge.py:31
+#: code:addons/hr_gamification/wizard/gamification_badge_user_wizard.py:21
#, python-format
msgid "You can not send a badge to yourself"
msgstr ""
#. module: hr_gamification
-#: code:addons/hr_gamification/wizard/grant_badge.py:28
+#: code:addons/hr_gamification/wizard/gamification_badge_user_wizard.py:18
#, python-format
msgid "You can send badges only to employees linked to a user."
msgstr ""
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index b888956772f6bb71733f73aff0b280238b629c76..890854b39dcf91346fe85d0129a8f63ec91b0c37 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,9 @@ msgid "!important; font-size: 8px; min-width: 18px\">"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:234
-#: code:addons/hr_holidays/hr_holidays.py:361
+#: code:addons/hr_holidays/models/hr_holidays.py:331
#, python-format
-msgid "%s on %s"
+msgid "%s on %s : %.2f day(s)"
msgstr ""
#. module: hr_holidays
@@ -92,6 +91,11 @@ msgstr ""
msgid "Absence by Today"
msgstr ""
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.hr_department_view_kanban
+msgid "Absent Employee(s), Whose leaves request are either confirmed or validated on today"
+msgstr ""
+
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.hr_employee_action_from_department
msgid "Absent Employees"
@@ -170,7 +174,7 @@ msgid "Allocation Requests to Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:575
+#: code:addons/hr_holidays/models/hr.py:129
#, python-format
msgid "Allocation for %s"
msgstr ""
@@ -230,6 +234,15 @@ msgstr ""
msgid "Assign Leaves"
msgstr ""
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_resource_calendar_uom_id
+msgid "Average hours of work per day.\n"
+" It is used in an employee leave request to compute the number of days consumed based on the resource calendar.\n"
+" It can be used to handle various contract types, e.g.:\n"
+" - 38 Hours/Week, 5 Days/Week: 1 Day = 7.6 Hours\n"
+" - 45 Hours/Week, 5 Days/Week: 1 Day = 9.0 Hours"
+msgstr ""
+
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Black"
@@ -299,6 +312,23 @@ msgid "Choose 'Leave Request' if someone wants to take an off-day. \n"
"Choose 'Allocation Request' if you want to increase the number of leaves available for someone"
msgstr ""
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_allocation_holidays
+msgid "Click here to create a new leave allocation request."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_allocation_approve
+msgid "Click here to create a new leave allocation."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_company_allocation
+#: model:ir.actions.act_window,help:hr_holidays.open_department_holidays_approve
+#: model:ir.actions.act_window,help:hr_holidays.open_employee_leaves
+msgid "Click here to create a new leave request."
+msgstr ""
+
#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
msgid "Click to create a new leave request."
@@ -362,11 +392,6 @@ msgstr ""
msgid "Created on"
msgstr ""
-#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-msgid "Current"
-msgstr ""
-
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_employee_current_leave_state
msgid "Current Leave Status"
@@ -377,13 +402,17 @@ msgstr ""
msgid "Current Leave Type"
msgstr ""
+#. module: hr_holidays
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+msgid "Current Year"
+msgstr ""
+
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_dashboard
msgid "Dashboard"
msgstr ""
#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_department
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_department_id
msgid "Department"
msgstr ""
@@ -499,6 +528,16 @@ msgstr ""
msgid "HR Leaves Summary Report By Employee"
msgstr ""
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_resource_calendar_uom_id
+msgid "Hours per Day"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_department
+msgid "Hr Department"
+msgstr ""
+
#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_remaining_leaves_user_id
@@ -901,6 +940,11 @@ msgstr ""
msgid "Refused"
msgstr ""
+#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday_allocation_tree
@@ -972,6 +1016,11 @@ msgstr ""
msgid "Reset to Draft"
msgstr ""
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "Search Leave"
@@ -1024,10 +1073,10 @@ msgid "The employee or employee category of this request is missing. Please make
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:570
+#: code:addons/hr_holidays/models/hr.py:117
#, python-format
msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
-"You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field."
+" You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in Leaves Application to manage the leave days of the employees if the configuration does not allow to use this field."
msgstr ""
#. module: hr_holidays
@@ -1036,24 +1085,22 @@ msgid "The number of days must be greater than 0."
msgstr ""
#. module: hr_holidays
-#: constraint:hr.holidays:0
+#: code:addons/hr_holidays/models/hr_holidays.py:253
+#, python-format
msgid "The number of remaining leaves is not sufficient for this leave type.\n"
"Please verify also the leaves waiting for validation."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:304
-#: code:addons/hr_holidays/hr_holidays.py:328
#: sql_constraint:hr.holidays:0
-#, python-format
msgid "The start date must be anterior to the end date."
msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_state
-msgid "The status is set to 'To Submit', when a holiday request is created. \n"
-"The status is 'To Approve', when holiday request is confirmed by user. \n"
-"The status is 'Refused', when holiday request is refused by manager. \n"
+msgid "The status is set to 'To Submit', when a holiday request is created.\n"
+"The status is 'To Approve', when holiday request is confirmed by user.\n"
+"The status is 'Refused', when holiday request is refused by manager.\n"
"The status is 'Approved', when holiday request is approved by manager."
msgstr ""
@@ -1069,7 +1116,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_color_name
-msgid "This color will be used in the leaves summary located in Reporting\\Leaves by Department."
+msgid "This color will be used in the leaves summary located in Reporting > Leaves by Department."
msgstr ""
#. module: hr_holidays
@@ -1180,6 +1227,7 @@ msgid "Wheat"
msgstr ""
#. module: hr_holidays
+#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_double_validation
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_double_validation
msgid "When selected, the Allocation/Leave Requests for this type require a second validation to be approved."
msgstr ""
@@ -1191,31 +1239,32 @@ msgid "You can assign remaining Legal Leaves for each employee, Odoo\n"
msgstr ""
#. module: hr_holidays
-#: constraint:hr.holidays:0
+#: code:addons/hr_holidays/models/hr_holidays.py:244
+#, python-format
msgid "You can not have 2 leaves that overlaps on same day!"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:293
+#: code:addons/hr_holidays/models/hr_holidays.py:367
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:577
+#: code:addons/hr_holidays/models/hr.py:139
#, python-format
msgid "You cannot reduce validated allocation requests"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:357
-#: code:addons/hr_holidays/hr_holidays.py:369
+#: code:addons/hr_holidays/models/hr_holidays.py:350
+#: code:addons/hr_holidays/models/hr_holidays.py:359
#, python-format
msgid "You cannot set a leave request as '%s'. Contact a human resource manager."
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:26
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:27
#, python-format
msgid "You have to select at least one Department. And try again."
msgstr ""
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 68622c04aac713bd6f54c2ad05722a5730b6aa66..ccf4db9d18ace8927df813f168060ec57d32fc46 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,16 +16,19 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:59
+#: code:addons/hr_payroll/models/hr_payroll.py:46
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_payslip_state
-msgid "* When the payslip is created the status is 'Draft'. \n"
-"* If the payslip is under verification, the status is 'Waiting'. \n"
-"* If the payslip is confirmed then status is set to 'Done'. \n"
+msgid "* When the payslip is created the status is 'Draft'\n"
+" \n"
+"* If the payslip is under verification, the status is 'Waiting'.\n"
+" \n"
+"* If the payslip is confirmed then status is set to 'Done'.\n"
+" \n"
"* When user cancel payslip the status is 'Rejected'."
msgstr ""
@@ -214,7 +217,7 @@ 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_9052
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_9022
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter
msgid "Category"
msgstr ""
@@ -460,7 +463,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_payslip_lines_contribution_register_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_contributionregister_display_name
-#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslip_display_name
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslipdetails_display_name
msgid "Display Name"
msgstr ""
@@ -534,7 +536,8 @@ msgid "Employees"
msgstr ""
#. module: hr_payroll
-#: constraint:hr.payroll.structure:0
+#: code:addons/hr_payroll/models/hr_payroll.py:41
+#, python-format
msgid "Error ! You cannot create a recursive Salary Structure."
msgstr ""
@@ -601,7 +604,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_id
#: model:ir.model.fields,field_description:hr_payroll.field_payslip_lines_contribution_register_id
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_contributionregister_id
-#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslip_id
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslipdetails_id
msgid "ID"
msgstr ""
@@ -647,7 +649,7 @@ msgstr ""
#. module: hr_payroll
#: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_quantity
-msgid "It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days.WORK100.number_of_days."
+msgid "It is used in computation for percentage and fixed amount. For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days.WORK100.number_of_days."
msgstr ""
#. module: hr_payroll
@@ -670,7 +672,6 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_payslip_lines_contribution_register___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_contributionregister___last_update
-#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslip___last_update
#: model:ir.model.fields,field_description:hr_payroll.field_report_hr_payroll_report_payslipdetails___last_update
msgid "Last Modified on"
msgstr ""
@@ -760,7 +761,7 @@ msgid "Name"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:395
+#: code:addons/hr_payroll/models/hr_payroll.py:321
#, python-format
msgid "Normal Working Days paid at 100%"
msgstr ""
@@ -866,7 +867,8 @@ msgid "Payslip"
msgstr ""
#. module: hr_payroll
-#: constraint:hr.payslip:0
+#: code:addons/hr_payroll/models/hr_payroll.py:223
+#, python-format
msgid "Payslip 'Date From' must be before 'Date To'."
msgstr ""
@@ -1050,13 +1052,7 @@ msgid "Refund"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:315
-#, python-format
-msgid "Refund Payslip"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:306
+#: code:addons/hr_payroll/models/hr_payroll.py:241
#, python-format
msgid "Refund: "
msgstr ""
@@ -1127,8 +1123,8 @@ msgid "Salary Rules"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:640
-#: code:addons/hr_payroll/hr_payroll.py:699
+#: code:addons/hr_payroll/models/hr_payroll.py:546
+#: code:addons/hr_payroll/models/hr_payroll.py:593
#, python-format
msgid "Salary Slip of %s for %s"
msgstr ""
@@ -1319,49 +1315,49 @@ msgid "Worked Days & Inputs"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:884
+#: code:addons/hr_payroll/models/hr_payroll.py:768
#, python-format
msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:890
+#: code:addons/hr_payroll/models/hr_payroll.py:774
#, python-format
msgid "Wrong python code defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:913
+#: code:addons/hr_payroll/models/hr_payroll.py:797
#, python-format
msgid "Wrong python condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:877
+#: code:addons/hr_payroll/models/hr_payroll.py:761
#, python-format
msgid "Wrong quantity defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:907
+#: code:addons/hr_payroll/models/hr_payroll.py:791
#, python-format
msgid "Wrong range condition defined for salary rule %s (%s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:333
+#: code:addons/hr_payroll/models/hr_payroll.py:266
#, python-format
msgid "You cannot delete a payslip which is not draft or cancelled!"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:35
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:24
#, python-format
msgid "You must select employee(s) to generate payslip(s)."
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:964
+#: code:addons/hr_payroll/models/hr_payroll.py:836
#, python-format
msgid "You must set a contract to create a payslip line."
msgstr ""
@@ -1381,11 +1377,6 @@ msgstr ""
msgid "report.hr_payroll.report_contributionregister"
msgstr ""
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_report_hr_payroll_report_payslip
-msgid "report.hr_payroll.report_payslip"
-msgstr ""
-
#. module: hr_payroll
#: model:ir.model,name:hr_payroll.model_report_hr_payroll_report_payslipdetails
msgid "report.hr_payroll.report_payslipdetails"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 698ade7b5f79b0b5230376dc43d35b8b76a54928..74d23cc78ceb0f88d8b428f929fa27a3f2fe893d 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -49,46 +49,6 @@ msgid "\n"
"<p>Please welcome him/her and help him/her finding his/her marks.</p>"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_1
-msgid "0-15"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_2
-msgid "16-20"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_3
-msgid "21-30"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_4
-msgid "31-40"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_5
-msgid "41-50"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_6
-msgid "51-60"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_7
-msgid "61-70"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_3_8
-msgid "71+"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
msgid "<b>Contact:</b>"
@@ -109,18 +69,6 @@ msgstr ""
msgid "<span class=\"o_stat_text\">Meetings</span>"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "<span class=\"o_stat_text\">Print</span>\n"
-" <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "<span class=\"o_stat_text\">Start</span>\n"
-" <span class=\"o_stat_text\">Interview</span>"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "<span class=\"o_stat_text\">Trackers</span>"
@@ -148,12 +96,15 @@ msgstr ""
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_active
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_active
msgid "Active"
msgstr ""
#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_2_4
-msgid "Activities"
+#. openerp-web
+#: code:addons/hr_recruitment/static/src/js/tour.js:20
+#, python-format
+msgid "Add columns to define the <b>interview stages</b>.<br/><i>e.g. New > Qualified > First Interview > Recruited</i>"
msgstr ""
#. module: hr_recruitment
@@ -191,16 +142,6 @@ msgstr ""
msgid "Aliased Model"
msgstr ""
-#. module: hr_recruitment
-#: selection:hr.recruitment.config.settings,module_document:0
-msgid "Allow the automatic indexation of resumes"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "Answer related job question"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model,name:hr_recruitment.model_hr_applicant
msgid "Applicant"
@@ -349,11 +290,6 @@ msgstr ""
msgid "Bachelor Degree"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.page,title:hr_recruitment.recruitment_1
-msgid "Basic information"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.filters,name:hr_recruitment.filter_recruitment_report_departmnet
msgid "By Department"
@@ -385,16 +321,10 @@ msgstr ""
msgid "Category of applicant"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_survey
-#: model:ir.model.fields,help:hr_recruitment.field_hr_job_survey_id
-msgid "Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
-msgid "Click here to create a new job. You can remove the \"In Recruitment\" filter to display all the job positions."
+msgid "Click here to create a new job position."
msgstr ""
#. module: hr_recruitment
@@ -408,6 +338,11 @@ msgstr ""
msgid "Click to add a new stage in the recruitment process."
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_category_action
+msgid "Click to add a new tag."
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_date_closed
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_date_closed
@@ -444,31 +379,31 @@ msgid "Configure Recruitment"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:388
+#: code:addons/hr_recruitment/models/hr_recruitment.py:366
#: 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:390
+#: code:addons/hr_recruitment/models/hr_recruitment.py:368
#, python-format
msgid "Contact Email"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "Contract"
+#: model:ir.ui.view,arch_db:hr_recruitment.ir_attachment_view_search_inherit_hr_recruitment
+msgid "Content"
msgstr ""
#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
-msgid "Contract Proposal"
+#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
+msgid "Contract"
msgstr ""
#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
-msgid "Contract Signed"
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Create"
msgstr ""
#. module: hr_recruitment
@@ -481,6 +416,12 @@ msgstr ""
msgid "Create Employee"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.create_job_simple
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Create a Job Position"
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_source_tree
msgid "Create alias"
@@ -537,6 +478,7 @@ msgid "Default Values"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Define a specific contact address for this job position. If you keep it empty, the default email address will be used which is in human resources settings"
msgstr ""
@@ -548,12 +490,6 @@ msgid "Define here your stages of the recruitment process, for example:\n"
" hired."
msgstr ""
-#. module: hr_recruitment
-#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
-#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
-msgid "Define job position profile and manage recruitment in a context of a particular job: print interview survey, define number of expected new employees, and manage its recruitment pipe"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_type_id
@@ -582,7 +518,6 @@ msgid "Delete"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_department
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_department_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_department_id
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
@@ -595,19 +530,19 @@ msgid "Department Manager"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_description
-msgid "Description"
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_department
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_department
+msgid "Departments"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_4
-msgid "Desk space"
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_description
+msgid "Description"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
-msgid "Display Interview Form"
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Discard"
msgstr ""
#. module: hr_recruitment
@@ -622,8 +557,8 @@ msgid "Display Name"
msgstr ""
#. module: hr_recruitment
-#: selection:hr.recruitment.config.settings,module_document:0
-msgid "Do not manage CVs and motivation letter"
+#: selection:hr.recruitment.config.settings,module_hr_recruitment_survey:0
+msgid "Do not use interview forms"
msgstr ""
#. module: hr_recruitment
@@ -651,21 +586,6 @@ msgid "Don't forget to specify the department if your recruitment process\n"
" is different according to the job position."
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_11
-msgid "Dress code"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_2_2
-msgid "Education"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.page,title:hr_recruitment.recruitment_2
-msgid "Education and Activities"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_email_from
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_email
@@ -673,6 +593,7 @@ msgid "Email"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_survey
msgid "Email Alias"
msgstr ""
@@ -726,11 +647,6 @@ msgstr ""
msgid "Expected Salary Extra"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_2_3
-msgid "Experience"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
msgid "Extended Filters"
@@ -746,41 +662,16 @@ msgstr ""
msgid "Feedback of interviews..."
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_2_2
-msgid "Female"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Filter and view on next actions and date"
msgstr ""
-#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_fold
msgid "Folded in Recruitment Pipe"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_8
-msgid "Freebies such as tea, coffee and stationery"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_1_1
-msgid "From which university will you graduate?"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_2
-msgid "Getting on with colleagues"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_degree_sequence
msgid "Gives the sequence order when displaying a list of degrees."
@@ -797,21 +688,6 @@ msgstr ""
msgid "Good"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_7
-msgid "Good management"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_1
-msgid "Good pay"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_13
-msgid "Good social life"
-msgstr ""
-
#. module: hr_recruitment
#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
msgid "Graduate"
@@ -828,6 +704,11 @@ msgstr ""
msgid "Hired Employees"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_department
+msgid "Hr Department"
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_id
@@ -844,18 +725,6 @@ msgstr ""
msgid "ID of the parent record holding the alias (example: project holding the task creation alias)"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,comments_message:hr_recruitment.recruitment_1_1
-#: model:survey.question,comments_message:hr_recruitment.recruitment_1_2
-#: model:survey.question,comments_message:hr_recruitment.recruitment_1_3
-#: model:survey.question,comments_message:hr_recruitment.recruitment_2_1
-#: model:survey.question,comments_message:hr_recruitment.recruitment_2_2
-#: model:survey.question,comments_message:hr_recruitment.recruitment_2_3
-#: model:survey.question,comments_message:hr_recruitment.recruitment_2_4
-#: model:survey.question,comments_message:hr_recruitment.recruitment_3_1
-msgid "If other, please specify:"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_template_id
msgid "If set, a message is posted on the applicant using the template when the applicant is set to the stage."
@@ -867,23 +736,7 @@ msgid "If the active field is set to false, it will allow you to hide the case w
msgstr ""
#. module: hr_recruitment
-#: model:survey.page,title:hr_recruitment.recruitment_3
-msgid "Importance"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rcol_3_1_3
-msgid "Important"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
-msgid "Initial Qualification"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_survey_id
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_hr_recruitment_survey
msgid "Interview Form"
msgstr ""
@@ -898,6 +751,11 @@ msgstr ""
msgid "Job Campaign"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Job Email"
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_job_id
msgid "Job ID"
@@ -949,11 +807,6 @@ msgstr ""
msgid "Jobs Sources"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_2_1
-msgid "Knowledge"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant___last_update
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category___last_update
@@ -998,14 +851,10 @@ msgid "Last Updated on"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_2_1
-msgid "Male"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_config_settings_module_document
-msgid "Manage your CV's and motivation letter related to all applicants.\n"
-"-This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"
+#. openerp-web
+#: code:addons/hr_recruitment/static/src/js/tour.js:16
+#, python-format
+msgid "Let's have a look at the <b>applications pipeline</b> for this job position."
msgstr ""
#. module: hr_recruitment
@@ -1033,11 +882,6 @@ msgstr ""
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rcol_3_1_5
-msgid "Most important"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "My"
@@ -1075,7 +919,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:438
+#: code:addons/hr_recruitment/models/hr_recruitment.py:416
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -1116,19 +960,14 @@ msgid "Next Actions"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
-msgid "No Interview Form"
-msgstr ""
-
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:406
+#: code:addons/hr_recruitment/models/hr_recruitment.py:384
#, python-format
msgid "No Subject"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_10
-msgid "No out of hours working"
+#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
+msgid "No document yet."
msgstr ""
#. module: hr_recruitment
@@ -1137,11 +976,6 @@ msgstr ""
msgid "Normal"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rcol_3_1_1
-msgid "Not important"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_attachment_number
msgid "Number of Attachments"
@@ -1165,13 +999,21 @@ msgid "Odoo helps you track applicants in the recruitment\n"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_3
-msgid "Office environment"
+#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job
+msgid "Once a job position is created, you can track related applications\n"
+" and manage the recruitment process."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_config
+msgid "Once a job position is created, you can track the applicants\n"
+" and manage the recruitment process related to the job\n"
+" position."
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_6
-msgid "Office location"
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+msgid "Ongoing"
msgstr ""
#. module: hr_recruitment
@@ -1204,11 +1046,6 @@ msgstr ""
msgid "Partner"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_9
-msgid "Perks such as free parking, gym passes"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_phone
msgid "Phone"
@@ -1223,11 +1060,6 @@ msgid "Policy to post a message on the document using the mailgateway.\n"
""
msgstr ""
-#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "Print interview report"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_probability
msgid "Probability"
@@ -1243,11 +1075,6 @@ msgstr ""
msgid "Proposed Salary Extra"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_3_1
-msgid "Rate the Importance"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_alias_force_thread_id
msgid "Record Thread ID"
@@ -1280,11 +1107,6 @@ msgstr ""
msgid "Recruitment Done"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.survey,title:hr_recruitment.recruitment_form
-msgid "Recruitment Form"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_user_id
msgid "Recruitment Responsible"
@@ -1311,8 +1133,8 @@ msgid "Refuse"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_12
-msgid "Regular meetings"
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+msgid "Refused"
msgstr ""
#. module: hr_recruitment
@@ -1331,11 +1153,6 @@ msgstr ""
msgid "Requirements"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_response_id
-msgid "Response"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_user_id
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
@@ -1343,11 +1160,6 @@ msgstr ""
msgid "Responsible"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings_module_document
-msgid "Resumes"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_resumes
#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job02
@@ -1399,16 +1211,6 @@ msgstr ""
msgid "Search Applicants"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
-msgid "Search through resumes and motivation letters."
-msgstr ""
-
-#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
-msgid "Second Interview"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_sequence
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_sequence
@@ -1421,11 +1223,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rcol_3_1_2
-msgid "Somewhat important"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_source_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_source_id
@@ -1510,11 +1307,6 @@ msgstr ""
msgid "Start Recruitment"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rrow_2_1_5
-msgid "State of the art technology"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Subject / Applicant"
@@ -1525,33 +1317,19 @@ msgstr ""
msgid "Subject / Application Name"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_survey
-msgid "Survey"
-msgstr ""
-
#. module: hr_recruitment
#: sql_constraint:hr.applicant.category:0
msgid "Tag name already exists !"
msgstr ""
#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_applicant_category_action
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_categ_ids
+#: model:ir.ui.menu,name:hr_recruitment.hr_applicant_category_menu
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_category_view_form
msgid "Tags"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_1_1
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_1_2
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_1_3
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_2_1
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_2_2
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_2_3
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_2_4
-#: model:survey.question,validation_error_msg:hr_recruitment.recruitment_3_1
-msgid "The answer you entered has an invalid format."
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_availability
msgid "The date at which the applicant will be available to start working"
@@ -1597,11 +1375,6 @@ msgstr ""
msgid "This Year"
msgstr ""
-#. module: hr_recruitment
-#: model:survey.survey,description:hr_recruitment.recruitment_form
-msgid "This form is intended to help the responsible of a recruitment interview."
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_report_medium_id
msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
@@ -1613,15 +1386,11 @@ msgid "This is the source of the link Ex: Search Engine, another domain, or name
msgstr ""
#. module: hr_recruitment
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_1_1
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_1_2
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_1_3
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_2_1
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_2_2
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_2_3
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_2_4
-#: model:survey.question,constr_error_msg:hr_recruitment.recruitment_3_1
-msgid "This question requires an answer."
+#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
+msgid "This menu helps you search through resumes and motivation\n"
+" letters. Odoo automatically indexes .PDF, .DOC, DOCX, .TXT\n"
+" files so that you can search keywords from the content of these\n"
+" files."
msgstr ""
#. module: hr_recruitment
@@ -1629,6 +1398,13 @@ msgstr ""
msgid "This stage is folded in the kanban view when there are no records in that stage to display."
msgstr ""
+#. module: hr_recruitment
+#. openerp-web
+#: code:addons/hr_recruitment/static/src/js/tour.js:30
+#, python-format
+msgid "Try to send an email to this address, it will create an application automatically."
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
@@ -1647,11 +1423,23 @@ msgstr ""
msgid "Update Date"
msgstr ""
+#. module: hr_recruitment
+#: selection:hr.recruitment.config.settings,module_hr_recruitment_survey:0
+msgid "Use interview forms during the recruitment process"
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_template_id
msgid "Use template"
msgstr ""
+#. module: hr_recruitment
+#. openerp-web
+#: code:addons/hr_recruitment/static/src/js/tour.js:25
+#, python-format
+msgid "Use the breadcrumbs to <b>go back to the dashboard</b>."
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_user_id
msgid "User"
@@ -1669,8 +1457,10 @@ msgid "Very Good"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.rcol_3_1_4
-msgid "Very important"
+#. openerp-web
+#: code:addons/hr_recruitment/static/src/js/tour.js:11
+#, python-format
+msgid "Want to <b>start recruiting</b> like a pro? <i>Start here.</i>"
msgstr ""
#. module: hr_recruitment
@@ -1683,16 +1473,6 @@ msgstr ""
msgid "Welcome ${object.name} "
msgstr ""
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_1_3
-msgid "What age group do you belong to?"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:survey.question,question:hr_recruitment.recruitment_1_2
-msgid "What is your gender?"
-msgstr ""
-
#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_no_employee
msgid "With just a quick glance on the Odoo employee screen, you\n"
@@ -1701,7 +1481,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:442
+#: code:addons/hr_recruitment/models/hr_recruitment.py:420
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
@@ -1711,13 +1491,18 @@ msgstr ""
msgid "e.g. Call for interview"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "e.g. Sales Manager"
+msgstr ""
+
#. module: hr_recruitment
#: model:ir.model,name:hr_recruitment.model_hr_recruitment_config_settings
msgid "hr.recruitment.config.settings"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:298
+#: code:addons/hr_recruitment/models/hr_recruitment.py:296
#, python-format
msgid "job applicants"
msgstr ""
diff --git a/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot b/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
new file mode 100644
index 0000000000000000000000000000000000000000..10fd5600f92110a2a0888dbd3771818366f9d425
--- /dev/null
+++ b/addons/hr_recruitment_survey/i18n/hr_recruitment_survey.pot
@@ -0,0 +1,323 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * hr_recruitment_survey
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+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_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_1
+msgid "0-15"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_2
+msgid "16-20"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_3
+msgid "21-30"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_4
+msgid "31-40"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_5
+msgid "41-50"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_6
+msgid "51-60"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_7
+msgid "61-70"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_3_8
+msgid "71+"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
+msgid "<span class=\"o_stat_text\">Print</span>\n"
+" <span class=\"o_stat_text\">Interview</span>"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
+msgid "<span class=\"o_stat_text\">Start</span>\n"
+" <span class=\"o_stat_text\">Interview</span>"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_2_4
+msgid "Activities"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
+msgid "Answer related job question"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model,name:hr_recruitment_survey.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.page,title:hr_recruitment_survey.recruitment_1
+msgid "Basic information"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model.fields,help:hr_recruitment_survey.field_hr_applicant_survey_id
+#: model:ir.model.fields,help:hr_recruitment_survey.field_hr_job_survey_id
+msgid "Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_4
+msgid "Desk space"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.hr_job_survey_inherit
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.view_hr_job_kanban_inherit
+msgid "Display Interview Form"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_11
+msgid "Dress code"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_2_2
+msgid "Education"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.page,title:hr_recruitment_survey.recruitment_2
+msgid "Education and Activities"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_2_3
+msgid "Experience"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_2_2
+msgid "Female"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_8
+msgid "Freebies such as tea, coffee and stationery"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_1_1
+msgid "From which university will you graduate?"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_2
+msgid "Getting on with colleagues"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_7
+msgid "Good management"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_1
+msgid "Good pay"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_13
+msgid "Good social life"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_1_1
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_1_2
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_1_3
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_2_1
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_2_2
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_2_3
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_2_4
+#: model:survey.question,comments_message:hr_recruitment_survey.recruitment_3_1
+msgid "If other, please specify:"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.page,title:hr_recruitment_survey.recruitment_3
+msgid "Importance"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rcol_3_1_3
+msgid "Important"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model.fields,field_description:hr_recruitment_survey.field_hr_job_survey_id
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.view_hr_job_kanban_inherit
+msgid "Interview Form"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model,name:hr_recruitment_survey.model_hr_job
+msgid "Job Position"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_2_1
+msgid "Knowledge"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.recruitment_1_2_1
+msgid "Male"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rcol_3_1_5
+msgid "Most important"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.view_hr_job_kanban_inherit
+msgid "No Interview Form"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_10
+msgid "No out of hours working"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rcol_3_1_1
+msgid "Not important"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_3
+msgid "Office environment"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_6
+msgid "Office location"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_9
+msgid "Perks such as free parking, gym passes"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.ui.view,arch_db:hr_recruitment_survey.crm_case_form_view_job_inherit
+msgid "Print interview report"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_3_1
+msgid "Rate the Importance"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.survey,title:hr_recruitment_survey.recruitment_form
+msgid "Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_12
+msgid "Regular meetings"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model.fields,field_description:hr_recruitment_survey.field_hr_applicant_response_id
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rcol_3_1_2
+msgid "Somewhat important"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rrow_2_1_5
+msgid "State of the art technology"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:ir.model.fields,field_description:hr_recruitment_survey.field_hr_applicant_survey_id
+msgid "Survey"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_1_1
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_1_2
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_1_3
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_2_1
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_2_2
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_2_3
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_2_4
+#: model:survey.question,validation_error_msg:hr_recruitment_survey.recruitment_3_1
+msgid "The answer you entered has an invalid format."
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.survey,description:hr_recruitment_survey.recruitment_form
+msgid "This form is intended to help the responsible of a recruitment interview."
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_1_1
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_1_2
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_1_3
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_2_1
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_2_2
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_2_3
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_2_4
+#: model:survey.question,constr_error_msg:hr_recruitment_survey.recruitment_3_1
+msgid "This question requires an answer."
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.label,value:hr_recruitment_survey.rcol_3_1_4
+msgid "Very important"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_1_3
+msgid "What age group do you belong to?"
+msgstr ""
+
+#. module: hr_recruitment_survey
+#: model:survey.question,question:hr_recruitment_survey.recruitment_1_2
+msgid "What is your gender?"
+msgstr ""
+
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index c2f48845b4a0e910dd599fdf27d0c0c85392e349..6f5b257524b58f68f86245b9709701dff07b3293 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,19 +15,46 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Timesheet Entries</span>"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+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"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_activity_analysis
+msgid "Activity Analysis"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_delay
msgid "Avg. Plan.-Eff."
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.model.fields,help:hr_timesheet.field_project_project_subtask_project_id
+#: model:ir.model.fields,help:hr_timesheet.field_project_task_subtask_project_id
msgid "Choosing a sub-tasks project will both enable sub-tasks and set their default project (possibly the project itself)"
msgstr ""
@@ -39,15 +66,10 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_by_project
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_report
msgid "Click to record activities."
msgstr ""
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_company_id
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Company"
-msgstr ""
-
#. module: hr_timesheet
#: model:ir.model.fields,help:hr_timesheet.field_project_task_delay_hours
msgid "Computed as difference between planned hours by the project manager and the total hours of the task."
@@ -59,17 +81,17 @@ msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,help:hr_timesheet.field_project_task_effective_hours
-msgid "Computed using the sum of the task work done."
+#: model:ir.model.fields,help:hr_timesheet.field_project_task_total_hours_spent
+msgid "Computed as: Time Spent + Sub-tasks Hours."
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_cost
-msgid "Cost"
+#: model:ir.model.fields,help:hr_timesheet.field_project_task_effective_hours
+msgid "Computed using the sum of the task work done."
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_date
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Date"
msgstr ""
@@ -84,13 +106,18 @@ msgid "Delay Hours"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
-msgid "Detailed Activities"
+#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_department_id
+msgid "Department"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Detailed Activities"
msgstr ""
#. module: hr_timesheet
@@ -104,47 +131,16 @@ msgstr ""
msgid "Effective Hours"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Extended Filters..."
-msgstr ""
-
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
msgid "Group By"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Group by month of date"
-msgstr ""
-
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_effective_hours
msgid "Hours Spent"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_id
-msgid "ID"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,help:hr_timesheet.field_project_task_progress
-msgid "If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Month"
-msgstr ""
-
#. module: hr_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
msgid "My Timesheet"
@@ -161,7 +157,6 @@ msgid "Planned Hours"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_product_id
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Product"
msgstr ""
@@ -174,11 +169,15 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_project_project
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_project_id
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_project_id
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Project"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Project -"
+msgstr ""
+
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_remaining_hours
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
@@ -195,6 +194,11 @@ msgstr ""
msgid "Reports"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Responsible"
+msgstr ""
+
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
msgid "Spent Hours"
@@ -213,6 +217,7 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.act_project_task_sub_task
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_child_ids
#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Sub-tasks"
msgstr ""
@@ -231,6 +236,7 @@ msgstr ""
#: model:ir.model,name:hr_timesheet.model_project_task
#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_task_id
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Task"
msgstr ""
@@ -240,21 +246,13 @@ msgid "Tasks by user and project"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "This Month"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_quantity
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
msgid "Time"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_timesheet_report
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_graph
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_pivot
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
+#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
msgid "Timesheet"
msgstr ""
@@ -265,9 +263,9 @@ msgid "Timesheet Activities"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_report_stat_all
-#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_report_stat_filtered
-msgid "Timesheet Analysis"
+#: model:ir.actions.act_window,name:hr_timesheet.project_task_action_view_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.timesheet_report
+msgid "Timesheet Entries"
msgstr ""
#. module: hr_timesheet
@@ -282,7 +280,6 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_timesheet_ids
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_report_all
#: 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.project_invoice_form
@@ -297,6 +294,7 @@ msgid "Total"
msgstr ""
#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_total_hours_spent
#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_total_hours
msgid "Total Hours"
msgstr ""
@@ -306,12 +304,6 @@ msgstr ""
msgid "Total time"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_user_id
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "User"
-msgstr ""
-
#. module: hr_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
msgid "Users"
@@ -319,12 +311,13 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_progress
-msgid "Working Time Progress (%)"
+msgid "Working Time Recorded"
msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line
#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_by_project
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_report
msgid "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."
@@ -335,13 +328,3 @@ msgstr ""
msgid "You should create an analytic account structure depending on your needs to analyse costs and revenues. In Odoo, analytic accounts are also used to track customer contracts."
msgstr ""
-#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_account_analytic_line
-msgid "account analytic line"
-msgstr ""
-
-#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "month"
-msgstr ""
-
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index f3d7f0278f49cb1d9eb5c9e876d2bca48d27df6d..0a638c45127a7f3feaaf16cc010b07cccfea0b53 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,39 +17,9 @@ msgstr ""
#. module: hr_timesheet_sheet
#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_state
-msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed timesheet. \n"
-"* The 'Confirmed' status is used for to confirm the timesheet by user. \n"
-"* The 'Done' status is used when users timesheet is accepted by his/her senior."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_nbr
-msgid "# Nbr Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_total_attendance
-msgid "# Total Attendance"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_total_diff
-msgid "# Total Diff"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_total_timesheet
-msgid "# Total Timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "<span class=\"o_stat_text\">Timesheet</span>"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state_attendance:0
-msgid "Absent"
+msgid " * The 'Open' status is used when a user is encoding a new and unconfirmed timesheet. \n"
+"* The 'Waiting Approval' status is used to confirm the timesheet by user. \n"
+"* The 'Approved' status is used when the users timesheet is accepted by his/her senior."
msgstr ""
#. module: hr_timesheet_sheet
@@ -64,6 +34,11 @@ msgstr ""
msgid "Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_ids
msgid "Analytic accounts"
@@ -80,20 +55,6 @@ msgstr ""
msgid "Approved"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_total_attendance
-msgid "Attendance"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_attendance_count
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_attendances_ids
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Attendances"
-msgstr ""
-
#. module: hr_timesheet_sheet
#. openerp-web
#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:51
@@ -111,12 +72,6 @@ msgstr ""
msgid "Company"
msgstr ""
-#. module: hr_timesheet_sheet
-#: selection:hr.timesheet.report,state:0
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_timesheet_report_search
-msgid "Confirmed"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "Confirmed Timesheets"
@@ -135,33 +90,18 @@ msgid "Created on"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_state_attendance
-msgid "Current Status"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_name
-msgid "Date"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_date_from
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_date_from
-msgid "Date from"
+msgid "Date From"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_date_to
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_date_to
-msgid "Date to"
+msgid "Date To"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_department
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_department_id
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_department_id
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_timesheet_report_search
msgid "Department"
msgstr ""
@@ -170,37 +110,13 @@ msgstr ""
msgid "Details"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_total_difference
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_total_difference
-msgid "Difference"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Differences"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_current_open_display_name
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_display_name
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_display_name
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_display_name
msgid "Display Name"
msgstr ""
-#. module: hr_timesheet_sheet
-#: selection:hr.timesheet.report,state:0
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_timesheet_report_search
-msgid "Done"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr.timesheet.report,state:0
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_timesheet_report_search
-msgid "Draft"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_employee
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_employee_id
@@ -218,14 +134,8 @@ msgid "Employees"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:85
-#, python-format
-msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.filters,name:hr_timesheet_sheet.filter_hr_timesheet_report_external_timesheets
-msgid "External Timesheet"
+#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_config_settings_form_inherit_hr_timesheet_sheet
+msgid "Extra features"
msgstr ""
#. module: hr_timesheet_sheet
@@ -238,10 +148,14 @@ msgstr ""
msgid "Hours"
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_department
+msgid "Hr Department"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_current_open_id
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_id
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_id
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_id
msgid "ID"
msgstr ""
@@ -252,22 +166,16 @@ msgid "In Draft"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:74
+#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:104
+#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:112
#, python-format
msgid "In order to create a timesheet for this employee, you must link him/her to a user."
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.filters,name:hr_timesheet_sheet.filter_hr_timesheet_report_internal_timesheets
-msgid "Internal Timesheet"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_current_open___last_update
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet___last_update
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account___last_update
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day___last_update
msgid "Last Modified on"
msgstr ""
@@ -289,7 +197,17 @@ msgid "Month"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_config_settings_form_inherit_hr_timesheet_sheet
+msgid "More Info"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timesheet_sheet
msgid "My Timesheet"
msgstr ""
@@ -300,7 +218,6 @@ msgid "My Timesheets"
msgstr ""
#. module: hr_timesheet_sheet
-#: selection:hr.timesheet.report,state:0
#: selection:hr_timesheet_sheet.sheet,state:0
msgid "New"
msgstr ""
@@ -321,34 +238,16 @@ msgid "Open"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:30
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:26
#, python-format
msgid "Open Timesheet"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_period_ids
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_day_tree
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Period"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,help:hr_timesheet_sheet.field_res_company_timesheet_range
msgid "Periodicity on which you validate your timesheets."
msgstr ""
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:116
-#, python-format
-msgid "Please verify that the total difference of the sheet is lower than %.2f."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: selection:hr_timesheet_sheet.sheet,state_attendance:0
-msgid "Present"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_name
msgid "Project / Analytic Account"
@@ -359,6 +258,11 @@ msgstr ""
msgid "Refuse"
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_user_id
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_account_filter
msgid "Search Account"
@@ -376,26 +280,13 @@ msgstr ""
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_account_analytic_line_sheet_id
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_attendance_sheet_id
+#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_account_analytic_line_sheet_id_computed
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_sheet_id
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_sheet_id
msgid "Sheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Sign In"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Sign Out"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_report_state
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_state
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_timesheet_report_search
msgid "Status"
msgstr ""
@@ -410,20 +301,12 @@ msgid "Summary"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:55
-#, python-format
-msgid "The timesheet cannot be validated as it does not contain an equal number of sign ins and sign outs."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
msgid "Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
msgid "Timesheet Activities"
msgstr ""
@@ -439,13 +322,13 @@ msgid "Timesheet allowed difference(Hours)"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:mail.message.subtype,description:hr_timesheet_sheet.mt_timesheet_approved
-msgid "Timesheet approved"
+#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_project_config_settings_module_project_timesheet_synchro
+msgid "Timesheet app for Chrome/Android/iOS"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
-msgid "Timesheet by Account"
+#: model:mail.message.subtype,description:hr_timesheet_sheet.mt_timesheet_approved
+msgid "Timesheet approved"
msgstr ""
#. module: hr_timesheet_sheet
@@ -454,11 +337,6 @@ msgstr ""
msgid "Timesheet by Accounts"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
-msgid "Timesheet by Day"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_timesheet_ids
msgid "Timesheet lines"
@@ -480,8 +358,8 @@ msgstr ""
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_department_view_kanban
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_company
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_employee_extd_form
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_tree_simplified
+#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_config_settings_form_inherit_hr_timesheet_sheet
msgid "Timesheets"
msgstr ""
@@ -492,7 +370,6 @@ msgstr ""
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
msgid "Timesheets by Period"
msgstr ""
@@ -527,33 +404,11 @@ msgstr ""
msgid "Total"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_total_attendance
-msgid "Total Attendance"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_day_tree
-msgid "Total Attendances"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_day_tree
-msgid "Total Difference"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_account_total
msgid "Total Time"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_day_total_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_total_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_day_tree
-msgid "Total Timesheet"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "Unread Messages"
@@ -581,73 +436,25 @@ msgid "Week"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:230
+#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:133
#, python-format
msgid "Week "
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
-msgid "Weekly"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:470
-#, python-format
-msgid "You can not enter an attendance date outside the current timesheet dates."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:468
-#, python-format
-msgid "You can not enter an attendance in a submitted timesheet. Ask your manager to reset it before adding attendance."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:240
-#, python-format
-msgid "You cannot delete a timesheet which have attendance entries."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:238
+#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:141
#, python-format
msgid "You cannot delete a timesheet which is already confirmed."
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:59
+#: code:addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py:98
#, python-format
msgid "You cannot duplicate a timesheet."
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:489
-#, python-format
-msgid "You cannot enter an attendance date outside the current timesheet dates."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: constraint:hr_timesheet_sheet.sheet:0
-msgid "You cannot have 2 timesheets that overlap!\n"
-"Please use the menu 'My Current Timesheet' to avoid this problem."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:76
-#, python-format
-msgid "You cannot have 2 timesheets that overlap!\n"
-"You should use the menu 'My Timesheet' to avoid this problem."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:496
-#, python-format
-msgid "You cannot modify an entry in a confirmed timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:355
+#: code:addons/hr_timesheet_sheet/models/account_analytic_line.py:60
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet."
msgstr ""
@@ -667,11 +474,6 @@ msgstr ""
msgid "You will be able to register your working hours and activities."
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line
-msgid "account analytic line"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
msgid "hr.timesheet.current.open"
@@ -682,6 +484,11 @@ msgstr ""
msgid "new timesheet."
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
msgid "to"
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index 9c44f04c6fc15740d60bc75df75cf494f545d2c1..ae0b1fafde5b64150916981907c4e88e79aa827b 100644
--- a/addons/im_livechat/i18n/im_livechat.pot
+++ b/addons/im_livechat/i18n/im_livechat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_nbr_channel
-msgid "# of channel"
+msgid "# of Sessions"
msgstr ""
#. module: im_livechat
@@ -33,9 +33,9 @@ msgstr ""
#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_action
-msgid "* Select 'Display the button' to simply display the chat button on the pages.\n"
-"* Select 'Auto popup' for to display the button, and automatically open the conversation window.\n"
-"* Select 'Hide the button' to hide the chat button on the pages."
+msgid "* 'Display the button' displays the chat button on the pages.\n"
+"* 'Auto popup' displays the button and automatically open the conversation pane.\n"
+"* 'Hide the button' hides the chat button on the pages."
msgstr ""
#. module: im_livechat
@@ -104,6 +104,20 @@ msgstr ""
msgid "Bad"
msgstr ""
+#. module: im_livechat
+#: model:ir.actions.act_window,name:im_livechat.im_livechat_canned_response_action
+#: model:ir.ui.menu,name:im_livechat.canned_responses
+msgid "Canned Responses"
+msgstr ""
+
+#. module: im_livechat
+#: model:ir.actions.act_window,help:im_livechat.im_livechat_canned_response_action
+msgid "Canned responses allow you to insert prewritten responses in\n"
+" your messages by typing <i>:shortcut</i>. The shortcut is\n"
+" replaced directly in your message, so that you can still edit\n"
+" it before sending."
+msgstr ""
+
#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_channel_id
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_livechat_channel_id
@@ -148,6 +162,11 @@ msgstr ""
msgid "Chat with one of our collaborators"
msgstr ""
+#. module: im_livechat
+#: model:ir.actions.act_window,help:im_livechat.im_livechat_canned_response_action
+msgid "Click to create a new canned response."
+msgstr ""
+
#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.im_livechat_channel_action
msgid "Click to define a new website live chat channel."
@@ -159,6 +178,11 @@ msgstr ""
msgid "Code"
msgstr ""
+#. module: im_livechat
+#: model:ir.ui.menu,name:im_livechat.livechat_config
+msgid "Configuration"
+msgstr ""
+
#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_channel_id
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_channel_id
@@ -228,7 +252,7 @@ msgstr ""
#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_auto_popup_timer
-msgid "Delay (in seconds) to automatically open the converssation window. Note : the selected action must be 'Auto popup', otherwise this parameter will not be take into account."
+msgid "Delay (in seconds) to automatically open the conversation window. Note: the selected action must be 'Auto popup' otherwise this parameter will not be taken into account."
msgstr ""
#. module: im_livechat
@@ -299,6 +323,11 @@ msgstr ""
msgid "Group By..."
msgstr ""
+#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree
+msgid "Has a Rating"
+msgstr ""
+
#. module: im_livechat
#: selection:im_livechat.channel.rule,action:0
msgid "Hide the button"
@@ -306,7 +335,6 @@ msgstr ""
#. module: im_livechat
#: model:ir.actions.act_window,name:im_livechat.mail_channel_action
-#: model:ir.ui.menu,name:im_livechat.session_history
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form
#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree
msgid "History"
@@ -373,6 +401,11 @@ msgstr ""
msgid "Last Modified on"
msgstr ""
+#. module: im_livechat
+#: model:ir.model,name:im_livechat.model_mail_channel_partner
+msgid "Last Seen Many2many"
+msgstr ""
+
#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_rule_write_uid
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_write_uid
@@ -396,6 +429,11 @@ msgstr ""
msgid "Leave Channel"
msgstr ""
+#. module: im_livechat
+#: model:ir.ui.menu,name:im_livechat.menu_livechat_root
+msgid "Live Chat"
+msgstr ""
+
#. module: im_livechat
#: model:ir.module.category,name:im_livechat.module_category_im_livechat
msgid "Live Support"
@@ -419,11 +457,6 @@ msgstr ""
msgid "Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract information about the missed sessions, the audiance, the duration of a session, etc."
msgstr ""
-#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.support_page
-msgid "Livechat Support Page"
-msgstr ""
-
#. module: im_livechat
#: model:ir.model,name:im_livechat.model_im_livechat_report_channel
#: model:ir.model,name:im_livechat.model_im_livechat_report_operator
@@ -530,6 +563,11 @@ msgid "Operators\n"
" <i class=\"fa fa-comments\"/>"
msgstr ""
+#. module: im_livechat
+#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
+msgid "Operators that do not show any activity In Odoo for more than 30 minutes will be considered as disconnected."
+msgstr ""
+
#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
msgid "Options"
@@ -559,7 +597,7 @@ msgstr ""
#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_regex_url
-msgid "Regular expression identifying the web page on which the rules will be applied."
+msgid "Regular expression specifying the web pages this rule will be applied on."
msgstr ""
#. module: im_livechat
@@ -613,6 +651,11 @@ msgstr ""
msgid "Sessions"
msgstr ""
+#. module: im_livechat
+#: model:ir.ui.menu,name:im_livechat.session_history
+msgid "Sessions History"
+msgstr ""
+
#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_image_small
msgid "Small-sized photo of the group. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
@@ -635,11 +678,6 @@ msgstr ""
msgid "Text of the Button"
msgstr ""
-#. module: im_livechat
-#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_country_ids
-msgid "The actual rule will match only for this country. So if you set select 'Belgium' and 'France' and you set the action to 'Hide Buttun', this 2 country will not be see the support button for the specified URL. This feature requires GeoIP installed on your server."
-msgstr ""
-
#. module: im_livechat
#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_channel_id
msgid "The channel of the rule"
@@ -650,6 +688,11 @@ msgstr ""
msgid "The name of the channel"
msgstr ""
+#. module: im_livechat
+#: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule_country_ids
+msgid "The rule will only be applied for these countries. Example: if you select 'Belgium' and 'United States' and that you set the action to 'Hide Button', the chat button will be hidden on the specified URL from the visitors located in these 2 countries. This feature requires GeoIP installed on your server."
+msgstr ""
+
#. module: im_livechat
#: model:res.groups,comment:im_livechat.im_livechat_group_manager
msgid "The user will be able to delete support channels."
@@ -707,7 +750,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/controllers/main.py:30
+#: code:addons/im_livechat/controllers/main.py:37
#: code:addons/im_livechat/static/src/js/im_livechat.js:28
#, python-format
msgid "Visitor"
@@ -718,21 +761,11 @@ msgstr ""
msgid "Web Page"
msgstr ""
-#. module: im_livechat
-#: model:ir.ui.menu,name:im_livechat.menu_livechat_root
-msgid "Website Live Chat"
-msgstr ""
-
#. module: im_livechat
#: model:ir.actions.act_window,name:im_livechat.im_livechat_channel_action
msgid "Website Live Chat Channels"
msgstr ""
-#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.support_page
-msgid "Website Live Chat Powered by <strong>Odoo</strong>."
-msgstr ""
-
#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_default_message
msgid "Welcome Message"
@@ -745,6 +778,11 @@ msgid "You can create channels for each website on which you want\n"
" visitors to talk in real time with your operators."
msgstr ""
+#. module: im_livechat
+#: model:ir.actions.act_window,help:im_livechat.mail_channel_action
+msgid "Your chatter history is empty. Create a channel and start chatting to fill up your history."
+msgstr ""
+
#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
msgid "e.g. Hello, how may I help you?"
@@ -755,6 +793,11 @@ msgstr ""
msgid "e.g. YourWebsite.com"
msgstr ""
+#. module: im_livechat
+#: model:ir.model,name:im_livechat.model_ir_autovacuum
+msgid "ir.autovacuum"
+msgstr ""
+
#. module: im_livechat
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
msgid "or copy this url and send it by email to your customers or suppliers:"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 241ca182ccdfbae9f22247695aa2933b7f86a1db..70177ab2107ad7d79b568c5819135672c2f48476 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,9 +16,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
-msgid "- Click on the"
+msgid "- Click on the <span class=\"fa fa-phone text-success\"></span> to announce that the order is ordered <br>\n"
+" - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
+" - Click on the <span class=\"fa fa-times-circle text-danger\"></span> red X to announce that the order isn't available"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
+msgid "- Click on the <span class=\"fa fa-phone text-success\"></span> to announce that the order is ordered <br>\n"
+" - Click on the <span class=\"fa fa-check text-success\"></span> to announce that the order is received <br>\n"
+" - Click on the <span class=\"fa fa-times-circle text-danger\"></span> to announce that the order isn't available"
msgstr ""
#. module: lunch
@@ -38,13 +46,6 @@ msgid "A cashmove can either be an expense or a payment.<br>\n"
" A payment represents the employee reimbursement to the company."
msgstr ""
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_action_tree
-msgid "A lunch order is defined by its user, date and order lines.\n"
-" Each order line corresponds to a product, an additional note and a price.\n"
-" Before selecting your order lines, don't forget to read the warnings displayed in the reddish area."
-msgstr ""
-
#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_product_action
msgid "A product is defined by its name, category, price and vendor."
@@ -64,7 +65,7 @@ msgid "Add"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:253
+#: code:addons/lunch/models/lunch.py:263
#, python-format
msgid "Alert"
msgstr ""
@@ -118,6 +119,11 @@ msgstr ""
msgid "By Employee"
msgstr ""
+#. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
+msgid "By Order"
+msgstr ""
+
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_cashmove_view_search
msgid "By User"
@@ -151,7 +157,6 @@ msgstr ""
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
#: selection:lunch.order,state:0
#: selection:lunch.order.line,state:0
msgid "Cancelled"
@@ -184,11 +189,6 @@ msgstr ""
msgid "Click to create a lunch category."
msgstr ""
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_action_tree
-msgid "Click to create a lunch order."
-msgstr ""
-
#. module: lunch
#: model:ir.actions.act_window,help:lunch.lunch_cashmove_action_control_accounts
msgid "Click to create a new payment."
@@ -388,7 +388,7 @@ msgstr ""
#: model:ir.model.fields,field_description:lunch.field_lunch_order_id
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_id
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_id
-#: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id_1894
+#: model:ir.model.fields,field_description:lunch.field_lunch_product_category_id_1868
#: model:ir.model.fields,field_description:lunch.field_lunch_product_id
msgid "ID"
msgstr ""
@@ -448,13 +448,13 @@ msgid "Lunch Alert"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:224
+#: code:addons/lunch/models/lunch.py:234
#, python-format
msgid "Lunch Cashmove"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:62
+#: code:addons/lunch/models/lunch.py:63
#: model:ir.actions.report.xml,name:lunch.action_report_lunch_order
#: model:ir.model,name:lunch.model_lunch_order
#: model:ir.ui.view,arch_db:lunch.report_lunch_order
@@ -495,7 +495,7 @@ msgid "My Lunch"
msgstr ""
#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
msgid "My Orders"
msgstr ""
@@ -505,7 +505,6 @@ msgid "Name/Date"
msgstr ""
#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
#: selection:lunch.order,state:0
#: selection:lunch.order.line,state:0
msgid "New"
@@ -518,7 +517,7 @@ msgid "New Order"
msgstr ""
#. module: lunch
-#: code:addons/lunch/wizard/lucky_order.py:37
+#: code:addons/lunch/wizard/lucky_order.py:39
#, python-format
msgid "No product is matching your request. Now you will starve to death."
msgstr ""
@@ -533,6 +532,24 @@ msgstr ""
msgid "Note"
msgstr ""
+#. module: lunch
+#: code:addons/lunch/models/lunch.py:194
+#, python-format
+msgid "Only your lunch manager cancels the orders."
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/models/lunch.py:163
+#, python-format
+msgid "Only your lunch manager processes the orders."
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/models/lunch.py:183
+#, python-format
+msgid "Only your lunch manager sets the orders as received."
+msgstr ""
+
#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_cashmove_order_id
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_order_id
@@ -597,14 +614,15 @@ msgstr ""
#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_price
#: model:ir.model.fields,field_description:lunch.field_lunch_product_price
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
msgid "Price"
msgstr ""
#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_product_id
-#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_name
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_product_id
#: model:ir.model.fields,field_description:lunch.field_lunch_product_name
+#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
msgid "Product"
msgstr ""
@@ -624,6 +642,11 @@ msgstr ""
msgid "Product Category:"
msgstr ""
+#. module: lunch
+#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_name
+msgid "Product Name"
+msgstr ""
+
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_product_view_search
msgid "Product Search"
@@ -659,7 +682,6 @@ msgstr ""
#. module: lunch
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_search
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
#: selection:lunch.order,state:0
#: selection:lunch.order.line,state:0
msgid "Received"
@@ -740,11 +762,16 @@ msgid "The company this user is currently working for."
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:98
+#: code:addons/lunch/models/lunch.py:99
#, python-format
msgid "The date of your order is in the past."
msgstr ""
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.lunch_order_line_action
+msgid "There is no previous order recorded. Click on \"My Lunch\" and then create a new lunch order."
+msgstr ""
+
#. module: lunch
#. openerp-web
#: code:addons/lunch/static/src/xml/lunch.xml:4
@@ -794,11 +821,6 @@ msgstr ""
msgid "User"
msgstr ""
-#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
-msgid "Users"
-msgstr ""
-
#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_lucky_supplier_ids
#: model:ir.model.fields,field_description:lunch.field_lunch_order_line_supplier
@@ -833,7 +855,7 @@ msgid "Your Lunch Account"
msgstr ""
#. module: lunch
-#: model:ir.actions.act_window,name:lunch.lunch_order_action_tree
+#: model:ir.actions.act_window,name:lunch.lunch_order_line_action
msgid "Your Orders"
msgstr ""
@@ -871,11 +893,6 @@ msgstr ""
msgid "lunch order line"
msgstr ""
-#. module: lunch
-#: model:ir.ui.view,arch_db:lunch.lunch_order_view_search
-msgid "lunch orders"
-msgstr ""
-
#. module: lunch
#: model:ir.model,name:lunch.model_lunch_product
msgid "lunch product"
@@ -896,27 +913,3 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
-msgid "red X to announce that the order isn't available"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
-msgid "to announce that the order is ordered <br>\n"
-" - Click on the"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_control_suppliers
-msgid "to announce that the order is received <br>\n"
-" - Click on the"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,help:lunch.lunch_order_line_action_by_supplier
-msgid "to announce that the order isn't available"
-msgstr ""
-
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index e1d9a6360966e3f8b856a3fccabedf2f616ff1c2..63d57b6c567621fd2926c1a93a60d0b8e910a6ad 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,158 +18,93 @@ msgstr ""
#. module: mail
#: model:mail.template,body_html:mail.mail_template_data_notification_email_default
msgid "\n"
+"% if ctx.get('button_access'):\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
-" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
-" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
-"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('is_accessible'):\n"
-"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size: 12px\">\n"
-" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
-" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:0px 10px 5px 5px; font-size: 12px;\">\n"
-" <p>\n"
-" % if ctx.get('actions'):\n"
-" % for action in ctx['actions']:\n"
-" <a href=\"${action['url']}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\">${action['title']}</a>\n"
-" % endfor\n"
-" % endif\n"
+"% endif\n"
+"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access') or ctx.get('is_accessible'):\n"
+"<div summary=\"o_mail_notification\">\n"
+"<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"width: 100%; margin-top: 5px;\">\n"
+"<tbody><tr>\n"
+" <td valign=\"center\">\n"
+" % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'):\n"
+" <a href=\"${ctx['button_access']['url']}\" style=\"padding: 8px 12px; font-size: 12px; text-decoration: none; color: #FFFFFF; text-decoration:none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px\">${ctx['button_access']['title']}</a>\n"
+" % endif\n"
"\n"
-" % if ctx.get('button_follow'):\n"
-" % if ctx.get('actions'):\n"
-" |\n"
-" % endif\n"
-" <a href=\"${ctx['button_follow']['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${ctx['button_follow']['title']}</strong></a>\n"
-" % elif ctx.get('button_unfollow'):\n"
-" % if ctx.get('actions'):\n"
-" |\n"
-" % endif\n"
-" <a href=\"${ctx['button_unfollow']['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${ctx['button_unfollow']['title']}</strong></a>\n"
-" % endif\n"
+" % if ctx.get('button_follow'):\n"
+" % if ctx.get('actions'):\n"
+" |\n"
+" % endif\n"
+" <a href=\"${ctx['button_follow']['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${ctx['button_follow']['title']}</a>\n"
+" % elif ctx.get('button_unfollow'):\n"
+" % if ctx.get('actions'):\n"
+" |\n"
+" % endif\n"
+" <a href=\"${ctx['button_unfollow']['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${ctx['button_unfollow']['title']}</a>\n"
+" % endif\n"
"\n"
-" % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'):\n"
-" % if ctx.get('actions'):\n"
-" |\n"
-" % endif\n"
-" <a href=\"${ctx['button_access']['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${ctx['button_access']['title']}</strong></a>\n"
-" % endif\n"
-" </p>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody></table>\n"
-"</div>\n"
-"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td valign=\"top\" style=\"width:600px; padding:0px 10px 5px 5px;\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:0px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
+" % if ctx.get('actions'):\n"
+" % for action in ctx['actions']:\n"
+" |\n"
+" <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689; text-decoration:none !important;\">${action['title']}</a>\n"
+" % endfor\n"
+" % endif\n"
+" </td>\n"
+" <td valign=\"center\" align=\"right\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+"</tr>\n"
+"<tr>\n"
+" <td colspan=\"2\" style=\"text-align:center;\">\n"
+" <hr width=\"100%\"\n"
+" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;\">\n"
+" % if ctx.get('subtype') and ctx.get('subtype').internal:\n"
+" <span style=\"background-color: #f2dede; padding: 5px;\">\n"
+" <strong>Internal note</strong>: replies are not sent to followers.\n"
+" </span>\n"
+" % endif\n"
+" </td>\n"
+"</tr>\n"
+"</tbody></table>\n"
"</div>\n"
-"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
-"% else:\n"
-"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;>\n"
"% endif\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\">\n"
-"\n"
-" <tbody>\n"
-" % if not ctx['is_discussion'] or not len(ctx['actions']) == 0:\n"
-" <tr>\n"
-" <td style=\"padding:0px 10px 5px 5px;font-size: 14px;\">\n"
-" ${object.body | safe}\n"
-" % if ctx.get('tracking'):\n"
-" <ul>\n"
-" % for tracking in ctx['tracking']\n"
-" <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li>\n"
-" % endfor\n"
-" </ul>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" % else:\n"
-" <tr>\n"
-" <td style=\"font-size: 14px;\">\n"
-" ${object.body | safe}\n"
-" % if ctx.get('tracking'):\n"
-" <ul>\n"
-" % for tracking in ctx['tracking']\n"
-" <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li>\n"
-" % endfor\n"
-" </ul>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" % endif\n"
-" </tbody>\n"
-" </table>\n"
-"</div>\n"
-"% if not ctx['is_discussion'] or not len(ctx['actions']) == 0:\n"
-"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-"% else:\n"
-"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;>\n"
+"${object.body | safe}\n"
+"% if ctx.get('tracking'):\n"
+" <ul>\n"
+" % for tracking in ctx['tracking']\n"
+" <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li>\n"
+" % endfor\n"
+" </ul>\n"
"% endif\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody>\n"
-" % if ctx.get('signature'):\n"
-" % if not ctx['is_discussion'] or not len(ctx['actions']) == 0:\n"
-" <tr>\n"
-" <td style=\"padding:0px 10px 5px 5px;font-size: 14px; text-align: left;\">\n"
-" ${ctx['signature'] | safe}\n"
-" </td>\n"
-" </tr>\n"
-" % else:\n"
-" <tr>\n"
-" <td style=\"font-size: 14px; text-align: left;\">\n"
-" ${ctx['signature'] | safe}\n"
-" </td>\n"
-" </tr>\n"
-" % endif\n"
-" % endif\n"
"\n"
-" % if not ctx['is_discussion'] or not len(ctx['actions']) == 0:\n"
-" <tr>\n"
-" <td style=\"padding:0px 10px 5px 5px;font-size: 11px; text-align: left;\">\n"
-" <strong>Sent by</strong>\n"
-" % if ctx.get('website_url'):\n"
-" <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n"
-" % endif\n"
-" <strong>${ctx.get('company_name')}</strong>\n"
-" % if ctx.get('website_url'):\n"
-" </a>\n"
-" % endif\n"
-" <strong>using</strong>\n"
-" <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n"
-" </td>\n"
-" </tr>\n"
-" % else:\n"
-" <tr>\n"
-" <td style=\"font-size: 14px; text-align: left;\">\n"
-" <strong>Sent by</strong>\n"
-" % if ctx.get('website_url'):\n"
-" <a href=\"${ctx['website_url']}\" style=\"text-decoration:none;\">\n"
-" % endif\n"
-" <strong>${ctx.get('company_name')}</strong>\n"
-" % if ctx.get('website_url'):\n"
-" </a>\n"
-" % endif\n"
-" <strong>using</strong>\n"
-" <a href=\"https://www.odoo.com\" style=\"text-decoration:none;\"><strong>Odoo</strong></a>\n"
-" </td>\n"
-" </tr>\n"
-" % endif\n"
-" </tbody>\n"
-" </table>\n"
-"</div>"
+"% if ctx.get('signature'):\n"
+" ${ctx['signature'] | safe}\n"
+"% endif\n"
+"<br/>\n"
+"<p style=\"color: #555555;\">\n"
+" Sent by\n"
+" % if ctx.get('website_url'):\n"
+" <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n"
+" % endif\n"
+" ${ctx.get('company_name')}\n"
+" % if ctx.get('website_url'):\n"
+" </a>\n"
+" % endif\n"
+" using\n"
+" <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\">Odoo</a>.\n"
+"</p>\n"
+""
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:627
+#, python-format
+msgid " This channel is private. People must be invited to join it."
msgstr ""
#. module: mail
@@ -179,25 +114,25 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:61
+#: code:addons/mail/static/src/js/chat_manager.js:66
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:231
+#: code:addons/mail/models/mail_template.py:226
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:241
+#: code:addons/mail/models/mail_thread.py:240
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:79
+#: code:addons/mail/models/res_users.py:80
#, python-format
msgid "%s has joined the %s network."
msgstr ""
@@ -209,16 +144,9 @@ msgstr ""
msgid "(from"
msgstr ""
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:48
-#, python-format
-msgid "(no email address)"
-msgstr ""
-
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_shortcode_type
-msgid "* Smiley are only used for HTML code to display an image * Text (default value) is use to substitute text with another text"
+msgid "* Smiley are only used for HTML code to display an image * Text (default value) is used to substitute text with another text"
msgstr ""
#. module: mail
@@ -229,36 +157,67 @@ msgid "-------- Show older messages --------"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:537
+#: code:addons/mail/models/mail_channel.py:631
+#, python-format
+msgid "<br><br>\n"
+" You can mention someone by typing <b>@username</b>, this will grab its attention.<br>\n"
+" You can mention a channel by typing <b>#channel</b>.<br>\n"
+" You can execute a command by typing <b>/command</b>.<br>\n"
+" You can insert canned responses in your message by typing <b>:shortcut</b>.<br>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:538
#, 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:460
-#: code:addons/mail/models/mail_channel.py:513
+#: code:addons/mail/models/mail_channel.py:461
+#: code:addons/mail/models/mail_channel.py:514
#, 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:162
+#: code:addons/mail/models/mail_channel.py:164
#, python-format
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/invite.py:22
+#: code:addons/mail/wizard/invite.py:23
#, python-format
msgid "<div><p>Hello,</p><p>%s invited you to follow %s document: %s.</p></div>"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/invite.py:25
+#: code:addons/mail/wizard/invite.py:26
#, python-format
msgid "<div><p>Hello,</p><p>%s invited you to follow a new document.</p></div>"
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tour.js:28
+#, python-format
+msgid "<p><b>Chat with coworkers</b> in real-time using direct messages.</p><p><i>You might need to invite users from the Settings app first.</i></p>"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tour.js:15
+#, python-format
+msgid "<p><b>Write a message</b> to the members of the channel here.</p> <p>You can notify someone with <i>'@'</i> or link another channel with <i>'#'</i>. Start your message with <i>'/'</i> to get the list of possible commands.</p>"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tour.js:11
+#, python-format
+msgid "<p>Channels make it easy to organize information across different topics and groups.</p> <p>Try to <b>create your first channel</b> (e.g. sales, marketing, product XYZ, after work party, etc).</p>"
+msgstr ""
+
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
@@ -343,20 +302,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_needaction
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_job_message_needaction
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_needaction
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction
#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_needaction
#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction
@@ -397,28 +358,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:19
-#, python-format
-msgid "Activity"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:78
+#: code:addons/mail/static/src/xml/client_action.xml:80
#, python-format
msgid "Add"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:64
+#: code:addons/mail/static/src/xml/followers.xml:65
#, python-format
msgid "Add Channels"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:61
+#: code:addons/mail/static/src/xml/followers.xml:62
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#, python-format
msgid "Add Followers"
@@ -432,8 +386,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:37
-#: code:addons/mail/static/src/xml/client_action.xml:54
+#: code:addons/mail/static/src/xml/client_action.xml:39
+#: code:addons/mail/static/src/xml/client_action.xml:56
#, python-format
msgid "Add a channel"
msgstr ""
@@ -535,7 +489,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:186
+#: code:addons/mail/static/src/js/chat_manager.js:192
#, python-format
msgid "Anonymous"
msgstr ""
@@ -647,7 +601,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:86
+#: code:addons/mail/static/src/xml/followers.xml:87
#, python-format
msgid "Be careful with channels following internal notifications"
msgstr ""
@@ -744,8 +698,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:33
-#: code:addons/mail/static/src/xml/client_action.xml:131
+#: code:addons/mail/static/src/xml/client_action.xml:35
+#: code:addons/mail/static/src/xml/client_action.xml:133
#: code:addons/mail/static/src/xml/systray.xml:22
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
@@ -803,22 +757,17 @@ msgid "Choose an example"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:347
+#: code:addons/mail/models/mail_thread.py:346
#, 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:363
+#: code:addons/mail/models/mail_thread.py:362
#, python-format
msgid "Click here to add new %s"
msgstr ""
-#. module: mail
-#: model:ir.actions.act_window,help:mail.action_contacts
-msgid "Click to add a contact in your address book."
-msgstr ""
-
#. module: mail
#: model:ir.actions.act_window,help:mail.mail_shortcode_action
msgid "Click to define a new chat shortcode."
@@ -885,12 +834,6 @@ msgstr ""
msgid "Congratulations, your inbox is empty"
msgstr ""
-#. module: mail
-#: model:ir.actions.act_window,name:mail.action_contacts
-#: model:ir.ui.menu,name:mail.menu_contacts
-msgid "Contacts"
-msgstr ""
-
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
#: model:ir.ui.view,arch_db:mail.view_message_search
@@ -930,7 +873,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:308
+#: code:addons/mail/static/src/js/client_action.js:316
#, python-format
msgid "Create %s"
msgstr ""
@@ -987,7 +930,7 @@ msgid "Current user has a starred notification linked to this message"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:17
+#: code:addons/mail/models/res_partner.py:19
#, python-format
msgid "Customers"
msgstr ""
@@ -1025,20 +968,22 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_hr_contract_message_last_post
#: model:ir.model.fields,help:mail.field_hr_department_message_last_post
#: model:ir.model.fields,help:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_equipment_category_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_equipment_message_last_post
-#: model:ir.model.fields,help:mail.field_hr_equipment_request_message_last_post
#: model:ir.model.fields,help:mail.field_hr_expense_message_last_post
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_last_post
#: model:ir.model.fields,help:mail.field_hr_holidays_message_last_post
#: model:ir.model.fields,help:mail.field_hr_job_message_last_post
#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_last_post
#: model:ir.model.fields,help:mail.field_mail_channel_message_last_post
#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_last_post
#: model:ir.model.fields,help:mail.field_mail_thread_message_last_post
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_last_post
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_last_post
+#: model:ir.model.fields,help:mail.field_maintenance_request_message_last_post
#: model:ir.model.fields,help:mail.field_mrp_bom_message_last_post
#: model:ir.model.fields,help:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mail.field_mrp_production_workcenter_line_message_last_post
#: model:ir.model.fields,help:mail.field_mrp_repair_message_last_post
+#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_last_post
+#: model:ir.model.fields,help:mail.field_mrp_workorder_message_last_post
#: model:ir.model.fields,help:mail.field_note_note_message_last_post
#: model:ir.model.fields,help:mail.field_procurement_order_message_last_post
#: model:ir.model.fields,help:mail.field_product_product_message_last_post
@@ -1139,7 +1084,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:42
+#: code:addons/mail/static/src/xml/client_action.xml:44
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1209,7 +1154,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:49
+#: code:addons/mail/static/src/xml/followers.xml:50
#, python-format
msgid "Edit subscription"
msgstr ""
@@ -1311,13 +1256,13 @@ msgid "Emails"
msgstr ""
#. module: mail
-#: code:addons/mail/models/update.py:96
+#: code:addons/mail/models/update.py:101
#, python-format
msgid "Error during communication with the publisher warranty server."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:247
+#: code:addons/mail/models/mail_mail.py:239
#, python-format
msgid "Error without exception. Probably due do sending an email without computed recipients."
msgstr ""
@@ -1359,7 +1304,7 @@ msgid "Failed"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:368
+#: code:addons/mail/models/mail_template.py:363
#, python-format
msgid "Failed to render template %r using values %r"
msgstr ""
@@ -1417,8 +1362,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:683
-#: code:addons/mail/static/src/xml/followers.xml:20
+#: code:addons/mail/models/mail_thread.py:666
+#: code:addons/mail/static/src/xml/followers.xml:21
#, python-format
msgid "Follow"
msgstr ""
@@ -1449,20 +1394,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_job_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_note_note_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_product_product_message_follower_ids
@@ -1512,20 +1459,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_job_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_note_note_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_product_product_message_channel_ids
@@ -1573,20 +1522,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_job_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_note_note_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_product_product_message_partner_ids
@@ -1621,7 +1572,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:24
+#: code:addons/mail/static/src/xml/followers.xml:25
#, python-format
msgid "Following"
msgstr ""
@@ -1721,7 +1672,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:110
+#: code:addons/mail/static/src/xml/client_action.xml:112
#, python-format
msgid "Idle"
msgstr ""
@@ -1751,20 +1702,22 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
#: model:ir.model.fields,help:mail.field_hr_department_message_unread
#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,help:mail.field_hr_equipment_category_message_unread
-#: model:ir.model.fields,help:mail.field_hr_equipment_message_unread
-#: model:ir.model.fields,help:mail.field_hr_equipment_request_message_unread
#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread
#: model:ir.model.fields,help:mail.field_hr_job_message_unread
#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread
#: model:ir.model.fields,help:mail.field_mail_channel_message_unread
#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread
#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread
+#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread
#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread
#: model:ir.model.fields,help:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mail.field_mrp_production_workcenter_line_message_unread
#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread
+#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread
+#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread
#: model:ir.model.fields,help:mail.field_note_note_message_unread
#: model:ir.model.fields,help:mail.field_procurement_order_message_unread
#: model:ir.model.fields,help:mail.field_product_product_message_unread
@@ -1812,20 +1765,22 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_equipment_category_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_equipment_message_needaction
-#: model:ir.model.fields,help:mail.field_hr_equipment_request_message_needaction
#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction
#: model:ir.model.fields,help:mail.field_hr_job_message_needaction
#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction
#: model:ir.model.fields,help:mail.field_mail_channel_message_needaction
#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction
#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction
+#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction
#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction
#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mail.field_mrp_production_workcenter_line_message_needaction
#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction
+#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction
#: model:ir.model.fields,help:mail.field_note_note_message_needaction
#: model:ir.model.fields,help:mail.field_procurement_order_message_needaction
#: model:ir.model.fields,help:mail.field_product_product_message_needaction
@@ -1889,7 +1844,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:958
+#: code:addons/mail/static/src/js/chat_manager.js:1008
#: code:addons/mail/static/src/xml/client_action.xml:22
#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
@@ -1916,28 +1871,28 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1718
+#: code:addons/mail/models/mail_thread.py:1703
#, python-format
msgid "Invalid record set: should be called as model (without records) or on single-record recordset"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:577
+#: code:addons/mail/static/src/js/chat_manager.js:601
#, python-format
msgid "Invitation"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/invite.py:53
+#: code:addons/mail/wizard/invite.py:54
#, python-format
msgid "Invitation to follow %s: %s"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:40
-#: code:addons/mail/static/src/xml/client_action.xml:132
+#: code:addons/mail/static/src/js/client_action.js:41
+#: code:addons/mail/static/src/xml/client_action.xml:134
#, python-format
msgid "Invite"
msgstr ""
@@ -1951,15 +1906,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
-#: code:addons/mail/static/src/xml/client_action.xml:132
+#: code:addons/mail/static/src/js/client_action.js:32
+#: code:addons/mail/static/src/xml/client_action.xml:134
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:638
+#: code:addons/mail/static/src/js/client_action.js:648
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -1999,20 +1954,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_job_message_is_follower
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_is_follower
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_is_follower
#: model:ir.model.fields,field_description:mail.field_note_note_message_is_follower
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_is_follower
#: model:ir.model.fields,field_description:mail.field_product_product_message_is_follower
@@ -2096,20 +2053,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_department_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_last_post
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_last_post
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_job_message_last_post
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_last_post
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_last_post
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_last_post
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_last_post
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_last_post
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_last_post
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_last_post
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_last_post
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_last_post
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_last_post
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_last_post
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_last_post
#: model:ir.model.fields,field_description:mail.field_note_note_message_last_post
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_last_post
#: model:ir.model.fields,field_description:mail.field_product_product_message_last_post
@@ -2204,7 +2163,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:99
+#: code:addons/mail/models/mail_channel.py:640
+#: code:addons/mail/static/src/xml/client_action.xml:101
#, python-format
msgid "Leave this channel"
msgstr ""
@@ -2219,6 +2179,12 @@ msgstr ""
msgid "List of partners that will be added as follower of the current document."
msgstr ""
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:651
+#, python-format
+msgid "List users in the current channel"
+msgstr ""
+
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
msgid "Listener"
@@ -2236,14 +2202,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:36
+#: code:addons/mail/static/src/js/chatter.js:37
#, python-format
msgid "Log"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/chatter.xml:59
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr ""
@@ -2256,7 +2222,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/chatter.xml:59
#, python-format
msgid "Log an internal note"
msgstr ""
@@ -2275,7 +2241,7 @@ msgid "Mail Channel Form"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:313
+#: code:addons/mail/models/mail_mail.py:305
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
@@ -2297,14 +2263,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
msgid "Mark all as read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:133
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
msgid "Mark all read"
msgstr ""
@@ -2382,7 +2348,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:122
+#: code:addons/mail/static/src/xml/client_action.xml:124
#, python-format
msgid "Message sent in \""
msgstr ""
@@ -2452,20 +2418,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_ids
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_job_message_ids
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_ids
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_ids
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_ids
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_ids
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_ids
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_ids
#: model:ir.model.fields,field_description:mail.field_note_note_message_ids
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_ids
#: model:ir.model.fields,field_description:mail.field_product_product_message_ids
@@ -2495,6 +2463,13 @@ msgstr ""
msgid "Messages Search"
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tour.js:20
+#, python-format
+msgid "Messages can be <b>starred</b> to remind you to check back later."
+msgstr ""
+
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
msgid "Messages with internal subtypes will be visible only by employees, aka members of base_user group"
@@ -2601,9 +2576,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#: code:addons/mail/static/src/js/window_manager.js:140
-#: code:addons/mail/static/src/xml/chatter.xml:67
+#: code:addons/mail/static/src/js/chat_manager.js:58
+#: 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/systray.xml:24
#, python-format
msgid "New message"
@@ -2720,20 +2695,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_job_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_note_note_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_product_product_message_needaction_counter
@@ -2781,20 +2758,22 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_category_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_request_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_holidays_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_job_message_needaction_counter
#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mail_thread_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mrp_bom_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_workcenter_line_message_needaction_counter
#: model:ir.model.fields,help:mail.field_mrp_repair_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder_message_needaction_counter
#: model:ir.model.fields,help:mail.field_note_note_message_needaction_counter
#: model:ir.model.fields,help:mail.field_procurement_order_message_needaction_counter
#: model:ir.model.fields,help:mail.field_product_product_message_needaction_counter
@@ -2842,20 +2821,22 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_category_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_message_unread_counter
-#: model:ir.model.fields,help:mail.field_hr_equipment_request_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_holidays_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_job_message_unread_counter
#: model:ir.model.fields,help:mail.field_hr_timesheet_sheet_sheet_message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_mass_mailing_contact_message_unread_counter
#: model:ir.model.fields,help:mail.field_mail_thread_message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_category_message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_equipment_message_unread_counter
+#: model:ir.model.fields,help:mail.field_maintenance_request_message_unread_counter
#: model:ir.model.fields,help:mail.field_mrp_bom_message_unread_counter
#: model:ir.model.fields,help:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mail.field_mrp_production_workcenter_line_message_unread_counter
#: model:ir.model.fields,help:mail.field_mrp_repair_message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_unbuild_message_unread_counter
+#: model:ir.model.fields,help:mail.field_mrp_workorder_message_unread_counter
#: model:ir.model.fields,help:mail.field_note_note_message_unread_counter
#: model:ir.model.fields,help:mail.field_procurement_order_message_unread_counter
#: model:ir.model.fields,help:mail.field_product_product_message_unread_counter
@@ -2878,13 +2859,6 @@ msgstr ""
msgid "Number of unread messages"
msgstr ""
-#. module: mail
-#: model:ir.actions.act_window,help:mail.action_contacts
-msgid "Odoo helps you easily track all activities related to\n"
-" a customer: discussions, history of business opportunities,\n"
-" documents, etc."
-msgstr ""
-
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:11
@@ -2894,7 +2868,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:111
+#: code:addons/mail/static/src/xml/client_action.xml:113
#, python-format
msgid "Offline"
msgstr ""
@@ -2929,6 +2903,13 @@ msgstr ""
msgid "Old Value Text"
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tour.js:24
+#, python-format
+msgid "Once a message has been starred, you can come back and review it at any time here."
+msgstr ""
+
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:220
@@ -2938,7 +2919,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:109
+#: code:addons/mail/static/src/xml/client_action.xml:111
#, python-format
msgid "Online"
msgstr ""
@@ -2960,14 +2941,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/client_action.xml:138
#, python-format
msgid "Open channel settings"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:46
+#: code:addons/mail/static/src/xml/client_action.xml:48
#, python-format
msgid "Open chat"
msgstr ""
@@ -3096,7 +3077,7 @@ msgid "Partner"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:37
+#: code:addons/mail/models/res_partner.py:39
#, python-format
msgid "Partner Profile"
msgstr ""
@@ -3134,7 +3115,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:191
+#: code:addons/mail/static/src/js/chatter.js:186
#, python-format
msgid "Please complete partner's informations"
msgstr ""
@@ -3153,7 +3134,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:578
+#: code:addons/mail/static/src/js/composer.js:640
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
@@ -3207,7 +3188,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:51
+#: code:addons/mail/static/src/xml/client_action.xml:53
#, python-format
msgid "Private Channels"
msgstr ""
@@ -3303,7 +3284,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/followers.xml:51
+#: code:addons/mail/static/src/xml/followers.xml:52
#, python-format
msgid "Remove this follower"
msgstr ""
@@ -3419,7 +3400,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:333
+#: code:addons/mail/static/src/js/composer.js:371
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Send"
@@ -3431,7 +3412,7 @@ msgid "Send Email"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:252
+#: code:addons/mail/models/mail_template.py:247
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -3444,7 +3425,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:67
+#: code:addons/mail/static/src/xml/chatter.xml:56
#, python-format
msgid "Send a message"
msgstr ""
@@ -3463,7 +3444,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:95
+#: code:addons/mail/static/src/xml/client_action.xml:97
#, python-format
msgid "Sends messages by email"
msgstr ""
@@ -3481,7 +3462,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:136
+#: code:addons/mail/static/src/xml/client_action.xml:138
#, python-format
msgid "Settings"
msgstr ""
@@ -3502,6 +3483,12 @@ msgstr ""
msgid "Shortcut"
msgstr ""
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:620
+#, python-format
+msgid "Show an helper message"
+msgstr ""
+
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_value
#: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_value
@@ -3551,7 +3538,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:964
+#: code:addons/mail/static/src/js/chat_manager.js:1014
#: 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
@@ -3623,7 +3610,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_2200
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2118
#: 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"
@@ -3691,8 +3678,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:728
-#: code:addons/mail/models/mail_message.py:823
+#: code:addons/mail/models/mail_message.py:555
+#: code:addons/mail/models/mail_message.py:650
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -3701,7 +3688,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_source
-msgid "The shortcut which must be replace in the Chat Messages"
+msgid "The shortcut which must be replaced in the Chat Messages"
msgstr ""
#. module: mail
@@ -3716,6 +3703,11 @@ msgid "The values displayed hereunder are informative. When sending the email, t
" will be taken from the email template."
msgstr ""
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_origin_link
+msgid "This"
+msgstr ""
+
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_image
msgid "This field holds the image used as photo for the group, limited to 1024x1024px."
@@ -3760,7 +3752,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:30
+#: code:addons/mail/static/src/xml/chatter.xml:20
#, python-format
msgid "To: Followers of"
msgstr ""
@@ -3774,7 +3766,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:131
+#: code:addons/mail/static/src/xml/client_action.xml:133
#, python-format
msgid "Toggle Channels"
msgstr ""
@@ -3831,22 +3823,22 @@ msgid "UUID"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:43
+#: code:addons/mail/models/mail_message.py:44
#, python-format
msgid "Unable to send email, please configure the sender's email address or alias."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:117
+#: code:addons/mail/static/src/xml/client_action.xml:119
#, python-format
msgid "Undo"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:684
-#: code:addons/mail/static/src/xml/followers.xml:22
+#: code:addons/mail/models/mail_thread.py:667
+#: code:addons/mail/static/src/xml/followers.xml:23
#, python-format
msgid "Unfollow"
msgstr ""
@@ -3881,20 +3873,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_unread
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_job_message_unread
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_unread
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread
#: model:ir.model.fields,field_description:mail.field_note_note_message_unread
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_unread
#: model:ir.model.fields,field_description:mail.field_product_product_message_unread
@@ -3942,20 +3936,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_category_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_hr_equipment_request_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_holidays_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_job_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_hr_timesheet_sheet_sheet_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_mass_mailing_contact_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_category_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_equipment_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_maintenance_request_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mrp_bom_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mail.field_mrp_production_workcenter_line_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_mrp_repair_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_unbuild_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_mrp_workorder_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_note_note_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_procurement_order_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_product_product_message_unread_counter
@@ -3985,39 +3981,32 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/client_action.xml:136
#, python-format
msgid "Unstar all"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:134
+#: code:addons/mail/static/src/xml/client_action.xml:136
#, python-format
msgid "Unstar all messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/client_action.xml:137
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
+#: code:addons/mail/static/src/xml/client_action.xml:137
#, python-format
msgid "Unsubscribe from channel"
msgstr ""
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:467
-#, python-format
-msgid "Unsubscribed"
-msgstr ""
-
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/thread.xml:169
@@ -4027,7 +4016,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:578
+#: code:addons/mail/static/src/js/composer.js:640
#, python-format
msgid "Uploading error"
msgstr ""
@@ -4062,15 +4051,21 @@ msgid "Users"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:671
-#: code:addons/mail/models/mail_thread.py:673
+#: code:addons/mail/models/mail_channel.py:664
+#, python-format
+msgid "Users in this channel: %s %s and you."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_thread.py:654
+#: code:addons/mail/models/mail_thread.py:656
#, python-format
msgid "View"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/followers.js:328
+#: code:addons/mail/static/src/js/followers.js:330
#, 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 ?"
@@ -4120,6 +4115,24 @@ msgstr ""
msgid "You added <b>%s</b> to the conversation."
msgstr ""
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:661
+#, python-format
+msgid "You are alone in this channel."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:630
+#, python-format
+msgid "You are in a private conversation with <b>@%s</b>."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:625
+#, python-format
+msgid "You are in channel <b>#%s</b>."
+msgstr ""
+
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/thread.xml:29
@@ -4135,20 +4148,20 @@ msgid "You cannot create a new user from here.\n"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:130
+#: code:addons/mail/models/mail_channel.py:132
#, 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:354
+#: code:addons/mail/models/mail_thread.py:353
#, python-format
msgid "You could also add a new %(document)s by sending an email to: %(email_link)s."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:577
+#: code:addons/mail/static/src/js/chat_manager.js:601
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -4161,7 +4174,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:466
+#: code:addons/mail/static/src/js/chat_manager.js:497
+#, 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:495
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
@@ -4172,7 +4192,7 @@ msgid "Your template does not defined the email address of the sender. Please up
msgstr ""
#. module: mail
-#: code:addons/mail/models/ir_actions.py:32
+#: code:addons/mail/models/ir_actions.py:33
#, python-format
msgid "Your template should define email_from"
msgstr ""
@@ -4183,17 +4203,17 @@ msgid "base.config.settings"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "board-meetings"
+#: model:ir.ui.view,arch_db:mail.view_mail_form
+msgid "by"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-msgid "by"
+#: model:ir.ui.view,arch_db:mail.message_origin_link
+msgid "created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:320
+#: code:addons/mail/models/mail_thread.py:319
#, python-format
msgid "document"
msgstr ""
@@ -4212,11 +4232,21 @@ msgstr ""
msgid "followers"
msgstr ""
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_origin_link
+msgid "from:"
+msgstr ""
+
#. module: mail
#: model:mail.channel,name:mail.channel_all_employees
msgid "general"
msgstr ""
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_origin_link
+msgid "has been"
+msgstr ""
+
#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
msgid "ir.actions.server"
@@ -4239,11 +4269,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:116
+#: code:addons/mail/static/src/xml/client_action.xml:118
#, python-format
msgid "mention(s) marked as read."
msgstr ""
+#. module: mail
+#: model:ir.ui.view,arch_db:mail.message_origin_link
+msgid "modified"
+msgstr ""
+
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
@@ -4269,11 +4304,6 @@ msgstr ""
msgid "publisher_warranty.contract"
msgstr ""
-#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "rd"
-msgstr ""
-
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/thread.js:16
@@ -4293,14 +4323,9 @@ msgstr ""
msgid "record:"
msgstr ""
-#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "sales"
-msgstr ""
-
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:35
+#: code:addons/mail/static/src/xml/chatter.xml:25
#, python-format
msgid "this document"
msgstr ""
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 897eb207fb79d0f462f95593ca0485ef9a257769..30227c2665100d845a10b68ba6ba3bc68c02b2e8 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,33 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_3
-msgid "\n"
-"<p>Hello,</p>\n"
-"<p>We are delighted to let you know that you have entered the select circle of our Gold Partners!</p>\n"
-"<p>Thank you,</p>\n"
-""
-msgstr ""
-
-#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_2
-msgid "\n"
-"<p>Hello,</p>\n"
-"<p>We are delighted to welcome you among our Silver Partners as of today!</p>\n"
-"<p>Thank you,</p>\n"
-""
-msgstr ""
-
-#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_1
-msgid "\n"
-"<p>Hello,</p>\n"
-"<p>You will receive your welcome pack via email shortly.</p>\n"
-"<p>Thank you,</p>\n"
-""
-msgstr ""
-
#. module: marketing_campaign
#: model:ir.model.fields,field_description:marketing_campaign.field_campaign_analysis_count
msgid "# of Actions"
@@ -83,7 +56,7 @@ msgid "Activity"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:479
+#: code:addons/marketing_campaign/models/marketing_campaign.py:376
#, python-format
msgid "After %(interval_nbr)d %(interval_type)s"
msgstr ""
@@ -119,7 +92,7 @@ msgid "Automatic"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:478
+#: code:addons/marketing_campaign/models/marketing_campaign.py:375
#, python-format
msgid "Automatic transition"
msgstr ""
@@ -218,7 +191,10 @@ msgid "Cancelled"
msgstr ""
#. module: marketing_campaign
+#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_activity_object_id
#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_object_id
+#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_segment_object_id
+#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_workitem_object_id
msgid "Choose the resource on which you want this campaign to be run"
msgstr ""
@@ -238,17 +214,7 @@ msgid "Condition"
msgstr ""
#. module: marketing_campaign
-#: model:mail.template,subject:marketing_campaign.email_template_2
-msgid "Congratulations! You are now a Silver Partner!"
-msgstr ""
-
-#. module: marketing_campaign
-#: model:mail.template,subject:marketing_campaign.email_template_3
-msgid "Congratulations! You are now one of our Gold Partners!"
-msgstr ""
-
-#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:480
+#: code:addons/marketing_campaign/models/marketing_campaign.py:377
#: selection:marketing.campaign.transition,trigger:0
#, python-format
msgid "Cosmetic"
@@ -284,7 +250,7 @@ msgid "Created on"
msgstr ""
#. module: marketing_campaign
-#: selection:marketing.campaign.activity,type:0
+#: selection:marketing.campaign.activity,action_type:0
msgid "Custom Action"
msgstr ""
@@ -345,18 +311,18 @@ msgid "Draft"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:170
+#: code:addons/marketing_campaign/models/marketing_campaign.py:123
#, python-format
msgid "Duplicating campaigns is not supported."
msgstr ""
#. module: marketing_campaign
-#: selection:marketing.campaign.activity,type:0
+#: selection:marketing.campaign.activity,action_type:0
msgid "Email"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:752
+#: code:addons/marketing_campaign/models/marketing_campaign.py:578
#, python-format
msgid "Email Preview"
msgstr ""
@@ -641,8 +607,9 @@ msgid "Mode"
msgstr ""
#. module: marketing_campaign
-#: constraint:marketing.campaign.segment:0
-msgid "Model of filter must be same as resource model of Campaign "
+#: code:addons/marketing_campaign/models/marketing_campaign.py:194
+#, python-format
+msgid "Model of filter must be same as resource model of Campaign"
msgstr ""
#. module: marketing_campaign
@@ -748,11 +715,6 @@ msgstr ""
msgid "Partner Field"
msgstr ""
-#. module: marketing_campaign
-#: model:ir.filters,name:marketing_campaign.filter0
-msgid "Partners"
-msgstr ""
-
#. module: marketing_campaign
#: model:ir.ui.view,arch_db:marketing_campaign.view_marketing_campaign_workitem_form
#: model:ir.ui.view,arch_db:marketing_campaign.view_marketing_campaign_workitem_tree
@@ -788,7 +750,7 @@ msgstr ""
#. module: marketing_campaign
#: model:ir.model.fields,field_description:marketing_campaign.field_marketing_campaign_activity_report_id
-#: selection:marketing.campaign.activity,type:0
+#: selection:marketing.campaign.activity,action_type:0
msgid "Report"
msgstr ""
@@ -935,9 +897,10 @@ msgstr ""
#. module: marketing_campaign
#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_mode
-msgid "Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports.\n"
+msgid "Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports. \n"
"Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.\n"
-"With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to \n"
+" validate all workitem manually.\n"
"Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"
msgstr ""
@@ -957,8 +920,9 @@ msgid "Test in Realtime"
msgstr ""
#. module: marketing_campaign
-#: constraint:marketing.campaign.transition:0
-msgid "The To/From Activity of transition must be of the same Campaign "
+#: code:addons/marketing_campaign/models/marketing_campaign.py:393
+#, python-format
+msgid "The To/From Activity of transition must be of the same Campaign"
msgstr ""
#. module: marketing_campaign
@@ -967,25 +931,25 @@ msgid "The action to perform when this activity is activated"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:114
+#: code:addons/marketing_campaign/models/marketing_campaign.py:103
#, python-format
msgid "The campaign cannot be marked as done before all segments are closed."
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:104
+#: code:addons/marketing_campaign/models/marketing_campaign.py:95
#, python-format
msgid "The campaign cannot be started. It does not have any starting activity. Modify campaign's activities to mark one as the starting point."
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:92
+#: code:addons/marketing_campaign/models/marketing_campaign.py:83
#, python-format
msgid "The campaign cannot be started. There are no activities in it."
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:777
+#: code:addons/marketing_campaign/models/marketing_campaign.py:601
#, python-format
msgid "The current step for this item has no email or report to preview."
msgstr ""
@@ -1011,12 +975,11 @@ msgid "The report to generate when this activity is activated"
msgstr ""
#. module: marketing_campaign
-#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_activity_type
+#: model:ir.model.fields,help:marketing_campaign.field_marketing_campaign_activity_action_type
msgid "The type of action to execute when an item enters this activity, such as:\n"
-" - Email: send an email using a predefined email template\n"
-" - Report: print an existing Report defined on the resource item and save it into a specific directory\n"
-" - Custom Action: execute a predefined action, e.g. to modify the fields of the resource record\n"
-" "
+"- Email: send an email using a predefined email template \n"
+"- Report: print an existing Report defined on the resource item and save it into a specific directory \n"
+"- Custom Action: execute a predefined action, e.g. to modify the fields of the resource record"
msgstr ""
#. module: marketing_campaign
@@ -1043,7 +1006,7 @@ msgid "Trigger"
msgstr ""
#. module: marketing_campaign
-#: model:ir.model.fields,field_description:marketing_campaign.field_marketing_campaign_activity_type
+#: model:ir.model.fields,field_description:marketing_campaign.field_marketing_campaign_activity_action_type
msgid "Type"
msgstr ""
@@ -1062,11 +1025,6 @@ msgstr ""
msgid "Variable Cost"
msgstr ""
-#. module: marketing_campaign
-#: model:mail.template,subject:marketing_campaign.email_template_1
-msgid "Welcome to the Odoo Partner Channel!"
-msgstr ""
-
#. module: marketing_campaign
#: selection:marketing.campaign,mode:0
msgid "With Manual Confirmation"
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index 9c28fa6c9277a4f57322aac200395f2a9c413132..78a55bcc94aff85298cfd4a35faa3e4a43b3d5e3 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid "%<br/>\n"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:632
+#: code:addons/mass_mailing/models/mass_mailing.py:452
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -75,7 +75,6 @@ msgstr ""
#. module: mass_mailing
#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1
-#: model:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_2
msgid "<div class=\"modal-header text-center\">\n"
" <h3 class=\"modal-title mt8\">Odoo Presents</h3>\n"
"</div>\n"
@@ -87,13 +86,6 @@ msgid "<div class=\"modal-header text-center\">\n"
"<p class=\"o_message_paragraph\">Join our Marketing newsletter and get <strong>this white paper instantly</strong></p>"
msgstr ""
-#. module: mass_mailing
-#: model:mail.template,body_html:mass_mailing.newsletter_template
-msgid "<div class=\"snippet_row bg-color\" style=\"padding:0px;width:600px;margin:auto;background: #ffffff repeat top /100%\">\n"
-" <table cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse:collapse\" width=\"100%\"><tbody><tr><td style=\"padding:10px 10px 10px 5px\" valign=\"center\" width=\"270\"> <a style=\"text-decoration:none\" href=\"http://www.example.com\"><strong>My Company</strong></a> </td><td style=\"padding:10px 15px 10px 10px;vertical-align:middle\" valign=\"center\" width=\"270\"><table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse:collapse\"><tbody><tr><td align=\"right\"><a href=\"https://www.facebook.com/Odoo\"><span class=\"fa fa-facebook-square fa-2x\" style=\"color:#44B7B7;\"></span></a></td><td align=\"right\" style=\"padding-left:5px\"><a href=\"https://www.facebook.com/Odoo\"><span class=\"fa fa-google-plus-square fa-2x\" style=\"color:#44B7B7;\"></span></a></td><td align=\"right\" style=\"padding-left:5px\"><a href=\"https://www.facebook.com/Odoo\"><span class=\"fa fa-linkedin-square fa-2x\" style=\"color:#44B7B7;\"></span></a></td><td align=\"right\" style=\"padding-left:5px\"><a href=\"https://www.facebook.com/Odoo\"><span class=\"fa fa-twitter-square fa-2x\" style=\"color:#44B7B7;\"></span></a></td></tr></tbody></table></td></tr></tbody></table></div><div style=\"padding:0px;width:600px;margin:auto;background-color:#44B7B7;color:#168484\"><table cellpadding=\"0\" cellspacing=\"0\" style=\"width:100%;background-color:inherit;border-collapse:collapse;color:inherit\"><tbody><tr><td class=\"col_mv bg-color\" style=\"text-align:left; padding-left:20px;vertical-align:middle;font-size:14px\"><p style=\"margin:0;font-size:20px;color:#fff\">You get a 20% discount for signing up!</p><p style=\"margin:0\">Discount Code: <strong>45A9E77DGW8455</strong></p></td><td class=\"col_mv bg-color\" style=\"padding:20px;text-align:center;vertical-align:middle\"> <span class=\"fa fa-6x fa-ticket\"></span> </td></tr></tbody></table></div><div class=\"snippet_row bg-color\" style=\"padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#168484\"><table style=\"width:100%;text-align:justify;margin:0 auto;inherit;border-collapse:collapse;color:inherit\"><tbody><tr><td style=\"padding:10px 30px;font-size:14px;line-height:20px\"><p style=\"margin:0\">Dear ${object.name}</p><p style=\"margin:0\">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br></p><p style=\"margin:0\">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p><p style=\"margin:0\">Kind Regards,</p><p style=\"margin:0\">Michael Fletcher</p></td></tr></tbody></table></div><div style=\"padding:0;width:600px;max-width:600px;margin:0 auto\"><table style=\"width:100%;text-align:justify;margin:0 auto;background-color:inherit;border-collapse:collapse\"><tbody><tr><td class=\"col_mv bg-color\" style=\"padding:10px 0;background-color:#168484;color:#fff\"><table style=\"border-collapse:collapse;background-color:inherit\"><tbody><tr><td rowspan=\"2\" style=\"padding-left:10px\"> <span class=\"fa fa-check fa-3x\"></span> </td><td style=\"padding-left:10px;color:#fff;font-size:14px\"><p style=\"font-weight:bold;font-size:18px;margin:0 0 3px 0\">Step 1:</p><p style=\"margin:0\">Place Order</p></td></tr></tbody></table></td><td class=\"col_mv bg-color\" style=\"padding:10px 0;background-color:#FFFFFF;color:#808080\"><table style=\"border-collapse:collapse;background-color:inherit\"><tbody><tr><td rowspan=\"2\" style=\"padding-left:10px\"> <span class=\"fa fa-truck fa-3x\"></span> </td><td style=\"padding-left:10px;color:#808080;font-size:14px\"><p style=\"font-weight:bold;font-size:18px;margin:0 0 3px 0\">Step 2:</p><p style=\"margin:0\">Shipping</p></td></tr></tbody></table></td><td class=\"col_mv bg-color\" style=\"padding:10px 0;background-color:#FFFFFF;color:#808080\"><table style=\"border-collapse:collapse;background-color:inherit\"><tbody><tr><td rowspan=\"2\" style=\"padding-left:10px\"> <span class=\"fa fa-dollar fa-3x\"></span> </td><td style=\"padding-left:10px;color:#808080;font-size:14px\"><p style=\"font-weight:bold;font-size:18px;margin:0 0 3px 0\">Step 3:</p><p style=\"margin:0\">Payment</p></td></tr></tbody></table></td></tr></tbody></table></div><div class=\"snippet_row bg-color\" style=\"padding:0px;width:600px;margin:auto;background: #414141 repeat top /100%;color:#44B7B7\"><div style=\"padding:10px\"><table cellpadding=\"0\" cellspacing=\"0\" style=\"margin: 0 auto;width:100%;border-collapse:collapse;color:inherit;color:inherit\"><tbody><tr><td style=\"text-align:center\"> <a style=\"text-decoration: none;\" href=\"https://www.facebook.com/Odoo\"><span class=\"fa fa-facebook-square fa-2x\"></span></a><a style=\"text-decoration: none;\" href=\"https://plus.google.com/+Odooapps\"><span class=\"fa fa-google-plus-square fa-2x\"></span></a><a style=\"text-decoration: none;\" href=\"https://www.linkedin.com/company/odoo\"><span class=\"fa fa-linkedin-square fa-2x\"></span></a><a style=\"text-decoration: none;\" href=\"https://twitter.com/Odoo\"><span class=\"fa fa-twitter-square fa-2x\"></span></a> </td></tr><tr><td style=\"font-size:12px;text-align:center;padding-top:10px;padding-bottom:5px\"> <a href=\"/unsubscribe_from_list\" style=\"color:#44B7B7\">Unsubscribe</a>|<a href=\"/page/contactus\" style=\"color:#44B7B7\">Contact</a> </td></tr></tbody></table></div>\n"
-" </div>"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "<span class=\"fa-stack\">\n"
@@ -134,7 +126,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "<strong>My Company</strong>"
msgstr ""
@@ -190,6 +181,11 @@ msgstr ""
msgid "Archived"
msgstr ""
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_maintenance_equipment_category
+msgid "Asset Category"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Attach a file"
@@ -238,7 +234,12 @@ msgid "Bounced Ratio"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3605
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_bounced_ratio
+msgid "Bounced ratio"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3637
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Campaign"
msgstr ""
@@ -254,6 +255,13 @@ msgstr ""
msgid "Campaign Stages"
msgstr ""
+#. module: mass_mailing
+#: model:ir.actions.act_window,name:mass_mailing.mass_mailing_tag_action
+#: model:ir.ui.menu,name:mass_mailing.mass_mailing_tag_menu
+#: model:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_tag_view_form
+msgid "Campaign Tags"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign
#: model:ir.ui.menu,name:mass_mailing.menu_email_campaigns
@@ -296,6 +304,16 @@ msgstr ""
msgid "Click here to create a new mailing."
msgstr ""
+#. module: mass_mailing
+#: model:ir.actions.act_window,help:mass_mailing.action_email_template_marketing
+msgid "Click here to create a new template."
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.actions.act_window,help:mass_mailing.mass_mailing_tag_action
+msgid "Click to add a new tag."
+msgstr ""
+
#. module: mass_mailing
#: model:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_contacts_from_list
msgid "Click to create a recipient."
@@ -344,7 +362,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Contact"
msgstr ""
@@ -445,7 +462,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Dear ${object.name}"
msgstr ""
@@ -475,21 +491,11 @@ msgstr ""
msgid "Delivered"
msgstr ""
-#. module: mass_mailing
-#: model:ir.model,name:mass_mailing.model_hr_department
-msgid "Department"
-msgstr ""
-
#. module: mass_mailing
#: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_2
msgid "Design"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Discount Code: <strong>45A9E77DGW8455</strong>"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_channel
msgid "Discussion channel"
@@ -535,7 +541,7 @@ msgid "Domain"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:640
+#: code:addons/mass_mailing/models/mass_mailing.py:460
#: selection:mail.mass_mailing,state:0
#: selection:mail.statistics.report,state:0
#, python-format
@@ -588,6 +594,11 @@ msgstr ""
msgid "Employee"
msgstr ""
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_maintenance_equipment
+msgid "Equipment"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_event_event
msgid "Event"
@@ -625,12 +636,6 @@ msgstr ""
msgid "Failed"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,name:mass_mailing.mass_mail_1
-#: model:utm.source,name:mass_mailing.mass_mail_1_utm_source
-msgid "First Newsletter"
-msgstr ""
-
#. module: mass_mailing
#: selection:mail.mass_mailing,reply_to_mode:0
msgid "Followers of leads/applicants"
@@ -654,15 +659,9 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest."
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br>"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br/>"
@@ -687,6 +686,11 @@ msgstr ""
msgid "Here you can design your own template from scratch by selecting your favorite theme."
msgstr ""
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_hr_department
+msgid "Hr Department"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id
@@ -712,7 +716,7 @@ msgid "If checked, recipients will be mailed only once, allowing to send various
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:640
+#: code:addons/mass_mailing/models/mass_mailing.py:460
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "In Queue"
@@ -735,7 +739,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Kind Regards,"
msgstr ""
@@ -836,6 +839,11 @@ msgstr ""
msgid "Mail Templates"
msgstr ""
+#. module: mass_mailing
+#: model:ir.actions.act_window,help:mass_mailing.action_email_template_marketing
+msgid "Mail templates are meant to design e-mails that can be used for several mass mailing campaigns."
+msgstr ""
+
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_test_mass_mailing_id
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -843,7 +851,7 @@ msgid "Mailing"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:431
+#: code:addons/mass_mailing/models/mass_mailing.py:304
#: model:ir.model,name:mass_mailing.model_mail_mass_mailing_list
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message_mailing_list_ids
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_id
@@ -904,6 +912,11 @@ msgstr ""
msgid "Mailings"
msgstr ""
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_maintenance_request
+msgid "Maintenance Requests"
+msgstr ""
+
#. module: mass_mailing
#: model:res.groups,name:mass_mailing.group_mass_mailing_campaign
msgid "Manage Mass Mailing Campaigns"
@@ -1024,6 +1037,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_mass_mailing_themes
+#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
msgid "Mass mailing themes"
msgstr ""
@@ -1040,10 +1054,14 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Michael Fletcher"
msgstr ""
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+msgid "More Info"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "My Account"
@@ -1056,13 +1074,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing.campaign,name:mass_mailing.mass_mail_campaign_1
-#: model:mail.template,subject:mass_mailing.newsletter_template
-#: model:utm.campaign,name:mass_mailing.mass_mail_campaign_1_utm_campaign
-msgid "Newsletter"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_next_departure
msgid "Next Departure"
@@ -1137,23 +1148,13 @@ msgstr ""
msgid "Partner"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Payment"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_ab_pc
msgid "Percentage of the contacts that will be mailed. Recipients will be taken randomly."
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Place Order"
-msgstr ""
-
-#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:764
+#: code:addons/mass_mailing/models/mass_mailing.py:578
#, python-format
msgid "Please select recipients."
msgstr ""
@@ -1286,20 +1287,14 @@ msgstr ""
msgid "Scheduled"
msgstr ""
-#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_scheduled_date
-msgid "Scheduled Date"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
msgid "Scheduled Month"
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,name:mass_mailing.mass_mail_2
-#: model:utm.source,name:mass_mailing.mass_mail_2_utm_source
-msgid "Second Newsletter"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_scheduled_date
+msgid "Scheduled date"
msgstr ""
#. module: mass_mailing
@@ -1359,14 +1354,14 @@ msgid "Send to All"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:640
+#: code:addons/mass_mailing/models/mass_mailing.py:460
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "Sending"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:640
+#: code:addons/mass_mailing/models/mass_mailing.py:460
#: 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
@@ -1410,11 +1405,6 @@ msgstr ""
msgid "Settings"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Shipping"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
msgid "Source"
@@ -1471,31 +1461,16 @@ msgstr ""
msgid "Step 1"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Step 1:"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "Step 2"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Step 2:"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "Step 3"
msgstr ""
-#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Step 3:"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_source_id
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -1524,7 +1499,7 @@ msgid "Templates"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:716
+#: code:addons/mass_mailing/models/mass_mailing.py:515
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
#, python-format
msgid "Test Mailing"
@@ -1563,7 +1538,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_3605
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3637
msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
msgstr ""
@@ -1578,6 +1553,11 @@ msgstr ""
msgid "Total"
msgstr ""
+#. module: mass_mailing
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_links_search
+msgid "Tracked Link"
+msgstr ""
+
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
msgid "Tracking"
@@ -1590,7 +1570,6 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Unsubscribe"
msgstr ""
@@ -1635,12 +1614,7 @@ msgid "Website Popup Redirect URL"
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "You get a 20% discount for signing up!"
-msgstr ""
-
-#. module: mass_mailing
-#: code:addons/mass_mailing/controllers/main.py:25
+#: code:addons/mass_mailing/controllers/main.py:26
#, python-format
msgid "You have been unsubscribed successfully"
msgstr ""
@@ -1705,11 +1679,6 @@ msgstr ""
msgid "template"
msgstr ""
-#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_bounced_ratio
-msgid "unknown"
-msgstr ""
-
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "© 2014 All Rights Reserved"
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 2c85daf1ccb72199b4fe4a0a3839e83abc0f824d..9fc5b4806511f3aca31e1ec616821d81a7b43225 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. module: membership
#: model:ir.model.fields,help:membership.field_res_partner_associate_member
-msgid "A member with whom you want to associate your membership.It will consider the membership state of the associated member."
+msgid "A member with whom you want to associate your membership. It will consider the membership state of the associated member."
msgstr ""
#. module: membership
@@ -219,15 +219,11 @@ msgid "Error ! Ending Date cannot be set before Beginning Date."
msgstr ""
#. module: membership
-#: constraint:res.partner:0
+#: code:addons/membership/models/partner.py:159
+#, python-format
msgid "Error ! You cannot create recursive associated members."
msgstr ""
-#. module: membership
-#: constraint:membership.membership_line:0
-msgid "Error, this membership product is out of date"
-msgstr ""
-
#. module: membership
#: model:ir.ui.view,arch_db:membership.view_report_membership_search
msgid "Forecast"
@@ -317,12 +313,12 @@ msgstr ""
#. module: membership
#: model:ir.model.fields,help:membership.field_membership_membership_line_state
msgid "It indicates the membership status.\n"
-" -Non Member: A member who has not applied for any membership.\n"
-" -Cancelled Member: A member who has cancelled his membership.\n"
-" -Old Member: A member whose membership date has expired.\n"
-" -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
-" -Invoiced Member: A member whose invoice has been created.\n"
-" -Paid Member: A member who has paid the membership amount."
+"-Non Member: A member who has not applied for any membership.\n"
+"-Cancelled Member: A member who has cancelled his membership.\n"
+"-Old Member: A member whose membership date has expired.\n"
+"-Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n"
+"-Invoiced Member: A member whose invoice has been created.\n"
+"-Paid Member: A member who has paid the membership amount."
msgstr ""
#. module: membership
@@ -506,13 +502,13 @@ msgid "Partner"
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:351
+#: code:addons/membership/models/partner.py:182
#, python-format
msgid "Partner doesn't have an address to make the invoice."
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:349
+#: code:addons/membership/models/partner.py:180
#, python-format
msgid "Partner is a free Member."
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 213419b20fa04896cc946964413ac4025c88324f..91958e313f3c472af3edcad905e207dd0b6e4df4 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: mrp
-#: code:addons/mrp/stock.py:231
+#: code:addons/mrp/models/stock_warehouse.py:43
#, python-format
msgid " Manufacture"
msgstr ""
@@ -27,6 +27,11 @@ msgstr ""
msgid "# Bill of Material"
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_workorder_done_count
+msgid "# Done Work Orders"
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_product_product_mo_count
#: model:ir.model.fields,field_description:mrp.field_product_template_mo_count
@@ -34,46 +39,106 @@ msgid "# Manufacturing Orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:341
-#, python-format
-msgid "%s (copy)"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_workorder_ready_count
+msgid "# Read Work Orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:1052
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_workorder_count
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_workorder_count
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_workorder_count
+msgid "# Work Orders"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:262
#, python-format
-msgid "%s produced"
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to upload files to your product.\n"
+" </p><p>\n"
+" Use this feature to store any files, like drawings or specifications.\n"
+" </p>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "<span class=\"label label-danger\" attrs=\"{'invisible': ['|', ('availability', 'in', ('assigned', 'none')), ('state', 'not in', ('confirmed','progress'))]}\">Raw materials not available!</span>"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_product_produce_mode
-msgid "'Consume only' mode will only consume the products with the quantity selected.\n"
-"'Consume & Produce' mode will consume as well as produce the products with the quantity selected and it will finish the production order when total ordered quantities are produced."
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "<span class=\"o_stat_text\">Lost</span>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Consumed Products</strong>"
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "<span class=\"o_stat_text\">OEE</span>"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Destination Location</strong>"
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "<span class=\"o_stat_text\">Performance</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "<span class=\"o_stat_text\">Scraps</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
+msgid "<span class=\"o_stat_text\">Time<br/> Analysis</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "<span class=\"o_stat_text\">Work Orders</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "<span>Actions</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+msgid "<span>New</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "<span>Plan Orders</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "<span>Reports</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+msgid "<span>View</span>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "<span>Work Orders</span>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Name</strong>"
+msgid "<strong>Destination Location</strong>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>No. Of Cycles</strong>"
+msgid "<strong>Name</strong>"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>No. Of Hours</strong>"
+msgid "<strong>No. Of Minutes</strong>"
msgstr ""
#. module: mrp
@@ -121,11 +186,6 @@ msgstr ""
msgid "<strong>Scheduled Date:</strong><br/>"
msgstr ""
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "<strong>Sequence</strong>"
-msgstr ""
-
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.report_mrporder
msgid "<strong>Source Document:</strong><br/>"
@@ -147,18 +207,15 @@ msgid "<strong>WorkCenter</strong>"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_product_efficiency
-msgid "A factor of 0.9 means a loss of 10% during the production process."
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_product_efficiency
-msgid "A factor of 0.9 means a loss of 10% within the production process."
+#: code:addons/mrp/models/mrp_workorder.py:418
+#, python-format
+msgid "A Manufacturing Order is already done or cancelled!"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_waiting
msgid "A manufacturing order, based on a bill of materials, will\n"
" consume raw materials and produce finished products."
msgstr ""
@@ -167,29 +224,40 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_active
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_active
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_active
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
msgid "Active"
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:51
-#, python-format
-msgid "Active Id not found"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_active_move_lot_ids
+msgid "Active move lot ids"
msgstr ""
#. module: mrp
-#: sql_constraint:mrp.bom.line:0
-msgid "All product quantities must be greater than 0.\n"
-"You should install the mrp_byproduct module if you want to manage extra products on BoMs !"
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
+msgid "Add a description..."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+msgid "All"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,ready_to_produce:0
+msgid "All components available"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,module_mrp_operations:0
-msgid "Allow detailed planning of work orders"
+#: sql_constraint:mrp.bom.line:0
+msgid "All product quantities must be greater than 0.\n"
+"You should install the mrp_byproduct module if you want to manage extra products on BoMs !"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_config_settings_group_rounding_efficiency
-msgid "Allow to manage product rounding on quantity and product efficiency during production process"
+#: model:ir.actions.act_window,help:mrp.mrp_unbuild
+msgid "An unbuild order will do a reverse bill of materials, unbuilding products\n"
+" you produced, but you can also use it to unbuild products you purchased."
msgstr ""
#. module: mrp
@@ -203,14 +271,45 @@ msgid "Approve"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_product_product_produce_delay
-#: model:ir.model.fields,help:mrp.field_product_template_produce_delay
-msgid "Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
+msgid "Archived"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Awaiting Raw Materials"
+#: code:addons/mrp/models/mrp_bom.py:254
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
+msgid "Author"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_availability
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_availability
+#: selection:mrp.workcenter.productivity.loss,loss_type:0
+msgid "Availability"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Availability Losses"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: selection:mrp.production,availability:0
+msgid "Available"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_product_product_produce_delay
+#: model:ir.model.fields,help:mrp.field_product_template_produce_delay
+msgid "Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."
msgstr ""
#. module: mrp
@@ -219,7 +318,7 @@ msgid "BOM Cost"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrpbomstructure
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
msgid "BOM Name"
msgstr ""
@@ -229,13 +328,13 @@ msgid "BOM Product Variants needed form apply this line."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrpbomstructure
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
msgid "BOM Ref"
msgstr ""
#. module: mrp
#: model:ir.actions.report.xml,name:mrp.action_report_bom_structure
-#: model:ir.ui.view,arch_db:mrp.report_mrpbomstructure
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
msgid "BOM Structure"
msgstr ""
@@ -245,9 +344,8 @@ msgid "BOM lines of the referred bom"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:25
-#, python-format
-msgid "Because the product %s requires it, you must assign a serial number to your raw material %s to proceed further in your production. Please use the 'Produce' button to do so."
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_time_mode_batch
+msgid "Based on"
msgstr ""
#. module: mrp
@@ -258,7 +356,9 @@ msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_bom_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_bom_id
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
msgid "Bill of Material"
msgstr ""
@@ -278,7 +378,7 @@ msgid "Bill of Materials"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action2
+#: model:ir.actions.act_window,name:mrp.mrp_bom_line_action_from_bom
msgid "Bill of Materials Structure"
msgstr ""
@@ -299,15 +399,42 @@ msgstr ""
msgid "Bills of materials may produce residual products (A + B --> C + D)"
msgstr ""
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
+msgid "Block"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_block_workcenter
+#: model:ir.actions.act_window,name:mrp.act_mrp_block_workcenter_wo
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
+msgid "Block Workcenter"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter,working_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_blocked_time
+msgid "Blocked Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_blocked_time
+msgid "Blocked hours over the last month"
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_procurement_order_bom_id
msgid "BoM"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:316
-#, python-format
-msgid "BoM \"%s\" contains a BoM line with a product recursion: \"%s\"."
+#: model:ir.model.fields,field_description:mrp.field_stock_move_bom_line_id
+msgid "BoM Line"
msgstr ""
#. module: mrp
@@ -321,27 +448,30 @@ msgid "BoM Type"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,tracking:0
-msgid "By Lots"
+#: code:addons/mrp/models/mrp_bom.py:67
+#, python-format
+msgid "BoM line product %s should not be same as BoM product."
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,tracking:0
-msgid "By Unique Serial Number"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_byproduct
+msgid "By-Products"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_byproduct
-msgid "By-Products"
+#: model:ir.model.fields,field_description:mrp.field_product_product_can_be_expensed
+msgid "Can be Expensed"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:228
+#: code:addons/mrp/models/stock_warehouse.py:36
#, python-format
msgid "Can't find any generic Manufacture route."
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form
#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
#: model:ir.ui.view,arch_db:mrp.view_mrp_config
#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
@@ -349,63 +479,54 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Cancel Production"
-msgstr ""
-
#. module: mrp
#: selection:mrp.production,state:0
+#: selection:mrp.workorder,state:0
msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:150
-#, python-format
-msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/models/mrp_production.py:258
#, python-format
-msgid "Cannot delete a manufacturing order in state '%s'."
+msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:719
+#: code:addons/mrp/wizard/change_production_qty.py:56
+#: code:addons/mrp/wizard/change_production_qty.py:59
#, python-format
-msgid "Cannot find a bill of material for this product."
+msgid "Cannot find bill of material for this production."
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:67
-#: code:addons/mrp/wizard/change_production_qty.py:72
-#, python-format
-msgid "Cannot find bill of material for this product."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_capacity
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_capacity
+msgid "Capacity"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
-msgid "Capacity Information"
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
+#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
+msgid "Change Product Qty"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_capacity_per_cycle
-msgid "Capacity per Cycle"
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_change_production_qty
-#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
-msgid "Change Product Qty"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_check_to_done
+msgid "Check Produced Qty"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_change_production_qty
-msgid "Change Quantity of Products"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Check availability"
msgstr ""
#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_work_orders
#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
msgid "Click to add a work center."
msgstr ""
@@ -415,19 +536,14 @@ msgstr ""
msgid "Click to create a bill of material."
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "Click to create a group of properties."
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
msgid "Click to create a manufacturing order."
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "Click to create a new property."
+#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
+msgid "Click to create a new message."
msgstr ""
#. module: mrp
@@ -435,17 +551,36 @@ msgstr ""
msgid "Click to create a new routing."
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_unbuild
+msgid "Click to start a new Unbuild Order"
+msgstr ""
+
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_waiting
msgid "Click to start a new manufacturing order."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_code
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production_specific
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_workcenter
+#: model:ir.actions.act_window,help:mrp.mrp_workorder_todo
+msgid "Click to start a new work order."
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_code
msgid "Code"
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_color
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_color
+msgid "Color"
+msgstr ""
+
#. module: mrp
#: model:ir.model,name:mrp.model_res_company
msgid "Companies"
@@ -471,8 +606,8 @@ msgid "Components"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Compute Data"
+#: selection:mrp.routing.workcenter,time_mode:0
+msgid "Compute based on real time"
msgstr ""
#. module: mrp
@@ -487,72 +622,81 @@ msgid "Configure Manufacturing"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
-msgid "Confirm"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: selection:mrp.production,state:0
+msgid "Confirmed"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Confirm Production"
+#: model:ir.actions.act_window,name:mrp.move_consume
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
+msgid "Consume Move"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,mode:0
-msgid "Consume & Produce"
+#: model:ir.model,name:mrp.model_stock_move_consume
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
+msgid "Consume Products"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
-msgid "Consume Lines"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_unbuild_id
+msgid "Consume Unbuild Order"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.move_consume
-#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
-msgid "Consume Move"
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_consume_line_ids
+msgid "Consume line ids"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,mode:0
-msgid "Consume Only"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Consumed"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_stock_move_consume
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
-msgid "Consume Products"
+msgid "Consumed Materials"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_lines2
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Consumed Products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_operation_id
+msgid "Consumed in Operation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_quant_consumed_quant_ids
+msgid "Consumed quant ids"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_consumed_for
-msgid "Consumed for"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Continue Production"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Cost Structure"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_cycle
-msgid "Cost per cycle"
+#: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_late
+msgid "Count mo late"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_hour
-msgid "Cost per hour"
+#: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_todo
+msgid "Count mo todo"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
-msgid "Costing Information"
+#: model:ir.model.fields,field_description:mrp.field_stock_picking_type_count_mo_waiting
+msgid "Count mo waiting"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Create Workorders"
msgstr ""
#. module: mrp
@@ -560,17 +704,18 @@ 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_message_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_create_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_create_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_create_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_create_uid
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_create_uid
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_create_uid
msgid "Created by"
msgstr ""
@@ -579,37 +724,60 @@ 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_message_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_create_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_create_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_create_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_create_date
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_create_date
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_create_date
msgid "Created on"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_cycle_account_id
-msgid "Cycle Account"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_final_lot_id
+msgid "Current Lot"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Default Unit of Measure"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Current Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Current Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_qty_producing
+msgid "Currently Produced Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_dashboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Date"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
+msgid "Default Duration"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "Define specific property groups that can be assigned to your\n"
-" bill of materials and sales orders. Properties allows Odoo\n"
-" to automatically select the right bill of materials according\n"
-" to properties selected in the sales order by salesperson."
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
+msgid "Default Unit of Measure"
msgstr ""
#. module: mrp
@@ -618,25 +786,35 @@ msgid "Define the schedule of resource"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_description
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_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
-#: model:ir.ui.view,arch_db:mrp.mrp_property_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_property_group_form_view
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_description
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
msgid "Description"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter_note
-msgid "Description of the Work Center. Explain here what's a cycle according to this Work Center."
+msgid "Description of the Work Center."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Destination Loc."
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "Description of the work center..."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_location_dest_id
+msgid "Destination Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
+msgid "Discard"
msgstr ""
#. module: mrp
@@ -644,152 +822,266 @@ 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_message_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_production_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_display_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_display_name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_display_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_display_name
#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost_display_name
#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout_display_name
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure_display_name
#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_display_name
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_display_name
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_display_name
msgid "Display Name"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,module_mrp_operations:0
-msgid "Do not use a planning for the work orders "
+#: model:ir.model.fields,field_description:mrp.field_stock_move_is_done
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_quantity_done
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+#: selection:mrp.production,state:0
+#: selection:mrp.unbuild,state:0
+msgid "Done"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Done"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_wo
+msgid "Done for Work Order"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_efficiency
-msgid "Efficiency Factor"
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: selection:mrp.unbuild,state:0
+msgid "Draft"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_finished
-msgid "End Date"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_time_cycle
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_duration
+#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_duration
+#: model:ir.ui.view,arch_db:mrp.oee_tree_view
+msgid "Duration"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Extra Information"
+#: model:ir.ui.view,arch_db:mrp.oee_tree_view
+msgid "Duration (hours)"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_costs_cycle_account_id
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_costs_hour_account_id
-msgid "Fill this only if you want automatic analytic accounting entries on production orders."
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_time_mode
+msgid "Duration Computation"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_product_id
-msgid "Fill this product to easily track your production costs in the analytic accounting."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration_percent
+msgid "Duration Deviation (%)"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Finished Products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration_unit
+msgid "Duration Per Unit"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_location_dest_id
-msgid "Finished Products Location"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Effective Date"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "For instance, in the property group \"Warranty\", you an have\n"
-" two properties: 1 year warranty, 3 years warranty. Depending\n"
-" on the propoerties selected in the sales order, Odoo will\n"
-" schedule a production using the matching bill of materials."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_finished
+msgid "Effective End Date"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Force Reservation"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_start
+msgid "Effective Start Date"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_general_account_id
-msgid "General Account"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_loss_type
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_type
+msgid "Effectiveness Category"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
-msgid "General Information"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Efficiency"
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."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_efficiency
+msgid "Efficiency Factor"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_sequence
-msgid "Gives the sequence order when displaying a list of routing Work Centers."
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_finished
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_date_end
+msgid "End Date"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_sequence
-msgid "Gives the sequence order when displaying a list of work orders."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Expected Date"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_sequence
-msgid "Gives the sequence order when displaying."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration_expected
+msgid "Expected Duration"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
-msgid "Group By"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_planned_finished
+msgid "Expected End Date"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
-msgid "Group By..."
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_planned_start
+msgid "Expected Start Date"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_hour_account_id
-msgid "Hour Account"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_duration_expected
+msgid "Expected duration (in minutes)"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_change_production_qty_id
-#: 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_product_produce_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_id
+#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+msgid "Extra Features"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+msgid "Filters"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Finish Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: selection:mrp.workorder,state:0
+msgid "Finished"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_produced_id
+msgid "Finished Lot"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_finished_ids
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Finished Products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_location_dest_id
+msgid "Finished Products Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Fully Productive"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "General Information"
+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 ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_sequence
+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 ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom_line_sequence
+msgid "Gives the sequence order when displaying."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Group By"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Group by..."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_has_attachments
+msgid "Has Attachments"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_has_moves
+msgid "Has moves"
+msgstr ""
+
+#. module: mrp
+#: selection:ir.attachment,priority:0
+msgid "High"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_change_production_qty_id
+#: 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_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
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_id
#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost_id
#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout_id
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure_id
#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_id
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_id
msgid "ID"
msgstr ""
@@ -798,6 +1090,11 @@ msgstr ""
msgid "If a product variant is defined the BOM is available only for this product."
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_production_propagate
+msgid "If checked, when the previous move of the move (which was generated by a next procurement) is cancelled or split, the move generated by this move will too"
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_bom_active
msgid "If the active field is set to False, it will allow you to hide the bills of material without removing it."
@@ -814,24 +1111,73 @@ msgid "If the active field is set to False, it will allow you to hide the routin
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "In Production"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: selection:mrp.production,state:0
+#: selection:mrp.workcenter,working_state:0
+#: selection:mrp.workorder,state:0
+msgid "In Progress"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
-msgid "Inactive"
+#: model:ir.model.fields,help:mrp.field_stock_move_lots_lot_produced_qty
+msgid "Informative, not used in matching"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
+msgid "Inventory Message"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_post_visible
+msgid "Inventory Post Visible"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_move_lot_ids
+msgid "Inventory moves for which you must scan a lot number at this work order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_is_user_working
+msgid "Is Current User Working"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_manual
+msgid "Is a Blocking Reason"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_is_produced
+msgid "Is produced"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_position
-msgid "Internal Reference"
+#: code:addons/mrp/models/mrp_workcenter.py:144
+#, python-format
+msgid "It has been unblocked already. "
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_routing_location_id
-msgid "Keep empty if you produce at the location where the finished products are needed.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
+msgid "Keep empty if you produce at the location where you find the raw materials.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_bom_type
+msgid "Kit (Phantom): When processing a sales order for this product, the delivery order will contain the raw materials, instead of the finished product."
msgstr ""
#. module: mrp
@@ -839,21 +1185,22 @@ 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_message___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_production___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_property___last_update
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_routing___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild___last_update
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss___last_update
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder___last_update
#: model:ir.model.fields,field_description:mrp.field_report_mrp_bom_cost___last_update
#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout___last_update
#: model:ir.model.fields,field_description:mrp.field_report_mrp_report_mrpbomstructure___last_update
#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load___last_update
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume___last_update
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots___last_update
msgid "Last Modified on"
msgstr ""
@@ -862,17 +1209,18 @@ 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_product_produce_line_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_product_line_write_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_write_uid
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_write_uid
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_write_uid
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_write_uid
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_write_uid
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_write_uid
msgid "Last Updated by"
msgstr ""
@@ -881,26 +1229,32 @@ 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_product_produce_line_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_product_line_write_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_production_write_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_write_date
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_write_date
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_write_date
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_write_date
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_write_date
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_write_date
msgid "Last Updated on"
msgstr ""
#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
msgid "Late"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_location_id
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_location_id
msgid "Location"
msgstr ""
@@ -916,17 +1270,45 @@ msgid "Location where the system will stock the finished products."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_lot_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9320
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Loss Reason"
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_lot_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_lot_id
#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_restrict_lot_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_id
msgid "Lot"
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_move_lot_ids
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
+msgid "Lots"
+msgstr ""
+
+#. module: mrp
+#: selection:ir.attachment,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_maintenance
+msgid "Maintenance"
+msgstr ""
+
#. module: mrp
#: model:res.groups,name:mrp.group_mrp_routings
msgid "Manage Work Order Operations"
msgstr ""
+#. module: mrp
+#: selection:mrp.config.settings,module_mrp_plm:0
+msgid "Manage engineering changes, versions and documents"
+msgstr ""
+
#. module: mrp
#: selection:mrp.config.settings,group_mrp_routings:0
msgid "Manage production by manufacturing orders"
@@ -938,23 +1320,23 @@ msgid "Manage production by work orders"
msgstr ""
#. module: mrp
-#: model:res.groups,name:mrp.group_rounding_efficiency
-msgid "Manage rounding and efficiency of BoM components"
+#: selection:mrp.config.settings,module_quality_mrp:0
+msgid "Manage quality control points, checks and measures"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,group_rounding_efficiency:0
-msgid "Manage rounding and efficiency of bills of materials components"
+#: model:res.groups,name:mrp.group_mrp_manager
+msgid "Manager"
msgstr ""
#. module: mrp
-#: model:res.groups,name:mrp.group_mrp_manager
-msgid "Manager"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_time_cycle_manual
+msgid "Manual Duration"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:15
-#: code:addons/mrp/stock.py:225
+#: code:addons/mrp/models/procurement.py:14
+#: code:addons/mrp/models/stock_warehouse.py:34
#: model:stock.location.route,name:mrp.route_warehouse0_manufacture
#, python-format
msgid "Manufacture"
@@ -976,18 +1358,14 @@ msgid "Manufacture this product"
msgstr ""
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+#: code:addons/mrp/models/stock_warehouse.py:64
#: model:ir.ui.view,arch_db:mrp.product_product_form_view_bom_button
#: model:ir.ui.view,arch_db:mrp.product_template_form_view_bom_button
+#: model:stock.picking.type,name:mrp.picking_type_manufacturing
+#, python-format
msgid "Manufacturing"
msgstr ""
-#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_efficiency
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_efficiency
-msgid "Manufacturing Efficiency"
-msgstr ""
-
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_product_product_produce_delay
#: model:ir.model.fields,field_description:mrp.field_product_template_produce_delay
@@ -996,23 +1374,32 @@ msgid "Manufacturing Lead Time"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_production_id
+#: model:ir.model.fields,field_description:mrp.field_change_production_qty_mo_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_mo_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_id
#: model:ir.model.fields,field_description:mrp.field_procurement_order_production_id
+#: model:ir.model.fields,field_description:mrp.field_stock_scrap_production_id
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
#: model:ir.ui.view,arch_db:mrp.view_mrp_config
msgid "Manufacturing Order"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:112
+#: code:addons/mrp/models/procurement.py:88
#, python-format
msgid "Manufacturing Order <em>%s</em> created."
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.act_product_mrp_production
+#: model:ir.actions.act_window,name:mrp.act_product_mrp_production_workcenter
+#: model:ir.actions.act_window,name:mrp.action_mrp_production_form
#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_picking_deshboard
#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.actions.act_window,name:mrp.mrp_production_report
#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_report
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
#: model:ir.ui.view,arch_db:mrp.view_production_calendar
@@ -1028,28 +1415,29 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Manufacturing Orders which are ready to start production."
+msgid "Manufacturing Orders which are in confirmed state."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Manufacturing Orders which are waiting for raw materials."
+#: model:ir.model.fields,field_description:mrp.field_stock_warehouse_manu_type_id
+msgid "Manufacturing Picking Type"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Manufacturing Reference"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_ready_to_produce
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+msgid "Manufacturing Readiness"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:784
-#, python-format
-msgid "Manufacturing order cancelled."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Manufacturing Reference"
msgstr ""
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_waiting
msgid "Manufacturing orders are usually proposed automatically based\n"
" on customer requirements or automated rules like the minimum\n"
" stock rule."
@@ -1057,318 +1445,535 @@ msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Mark as Started"
+msgid "Mark as Done"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
msgid "Master Data"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_mode
-msgid "Mode"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_mps
+msgid "Master Production Schedule"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
-msgid "Mrp Workcenter"
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_message
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
+msgid "Message"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_name
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_name
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
-msgid "Name"
+#: model:ir.actions.act_window,help:mrp.mrp_message_action_main
+msgid "Messages can be configurred to appear during any operation: receptions, delivery orders,\n"
+" manufacturing orders, work orders, etc."
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "New"
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Miscellaneous"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:108
-#, python-format
-msgid "No BoM exists for this product!"
+#: 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
-#: selection:mrp.product.produce,tracking:0
-msgid "No Tracking"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_move_id
+msgid "Move"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,module_mrp_byproduct:0
-msgid "No by-products in bills of materials (A + B --> C)"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_move
+msgid "Move Done"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,group_rounding_efficiency:0
-msgid "No rounding and efficiency on bills of materials"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_move_raw_ids
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Moves"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,group_product_variant:0
-msgid "No variants on products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_move_lot_ids
+msgid "Moves to Track"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Normal"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
+msgid "Mrp Workcenter"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Not urgent"
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
+msgid "My Messages"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_property_composition
-msgid "Not used in computations, for information purpose only."
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_name
+msgid "Name"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
-msgid "Notes"
+#: code:addons/mrp/models/mrp_production.py:46
+#: code:addons/mrp/models/mrp_production.py:248
+#: 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
+#, python-format
+msgid "New"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_cycle
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_cycle_nbr
-#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_cycle
-msgid "Number of Cycles"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_batch
+msgid "Next Operation"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_hour
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_hour_nbr
-#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_hour
-msgid "Number of Hours"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_next_work_order_id
+msgid "Next Work Order"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_cycle_nbr
-msgid "Number of iterations this work center has to do in the specified operation of the routing."
+#: code:addons/mrp/models/procurement.py:91
+#, python-format
+msgid "No BoM exists for this product!"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_capacity_per_cycle
-msgid "Number of operations this Work Center can do in parallel. If this Work Center represents a team of 5 workers, the capacity per cycle is 5."
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "No Routing"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
-msgid "Odoo uses these BoMs to automatically propose manufacturing\n"
-" orders according to procurement needs."
+#: selection:mrp.config.settings,module_mrp_byproduct:0
+msgid "No by-products in bills of materials (A + B --> C)"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
-msgid "Ok"
+#: model:ir.actions.act_window,help:mrp.action_mrp_routing_time
+#: model:ir.actions.act_window,help:mrp.mrp_workorder_delta_report
+msgid "No data to display. You will get here statistics about the\n"
+" work orders duration related to this routing."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
-msgid "Operation"
+#: selection:mrp.config.settings,module_mrp_maintenance:0
+msgid "No maintenance machine and work centers"
msgstr ""
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Order Planning"
+#: selection:mrp.config.settings,module_mrp_mps:0
+msgid "No need for Master Production Schedule as products have short lead times"
msgstr ""
#. module: mrp
-#: constraint:mrp.production:0
-msgid "Order quantity cannot be negative or zero!"
+#: selection:mrp.config.settings,module_mrp_plm:0
+msgid "No product lifecycle management"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_bom_id
-msgid "Parent BoM"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_loss_action
+msgid "No productivity loss defined."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_routing_id
-msgid "Parent Routing"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_report_blocked
+msgid "No productivity loss for this equipment."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Pending"
+#: selection:mrp.config.settings,module_quality_mrp:0
+msgid "No quality control"
msgstr ""
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_planning
-msgid "Planning"
+#: selection:mrp.config.settings,group_product_variant:0
+msgid "No variants on products"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:136
-#, python-format
-msgid "Please provide proper quantity."
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "No workorder currently in progress. Click to mark work center as blocked."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_priority
-msgid "Priority"
+#: selection:mrp.production,availability:0
+msgid "None"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_procurement_order
-msgid "Procurement"
+#: selection:ir.attachment,priority:0
+#: selection:mrp.workcenter,working_state:0
+msgid "Normal"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_procurement_rule
-msgid "Procurement Rule"
+#: model:ir.model.fields,help:mrp.field_stock_scrap_workorder_id
+msgid "Not to restrict or prefer quants, but informative."
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_produce_id
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
-msgid "Produce"
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
+msgid "Notes"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_created_ids2
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Produced Products"
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_capacity
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_capacity
+msgid "Number of pieces that can be produced in parallel."
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_product_product
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_tmpl_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_tmpl_id
-#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_id
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Product"
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "OEE"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_prod_id
-msgid "Product Move"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_oee_target
+msgid "OEE Target"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_product_produce
-msgid "Product Produce"
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_oee_target
+msgid "OEE Target in percentage"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_product_produce_line
-msgid "Product Produce Consume lines"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid "Odoo uses these BoMs to automatically propose manufacturing\n"
+" orders according to procurement needs."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_change_production_qty_product_qty
-msgid "Product Qty"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_oee
+msgid "Oee"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_qty
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_qty
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_product_qty
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_qty
-msgid "Product Quantity"
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
+msgid "Ok"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_rounding
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_rounding
-msgid "Product Rounding"
+#: selection:mrp.routing.workcenter,batch:0
+msgid "Once a minimum number of products is processed"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_product_template
-msgid "Product Template"
+#: selection:mrp.routing.workcenter,batch:0
+msgid "Once all products are processed"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_uom
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_uom
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_product_uom
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_uom
-#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_uom
-msgid "Product Unit of Measure"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_operation_id
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+msgid "Operation"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_id
-msgid "Product Variant"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_operation_id
+msgid "Operation To Consume"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_product_variant
-msgid "Product Variants"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_operation_ids
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
+#: model:ir.ui.view,arch_db:mrp.mrp_workorder_view_gantt
+#: model:ir.ui.view,arch_db:mrp.oee_loss_search_view
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.workcenter_line_calendar
+#: model:ir.ui.view,arch_db:mrp.workcenter_line_gantt_production
+#: model:ir.ui.view,arch_db:mrp.workcenter_line_graph
+#: model:ir.ui.view,arch_db:mrp.workcenter_line_pivot
+msgid "Operations"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Production"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_order_ids
+msgid "Orders"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_location_id
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
-msgid "Production Location"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_qty_production
+msgid "Original Production Quantity"
msgstr ""
#. module: mrp
-#: model:ir.actions.report.xml,name:mrp.action_report_production_order
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_line_production_id
-msgid "Production Order"
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_report
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_report_oee
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_productivity_report
+msgid "Overall Equipment Effectiveness"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.report_mrporder
-msgid "Production Order # :"
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_oee
+msgid "Overall Equipment Effectiveness, based on the last month"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_production_id
-msgid "Production Order for Produced Products"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_report
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_report_oee
+msgid "Overall Equipment Effectiveness: no working or blocked time."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_raw_material_production_id
-msgid "Production Order for Raw Materials"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_plm
+msgid "PLM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_bom_id
+msgid "Parent BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_routing_id
+msgid "Parent Routing"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,availability:0
+msgid "Partially Available"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Pause"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: selection:mrp.workorder,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_performance
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+#: selection:mrp.workcenter.productivity.loss,loss_type:0
+msgid "Performance"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Performance Losses"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_performance
+msgid "Performance over the last month"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_product_line
-msgid "Production Scheduled Product"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_picking_type_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_picking_type_id
+msgid "Picking Type"
msgstr ""
#. module: mrp
+#: model:ir.actions.server,name:mrp.production_order_server_action
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "Plan Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
#: selection:mrp.production,state:0
-msgid "Production Started"
+msgid "Planned"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Planned Date"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:263
+#, python-format
+msgid "Please set the quantity you produced in the Current Qty field. It can not be 0!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_plus_visible
+msgid "Plus Visible"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Production Work Centers"
+msgid "Post Inventory"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.config.settings,module_mrp_maintenance:0
+msgid "Preventive and Corrective maintenance management"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_progress
-msgid "Production progress"
+#: model:ir.model.fields,field_description:mrp.field_ir_attachment_priority
+msgid "Priority"
msgstr ""
#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_procurement_group_id
+msgid "Procurement Group"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_procurement_rule
+msgid "Procurement Rule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_produce_line_ids
+msgid "Produce line ids"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Produced"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_quant_produced_quant_ids
+msgid "Produced quant ids"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_tmpl_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_product_id
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Product"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_change_production_qty_product_qty
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_qty
+msgid "Product Quantity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_product_template
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_product_tmpl_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_tmpl_id
+msgid "Product Template"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_uom_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_uom_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_uom_id
+#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_uom
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_id
+msgid "Product Variant"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_product_variant
+msgid "Product Variants"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_consume_line_ids
+msgid "Product to Track"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_has_tracking
+msgid "Product with Tracking"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_production_id
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_location_id
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
+msgid "Production Location"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_message
+msgid "Production Message"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.report.xml,name:mrp.action_report_production_order
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_production_id
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+msgid "Production Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.report_mrporder
+msgid "Production Order # :"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_production_id
+msgid "Production Order for finished products"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_raw_material_production_id
+msgid "Production Order for raw materials"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Production Workcenter"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
msgid "Production started late"
msgstr ""
@@ -1377,97 +1982,114 @@ msgstr ""
msgid "Productions"
msgstr ""
+#. module: mrp
+#: selection:mrp.workcenter.productivity.loss,loss_type:0
+msgid "Productive"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productive_time
+msgid "Productive Time"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_productive_time
+msgid "Productive hours over the last month"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_loss_action
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_productivity_report_blocked
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_productivity_loss
+msgid "Productivity Losses"
+msgstr ""
+
#. module: mrp
#: model:ir.actions.act_window,name:mrp.product_template_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom
#: model:ir.ui.menu,name:mrp.menu_mrp_product_form
msgid "Products"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_consume_lines
-msgid "Products Consumed"
+#: selection:mrp.config.settings,group_product_variant:0
+msgid "Products can have several attributes, defining variants (Example: size, color,...)"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,group_product_variant:0
-msgid "Products can have several attributes, defining variants (Example: size, color,...)"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_propagate
+msgid "Propagate cancel and split"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_lines
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Products to Consume"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_quality_mrp
+#: selection:mrp.workcenter.productivity.loss,loss_type:0
+msgid "Quality"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Products to Finish"
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Quality Losses"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_created_ids
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Products to Produce"
+#: model:ir.model,name:mrp.model_stock_move_lots
+msgid "Quantities to Process by lots"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_property_action
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_property_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_property_ids
-#: model:ir.model.fields,field_description:mrp.field_procurement_order_property_ids
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_action
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_product_qty
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_qty
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_qty
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_qty_produced
+#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_qty
+#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_done
+#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_done_store
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_property_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_property_tree_view
-msgid "Properties"
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_structure_report
+#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
+msgid "Quantity"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_property_group_form_view
-msgid "Properties categories"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_quantity_available
+msgid "Quantity Available"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_composition
-msgid "Properties composition"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_lot_produced_qty
+msgid "Quantity Finished Product"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property
-msgid "Property"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_qty_produced
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Quantity Produced"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property_group
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_id_9665
-#: model:ir.model.fields,field_description:mrp.field_mrp_property_group_name
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
-msgid "Property Group"
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_batch_size
+msgid "Quantity to Process"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
-msgid "Property Groups"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_qty
+msgid "Quantity to Produce"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_stock_move_consume_product_qty
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.report_mrpbomstructure
-msgid "Quantity"
+#: model:ir.model,name:mrp.model_stock_quant
+msgid "Quants"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_product_qty
-msgid "Quantity (in default UoM)"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Raw Material"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_raw_ids
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Raw Materials"
msgstr ""
@@ -1477,23 +2099,46 @@ msgid "Raw Materials Location"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+#: selection:mrp.workorder,state:0
msgid "Ready"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_ready_production
-msgid "Ready for production"
+#. openerp-web
+#: code:addons/mrp/static/src/js/mrp.js:22
+#, python-format
+msgid "Ready to produce"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Ready to Produce"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration
+msgid "Real Duration"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_name
+msgid "Reason"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_product_produce
+#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
+msgid "Record Production"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:126
+#, python-format
+msgid "Recursion error! A product with a Bill of Material should not have itself in its BoM or child BoMs!"
msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_code
#: model:ir.model.fields,field_description:mrp.field_mrp_production_name
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_code
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_name
msgid "Reference"
msgstr ""
@@ -1508,8 +2153,19 @@ msgid "Reference of the document that generated this production order request."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_position
-msgid "Reference to a position in an external plan."
+#: code:addons/mrp/models/stock_move.py:237
+#, python-format
+msgid "Register Lots"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Register lots"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_procurement_ids
+msgid "Related Procurements"
msgstr ""
#. module: mrp
@@ -1518,8 +2174,13 @@ msgid "Related user name for the resource to manage its access."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Reserve"
+#: model:ir.ui.menu,name:mrp.menu_mrp_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_serial
+msgid "Requires Serial"
msgstr ""
#. module: mrp
@@ -1547,20 +2208,10 @@ msgstr ""
msgid "Responsible"
msgstr ""
-#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_product_rounding
-#: model:ir.model.fields,help:mrp.field_mrp_bom_product_rounding
-msgid "Rounding applied on the product quantity."
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_rounding_efficiency
-msgid "Rounding efficiency"
-msgstr ""
-
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_routing_id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_routing_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_routing_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_routing_id
#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_routing_search_view
@@ -1569,6 +2220,16 @@ msgstr ""
msgid "Routing"
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_routing_line_ids
+msgid "Routing Lines"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_name
+msgid "Routing Name"
+msgstr ""
+
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_tree_view
@@ -1578,7 +2239,6 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
#: model:ir.model,name:mrp.model_mrp_routing
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_mrp_routings
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
@@ -1586,345 +2246,588 @@ msgid "Routings"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Routings allow you to create and manage the manufacturing\n"
-" operations that should be followed within your work centers in\n"
-" order to produce a product. They are attached to bills of\n"
-" materials that will define the required raw materials."
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_mrp_routings
+msgid "Routings & Planning"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid "Routings allow you to create and manage the manufacturing\n"
+" operations that should be followed within your work centers in\n"
+" order to produce a product. They are attached to bills of\n"
+" materials that will define the required raw materials."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_bom
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_lots
+msgid "Save"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_planned_finished
+msgid "Scheduled Date Finished"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_planned_start
+msgid "Scheduled Date Start"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Scheduled Date by Month"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Scheduled Month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:520
+#: code:addons/mrp/models/mrp_workorder.py:427
+#: model:ir.ui.menu,name:mrp.menu_mrp_scrap
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#, python-format
+msgid "Scrap"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_scrap_count
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_count
+msgid "Scrap Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
+msgid "Scrap ids"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_scrap_ids
+msgid "Scraps"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_search
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
+msgid "Search Bill Of Material"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
+msgid "Search Bill Of Material Components"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "Search Production"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Search Work Orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
+msgid "Search for mrp workcenter"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_res_company_manufacturing_lead
+msgid "Security days for each manufacturing operation."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_sequence
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_sequence
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_sequence
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_sequence
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.routing.workcenter,time_mode:0
+msgid "Set duration manually"
+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 "Settings"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.bom,type:0
+msgid "Ship this product as a set of components (kit)"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_unbuild.py:88
+#, python-format
+msgid "Should have a lot for the finished product"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_origin
+msgid "Source"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_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"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Start Working"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_state
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_state
+msgid "State"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_state
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_working_state
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_state
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_working_state
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
+msgid "Status"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_production_moves
+#: model:ir.actions.act_window,name:mrp.action_mrp_unbuild_moves
+msgid "Stock Moves"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout_value
+msgid "Stock value"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_form
+#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_graph
+#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_tree
+msgid "Stock value variation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_child_bom_id
+msgid "Sub BoM"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "TPM Big Loss"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_productivity_loss
+msgid "TPM Big Losses"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_stock_move_is_done
+#: model:ir.model.fields,help:mrp.field_stock_move_lots_done_move
+msgid "Technical Field to order moves"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_production_check_to_done
+msgid "Technical Field to see if we can show 'Mark as Done' button"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_routing_id
-msgid "Routings indicates all the Work Centers used, for how long and/or cycles.If Routings is set then,the third tab of a production order (Work Centers) will be automatically pre-completed."
+#: model:ir.model.fields,help:mrp.field_stock_move_lots_done_wo
+msgid "Technical Field which is False when temporarily filled in in work order"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_planned
-msgid "Scheduled Date"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_is_user_working
+msgid "Technical field indicating whether the current user is working. "
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Scheduled Date by Month"
+#: model:ir.model.fields,help:mrp.field_mrp_production_post_visible
+msgid "Technical field to check when we can post"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Scheduled Month"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_production_availability
+msgid "Technical: used in views and domains only."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_product_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_product_tree_view
-msgid "Scheduled Products"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_working_state
+msgid "Technical: used in views only"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_product_lines
-msgid "Scheduled goods"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_product_id
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_product_tracking
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_product_uom_id
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_production_state
+msgid "Technical: used in views only."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Scrap Products"
+#: code:addons/mrp/models/mrp_bom.py:76
+#: code:addons/mrp/models/mrp_bom.py:223
+#, python-format
+msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
-msgid "Search"
+#: code:addons/mrp/models/mrp_workcenter.py:138
+#, python-format
+msgid "The capacity must be strictly positive."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-msgid "Search Bill Of Material"
+#: selection:mrp.bom,ready_to_produce:0
+msgid "The components of 1st operation"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Search Bill Of Material Components"
+#: 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 ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Search Production"
+#: model:ir.model.fields,help:mrp.field_mrp_bom_line_routing_id
+msgid "The list of operations 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 ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
-msgid "Search for mrp workcenter"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_qty_produced
+msgid "The number of products already handled by this work order"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_res_company_manufacturing_lead
-msgid "Security days for each manufacturing operation."
+#: model:ir.model.fields,help:mrp.field_mrp_bom_line_operation_id
+msgid "The operation where the components are consumed, or the finished products created."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_qty
-msgid "Select Quantity"
+#: model:ir.model.fields,help:mrp.field_mrp_bom_routing_id
+msgid "The operations for producing this BoM. When a routing is specified, the production orders will be executed through work orders, otherwise everything is processed in the production order itself. "
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_sequence
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_sequence
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_sequence
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_sequence
-msgid "Sequence"
+#: model:ir.model,name:mrp.model_stock_picking_type
+msgid "The picking type determines the picking view"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_type
-msgid "Set: When processing a sales order for this product, the delivery order will contain the raw materials, instead of the finished product."
+#: sql_constraint:mrp.production:0
+msgid "The quantity to produce must be positive!"
msgstr ""
#. module: mrp
-#: selection:mrp.bom,type:0
-msgid "Ship this product as a set of components (kit)"
+#: 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 ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_origin
-msgid "Source Document"
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+msgid "This Month"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_costs_cycle
-msgid "Specify Cost of Work Center per cycle."
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+msgid "This Year"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_costs_hour
-msgid "Specify Cost of Work Center per hour."
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_efficiency
+msgid "This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficiency of 200%, then his load will only be 50%."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_start
-msgid "Start Date"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_ids
+msgid "Time Logs"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_state
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Status"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Time Tracking"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_stock_move
-msgid "Stock Move"
+#: code:addons/mrp/models/mrp_workorder.py:354
+#, python-format
+msgid "Time Tracking: "
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout_value
-msgid "Stock value"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_stop
+msgid "Time after prod."
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_inout
-#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_form
-#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_graph
-#: model:ir.ui.view,arch_db:mrp.view_report_in_out_picking_tree
-msgid "Stock value variation"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_start
+msgid "Time before prod."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_stock_move_consumed_for
-msgid "Technical field used to make the traceability of produced products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_time_ids
+msgid "Time ids"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:351
-#: code:addons/mrp/mrp.py:450
-#, python-format
-msgid "The Product Unit of Measure you chose has a different category than in the product form."
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_stop
+msgid "Time in minutes for the cleaning."
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "The Properties in Odoo are used to select the right bill of\n"
-" materials for manufacturing a product when you have different\n"
-" ways of building the same product. You can assign several\n"
-" properties to each bill of materials. When a salesperson\n"
-" creates a sales order, they can relate it to several properties\n"
-" and Odoo will automatically select the BoM to use according\n"
-" the needs."
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_start
+msgid "Time in minutes for the setup."
msgstr ""
#. module: mrp
-#: constraint:mrp.workcenter:0
-msgid "The capacity per cycle must be strictly positive."
+#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_time_cycle_manual
+msgid "Time in minutes. Is the time used in manual mode, or the first time supposed in real time when there are not any work orders yet."
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 plannification."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "To Consume"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_routing_id
-#: model:ir.model.fields,help:mrp.field_mrp_bom_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."
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_quantity
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "To Do"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_config_settings_module_mrp_operations
-msgid "This allows to add state, date_start,date_stop in production order operation lines (in the \"Work Centers\" tab).\n"
-"-This installs the module mrp_operations."
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "To Launch"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_efficiency
-msgid "This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficiency of 200%, then his load will only be 50%."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "To Produce"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_stop
-msgid "Time after prod."
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
+msgid "To create a new work center, Go to <b><i> Master Data/Work Centers. </i></b>"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_start
-msgid "Time before prod."
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production
+msgid "To manufacture or assemble products, and use raw materials and\n"
+" finished products you must also handle manufacturing operations.\n"
+" Manufacturing operations are often called Work Orders. The various\n"
+" operations will have different impacts on the costs of\n"
+" manufacturing and planning depending on the available workload."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_cycle
-msgid "Time for 1 cycle (hour)"
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+msgid "Today"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_cycle
-msgid "Time in hours for doing one cycle."
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
+msgid "Total Cost"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_stop
-msgid "Time in hours for the cleaning."
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
+msgid "Total Cost of Raw Materials"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_start
-msgid "Time in hours for the setup."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_workorder_late_count
+msgid "Total Late Orders"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_hour_nbr
-msgid "Time in hours for this Work Center to achieve the operation of the specified routing."
+#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
+msgid "Total Qty"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
-msgid "To Consume"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_workorder_pending_count
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_workorder_progress_count
+msgid "Total Running Orders"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
-msgid "Total Cost"
+#: model:ir.ui.menu,name:mrp.menu_mrp_traceability
+msgid "Traceability: Lots"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
-msgid "Total Cost of Raw Materials"
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_tracking
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_tracking
+msgid "Tracking"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_cycle_total
-#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
-msgid "Total Cycles"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Unblock"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_hour_total
-#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
-msgid "Total Hours"
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Unbuild"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
-msgid "Total Qty"
+#: model:ir.model,name:mrp.model_mrp_unbuild
+#: model:ir.model.fields,field_description:mrp.field_stock_move_unbuild_id
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Unbuild Order"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search
-msgid "Type"
+#: code:addons/mrp/models/mrp_unbuild.py:75
+#, python-format
+msgid "Unbuild Order product quantity has to be strictly positive."
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_unbuild
+#: model:ir.ui.menu,name:mrp.menu_mrp_unbuild
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Unbuild Orders"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Unit Cost"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.model.fields,field_description:mrp.field_stock_move_unit_factor
+msgid "Unit Factor"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_uom_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_product_uom_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_uom_id
+#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
msgid "Unit of Measure"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_product_uom
-#: model:ir.model.fields,help:mrp.field_mrp_bom_product_uom
+#: model:ir.model.fields,help:mrp.field_mrp_bom_line_product_uom_id
+#: model:ir.model.fields,help:mrp.field_mrp_bom_product_uom_id
msgid "Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"
msgstr ""
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Unreserve"
+msgstr ""
+
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
msgid "Update"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Urgent"
+#: selection:mrp.config.settings,module_mrp_mps:0
+msgid "Use Master Production Schedule in order to create procurements based on forecasts"
+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)"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_user_id
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_user_id
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
#: model:res.groups,name:mrp.group_mrp_user
msgid "User"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_date_start
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_date_start
-msgid "Valid From"
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_valid_until
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
+msgid "Validity Date"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Valid From Date by Month"
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_form_embedded_product
+msgid "Variant"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_filter
-#: model:ir.ui.view,arch_db:mrp.view_mrp_bom_line_filter
-msgid "Valid From Month"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_attribute_value_ids
+msgid "Variants"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_date_stop
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_date_stop
-msgid "Valid Until"
+#: selection:ir.attachment,priority:0
+msgid "Very High"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_date_start
-#: model:ir.model.fields,help:mrp.field_mrp_bom_line_date_stop
-msgid "Validity of component. Keep empty if it's always valid."
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: selection:mrp.production,availability:0
+msgid "Waiting"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_date_start
-#: model:ir.model.fields,help:mrp.field_mrp_bom_date_stop
-msgid "Validity of this BoM. Keep empty if it's always valid."
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "Waiting Availability"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_attribute_value_ids
-msgid "Variants"
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_waiting
+msgid "Waiting Availability MO"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Very Urgent"
+#. openerp-web
+#: code:addons/mrp/static/src/js/mrp.js:22
+#, python-format
+msgid "Waiting Materials"
msgstr ""
#. module: mrp
@@ -1933,8 +2836,8 @@ msgid "Warehouse"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:351
-#: code:addons/mrp/mrp.py:450
+#: code:addons/mrp/models/mrp_bom.py:76
+#: code:addons/mrp/models/mrp_bom.py:223
#, python-format
msgid "Warning"
msgstr ""
@@ -1957,27 +2860,32 @@ msgid "Weekly Stock Value Variation enables you to track the stock value evoluti
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_stock_warehouse_manufacture_to_resupply
-msgid "When products are manufactured, they can be manufactured in this warehouse."
+#: model:ir.model.fields,help:mrp.field_mrp_bom_picking_type_id
+msgid "When a procurement has a ‘produce’ route with a picking type set, it will try to create a Manufacturing Order for that product using a BoM of the same picking type. That allows to define procurement rules which trigger different manufacturing orders with different BoMs. "
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_form_view
+msgid "When processing a sales order for this product, the delivery order\n"
+" will contain the raw materials, instead of the finished product."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_production_state
-msgid "When the production order is created the status is set to 'Draft'.\n"
-"If the order is confirmed the status is set to 'Waiting Goods.\n"
-"If any exceptions are there, the status is set to 'Picking Exception.\n"
-"If the stock is available then the status is set to 'Ready to Produce.\n"
-"When the production gets started then the status is set to 'In Production.\n"
-"When the production is over, the status is set to 'Done'."
+#: model:ir.model.fields,help:mrp.field_stock_warehouse_manufacture_to_resupply
+msgid "When products are manufactured, they can be manufactured in this warehouse."
msgstr ""
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_workcenter
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_workcenter_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_workcenter_id
#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_workcenter_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_workcenter_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_workcenter_id
#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_workcenter_id
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_tree_view
#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
msgid "Work Center"
msgstr ""
@@ -1992,13 +2900,13 @@ msgid "Work Center Loads"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
-msgid "Work Center Operations"
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "Work Center Name"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_product_id
-msgid "Work Center Product"
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
+msgid "Work Center Operations"
msgstr ""
#. module: mrp
@@ -2014,18 +2922,19 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_lines
#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
msgid "Work Centers"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_lines
-msgid "Work Centers Utilisation"
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_kanban_action
+msgid "Work Centers Dashboard"
msgstr ""
#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_work_orders
#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_kanban_action
msgid "Work Centers allow you to create and manage manufacturing\n"
" units. They consist of workers and/or machines, which are\n"
" considered as units for task assignation as well as capacity\n"
@@ -2033,8 +2942,16 @@ msgid "Work Centers allow you to create and manage manufacturing\n"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_name
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Work Instruction"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workorder
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_workorder_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_name
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_workorder_id
+#: model:ir.model.fields,field_description:mrp.field_stock_scrap_workorder_id
msgid "Work Order"
msgstr ""
@@ -2044,26 +2961,126 @@ msgid "Work Order Operations allow you to create and manage the manufacturing op
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_operations
-msgid "Work Order Planning"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_workorder_id
+msgid "Work Order To Consume"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.actions.act_window,name:mrp.action_mrp_routing_time
+#: model:ir.actions.act_window,name:mrp.action_mrp_workorder_production_specific
+#: model:ir.actions.act_window,name:mrp.action_mrp_workorder_workcenter
+#: model:ir.actions.act_window,name:mrp.action_work_orders
+#: model:ir.actions.act_window,name:mrp.mrp_workorder_todo
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_workorder_ids
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_workorder_ids
+#: model:ir.ui.menu,name:mrp.menu_mrp_work_order_report
+#: model:ir.ui.menu,name:mrp.menu_mrp_workorder_todo
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_tree_view_inherit
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
msgid "Work Orders"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workorder_delta_report
+msgid "Work Orders Deviation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_workorder_report
+#: model:ir.actions.act_window,name:mrp.mrp_workorder_workcenter_report
+msgid "Work Orders Performance"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_mrp_workorder_production
+msgid "Work Orders Planning"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_production_specific
+#: model:ir.actions.act_window,help:mrp.action_mrp_workorder_workcenter
+#: model:ir.actions.act_window,help:mrp.mrp_workorder_todo
+msgid "Work Orders is the list of operations to be performed for each\n"
+" manufacturing order. Once you start the first work order of a\n"
+" manufacturing order, the manufacturing order is automatically\n"
+" marked as started. Once you finish the latest operation of a\n"
+" manufacturing order, the MO is automatically done and the related\n"
+" products are produced."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
+msgid "Work Sheet"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_production.py:498
+#, python-format
+msgid "Work order %s is still running"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "Work orders in progress. Click to block work center."
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_config_settings_group_product_variant
msgid "Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example"
msgstr ""
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Workcenter"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_form_view
+#: model:ir.ui.view,arch_db:mrp.oee_graph_view
+#: model:ir.ui.view,arch_db:mrp.oee_pie_view
+#: model:ir.ui.view,arch_db:mrp.oee_pivot_view
+#: model:ir.ui.view,arch_db:mrp.oee_tree_view
+msgid "Workcenter Productivity"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_productivity
+msgid "Workcenter Productivity Log"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_loss_form_view
+#: model:ir.ui.view,arch_db:mrp.oee_loss_tree_view
+msgid "Workcenter Productivity Loss"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "Workcenter blocked, click to unblock."
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_calendar_id
#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
msgid "Working Time"
msgstr ""
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_production_messages
+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"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_worksheet
+msgid "Worksheet"
+msgstr ""
+
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_config_settings_module_mrp_byproduct
msgid "You can configure by-products in the bill of material.\n"
@@ -2073,25 +3090,102 @@ msgid "You can configure by-products in the bill of material.\n"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:357
+#: code:addons/mrp/models/mrp_production.py:436
+#, python-format
+msgid "You can not cancel production order, a work order is still in progress."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:225
+#, python-format
+msgid "You can not change the finished work order."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_bom.py:91
#, python-format
msgid "You can not delete a Bill of Material with running manufacturing orders.\n"
"Please close or cancel it first."
msgstr ""
+#. module: mrp
+#: code:addons/mrp/models/stock_move.py:121
+#, python-format
+msgid "You cannot cancel a move move having already consumed material"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:45
+#, python-format
+msgid "You have already produced %d qty , Please give update quantity more then %d "
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:347
+#, 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:343
+#, 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:395
+#, python-format
+msgid "You need to define at least one unactive productivity loss in the category 'Performance'. Create one from the Manufacturing app, menu: Configuration / Productivity Losses."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/mrp_product_produce.py:95
+#, python-format
+msgid "You need to provide a lot for the finished product"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:281
+#, python-format
+msgid "You should provide a lot for a component"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:266
+#, python-format
+msgid "You should provide a lot for the final product"
+msgstr ""
+
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_mrp_product_template_form_inherited
msgid "days"
msgstr ""
#. module: mrp
-#: selection:mrp.property,composition:0
-msgid "max"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "from"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+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 ""
#. module: mrp
-#: selection:mrp.property,composition:0
-msgid "min"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
+msgid "minutes"
msgstr ""
#. module: mrp
@@ -2104,11 +3198,6 @@ msgstr ""
msgid "mrp.config.settings"
msgstr ""
-#. module: mrp
-#: selection:mrp.property,composition:0
-msgid "plus"
-msgstr ""
-
#. module: mrp
#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
msgid "report.mrp.report_mrpbomstructure"
@@ -2120,8 +3209,23 @@ msgid "report.mrp_bom_cost"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_tracking
-msgid "unknown"
+#: model:ir.model,name:mrp.model_stock_scrap
+msgid "stock.scrap"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "to"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_workcenter_form_view
+msgid "work orders"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_worksheet
+msgid "worksheet"
msgstr ""
diff --git a/addons/mrp_byproduct/i18n/mrp_byproduct.pot b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
index 3714e3d55fb32547f670b31e1f21dc214f4e1621..cce9d9542abd2cb6739d590a6764e4f041685493 100644
--- a/addons/mrp_byproduct/i18n/mrp_byproduct.pot
+++ b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,21 +51,11 @@ msgstr ""
msgid "Created on"
msgstr ""
-#. module: mrp_byproduct
-#: model:ir.model.fields,help:mrp_byproduct.field_mrp_subproduct_subproduct_type
-msgid "Define how the quantity of byproducts will be set on the production orders using this BoM. 'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order. By opposition, 'Variable' means that the quantity will be computed as '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"
-msgstr ""
-
#. module: mrp_byproduct
#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_display_name
msgid "Display Name"
msgstr ""
-#. module: mrp_byproduct
-#: selection:mrp.subproduct,subproduct_type:0
-msgid "Fixed"
-msgstr ""
-
#. module: mrp_byproduct
#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_id
msgid "ID"
@@ -86,6 +76,11 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
+#. module: mrp_byproduct
+#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_operation_id
+msgid "Produced at Operation"
+msgstr ""
+
#. module: mrp_byproduct
#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_product_id
msgid "Product"
@@ -97,33 +92,38 @@ msgid "Product Qty"
msgstr ""
#. module: mrp_byproduct
-#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_product_uom
-msgid "Product Unit of Measure"
+#: model:ir.model,name:mrp_byproduct.model_mrp_production
+msgid "Production"
msgstr ""
#. module: mrp_byproduct
-#: model:ir.model,name:mrp_byproduct.model_mrp_production
-msgid "Production"
+#: model:ir.model,name:mrp_byproduct.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp_byproduct
+#: model:ir.model.fields,field_description:mrp_byproduct.field_stock_move_subproduct_id
+msgid "Subproduct"
msgstr ""
#. module: mrp_byproduct
-#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_subproduct_type
-msgid "Quantity Type"
+#: model:ir.model.fields,help:mrp_byproduct.field_stock_move_subproduct_id
+msgid "Subproduct line that generated the move in a manufacturing order"
msgstr ""
#. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:45
+#: code:addons/mrp_byproduct/models/mrp_subproduct.py:32
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
#. module: mrp_byproduct
-#: selection:mrp.subproduct,subproduct_type:0
-msgid "Variable"
+#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_product_uom_id
+msgid "Unit of Measure"
msgstr ""
#. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:45
+#: code:addons/mrp_byproduct/models/mrp_subproduct.py:31
#, python-format
msgid "Warning"
msgstr ""
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 111f696754f90decb214b50f1b1cf8c6bac11fb7..cc8e8c85fd7da79070696473f4f1cf7f1853ea65 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,16 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_state
-msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed repair order. \n"
-"* The 'Confirmed' status is used when a user confirms the repair order. \n"
-"* The 'Ready to Repair' status is used to start to repairing, user can start repairing only after repair order is confirmed. \n"
-"* The 'To be Invoiced' status is used to generate the invoice before or after repairing done. \n"
-"* The 'Done' status is set when repairing is completed. \n"
-"* The 'Cancelled' status is used when user cancel repair order."
-msgstr ""
-
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "(<i>Remove</i>)"
@@ -35,6 +25,16 @@ msgstr ""
msgid "(update)"
msgstr ""
+#. module: mrp_repair
+#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_state
+msgid "* The 'Draft' status is used when a user is encoding a new and unconfirmed repair order.\n"
+"* The 'Confirmed' status is used when a user confirms the repair order.\n"
+"* The 'Ready to Repair' status is used to start to repairing, user can start repairing only after repair order is confirmed.\n"
+"* The 'To be Invoiced' status is used to generate the invoice before or after repairing done.\n"
+"* The 'Done' status is set when repairing is completed.\n"
+"* The 'Cancelled' status is used when user cancel repair order."
+msgstr ""
+
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
msgid "<i>(Add)</i>"
@@ -85,12 +85,6 @@ msgstr ""
msgid "<strong>Total</strong>"
msgstr ""
-#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:24
-#, python-format
-msgid "Active ID not Found"
-msgstr ""
-
#. module: mrp_repair
#: selection:mrp.repair.line,type:0
msgid "Add"
@@ -169,7 +163,8 @@ msgid "Confirmed"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:524
+#: code:addons/mrp_repair/models/mrp_repair.py:500
+#: code:addons/mrp_repair/models/mrp_repair.py:562
#, 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."
@@ -210,6 +205,11 @@ msgstr ""
msgid "Current Location"
msgstr ""
+#. module: mrp_repair
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
+msgid "Default address id"
+msgstr ""
+
#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_address_id
msgid "Delivery Address"
@@ -430,32 +430,34 @@ msgid "No Invoice"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:511
+#: code:addons/mrp_repair/models/mrp_repair.py:491
+#: code:addons/mrp_repair/models/mrp_repair.py:553
#, python-format
msgid "No Pricelist!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:322
+#: code:addons/mrp_repair/models/mrp_repair.py:250
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:379
+#: code:addons/mrp_repair/models/mrp_repair.py:275
+#: code:addons/mrp_repair/models/mrp_repair.py:303
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:372
+#: code:addons/mrp_repair/models/mrp_repair.py:296
#, python-format
msgid "No product defined on Fees!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:522
+#: code:addons/mrp_repair/models/mrp_repair.py:498
+#: code:addons/mrp_repair/models/mrp_repair.py:560
#, python-format
msgid "No valid pricelist line found !"
msgstr ""
@@ -623,13 +625,13 @@ msgid "Repair Reference"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:285
+#: code:addons/mrp_repair/models/mrp_repair.py:217
#, python-format
msgid "Repair order is already invoiced."
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:32
+#: code:addons/mrp_repair/wizard/mrp_repair_cancel.py:20
#, python-format
msgid "Repair order is not invoiced."
msgstr ""
@@ -667,7 +669,7 @@ msgid "Selecting 'Before Repair' or 'After Repair' will allow you to generate in
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:272
+#: code:addons/mrp_repair/models/mrp_repair.py:210
#, python-format
msgid "Serial number is required for operation line with product '%s'"
msgstr ""
@@ -714,7 +716,7 @@ msgid "Taxes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:207
+#: code:addons/mrp_repair/models/mrp_repair.py:166
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -800,7 +802,7 @@ msgid "VAT:"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:207
+#: code:addons/mrp_repair/models/mrp_repair.py:166
#, python-format
msgid "Warning"
msgstr ""
@@ -816,20 +818,16 @@ msgid "Yes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:308
+#: code:addons/mrp_repair/models/mrp_repair.py:238
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form!"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:513
+#: code:addons/mrp_repair/models/mrp_repair.py:493
+#: code:addons/mrp_repair/models/mrp_repair.py:555
#, python-format
msgid "You have to select a pricelist in the Repair form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
-msgid "unknown"
+" Please set one before choosing a product."
msgstr ""
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 34c5d8cacb2e8149260ad7d4308ae40098f9876b..d463a616a3591d1c096608af176c1d6051469f6a 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgstr ""
msgid "By sticky note Category"
msgstr ""
+#. module: note
+#: model:ir.actions.act_window,help:note.note_tag_action
+msgid "Click to add a new tag."
+msgstr ""
+
#. module: note
#: model:ir.actions.act_window,help:note.action_note_note
msgid "Click to add a personal note."
@@ -117,7 +122,6 @@ msgid "Last Updated on"
msgstr ""
#. module: note
-#: model:note.stage,name:note.demo_note_stage_03
#: model:note.stage,name:note.note_stage_03
msgid "Later"
msgstr ""
@@ -128,7 +132,7 @@ msgid "New"
msgstr ""
#. module: note
-#: code:addons/note/note.py:165
+#: code:addons/note/models/note.py:128
#, python-format
msgid "New Note"
msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
#. module: note
#: model:ir.model.fields,help:note.field_note_stage_user_id
-msgid "Owner of the note stage."
+msgid "Owner of the note stage"
msgstr ""
#. module: note
@@ -229,28 +233,24 @@ msgid "Tag name already exists !"
msgstr ""
#. module: note
+#: model:ir.actions.act_window,name:note.note_tag_action
#: model:ir.model.fields,field_description:note.field_note_note_tag_ids
+#: model:ir.ui.menu,name:note.notes_tag_menu
+#: model:ir.ui.view,arch_db:note.note_tag_view_form
#: model:ir.ui.view,arch_db:note.view_note_note_form
msgid "Tags"
msgstr ""
#. module: note
-#: model:note.stage,name:note.demo_note_stage_04
#: model:note.stage,name:note.note_stage_02
msgid "This Week"
msgstr ""
#. module: note
-#: model:note.stage,name:note.demo_note_stage_01
#: model:note.stage,name:note.note_stage_01
msgid "Today"
msgstr ""
-#. module: note
-#: model:note.stage,name:note.demo_note_stage_02
-msgid "Tomorrow"
-msgstr ""
-
#. module: note
#: model:ir.actions.act_window,help:note.action_note_note
msgid "Use notes to organize personal tasks or notes. All\n"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 9637036175d65b764e260dfa04627c90b3979c8f..5cf438e82880459b428bfa2923ef10caa0e658a9 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,18 +51,18 @@ msgid "Pad Api Key"
msgstr ""
#. module: pad
-#: model:ir.model.fields,field_description:pad.field_res_company_pad_server
-msgid "Pad Server"
+#: code:addons/pad/models/pad.py:57
+#, python-format
+msgid "Pad creation failed, either there is a problem with your pad server URL or with your connection."
msgstr ""
#. module: pad
-#: code:addons/pad/pad.py:53
-#, python-format
-msgid "Pad creation failed, either there is a problem with your pad server URL or with your connection."
+#: model:ir.model.fields,field_description:pad.field_res_company_pad_server
+msgid "Pad server"
msgstr ""
#. module: pad
-#: model:ir.ui.view,arch_db:pad.view_company_form_with_pad
+#: model:ir.ui.view,arch_db:pad.view_company_form_inherit_pad
msgid "Pads"
msgstr ""
@@ -82,13 +82,13 @@ msgstr ""
#. module: pad
#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:7
+#: code:addons/pad/static/src/xml/pad.xml:6
#, python-format
msgid "You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company."
msgstr ""
#. module: pad
-#: model:ir.ui.view,arch_db:pad.view_company_form_with_pad
+#: model:ir.ui.view,arch_db:pad.view_company_form_inherit_pad
msgid "e.g. beta.primarypad.com"
msgstr ""
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index fc73eeeeb1339fe92d326910f71ff9c8aaed9aae..dabcb76863dd0686497bd2e9b0d9986d68ebabf4 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,60 +17,95 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_transaction_callback_eval
-msgid " Will be safe_eval with `self` being the current transaction. i.e.:\n"
-" self.env['my.model'].payment_validated(self)"
+msgid " Will be safe_eval with `self` being the current transaction. i.e.:\n"
+" self.env['my.model'].payment_validated(self)"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_adyen
-msgid "-This installs the module payment_adyen."
+#: model:ir.model.fields,field_description:payment.field_payment_transaction_html_3ds
+msgid "3D Secure HTML"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_authorize
-msgid "-This installs the module payment_authorize."
+#: model:ir.ui.view,arch_db:payment.acquirer_form
+msgid "<span class=\"o_warning_text\">Test</span>\n"
+" <span class=\"o_stat_text\">Environment</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_buckaroo
-msgid "-This installs the module payment_buckaroo."
+#: model:ir.ui.view,arch_db:payment.acquirer_form
+msgid "<span class=\"text-success\">Production</span>\n"
+" <span class=\"o_stat_text\">Environment</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_ogone
-msgid "-This installs the module payment_ogone."
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_adyen
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_authorize
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_buckaroo
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_ogone
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_paypal
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_payu
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_sips
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_stripe
+#: model:payment.acquirer,cancel_msg:payment.payment_acquirer_transfer
+msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_paypal
-msgid "-This installs the module payment_paypal."
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_adyen
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_authorize
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_buckaroo
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_ogone
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_paypal
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_payu
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_sips
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_stripe
+#: model:payment.acquirer,done_msg:payment.payment_acquirer_transfer
+msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_sips
-msgid "-This installs the module payment_sips."
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_adyen
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_authorize
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_buckaroo
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_ogone
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_paypal
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_payu
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_sips
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_stripe
+#: model:payment.acquirer,error_msg:payment.payment_acquirer_transfer
+msgid "<span><i>Error,</i> Please be aware that an error occurred during the transaction. The order has been confirmed but will not be paid. Do not hesitate to contact us if you have any questions on the status of your order.</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_account_config_settings_module_payment_transfer
-msgid "-This installs the module payment_transfer."
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_adyen
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_authorize
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_buckaroo
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_custom
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_ogone
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_paypal
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_payu
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_sips
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_stripe
+msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_transaction_html_3ds
-msgid "3D Secure HTML"
+#: model:payment.acquirer,pending_msg:payment.payment_acquirer_transfer
+msgid "<span><i>Pending</i>... The order will be validated after the payment.</span>"
msgstr ""
#. module: payment
-#: model:ir.ui.view,arch_db:payment.acquirer_form
-msgid "<span class=\"text-danger\">Test</span>\n"
-" <span class=\"o_stat_text\">Environment</span>"
+#: model:ir.model.fields,help:payment.field_payment_acquirer_journal_id
+msgid "Account journal used for automatic payment reconciliation."
msgstr ""
#. module: payment
-#: model:ir.ui.view,arch_db:payment.acquirer_form
-msgid "<span class=\"text-success\">Production</span>\n"
-" <span class=\"o_stat_text\">Environment</span>"
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
+msgid "Accounting Journal"
msgstr ""
#. module: payment
@@ -79,12 +114,12 @@ msgid "Acquirer"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_method_acquirer_id
+#: model:ir.model.fields,field_description:payment.field_payment_token_acquirer_id
msgid "Acquirer Account"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_method_acquirer_ref
+#: model:ir.model.fields,field_description:payment.field_payment_token_acquirer_ref
msgid "Acquirer Ref."
msgstr ""
@@ -94,7 +129,7 @@ msgid "Acquirer Reference"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_method_active
+#: model:ir.model.fields,field_description:payment.field_payment_token_active
msgid "Active"
msgstr ""
@@ -110,7 +145,8 @@ msgid "Address"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_adyen
+#: model:payment.acquirer,name:payment.payment_acquirer_adyen
+#: selection:payment.acquirer,provider:0
msgid "Adyen"
msgstr ""
@@ -121,22 +157,14 @@ msgid "Amount"
msgstr ""
#. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "At payment no acquirer confirmation needed"
-msgstr ""
-
-#. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "At payment with acquirer confirmation"
-msgstr ""
-
-#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_authorize
+#: model:payment.acquirer,name:payment.payment_acquirer_authorize
+#: selection:payment.acquirer,provider:0
msgid "Authorize.Net"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_buckaroo
+#: model:payment.acquirer,name:payment.payment_acquirer_buckaroo
+#: selection:payment.acquirer,provider:0
msgid "Buckaroo"
msgstr ""
@@ -156,6 +184,16 @@ msgstr ""
msgid "City"
msgstr ""
+#. module: payment
+#: model:ir.actions.act_window,help:payment.action_payment_acquirer
+msgid "Click to create a payment acquirer."
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_account_payment_payment_method_id_code
+msgid "Code"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_company_id
msgid "Company"
@@ -166,14 +204,29 @@ msgstr ""
msgid "Configuration"
msgstr ""
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.acquirer_kanban
+msgid "Configure"
+msgstr ""
+
#. module: payment
#: model:ir.ui.view,arch_db:payment.payment_acquirer_installation
msgid "Configure payment acquiring methods"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_res_partner_payment_method_count
-msgid "Count Payment Method"
+#: selection:payment.acquirer,auto_confirm:0
+msgid "Confirm the SO on acquirer confirmation"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_id
+msgid "Corresponding Module"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_res_partner_payment_token_count
+msgid "Count Payment Token"
msgstr ""
#. module: payment
@@ -184,14 +237,14 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_create_uid
-#: model:ir.model.fields,field_description:payment.field_payment_method_create_uid
+#: model:ir.model.fields,field_description:payment.field_payment_token_create_uid
#: model:ir.model.fields,field_description:payment.field_payment_transaction_create_uid
msgid "Created by"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_create_date
-#: model:ir.model.fields,field_description:payment.field_payment_method_create_date
+#: model:ir.model.fields,field_description:payment.field_payment_token_create_date
msgid "Created on"
msgstr ""
@@ -215,11 +268,21 @@ msgstr ""
msgid "Currency"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_custom
+msgid "Custom"
+msgstr ""
+
#. module: payment
#: model:ir.ui.view,arch_db:payment.transaction_form
msgid "Customer Details"
msgstr ""
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_description
+msgid "Description"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_acquirer_sequence
msgid "Determine the display order"
@@ -227,7 +290,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_display_name
-#: model:ir.model.fields,field_description:payment.field_payment_method_display_name
+#: model:ir.model.fields,field_description:payment.field_payment_token_display_name
#: model:ir.model.fields,field_description:payment.field_payment_transaction_display_name
msgid "Display Name"
msgstr ""
@@ -259,6 +322,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_environment
+#: model:ir.ui.view,arch_db:payment.acquirer_search
msgid "Environment"
msgstr ""
@@ -277,6 +341,11 @@ msgstr ""
msgid "Fees"
msgstr ""
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_fees_implemented
+msgid "Fees Computation Supported"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_transaction_fees
msgid "Fees amount; set by the system because depends on the acquirer"
@@ -324,7 +393,7 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_id
-#: model:ir.model.fields,field_description:payment.field_payment_method_id
+#: model:ir.model.fields,field_description:payment.field_payment_token_id
#: model:ir.model.fields,field_description:payment.field_payment_transaction_id
msgid "ID"
msgstr ""
@@ -334,6 +403,22 @@ msgstr ""
msgid "Image"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_ogone
+msgid "Ingenico"
+msgstr ""
+
+#. module: payment
+#: model:ir.ui.view,arch_db:payment.acquirer_form
+#: model:ir.ui.view,arch_db:payment.acquirer_kanban
+msgid "Install"
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_state
+msgid "Installation State"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_transaction_reference
msgid "Internal reference of the TX"
@@ -346,21 +431,21 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer___last_update
-#: model:ir.model.fields,field_description:payment.field_payment_method___last_update
+#: model:ir.model.fields,field_description:payment.field_payment_token___last_update
#: model:ir.model.fields,field_description:payment.field_payment_transaction___last_update
msgid "Last Modified on"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_write_uid
-#: model:ir.model.fields,field_description:payment.field_payment_method_write_uid
+#: model:ir.model.fields,field_description:payment.field_payment_token_write_uid
#: model:ir.model.fields,field_description:payment.field_payment_transaction_write_uid
msgid "Last Updated by"
msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_write_date
-#: model:ir.model.fields,field_description:payment.field_payment_method_write_date
+#: model:ir.model.fields,field_description:payment.field_payment_token_write_date
#: model:ir.model.fields,field_description:payment.field_payment_transaction_write_date
msgid "Last Updated on"
msgstr ""
@@ -370,6 +455,11 @@ msgstr ""
msgid "Make this payment acquirer available (Customer invoices, etc.)"
msgstr ""
+#. module: payment
+#: selection:payment.acquirer,provider:0
+msgid "Manual Configuration"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_image_medium
msgid "Medium-sized image"
@@ -423,15 +513,15 @@ msgstr ""
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_name
-#: model:ir.model.fields,field_description:payment.field_payment_method_name
+#: model:ir.model.fields,field_description:payment.field_payment_token_name
#: model:ir.ui.view,arch_db:payment.acquirer_form
#: model:ir.ui.view,arch_db:payment.transaction_form
msgid "Name"
msgstr ""
#. module: payment
-#: model:ir.model.fields,help:payment.field_payment_method_name
-msgid "Name of the payment method"
+#: model:ir.model.fields,help:payment.field_payment_token_name
+msgid "Name of the payment token"
msgstr ""
#. module: payment
@@ -440,10 +530,15 @@ msgid "No automatic confirmation"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_ogone
+#: selection:payment.acquirer,provider:0
msgid "Ogone"
msgstr ""
+#. module: payment
+#: selection:payment.acquirer,auto_confirm:0
+msgid "On acquirer confirmation, confirm the SO, generate the invoice and pay it"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_auto_confirm
msgid "Order Confirmation"
@@ -451,7 +546,7 @@ msgstr ""
#. module: payment
#: model:ir.model,name:payment.model_res_partner
-#: model:ir.model.fields,field_description:payment.field_payment_method_partner_id
+#: model:ir.model.fields,field_description:payment.field_payment_token_partner_id
#: model:ir.model.fields,field_description:payment.field_payment_transaction_partner_id
msgid "Partner"
msgstr ""
@@ -461,6 +556,12 @@ msgstr ""
msgid "Partner Name"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_payu
+#: selection:payment.acquirer,provider:0
+msgid "PayUmoney"
+msgstr ""
+
#. module: payment
#: model:ir.model,name:payment.model_payment_acquirer
#: model:ir.ui.view,arch_db:payment.acquirer_form
@@ -475,20 +576,21 @@ msgid "Payment Acquirers"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_payment_transaction_payment_method_id
-msgid "Payment Method"
+#: model:ir.model.fields,field_description:payment.field_payment_transaction_payment_token_id
+msgid "Payment Token"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_res_partner_payment_method_ids
-#: model:ir.ui.view,arch_db:payment.payment_method_form_view
-#: model:ir.ui.view,arch_db:payment.payment_method_tree_view
-#: model:ir.ui.view,arch_db:payment.payment_method_view_search
-msgid "Payment Methods"
+#: model:ir.model.fields,field_description:payment.field_res_partner_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
+msgid "Payment Tokens"
msgstr ""
#. module: payment
#: model:ir.model,name:payment.model_payment_transaction
+#: model:ir.model.fields,field_description:payment.field_account_payment_payment_transaction_id
msgid "Payment Transaction"
msgstr ""
@@ -496,7 +598,7 @@ msgstr ""
#: model:ir.actions.act_window,name:payment.action_payment_transaction
#: model:ir.actions.act_window,name:payment.action_payment_tx_ids
#: model:ir.actions.act_window,name:payment.payment_transaction_action_child
-#: model:ir.model.fields,field_description:payment.field_payment_method_payment_ids
+#: model:ir.model.fields,field_description:payment.field_payment_token_payment_ids
#: model:ir.ui.menu,name:payment.payment_transaction_menu
#: model:ir.ui.view,arch_db:payment.transaction_form
#: model:ir.ui.view,arch_db:payment.transaction_list
@@ -504,14 +606,22 @@ msgid "Payment Transactions"
msgstr ""
#. module: payment
+#: code:addons/payment/models/account_payment.py:56
+#, python-format
+msgid "Payment transaction failed (%s)"
+msgstr ""
+
+#. module: payment
+#: model:ir.model,name:payment.model_account_payment
#: model:ir.ui.menu,name:payment.root_payment_menu
#: model:ir.ui.view,arch_db:payment.acquirer_form
-#: model:ir.ui.view,arch_db:payment.payment_method_form_view
+#: model:ir.ui.view,arch_db:payment.payment_token_form_view
msgid "Payments"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_paypal
+#: model:payment.acquirer,name:payment.payment_acquirer_paypal
+#: selection:payment.acquirer,provider:0
msgid "Paypal"
msgstr ""
@@ -567,11 +677,16 @@ msgid "S2S Form Template"
msgstr ""
#. module: payment
-#: model:ir.actions.act_window,name:payment.payment_method_action
-#: model:ir.ui.menu,name:payment.payment_method_menu
+#: model:ir.actions.act_window,name:payment.payment_token_action
+#: model:ir.ui.menu,name:payment.payment_token_menu
msgid "Saved Payment Data"
msgstr ""
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_account_payment_payment_token_id
+msgid "Saved payment token"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_sequence
msgid "Sequence"
@@ -583,7 +698,8 @@ msgid "Server To Server"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_sips
+#: model:payment.acquirer,name:payment.payment_acquirer_sips
+#: selection:payment.acquirer,provider:0
msgid "Sips"
msgstr ""
@@ -602,6 +718,12 @@ msgstr ""
msgid "Status"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_stripe
+#: selection:payment.acquirer,provider:0
+msgid "Stripe"
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,help:payment.field_payment_acquirer_registration_view_template_id
msgid "Template for method registration"
@@ -618,7 +740,8 @@ msgid "Thanks Message"
msgstr ""
#. module: payment
-#: constraint:payment.transaction:0
+#: code:addons/payment/models/payment_acquirer.py:441
+#, python-format
msgid "The payment transaction reference must be unique!"
msgstr ""
@@ -633,6 +756,11 @@ msgid "This template renders the acquirer button with all necessary values.\n"
" It is be rendered with qWeb with the following evaluation context:"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_transfer
+msgid "Transfer information will be provided after choosing the payment method."
+msgstr ""
+
#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_transaction_type
msgid "Type"
@@ -659,10 +787,51 @@ msgid "Visible in Portal / Website"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_transfer
+#: model:payment.acquirer,name:payment.payment_acquirer_transfer
+#: selection:payment.acquirer,provider:0
msgid "Wire Transfer"
msgstr ""
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_stripe
+msgid "You will be prompt with Stripe Payment page for payment information."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_adyen
+msgid "You will be redirected to the Adyen website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_authorize
+msgid "You will be redirected to the Authorize website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_buckaroo
+msgid "You will be redirected to the Buckaroo website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_ogone
+msgid "You will be redirected to the Ingenico website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_payu
+msgid "You will be redirected to the PayUmoney website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_paypal
+msgid "You will be redirected to the Paypal website after clicking on the payment button."
+msgstr ""
+
+#. module: payment
+#: model:payment.acquirer,pre_msg:payment.payment_acquirer_sips
+msgid "You will be redirected to the Sips website after clicking on payment button."
+msgstr ""
+
#. module: payment
#: model:ir.ui.view,arch_db:payment.transaction_form
msgid "ZIP"
@@ -673,11 +842,6 @@ msgstr ""
msgid "Zip"
msgstr ""
-#. module: payment
-#: model:ir.model,name:payment.model_account_config_settings
-msgid "account.config.settings"
-msgstr ""
-
#. module: payment
#: model:ir.ui.view,arch_db:payment.acquirer_form
msgid "acquirer: payment.acquirer browse record"
@@ -709,8 +873,8 @@ msgid "partner_values: specific values about the buyer, for example coming from
msgstr ""
#. module: payment
-#: model:ir.model,name:payment.model_payment_method
-msgid "payment.method"
+#: model:ir.model,name:payment.model_payment_token
+msgid "payment.token"
msgstr ""
#. module: payment
diff --git a/addons/payment_ogone/i18n/payment_ogone.pot b/addons/payment_ogone/i18n/payment_ogone.pot
index df581553387c99400fb25e347bff0e667ecce3db..eae91cfca4727f9b91f45ef93794bfb7d1df75d0 100644
--- a/addons/payment_ogone/i18n/payment_ogone.pot
+++ b/addons/payment_ogone/i18n/payment_ogone.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,37 +16,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:241
+#: code:addons/payment_ogone/models/payment.py:226
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:239
+#: code:addons/payment_ogone/models/payment.py:224
#, python-format
msgid "; no order found"
msgstr ""
-#. module: payment_ogone
-#: model:payment.acquirer,cancel_msg:payment_ogone.payment_acquirer_ogone
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_ogone
-#: model:payment.acquirer,done_msg:payment_ogone.payment_acquirer_ogone
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_ogone
-#: model:payment.acquirer,error_msg:payment_ogone.payment_acquirer_ogone
-msgid "<span><i>Error,</i> Please be aware that an error occurred during the transaction. The order has been confirmed but won't be paid. Don't hesitate to contact us if you have any questions on the status of your order.</span>"
-msgstr ""
-
-#. module: payment_ogone
-#: model:payment.acquirer,pending_msg:payment_ogone.payment_acquirer_ogone
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
#. module: payment_ogone
#: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer_ogone_userid
msgid "API User ID"
@@ -90,9 +70,9 @@ msgstr ""
#. module: payment_ogone
#: model:ir.model.fields,help:payment_ogone.field_payment_acquirer_ogone_alias_usage
msgid "If you want to use Ogone Aliases,\n"
-" this default Alias Usage will be presented to\n"
-" the customer as the reason you want to\n"
-" keep his payment data"
+" this default Alias Usage will be presented to\n"
+" the customer as the reason you want to\n"
+" keep his payment data"
msgstr ""
#. module: payment_ogone
@@ -106,24 +86,19 @@ msgid "Name"
msgstr ""
#. module: payment_ogone
-#: model:payment.acquirer,name:payment_ogone.payment_acquirer_ogone
-msgid "Ogone"
-msgstr ""
-
-#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:249
+#: code:addons/payment_ogone/models/payment.py:233
#, python-format
msgid "Ogone: invalid shasign, received %s, computed %s, for data %s"
msgstr ""
#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:237
+#: code:addons/payment_ogone/models/payment.py:222
#, python-format
msgid "Ogone: received data for reference %s"
msgstr ""
#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:230
+#: code:addons/payment_ogone/models/payment.py:215
#, python-format
msgid "Ogone: received data with missing reference (%s) or pay_id (%s) or shasign (%s)"
msgstr ""
@@ -154,12 +129,7 @@ msgid "SHA Key OUT"
msgstr ""
#. module: payment_ogone
-#: model:payment.acquirer,pre_msg:payment_ogone.payment_acquirer_ogone
-msgid "You will be redirected to the Ogone website after clicking on the payment button."
-msgstr ""
-
-#. module: payment_ogone
-#: model:ir.model,name:payment_ogone.model_payment_method
-msgid "payment.method"
+#: model:ir.model,name:payment_ogone.model_payment_token
+msgid "payment.token"
msgstr ""
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 907b7eedd3e810a78b74b44fb9f77b63f2ed5fa7..cb0f284a1ec9720e56b6f5507e5b3e06a2062e92 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,37 +16,27 @@ msgstr ""
"Plural-Forms: \n"
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:642
+#: code:addons/point_of_sale/models/pos_order.py:677
#, python-format
msgid " REFUND"
msgstr ""
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_supplier_invoice_count
-msgid "# Vendor Bills"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_nbr_lines
msgid "# of Lines"
msgstr ""
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_purchase_order_count
-msgid "# of Purchase Order"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1283
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1331
#, python-format
msgid "% discount"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1410
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1450
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1458
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1498
#, python-format
msgid " "
msgstr ""
@@ -68,6 +58,13 @@ msgstr ""
msgid "123.14 €"
msgstr ""
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/tour.js:17
+#, python-format
+msgid "<p>Click to start the point of sale interface. It <b>runs on tablets</b>, laptops, or industrial hardware.</p><p>Once the session launched, the system continues to run without an internet connection.</p>"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
msgid "<span class=\"o_stat_text\">Put</span>\n"
@@ -112,7 +109,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
msgid "<strong>Company</strong>:<br/>"
msgstr ""
@@ -131,21 +127,11 @@ msgstr ""
msgid "<strong>Opening Date</strong>:<br/>"
msgstr ""
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
-msgid "<strong>Print Date</strong>:<br/>"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "<strong>Starting Balance</strong>:<br/>"
msgstr ""
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
-msgid "<strong>Starting Date</strong>:<br/>"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "<strong>Statement Name</strong>:<br/>"
@@ -153,13 +139,11 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
msgid "<strong>Total</strong>"
msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
msgid "<strong>User</strong>:<br/>"
msgstr ""
@@ -170,14 +154,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1885
+#: code:addons/point_of_sale/static/src/js/screens.js:1909
#, python-format
msgid "? Clicking \"Confirm\" will validate the payment."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1171
+#: code:addons/point_of_sale/static/src/js/screens.js:1198
#, python-format
msgid "A Customer Name Is Required"
msgstr ""
@@ -237,11 +221,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1449
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1497
#, python-format
msgid "ABC"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_cashbox
+msgid "Account Bank Statement Cashbox Details"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Accounting Information"
@@ -254,14 +243,12 @@ msgid "Accounting journal used to post sales entries."
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_5
-#: model:product.template,name:point_of_sale.partner_product_5_product_template
-msgid "Acsone.eu"
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_activation
+msgid "Activation"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_search
-#: selection:pos.config,state:0
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_active
msgid "Active"
msgstr ""
@@ -272,7 +259,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1729
+#: code:addons/point_of_sale/static/src/js/screens.js:1753
#, python-format
msgid "Add Tip"
msgstr ""
@@ -285,7 +272,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:374
-#: code:addons/point_of_sale/static/src/xml/pos.xml:452
+#: code:addons/point_of_sale/static/src/xml/pos.xml:462
#, python-format
msgid "Address"
msgstr ""
@@ -328,7 +315,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_amount
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
msgid "Amount"
msgstr ""
@@ -360,7 +346,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1877
+#: code:addons/point_of_sale/static/src/js/screens.js:1901
#, python-format
msgid "Are you sure that the customer wants to pay"
msgstr ""
@@ -382,6 +368,11 @@ msgstr ""
msgid "Available Payment Methods"
msgstr ""
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.product_template_search_view_pos
+msgid "Available in POS"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_product_template_available_in_pos
msgid "Available in the Point of Sale"
@@ -401,7 +392,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:267
-#: code:addons/point_of_sale/static/src/xml/pos.xml:587
+#: code:addons/point_of_sale/static/src/xml/pos.xml:597
#, python-format
msgid "Back"
msgstr ""
@@ -426,7 +417,7 @@ 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:393
+#: code:addons/point_of_sale/static/src/xml/pos.xml:403
#, python-format
msgid "Barcode"
msgstr ""
@@ -438,7 +429,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1157
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1206
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
#, python-format
msgid "Barcode Scanner"
@@ -460,24 +451,12 @@ msgstr ""
msgid "Beverages"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.raisins_noir
-#: model:product.template,name:point_of_sale.raisins_noir_product_template
-msgid "Black Grapes"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.bloody_mary
#: model:product.template,name:point_of_sale.bloody_mary_product_template
msgid "Bloody Mary"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.boni_orange
-#: model:product.template,name:point_of_sale.boni_orange_product_template
-msgid "Boni Oranges"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.budweiser
#: model:product.template,name:point_of_sale.budweiser_product_template
@@ -486,7 +465,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:868
+#: code:addons/point_of_sale/static/src/js/screens.js:895
#, python-format
msgid "Button"
msgstr ""
@@ -498,7 +477,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:781
+#: code:addons/point_of_sale/static/src/xml/pos.xml:798
#, python-format
msgid "CHANGE"
msgstr ""
@@ -511,12 +490,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:420
-#: code:addons/point_of_sale/static/src/xml/pos.xml:909
+#: code:addons/point_of_sale/static/src/xml/pos.xml:430
#: code:addons/point_of_sale/static/src/xml/pos.xml:926
#: code:addons/point_of_sale/static/src/xml/pos.xml:943
-#: code:addons/point_of_sale/static/src/xml/pos.xml:963
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1015
+#: code:addons/point_of_sale/static/src/xml/pos.xml:972
+#: code:addons/point_of_sale/static/src/xml/pos.xml:989
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1009
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1061
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_payment
@@ -533,7 +513,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1866
+#: code:addons/point_of_sale/static/src/js/screens.js:1890
#, python-format
msgid "Cannot return change without a cash payment method"
msgstr ""
@@ -556,14 +536,9 @@ msgstr ""
msgid "Carlsberg"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.carotte
-#: model:product.template,name:point_of_sale.carotte_product_template
-msgid "Carrots"
-msgstr ""
-
#. module: point_of_sale
#: 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
msgid "Cash Control"
msgstr ""
@@ -578,18 +553,28 @@ msgid "Cash Register"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:106
+#: code:addons/point_of_sale/models/pos_session.py:121
#, python-format
msgid "Cash control can only be applied to cash journals."
msgstr ""
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
+msgid "Cashbox"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_cashdrawer
msgid "Cashdrawer"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/barcode_rule.py:19
+#: code:addons/point_of_sale/models/barcode_rule.py:16
#, python-format
msgid "Cashier"
msgstr ""
@@ -602,7 +587,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:493
+#: code:addons/point_of_sale/static/src/xml/pos.xml:503
#, python-format
msgid "Change"
msgstr ""
@@ -616,22 +601,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1116
+#: code:addons/point_of_sale/static/src/js/screens.js:1143
#, python-format
msgid "Change Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1729
+#: code:addons/point_of_sale/static/src/js/screens.js:1753
#, python-format
msgid "Change Tip"
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:1339
+#: code:addons/point_of_sale/static/src/xml/pos.xml:659
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1387
#, python-format
msgid "Change:"
msgstr ""
@@ -663,7 +648,7 @@ 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:1941
#, python-format
msgid "Check your internet connection and try again."
msgstr ""
@@ -682,7 +667,7 @@ msgid "City"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,help:point_of_sale.product_template_action
+#: model:ir.actions.act_window,help:point_of_sale.product_product_action
msgid "Click to add a new product."
msgstr ""
@@ -712,7 +697,7 @@ msgid "Click to start a new session."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/barcode_rule.py:18
+#: code:addons/point_of_sale/models/barcode_rule.py:15
#, python-format
msgid "Client"
msgstr ""
@@ -773,12 +758,6 @@ msgstr ""
msgid "Company"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poire_conference
-#: model:product.template,name:point_of_sale.poire_conference_product_template
-msgid "Conference pears"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
msgid "Configuration"
@@ -797,7 +776,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:684
-#: code:addons/point_of_sale/static/src/xml/pos.xml:906
+#: code:addons/point_of_sale/static/src/xml/pos.xml:923
#, python-format
msgid "Confirm"
msgstr ""
@@ -828,7 +807,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1259
+#: code:addons/point_of_sale/static/src/js/screens.js:1285
#, python-format
msgid "Could Not Read Image"
msgstr ""
@@ -849,6 +828,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_create_uid
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_create_uid
msgid "Created by"
msgstr ""
@@ -861,6 +841,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_create_date
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_create_date
msgid "Created on"
msgstr ""
@@ -899,9 +880,9 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1740
+#: code:addons/point_of_sale/static/src/js/screens.js:1764
#: code:addons/point_of_sale/static/src/xml/pos.xml:116
-#: code:addons/point_of_sale/static/src/xml/pos.xml:617
+#: code:addons/point_of_sale/static/src/xml/pos.xml:627
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_partner_id
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#, python-format
@@ -909,7 +890,8 @@ msgid "Customer"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:459
+#: code:addons/point_of_sale/models/pos_order.py:421
+#: code:addons/point_of_sale/models/pos_order.py:466
#, python-format
msgid "Customer Invoice"
msgstr ""
@@ -925,12 +907,6 @@ msgstr ""
msgid "Dashboard"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_7
-#: model:product.template,name:point_of_sale.partner_product_7_product_template
-msgid "Datalp.com"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_date
msgid "Date Order"
@@ -938,11 +914,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1147
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1196
#, python-format
msgid "Debug Window"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_default_cashbox_lines_ids
+msgid "Default Balance"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_account_id
msgid "Default Debit Account"
@@ -965,7 +946,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1167
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1216
#, python-format
msgid "Delete Paid Orders"
msgstr ""
@@ -979,7 +960,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1168
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1217
#, python-format
msgid "Delete Unpaid Orders"
msgstr ""
@@ -991,19 +972,9 @@ msgstr ""
msgid "Delete Unpaid Orders ?"
msgstr ""
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_property_delivery_carrier_id
-msgid "Delivery Method"
-msgstr ""
-
-#. module: point_of_sale
-#: selection:pos.config,state:0
-msgid "Deprecated"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1119
+#: code:addons/point_of_sale/static/src/js/screens.js:1146
#, python-format
msgid "Deselect Customer"
msgstr ""
@@ -1056,21 +1027,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:724
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1312
+#: code:addons/point_of_sale/static/src/xml/pos.xml:741
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1360
#, python-format
msgid "Discount:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/barcode_rule.py:17
+#: code:addons/point_of_sale/models/barcode_rule.py:14
#, python-format
msgid "Discounted Product"
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:807
#, python-format
msgid "Discounts"
msgstr ""
@@ -1089,16 +1060,15 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_display_name
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_invoice_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_statement_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_usersproduct_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_display_name
msgid "Display Name"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,help:point_of_sale.product_template_action
+#: model:ir.actions.act_window,help:point_of_sale.product_product_action
msgid "Do not forget to set the price and the point of sale category\n"
" in which it should appear. If a product has no point of sale\n"
" category, you can not sell it through the point of sale\n"
@@ -1117,38 +1087,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:491
+#: code:addons/point_of_sale/static/src/xml/pos.xml:501
#, python-format
msgid "Due"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_9
-#: model:product.template,name:point_of_sale.partner_product_9_product_template
-msgid "EGGS-solutions.fr"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_3
-#: model:product.template,name:point_of_sale.partner_product_3_product_template
-msgid "Eezee-It"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.efes
#: model:product.template,name:point_of_sale.efes_product_template
msgid "Efes"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_4
-#: model:product.template,name:point_of_sale.partner_product_4_product_template
-msgid "Ekomurz.nl"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1150
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1199
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_electronic_scale
#, python-format
msgid "Electronic Scale"
@@ -1157,18 +1109,25 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:343
-#: code:addons/point_of_sale/static/src/xml/pos.xml:378
+#: code:addons/point_of_sale/static/src/xml/pos.xml:383
#, python-format
msgid "Email"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1837
+#: code:addons/point_of_sale/static/src/js/screens.js:1861
#, python-format
msgid "Empty Order"
msgstr ""
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:420
+#, python-format
+msgid "Empty Serial/Lot Number"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_scan_via_proxy
msgid "Enable barcode scanning with a remotely connected barcode scanner"
@@ -1212,7 +1171,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1188
+#: code:addons/point_of_sale/static/src/js/screens.js:1214
#, python-format
msgid "Error: Could not Save Changes"
msgstr ""
@@ -1232,24 +1191,18 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1169
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1218
#, python-format
msgid "Export Paid Orders"
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:1219
#, python-format
msgid "Export Unpaid Orders"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.chicon_flandria_extra
-#: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
-msgid "Extra Flandria chicory"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Extra Info"
@@ -1268,7 +1221,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1029
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1075
#, python-format
msgid "Finished Importing Orders"
msgstr ""
@@ -1299,25 +1252,19 @@ msgstr ""
msgid "Foster's"
msgstr ""
-#. module: point_of_sale
-#: model:pos.category,name:point_of_sale.fruits_vegetables
-msgid "Fruits and Vegetables"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "General Information"
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."
+#: 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:product.product,name:point_of_sale.pomme_golden_perlim
-#: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template
-msgid "Golden Apples Perlim"
+#: 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 ""
#. module: point_of_sale
@@ -1326,18 +1273,6 @@ msgstr ""
msgid "Gordon"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.pomme_granny_smith
-#: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
-msgid "Granny Smith apples"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poivron_verts
-#: model:product.template,name:point_of_sale.poivron_verts_product_template
-msgid "Green Peppers"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.green_tea
#: model:product.template,name:point_of_sale.green_tea_product_template
@@ -1364,7 +1299,7 @@ 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:1230
#, python-format
msgid "Hardware Events"
msgstr ""
@@ -1376,7 +1311,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1177
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1226
#, python-format
msgid "Hardware Status"
msgstr ""
@@ -1405,10 +1340,9 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_id
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_invoice_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_statement_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_usersproduct_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_id
msgid "ID"
msgstr ""
@@ -1443,6 +1377,16 @@ msgstr ""
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_assigned_partner_id
+msgid "Implemented by"
+msgstr ""
+
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.alcohol
msgid "Import Drinks"
@@ -1450,7 +1394,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1171
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1220
#, python-format
msgid "Import Orders"
msgstr ""
@@ -1465,26 +1409,19 @@ msgstr ""
msgid "Importable Point of Sales Data"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.tomate_en_grappe
-#: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
-msgid "In Cluster Tomatoes"
-msgstr ""
-
#. module: point_of_sale
#: selection:pos.session,state:0
msgid "In Progress"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:406
+#: code:addons/point_of_sale/models/pos_order.py:399
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_search
-#: selection:pos.config,state:0
msgid "Inactive"
msgstr ""
@@ -1507,7 +1444,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:625
+#: code:addons/point_of_sale/static/src/xml/pos.xml:635
#: 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
@@ -1552,12 +1489,6 @@ msgstr ""
msgid "Jim Beam"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.pomme_jonagold
-#: model:product.template,name:point_of_sale.pomme_jonagold_product_template
-msgid "Jonagold apples"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_journal
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_journal_id
@@ -1588,10 +1519,9 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line___last_update
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_invoice___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_statement___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_usersproduct___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order___last_update
msgid "Last Modified on"
msgstr ""
@@ -1605,6 +1535,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_write_uid
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_write_uid
msgid "Last Updated by"
msgstr ""
@@ -1618,6 +1549,7 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_write_date
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_write_date
msgid "Last Updated on"
msgstr ""
@@ -1633,15 +1565,18 @@ msgid "Last session closing date"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poireaux_poireaux
-#: model:product.template,name:point_of_sale.poireaux_poireaux_product_template
-msgid "Leeks"
+#: 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:product.product,name:point_of_sale.citron
-#: model:product.template,name:point_of_sale.citron_product_template
-msgid "Lemon"
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_partner_weight
+msgid "Level Weight"
msgstr ""
#. module: point_of_sale
@@ -1662,7 +1597,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:484
+#: code:addons/point_of_sale/static/src/js/models.js:477
#: code:addons/point_of_sale/static/src/xml/pos.xml:38
#, python-format
msgid "Loading"
@@ -1686,6 +1621,23 @@ msgstr ""
msgid "Login as a Manager"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_lot_name
+msgid "Lot Name"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/models.js:2011
+#, python-format
+msgid "Lot/Serial Number(s) Required"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_pack_lot_ids
+msgid "Lot/serial Number"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_loyalty
msgid "Loyalty Program"
@@ -1744,7 +1696,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:494
+#: code:addons/point_of_sale/static/src/xml/pos.xml:504
#, python-format
msgid "Method"
msgstr ""
@@ -1818,6 +1770,11 @@ msgstr ""
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos
+msgid "More Info"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "My Sales"
@@ -1825,9 +1782,11 @@ 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:398
-#: code:addons/point_of_sale/static/src/xml/pos.xml:407
+#: code:addons/point_of_sale/static/src/xml/pos.xml:379
+#: code:addons/point_of_sale/static/src/xml/pos.xml:388
+#: code:addons/point_of_sale/static/src/xml/pos.xml:397
+#: code:addons/point_of_sale/static/src/xml/pos.xml:408
+#: code:addons/point_of_sale/static/src/xml/pos.xml:417
#, python-format
msgid "N/A"
msgstr ""
@@ -1835,7 +1794,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:310
-#: code:addons/point_of_sale/static/src/xml/pos.xml:451
+#: code:addons/point_of_sale/static/src/xml/pos.xml:461
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_name
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
#, python-format
@@ -1844,7 +1803,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1847
+#: code:addons/point_of_sale/static/src/js/screens.js:1871
#, python-format
msgid "Negative Bank Payment"
msgstr ""
@@ -1869,13 +1828,18 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:650
+#: code:addons/point_of_sale/static/src/xml/pos.xml:660
#, python-format
msgid "Next Order"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:134
+#: 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:135
#, python-format
msgid "No cash statement found for this session. Unable to record returned cash."
msgstr ""
@@ -1904,7 +1868,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1962
+#: code:addons/point_of_sale/static/src/js/screens.js:1986
#: code:addons/point_of_sale/static/src/xml/pos.xml:332
#, python-format
msgid "None"
@@ -1931,11 +1895,6 @@ msgstr ""
msgid "Number of Print"
msgstr ""
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.index
-msgid "Odoo POS"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/js/chrome.js:388
@@ -1952,27 +1911,29 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:838
-#: code:addons/point_of_sale/static/src/xml/pos.xml:852
-#: code:addons/point_of_sale/static/src/xml/pos.xml:866
-#: code:addons/point_of_sale/static/src/xml/pos.xml:892
-#: code:addons/point_of_sale/static/src/xml/pos.xml:923
+#: code:addons/point_of_sale/static/src/xml/pos.xml:855
+#: code:addons/point_of_sale/static/src/xml/pos.xml:869
+#: code:addons/point_of_sale/static/src/xml/pos.xml:883
+#: code:addons/point_of_sale/static/src/xml/pos.xml:909
#: code:addons/point_of_sale/static/src/xml/pos.xml:940
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1018
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1054
+#: code:addons/point_of_sale/static/src/xml/pos.xml:969
+#: code:addons/point_of_sale/static/src/xml/pos.xml:986
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1064
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1100
#, python-format
msgid "Ok"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.Onions
-#: model:product.template,name:point_of_sale.Onions_product_template
-msgid "Onions"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:421
+#, python-format
+msgid "One or more product(s) required serial/lot number."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1245
+#: code:addons/point_of_sale/static/src/js/screens.js:1271
#, python-format
msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
msgstr ""
@@ -1989,8 +1950,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:636
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1183
+#: code:addons/point_of_sale/static/src/xml/pos.xml:646
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1232
#, python-format
msgid "Open Cashbox"
msgstr ""
@@ -2033,23 +1994,18 @@ msgstr ""
msgid "Opening Date"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.papillon_orange
-#: model:product.template,name:point_of_sale.papillon_orange_product_template
-msgid "Orange Butterfly"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:282
+#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_order_id
#, python-format
msgid "Order"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:1515
-#: code:addons/point_of_sale/static/src/js/models.js:1546
+#: code:addons/point_of_sale/static/src/js/models.js:1653
+#: code:addons/point_of_sale/static/src/js/models.js:1684
#, python-format
msgid "Order "
msgstr ""
@@ -2078,6 +2034,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_order_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_name
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_order_id
msgid "Order Ref"
msgstr ""
@@ -2093,7 +2050,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1164
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1213
#: 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
@@ -2113,7 +2070,7 @@ msgid "Orders Analysis"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:180
+#: code:addons/point_of_sale/models/pos_config.py:196
#, python-format
msgid "POS Order %s"
msgstr ""
@@ -2139,7 +2096,12 @@ msgid "POS Orders lines"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:191
+#: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form
+msgid "POS Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_config.py:207
#, python-format
msgid "POS order line %s"
msgstr ""
@@ -2174,8 +2136,8 @@ msgid "Partner"
msgstr ""
#. module: point_of_sale
-#: model:pos.category,name:point_of_sale.partner_services
-msgid "Partner Services"
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_partnership
+msgid "Partnership Date"
msgstr ""
#. module: point_of_sale
@@ -2193,7 +2155,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:121
-#: code:addons/point_of_sale/static/src/xml/pos.xml:590
+#: code:addons/point_of_sale/static/src/xml/pos.xml:600
#: code:addons/point_of_sale/wizard/pos_payment.py:51
#: 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
@@ -2241,12 +2203,6 @@ msgstr ""
msgid "Payments"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.peche
-#: model:product.template,name:point_of_sale.peche_product_template
-msgid "Peaches"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.filters,name:point_of_sale.filter_orders_per_session
msgid "Per session"
@@ -2260,15 +2216,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:347
-#: code:addons/point_of_sale/static/src/xml/pos.xml:382
-#: code:addons/point_of_sale/static/src/xml/pos.xml:453
+#: code:addons/point_of_sale/static/src/xml/pos.xml:392
+#: code:addons/point_of_sale/static/src/xml/pos.xml:463
#, python-format
msgid "Phone"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1261
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1310
#, python-format
msgid "Phone:"
msgstr ""
@@ -2278,12 +2234,22 @@ msgstr ""
msgid "Picking"
msgstr ""
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
+msgid "Picking Errors"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_picking_type_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_picking_type_id
msgid "Picking Type"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_picking_count
+msgid "Picking count"
+msgstr ""
+
#. module: point_of_sale
#: model:product.product,name:point_of_sale.pina_colada
#: model:product.template,name:point_of_sale.pina_colada_product_template
@@ -2292,33 +2258,33 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1876
+#: code:addons/point_of_sale/static/src/js/screens.js:1900
#, python-format
msgid "Please Confirm Large Amount"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:272
+#: code:addons/point_of_sale/models/pos_order.py:265
#, 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:437
+#: code:addons/point_of_sale/models/pos_order.py:442
#, 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:474
+#: code:addons/point_of_sale/static/src/xml/pos.xml:484
#, 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:1908
+#: code:addons/point_of_sale/static/src/js/screens.js:1932
#, python-format
msgid "Please select the Customer"
msgstr ""
@@ -2423,6 +2389,17 @@ msgstr ""
msgid "Pos Product Categories"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_partner_pos_order_count
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_pos_order_count
+msgid "Pos order count"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_pos_order_line_id
+msgid "Pos order line id"
+msgstr ""
+
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
msgid "Pos session username"
@@ -2442,12 +2419,6 @@ msgstr ""
msgid "Posted"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.pomme_de_terre
-#: model:product.template,name:point_of_sale.pomme_de_terre_product_template
-msgid "Potatoes"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_precompute_cash
msgid "Prefill Cash Payment"
@@ -2461,7 +2432,7 @@ msgid "Price"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/barcode_rule.py:16
+#: code:addons/point_of_sale/models/barcode_rule.py:13
#, python-format
msgid "Priced Product"
msgstr ""
@@ -2475,8 +2446,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:657
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1184
+#: code:addons/point_of_sale/static/src/xml/pos.xml:667
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1233
#, python-format
msgid "Print Receipt"
msgstr ""
@@ -2502,8 +2473,8 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_product_id
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_pack_operation_lot_product_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_product_id
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Product"
msgstr ""
@@ -2531,7 +2502,7 @@ msgid "Product Template"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.product_template_action
+#: model:ir.actions.act_window,name:point_of_sale.product_product_action
#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Products"
@@ -2551,7 +2522,6 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:134
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
#, python-format
msgid "Qty"
msgstr ""
@@ -2562,15 +2532,17 @@ msgid "Quantity"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
-msgid "Re-Print"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1234
+#, python-format
+msgid "Read Weighing Scale"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1185
+#: code:addons/point_of_sale/static/src/js/tour.js:13
#, python-format
-msgid "Read Weighting Scale"
+msgid "Ready to launch your <b>point of sale</b>? <i>Click here</i>."
msgstr ""
#. module: point_of_sale
@@ -2609,24 +2581,12 @@ msgstr ""
msgid "Red Label"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poivron_rouges
-#: model:product.template,name:point_of_sale.poivron_rouges_product_template
-msgid "Red Pepper"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.red_wine
#: model:product.template,name:point_of_sale.red_wine_product_template
msgid "Red Wine"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.pamplemousse_rouge_pamplemousse
-#: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
-msgid "Red grapefruit"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.redbull
#: model:product.template,name:point_of_sale.redbull_product_template
@@ -2645,7 +2605,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1154
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1203
#, python-format
msgid "Reset"
msgstr ""
@@ -2671,7 +2631,7 @@ msgid "Resume"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:652
+#: code:addons/point_of_sale/models/pos_order.py:688
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
msgid "Return Products"
@@ -2733,14 +2693,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1160
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1209
#, python-format
msgid "Scan"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1161
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1210
#, python-format
msgid "Scan EAN-13"
msgstr ""
@@ -2765,7 +2725,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:424
+#: code:addons/point_of_sale/static/src/xml/pos.xml:434
#, python-format
msgid "Search Customers"
msgstr ""
@@ -2795,7 +2755,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:432
+#: code:addons/point_of_sale/static/src/xml/pos.xml:442
#, python-format
msgid "Select Customer"
msgstr ""
@@ -2809,13 +2769,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1973
+#: code:addons/point_of_sale/static/src/js/screens.js:1997
#, python-format
msgid "Select tax"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:202
+#: code:addons/point_of_sale/models/pos_order.py:203
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
@@ -2832,20 +2792,27 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:704
+#: code:addons/point_of_sale/static/src/xml/pos.xml:963
+#, python-format
+msgid "Serial/Lot Number"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:719
#, python-format
msgid "Served by"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1921
+#: code:addons/point_of_sale/static/src/js/screens.js:1945
#, python-format
msgid "Server Error"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:249
+#: code:addons/point_of_sale/models/pos_config.py:253
#: 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_order_session_id
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_session_id
@@ -2861,7 +2828,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1043
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1089
#, python-format
msgid "Session ids:"
msgstr ""
@@ -2883,46 +2850,24 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1114
+#: code:addons/point_of_sale/static/src/js/screens.js:1141
#, python-format
msgid "Set Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1153
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1202
#, python-format
msgid "Set Weight"
msgstr ""
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Set to Active"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Set to Deprecated"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
-msgid "Set to Inactive"
-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"
msgstr ""
-#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1263
-#, python-format
-msgid "Shop:"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:42
@@ -2963,6 +2908,11 @@ msgstr ""
msgid "Some orders could not be submitted to"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_pack_operation_lot
+msgid "Specify product lot/serial number in pos order line"
+msgstr ""
+
#. module: point_of_sale
#: model:product.product,name:point_of_sale.sprite
#: model:product.template,name:point_of_sale.sprite_product_template
@@ -2996,7 +2946,6 @@ msgid "Statements"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_state
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_state
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_state
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_state
@@ -3023,15 +2972,9 @@ msgstr ""
msgid "Street"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.limon
-#: model:product.template,name:point_of_sale.limon_product_template
-msgid "Stringers"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:752
+#: code:addons/point_of_sale/static/src/xml/pos.xml:769
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_price_subtotal_incl
#, python-format
msgid "Subtotal"
@@ -3049,21 +2992,21 @@ 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:1346
#, python-format
msgid "Subtotal:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1035
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1081
#, python-format
msgid "Successfully imported"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1034
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1080
#, python-format
msgid "Successfully imported"
msgstr ""
@@ -3083,14 +3026,9 @@ msgstr ""
msgid "Summary by Payment Methods"
msgstr ""
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_property_purchase_currency_id
-msgid "Supplier Currency"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:765
+#: code:addons/point_of_sale/static/src/xml/pos.xml:782
#, python-format
msgid "TOTAL"
msgstr ""
@@ -3102,8 +3040,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:300
-#: code:addons/point_of_sale/static/src/js/screens.js:1983
+#: code:addons/point_of_sale/models/pos_order.py:293
+#: code:addons/point_of_sale/static/src/js/screens.js:2007
#, python-format
msgid "Tax"
msgstr ""
@@ -3111,7 +3049,7 @@ 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:402
+#: code:addons/point_of_sale/static/src/xml/pos.xml:412
#, python-format
msgid "Tax ID"
msgstr ""
@@ -3125,21 +3063,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1133
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1182
#, python-format
msgid "Taxes:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:684
+#: code:addons/point_of_sale/static/src/xml/pos.xml:699
#, python-format
msgid "Tel:"
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:502
#, python-format
msgid "Tendered"
msgstr ""
@@ -3151,39 +3089,39 @@ msgid "Tequila"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:260
+#: code:addons/point_of_sale/models/pos_order.py:253
#, 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:887
+#: code:addons/point_of_sale/static/src/xml/pos.xml:904
#, 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:150
+#: code:addons/point_of_sale/models/pos_config.py:166
#, 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:145
+#: code:addons/point_of_sale/models/pos_config.py:161
#, python-format
msgid "The company of the sale journal is different than the one of point of sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:140
+#: code:addons/point_of_sale/models/pos_config.py:156
#, 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:155
+#: code:addons/point_of_sale/models/pos_config.py:171
#, python-format
msgid "The default fiscal position must be included in the available fiscal positions of the point of sale"
msgstr ""
@@ -3205,16 +3143,22 @@ msgstr ""
msgid "The name of this POS Session must be unique !"
msgstr ""
+#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_res_partner_pos_order_count
+#: model:ir.model.fields,help:point_of_sale.field_res_users_pos_order_count
+msgid "The number of point of sale orders related to this customer"
+msgstr ""
+
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1916
+#: code:addons/point_of_sale/static/src/js/screens.js:1940
#, 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:1927
+#: code:addons/point_of_sale/static/src/js/screens.js:1951
#, python-format
msgid "The order could not be sent to the server due to an unknown error"
msgstr ""
@@ -3247,7 +3191,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1260
+#: code:addons/point_of_sale/static/src/js/screens.js:1286
#, python-format
msgid "The provided file could not be read due to an unknown error"
msgstr ""
@@ -3264,7 +3208,7 @@ 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:1946
#, python-format
msgid "The server encountered an error while receiving your order."
msgstr ""
@@ -3280,7 +3224,7 @@ msgid "The transactions are processed by MercuryPay"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:215
+#: code:addons/point_of_sale/models/pos_session.py:233
#, python-format
msgid "The type of the journal for your payment method should be bank or cash "
msgstr ""
@@ -3299,7 +3243,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1867
+#: code:addons/point_of_sale/static/src/js/screens.js:1891
#, python-format
msgid "There is no cash payment method available in this point of sale to handle the change.\n"
"\n"
@@ -3313,32 +3257,27 @@ msgid "There is no cash register for this PoS Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:607
+#: code:addons/point_of_sale/models/pos_order.py:642
#, 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:605
+#: code:addons/point_of_sale/models/pos_order.py:640
#, 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:1838
+#: code:addons/point_of_sale/static/src/js/screens.js:1862
#, python-format
msgid "There must be at least one product in your order before it can be validated"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.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 ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_res_users_property_delivery_carrier_id
-msgid "This delivery method will be used when invoicing from picking."
+#: model:ir.model.fields,field_description:point_of_sale.field_account_cashbox_line_default_pos_id
+msgid "This cashbox line is used by default when opening or closing a balance for this point of sale"
msgstr ""
#. module: point_of_sale
@@ -3361,6 +3300,12 @@ msgstr ""
msgid "This field is there to pass the id of the pos user group to the point of sale client"
msgstr ""
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:450
+#, 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
#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_pos_restaurant
msgid "This module adds several restaurant features to the Point of Sale: \n"
@@ -3391,6 +3336,12 @@ msgstr ""
msgid "This sequence is automatically created by Odoo but you can change it to customize the reference numbers of your orders."
msgstr ""
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:564
+#, 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_template_pos_categ_id
msgid "Those categories are used to group similar products for point of sale."
@@ -3398,7 +3349,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:631
+#: code:addons/point_of_sale/static/src/xml/pos.xml:641
#, python-format
msgid "Tip"
msgstr ""
@@ -3414,7 +3365,7 @@ msgid "To Weigh With Scale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:638
+#: code:addons/point_of_sale/models/pos_order.py:673
#, python-format
msgid "To return product(s), you need to open a session that will be used to register the refund."
msgstr ""
@@ -3446,7 +3397,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:802
+#: code:addons/point_of_sale/static/src/xml/pos.xml:819
#, python-format
msgid "Total Taxes"
msgstr ""
@@ -3473,14 +3424,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1132
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1318
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1181
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1366
#, python-format
msgid "Total:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:312
+#: code:addons/point_of_sale/models/pos_order.py:305
#, python-format
msgid "Trade Receivables"
msgstr ""
@@ -3492,7 +3443,7 @@ msgid "Tuborg"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:134
+#: code:addons/point_of_sale/models/pos_session.py:149
#, python-format
msgid "Unable to open the session. You have to assign a sale journal to your point of sale."
msgstr ""
@@ -3504,21 +3455,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:883
+#: code:addons/point_of_sale/static/src/xml/pos.xml:900
#, python-format
msgid "Unknown Barcode"
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:1950
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1244
+#: code:addons/point_of_sale/static/src/js/screens.js:1270
#, python-format
msgid "Unsupported File Format"
msgstr ""
@@ -3541,15 +3492,9 @@ msgstr ""
msgid "User Labels"
msgstr ""
-#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.action_report_pos_users_product
-#: model:ir.ui.view,arch_db:point_of_sale.report_usersproduct
-msgid "User's Product"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1262
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1311
#, python-format
msgid "User:"
msgstr ""
@@ -3566,14 +3511,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:687
+#: code:addons/point_of_sale/static/src/xml/pos.xml:702
#, python-format
msgid "VAT:"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:591
+#: code:addons/point_of_sale/static/src/xml/pos.xml:601
#, python-format
msgid "Validate"
msgstr ""
@@ -3583,12 +3528,6 @@ msgstr ""
msgid "Validate Closing & Post Entries"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_6
-#: model:product.template,name:point_of_sale.partner_product_6_product_template
-msgid "Vauxoo.com"
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_vkeyboard
msgid "Virtual KeyBoard"
@@ -3606,16 +3545,16 @@ msgid "Water"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/barcode_rule.py:15
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1228
#, python-format
-msgid "Weighted Product"
+msgid "Weighing"
msgstr ""
#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1179
+#: code:addons/point_of_sale/models/barcode_rule.py:12
#, python-format
-msgid "Weighting"
+msgid "Weighted Product"
msgstr ""
#. module: point_of_sale
@@ -3637,8 +3576,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1105
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1282
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1154
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1330
#, python-format
msgid "With a"
msgstr ""
@@ -3648,12 +3587,6 @@ msgstr ""
msgid "Year"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poivron_jaunes
-#: model:product.template,name:point_of_sale.poivron_jaunes_product_template
-msgid "Yellow Peppers"
-msgstr ""
-
#. module: point_of_sale
#: model:product.product,name:point_of_sale.tea
#: model:product.template,name:point_of_sale.tea_product_template
@@ -3667,7 +3600,7 @@ msgid "You can define another list of available currencies on the\n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_order.py:396
+#: code:addons/point_of_sale/models/pos_order.py:389
#, python-format
msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
msgstr ""
@@ -3679,13 +3612,13 @@ msgid "You cannot confirm all orders of this session, because they have not the
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:117
+#: code:addons/point_of_sale/models/pos_session.py:132
#, 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:112
+#: code:addons/point_of_sale/models/pos_session.py:127
#, python-format
msgid "You cannot create two active sessions with the same responsible!"
msgstr ""
@@ -3698,13 +3631,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1848
+#: code:addons/point_of_sale/static/src/js/screens.js:1872
#, 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:231
+#: code:addons/point_of_sale/models/pos_session.py:249
#, 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."
msgstr ""
@@ -3716,39 +3649,39 @@ 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:621
+#: code:addons/point_of_sale/models/pos_order.py:656
#, 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:724
+#: code:addons/point_of_sale/models/pos_order.py:761
#, 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:712
+#: code:addons/point_of_sale/models/pos_order.py:749
#, 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
-#: model:ir.actions.act_window,help:point_of_sale.product_template_action
+#: model:ir.actions.act_window,help:point_of_sale.product_product_action
msgid "You must define a product for everything you sell through\n"
" the point of sale interface."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1909
+#: code:addons/point_of_sale/static/src/js/screens.js:1933
#, 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:123
+#: code:addons/point_of_sale/models/pos_session.py:138
#, python-format
msgid "You should assign a Point of Sale to your session."
msgstr ""
@@ -3762,20 +3695,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1189
+#: code:addons/point_of_sale/static/src/js/screens.js:1215
#, python-format
msgid "Your Internet connection is probably down."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_session.py:213
+#: code:addons/point_of_sale/models/pos_session.py:231
#, 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:1124
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1173
#, python-format
msgid "Your shopping cart is empty"
msgstr ""
@@ -3787,15 +3720,9 @@ msgstr ""
msgid "ZIP"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.courgette
-#: model:product.template,name:point_of_sale.courgette_product_template
-msgid "Zucchini"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1097
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1146
#, python-format
msgid "at"
msgstr ""
@@ -3807,20 +3734,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1040
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1086
#, python-format
msgid "belong to another session:"
msgstr ""
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.partner_product_8
-#: model:product.template,name:point_of_sale.partner_product_8_product_template
-msgid "camptocamp.com"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1385
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1433
#, python-format
msgid "caps lock"
msgstr ""
@@ -3837,43 +3758,43 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1412
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1454
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1460
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1502
#, python-format
msgid "close"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1370
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1447
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1418
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1495
#, python-format
msgid "delete"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1107
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1156
#, python-format
msgid "discount"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1881
+#: code:addons/point_of_sale/static/src/js/screens.js:1905
#, python-format
msgid "for an order of"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/models/pos_config.py:171
+#: code:addons/point_of_sale/models/pos_config.py:187
#, python-format
msgid "not used"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1034
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1080
#, python-format
msgid "paid orders"
msgstr ""
@@ -3903,57 +3824,47 @@ msgstr ""
msgid "report.point_of_sale.report_invoice"
msgstr ""
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_statement
-msgid "report.point_of_sale.report_statement"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_usersproduct
-msgid "report.point_of_sale.report_usersproduct"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/models/pos_order.py:139
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1397
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1452
+#: code:addons/point_of_sale/models/pos_order.py:140
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1445
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1500
#, python-format
msgid "return"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1398
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1409
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1446
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1457
#, python-format
msgid "shift"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1371
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1419
#, python-format
msgid "tab"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1035
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1081
#, python-format
msgid "unpaid orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1037
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1083
#, 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:1039
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1085
#, python-format
msgid "were duplicates of existing orders"
msgstr ""
diff --git a/addons/pos_discount/i18n/pos_discount.pot b/addons/pos_discount/i18n/pos_discount.pot
index 48b99eb51e0bbab3164ba900a7501787e8350fc0..3f172916474fa6371b47d810ac3cfb671bc61e19 100644
--- a/addons/pos_discount/i18n/pos_discount.pot
+++ b/addons/pos_discount/i18n/pos_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
#. module: pos_discount
#. openerp-web
-#: code:addons/pos_discount/static/src/xml/discount.xml:6
+#: code:addons/pos_discount/static/src/xml/discount_templates.xml:6
#, python-format
msgid "Discount"
msgstr ""
@@ -49,12 +49,12 @@ msgstr ""
#. module: pos_discount
#: model:ir.model.fields,help:pos_discount.field_pos_config_discount_pc
-msgid "The default discount percentage."
+msgid "The default discount percentage"
msgstr ""
#. module: pos_discount
#: model:ir.model.fields,help:pos_discount.field_pos_config_discount_product_id
-msgid "The product used to record the discount. The ability to discount on the whole order will be disabled if this field is empty."
+msgid "The product used to model the discount"
msgstr ""
#. module: pos_discount
diff --git a/addons/pos_mercury/i18n/pos_mercury.pot b/addons/pos_mercury/i18n/pos_mercury.pot
index e8340f71b7907f9d4aca65d7e6f59a7c9f8239bc..5dd4fb915d934fbcc01668e971bcf0475fef9410 100644
--- a/addons/pos_mercury/i18n/pos_mercury.pot
+++ b/addons/pos_mercury/i18n/pos_mercury.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -152,7 +152,7 @@ msgid "Created on"
msgstr ""
#. module: pos_mercury
-#: code:addons/pos_mercury/models/pos_mercury.py:17
+#: code:addons/pos_mercury/models/pos_mercury.py:15
#, python-format
msgid "Credit Card"
msgstr ""
@@ -935,6 +935,11 @@ msgstr ""
msgid "barcode.rule"
msgstr ""
+#. module: pos_mercury
+#: model:ir.model,name:pos_mercury.model_ir_autovacuum
+msgid "ir.autovacuum"
+msgstr ""
+
#. module: pos_mercury
#: model:ir.model,name:pos_mercury.model_pos_mercury_configuration
msgid "pos_mercury.configuration"
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index a3c85c6e890c4c9a29cf4efb91635eed1a034c6f..53391b1dcfdecfa222e3ede2375e9c3fb9f7a593 100644
--- a/addons/pos_restaurant/i18n/pos_restaurant.pot
+++ b/addons/pos_restaurant/i18n/pos_restaurant.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -70,7 +70,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:543
+#: code:addons/pos_restaurant/static/src/js/floors.js:550
#, python-format
msgid "Are you sure ?"
msgstr ""
@@ -131,19 +131,12 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
#: code:addons/pos_restaurant/static/src/js/floors.js:260
-#: code:addons/pos_restaurant/static/src/js/floors.js:404
+#: code:addons/pos_restaurant/static/src/js/floors.js:297
+#: code:addons/pos_restaurant/static/src/js/floors.js:411
#, python-format
msgid "Changes could not be saved"
msgstr ""
-#. module: pos_restaurant
-#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:261
-#: code:addons/pos_restaurant/static/src/js/floors.js:405
-#, python-format
-msgid "Check your internet connection and access rights"
-msgstr ""
-
#. module: pos_restaurant
#: model:ir.actions.act_window,help:pos_restaurant.action_restaurant_floor_form
msgid "Click to add a Restaurant Floor."
@@ -233,7 +226,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:918
+#: code:addons/pos_restaurant/static/src/js/floors.js:925
#, python-format
msgid "Guests ?"
msgstr ""
@@ -313,7 +306,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:476
+#: code:addons/pos_restaurant/static/src/js/floors.js:483
#, python-format
msgid "Number of Seats ?"
msgstr ""
@@ -368,11 +361,6 @@ msgstr ""
msgid "Point of Sale"
msgstr ""
-#. module: pos_restaurant
-#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_pos_order_ids
-msgid "Pos Orders"
-msgstr ""
-
#. module: pos_restaurant
#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/printbill.xml:20
@@ -397,7 +385,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:544
+#: code:addons/pos_restaurant/static/src/js/floors.js:551
#, python-format
msgid "Removing a table cannot be undone"
msgstr ""
@@ -488,7 +476,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:464
+#: code:addons/pos_restaurant/static/src/js/floors.js:471
#, python-format
msgid "Table Name ?"
msgstr ""
@@ -531,11 +519,6 @@ msgstr ""
msgid "The list of tables in this floor"
msgstr ""
-#. module: pos_restaurant
-#: model:ir.model.fields,help:pos_restaurant.field_restaurant_table_pos_order_ids
-msgid "The orders served at this table"
-msgstr ""
-
#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_pos_config_floor_ids
msgid "The restaurant floors served by this point of sale"
@@ -573,7 +556,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:102
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:106
#, python-format
msgid "This floor has no tables yet, use the"
msgstr ""
@@ -614,6 +597,15 @@ msgstr ""
msgid "With a"
msgstr ""
+#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/js/floors.js:261
+#: code:addons/pos_restaurant/static/src/js/floors.js:298
+#: code:addons/pos_restaurant/static/src/js/floors.js:412
+#, python-format
+msgid "You must be connected to the internet to save your changes."
+msgstr ""
+
#. module: pos_restaurant
#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/splitbill.xml:36
@@ -631,7 +623,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:103
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:107
#, python-format
msgid "button in the editing toolbar to create new tables."
msgstr ""
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 594ae743abb04a1111c4602dabf2b0834d01bcf1..cd16e8d64ecefb8ea29da7cb87f29acddb93d26e 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,6 +45,11 @@ msgstr ""
msgid "All at once"
msgstr ""
+#. module: procurement
+#: model:ir.ui.view,arch_db:procurement.view_procurement_rule_filter
+msgid "Archived"
+msgstr ""
+
#. module: procurement
#: model:ir.ui.view,arch_db:procurement.view_compute_schedulers_wizard
msgid "Cancel"
@@ -60,12 +65,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:138
-#, python-format
-msgid "Cannot delete Procurement Order(s) which are in %s state."
-msgstr ""
-
#. module: procurement
#: model:ir.ui.view,arch_db:procurement.procurement_form_view
msgid "Check Procurement"
@@ -259,7 +258,7 @@ msgid "Name"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:200
+#: code:addons/procurement/models/procurement.py:189
#, python-format
msgid "No rule matching this procurement"
msgstr ""
@@ -397,8 +396,7 @@ msgstr ""
#. module: procurement
#: model:ir.model.fields,help:procurement.field_procurement_order_origin
-msgid "Reference of the document that created this Procurement.\n"
-"This is automatically completed by Odoo."
+msgid "Reference of the document that created this Procurement. This is automatically completed by Odoo."
msgstr ""
#. module: procurement
@@ -498,6 +496,12 @@ msgid "When the procurement order is confirmed, it automatically\n"
" order proposition, manufacturing order, etc."
msgstr ""
+#. module: procurement
+#: code:addons/procurement/models/procurement.py:144
+#, python-format
+msgid "You cannot delete procurements that are in cancel state."
+msgstr ""
+
#. module: procurement
#: model:ir.ui.view,arch_db:procurement.view_procurement_rule_form
msgid "e.g. Buy"
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index c6f7571bb0c1b46f0bf88a2691b4a6cda9df08a7..039b7c4e9f551b1403c01009f67b703322ee96d8 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,91 +23,32 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_product_variant_count
#: model:ir.model.fields,field_description:product.field_product_template_product_variant_count
-msgid "# of Product Variants"
+msgid "# Product Variants"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:372
+#: model:ir.model.fields,field_description:product.field_product_category_product_count
+msgid "# Products"
+msgstr ""
+
+#. module: product
+#: code:addons/product/models/product_pricelist.py:392
#, python-format
msgid "%s %% discount"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/models/product_pricelist.py:394
#, python-format
msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
-#: code:addons/product/product.py:716
+#: code:addons/product/models/product_template.py:278
#, python-format
msgid "%s (copy)"
msgstr ""
-#. module: product
-#: model:product.attribute.value,name:product.product_attribute_value_1
-msgid "16 GB"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_3
-#: model:product.template,description_sale:product.product_product_3_product_template
-msgid "17\" LCD Monitor\n"
-"Processor AMD 8-Core\n"
-"512MB RAM\n"
-"HDD SH-1"
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_25
-#: model:product.template,description:product.product_product_25_product_template
-msgid "17\" Monitor\n"
-"4GB RAM\n"
-"Standard-1294P Processor\n"
-"QWERTY keyboard"
-msgstr ""
-
-#. module: product
-#: model:product.attribute.value,name:product.product_attribute_value_5
-msgid "2.4 GHz"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_8
-#: model:product.template,description_sale:product.product_product_8_product_template
-msgid "2.7GHz quad-core Intel Core i5\n"
-" Turbo Boost up to 3.2GHz\n"
-" 8GB (two 4GB) memory\n"
-" 1TB hard drive\n"
-" Intel Iris Pro graphics\n"
-" "
-msgstr ""
-
-#. module: product
-#: model:product.attribute.value,name:product.product_attribute_value_2
-msgid "32 GB"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_4
-#: model:product.product,description_sale:product.product_product_4b
-#: model:product.product,description_sale:product.product_product_4c
-#: model:product.product,description_sale:product.product_product_4d
-#: model:product.template,description_sale:product.product_product_4_product_template
-#: model:product.template,description_sale:product.product_product_4b_product_template
-#: model:product.template,description_sale:product.product_product_4c_product_template
-#: model:product.template,description_sale:product.product_product_4d_product_template
-msgid "7.9‑inch (diagonal) LED-backlit, 128Gb\n"
-"Dual-core A5 with quad-core graphics\n"
-"FaceTime HD Camera, 1.2 MP Photos"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "75 percent less reflection."
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "<span attrs=\"{'invisible':[('base', '!=', 'list_price')]}\">Public Price - </span>\n"
@@ -115,6 +56,11 @@ msgid "<span attrs=\"{'invisible':[('base', '!=', 'list_price')]}\">Public Price
" <span attrs=\"{'invisible':[('base', '!=', 'pricelist')]}\">Other Pricelist - </span>"
msgstr ""
+#. module: product
+#: model:ir.ui.view,arch_db:product.product_category_form_view
+msgid "<span class=\"o_stat_text\"> Products</span>"
+msgstr ""
+
#. module: product
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
msgid "<span>kg</span>"
@@ -143,12 +89,12 @@ msgstr ""
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_only_form_view
msgid "<strong>Warning</strong>: adding or deleting attributes\n"
-" will delete and recreate existing variants and lead\n"
-" to the loss of their possible customizations."
+" will delete and recreate existing variants and lead\n"
+" to the loss of their possible customizations."
msgstr ""
#. module: product
-#: code:addons/product/product.py:1011
+#: code:addons/product/models/product.py:167
#: sql_constraint:product.product:0
#, python-format
msgid "A barcode can only be assigned to one product !"
@@ -159,12 +105,6 @@ msgstr ""
msgid "A category of the view type is a virtual category that can be used as the parent of another category to create a hierarchical structure."
msgstr ""
-#. module: product
-#: model:ir.model.fields,help:product.field_product_product_type
-#: model:ir.model.fields,help:product.field_product_template_type
-msgid "A consumable is a product for which you don't manage stock, a service is a non-material product provided by a company or an individual."
-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
@@ -177,12 +117,6 @@ msgstr ""
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."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_9
-#: model:product.template,website_description:product.product_product_9_product_template
-msgid "A great Keyboard. Cordless."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_product_description
#: model:ir.model.fields,help:product.field_product_template_description
@@ -196,19 +130,12 @@ msgid "A price list contains rules to be evaluated in order to compute\n"
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "A screen worthy of iPad."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "About the size of a credit card — and just 5.4 mm thin — iPod nano is the thinnest iPod ever made.\n"
-" The 2.5-inch Multi-Touch display is nearly twice as big as the display on the previous iPod nano,\n"
-" so you can see more of the music, photos, and videos you love."
+#: model:ir.model.fields,help:product.field_product_product_type
+#: model:ir.model.fields,help:product.field_product_template_type
+msgid "A stockable product is a product for which you manage stock. The \"Inventory\" app has to be installed.\n"
+"A consumable product, on the other hand, is a product for which stock is not managed.\n"
+"A service is a non-material product you provide.\n"
+"A digital content is a non-material product you sell online. The files attached to the products are the one that are sold on the e-commerce such as e-books, music, pictures,... The \"Digital Product\" module has to be installed."
msgstr ""
#. module: product
@@ -225,7 +152,7 @@ msgid "All"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:367
+#: code:addons/product/models/product_pricelist.py:387
#, python-format
msgid "All Products"
msgstr ""
@@ -235,36 +162,6 @@ msgstr ""
msgid "All general settings about this product are managed on"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "And at the Apple Online Store, you can configure your iMac with an even more powerful Intel Core i7 processor, up to 3.5GHz."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-msgid "And because it’s so easy to use, it’s easy to love."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_7
-#: model:product.template,name:product.product_product_7_product_template
-msgid "Apple In-Ear Headphones"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_9
-#: model:product.template,name:product.product_product_9_product_template
-msgid "Apple Wireless Keyboard"
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_normal_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_view
@@ -282,12 +179,6 @@ msgstr ""
msgid "Archived"
msgstr ""
-#. module: product
-#: model:product.product,name:product.product_assembly
-#: model:product.template,name:product.product_assembly_product_template
-msgid "Assembly Service Cost"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_supplierinfo_sequence
msgid "Assigns the priority to the list of product vendor."
@@ -312,32 +203,18 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.variants_action
#: model:ir.model.fields,field_description:product.field_product_attribute_line_value_ids
-#: model:ir.ui.menu,name:product.menu_variants_action
msgid "Attribute Values"
msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.attribute_action
#: model:ir.model.fields,field_description:product.field_product_product_attribute_value_ids
-#: model:ir.ui.menu,name:product.menu_attribute_action
#: model:ir.ui.view,arch_db:product.product_attribute_value_view_tree
#: model:ir.ui.view,arch_db:product.product_template_search_view
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
msgid "Attributes"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Auxiliary input for portable devices"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Auxiliary port lets you connect other audio sources, like an MP3 player"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_barcode
#: model:ir.model.fields,field_description:product.field_product_template_barcode
@@ -346,15 +223,16 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_base
-msgid "Base price for computation. \n"
-" Public Price: The base price will be the Sale/public Price. \n"
-" Cost Price : The base price will be the cost price. \n"
-" Other Pricelist : Computation of the base price based on another Pricelist."
+msgid "Base price for computation.\n"
+"Public Price: The base price will be the Sale/public Price.\n"
+"Cost Price : The base price will be the cost price.\n"
+"Other Pricelist : Computation of the base price based on another Pricelist."
msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_list_price
#: model:ir.model.fields,help:product.field_product_template_list_price
+#: model:ir.model.fields,help:product.field_product_template_lst_price
msgid "Base price to compute the customer price. Sometimes called the catalog price."
msgstr ""
@@ -363,30 +241,6 @@ msgstr ""
msgid "Based on"
msgstr ""
-#. module: product
-#: model:product.product,name:product.consu_delivery_03
-#: model:product.template,name:product.consu_delivery_03_product_template
-msgid "Basic Computer"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.membership_2
-#: model:product.template,name:product.membership_2_product_template
-msgid "Basic Membership"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Beautiful 7.9‑inch display."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Beautiful widescreen display."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_image
msgid "Big-sized image"
@@ -402,56 +256,6 @@ msgstr ""
msgid "Bigger than the reference Unit of Measure"
msgstr ""
-#. module: product
-#: model:product.attribute.value,name:product.product_attribute_value_4
-msgid "Black"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Bluetooth connectivity"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_5b
-#: model:product.template,name:product.product_product_5b_product_template
-msgid "Bose Mini Bluetooth Speaker"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Bose Mini Bluetooth Speaker."
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_5b
-#: model:product.template,description_sale:product.product_product_5b_product_template
-msgid "Bose's smallest portable Bluetooth speaker"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Brilliance onscreen. And behind it."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Buttons let you quickly play, pause, change songs, or adjust the volume.\n"
-" The smooth anodized aluminum design makes iPod nano feel as good as it sounds.\n"
-" And iPod nano wouldn’t be iPod nano without gorgeous, hard-to-choose-from color."
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_uom_active
-msgid "By unchecking the active field you can disable a unit of measure without deleting it."
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.view_product_price_list
msgid "Calculate Product Price per Unit Based on Pricelist Version."
@@ -475,6 +279,11 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_uom_category_id
+msgid "Category"
+msgstr ""
+
#. module: product
#: model:ir.model.fields,field_description:product.field_product_category_type
#: model:ir.ui.view,arch_db:product.product_category_form_view
@@ -487,28 +296,14 @@ msgid "Category name"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:361
+#: code:addons/product/models/product_pricelist.py:381
#, python-format
msgid "Category: %s"
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Characteristics"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Charges iPod/iPhone"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Charging cradle recharges the battery and serves as a convenient\n"
-" home base for your speaker, and it lets you play while it charges."
+#: model:ir.model.fields,help:product.field_product_attribute_create_variant
+msgid "Check this if you want to create multiple variants for this attribute."
msgstr ""
#. module: product
@@ -535,7 +330,7 @@ msgstr ""
#: model:ir.actions.act_window,help:product.product_normal_action
#: model:ir.actions.act_window,help:product.product_normal_action_sell
#: model:ir.actions.act_window,help:product.product_template_action
-#: model:ir.actions.act_window,help:product.product_template_action_product
+#: model:ir.actions.act_window,help:product.product_template_action_all
#: model:ir.actions.act_window,help:product.product_variant_action
msgid "Click to define a new product."
msgstr ""
@@ -545,11 +340,6 @@ msgstr ""
msgid "Codes"
msgstr ""
-#. module: product
-#: model:product.attribute,name:product.product_attribute_2
-msgid "Color"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_color
#: model:ir.model.fields,field_description:product.field_product_template_color
@@ -557,16 +347,8 @@ msgid "Color Index"
msgstr ""
#. module: product
-#: model:product.product,description_sale:product.product_product_6
-#: model:product.template,description_sale:product.product_product_6_product_template
-msgid "Color: White\n"
-"Capacity: 16GB\n"
-"Connectivity: Wifi\n"
-"Beautiful 7.9-inch display\n"
-"Over 375,000 apps\n"
-"Ultrafast wireless\n"
-"iOS7\n"
-" "
+#: model:ir.model,name:product.model_res_company
+msgid "Companies"
msgstr ""
#. module: product
@@ -579,8 +361,8 @@ msgid "Company"
msgstr ""
#. module: product
-#: model:product.public.category,name:product.Components
-msgid "Components"
+#: model:ir.model.fields,field_description:product.field_product_price_history_company_id
+msgid "Company id"
msgstr ""
#. module: product
@@ -589,29 +371,13 @@ msgid "Compute Price"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_16
-#: model:product.template,name:product.product_product_16_product_template
-msgid "Computer Case"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_3
-#: model:product.template,name:product.product_product_3_product_template
-msgid "Computer SC234"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.Computer_all_in_one
-msgid "Computer all-in-one"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.sub_computers
-msgid "Computers"
+#: model:ir.model.fields,field_description:product.field_product_pricelist_item_compute_price
+msgid "Compute price"
msgstr ""
#. module: product
-#: code:addons/product/product.py:474
+#: code:addons/product/models/product_template.py:42
+#: selection:product.template,type:0
#, python-format
msgid "Consumable"
msgstr ""
@@ -622,7 +388,7 @@ msgid "Conversion between Units of Measure can only occur if they belong to the
msgstr ""
#. module: product
-#: code:addons/product/product.py:122
+#: code:addons/product/models/product_uom.py:88
#, python-format
msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!."
msgstr ""
@@ -646,9 +412,8 @@ msgid "Cost of the product, in the default unit of measure of the product."
msgstr ""
#. module: product
-#: model:product.product,name:product.service_delivery
-#: model:product.template,name:product.service_delivery_product_template
-msgid "Cost-plus Contract"
+#: model:ir.model.fields,field_description:product.field_product_attribute_create_variant
+msgid "Create variant"
msgstr ""
#. module: product
@@ -689,12 +454,6 @@ msgstr ""
msgid "Created on"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Creating such a stunningly thin design took some equally stunning feats of technological innovation. We refined,re-imagined,or re-engineered everything about iMac from the inside out. The result is an advanced, elegant all-in-one computer that’s as much a work of art as it is state of the art."
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_res_currency
#: model:ir.model.fields,field_description:product.field_product_pricelist_currency_id
@@ -705,33 +464,9 @@ msgstr ""
msgid "Currency"
msgstr ""
-#. module: product
-#: model:product.product,name:product.product_product_5
-#: model:product.template,name:product.product_product_5_product_template
-msgid "Custom Computer (kit)"
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_27
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_5
-#: model:product.template,description:product.product_product_5_product_template
-msgid "Custom computer shipped in kit."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_partner_ref
-msgid "Customer ref"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_delivery_02
-#: model:product.template,name:product.product_delivery_02_product_template
-msgid "Datacard"
+msgid "Customer Ref"
msgstr ""
#. module: product
@@ -777,25 +512,12 @@ msgstr ""
msgid "Description for Vendors"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Design. The thinnest iPod ever."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_attribute_sequence
#: model:ir.model.fields,help:product.field_product_attribute_value_sequence
msgid "Determine the display order"
msgstr ""
-#. module: product
-#: model:product.public.category,name:product.devices
-msgid "Devices"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute_display_name
#: model:ir.model.fields,field_description:product.field_product_attribute_line_display_name
@@ -821,13 +543,6 @@ msgstr ""
msgid "Dozen(s)"
msgstr ""
-#. module: product
-#: model:product.product,description_sale:product.consu_delivery_03
-#: model:product.template,description_sale:product.consu_delivery_03_product_template
-msgid "Dvorak keyboard \n"
-" left-handed mouse"
-msgstr ""
-
#. module: product
#: model:ir.actions.act_window,help:product.product_pricelist_action2
msgid "Each rule include a set of applicability criteria (date range,\n"
@@ -835,12 +550,6 @@ msgid "Each rule include a set of applicability criteria (date range,\n"
" any kind of pricing."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Efficient, high-quality audio"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_date_end
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_date_end
@@ -858,126 +567,47 @@ msgid "Ending valid for the pricelist item validation"
msgstr ""
#. module: product
-#: constraint:product.category:0
+#: code:addons/product/models/product.py:43
+#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
#. module: product
-#: constraint:product.attribute.line:0
+#: code:addons/product/models/product_attribute.py:97
+#, python-format
msgid "Error ! You cannot use this attribute with the following value."
msgstr ""
#. module: product
-#: constraint:product.product:0
+#: code:addons/product/models/product.py:293
+#, python-format
msgid "Error! It is not allowed to choose more than one value for a given attribute."
msgstr ""
#. module: product
-#: constraint:product.pricelist.item:0
+#: code:addons/product/models/product_pricelist.py:373
+#, python-format
msgid "Error! The minimum margin should be lower than the maximum margin."
msgstr ""
#. module: product
-#: constraint:product.pricelist.item:0
+#: code:addons/product/models/product_pricelist.py:367
+#, python-format
msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!"
msgstr ""
#. module: product
-#: constraint:res.currency:0
-msgid "Error! You cannot define a rounding factor for the company's main currency that is smaller than the decimal precision of 'Account'."
-msgstr ""
-
-#. module: product
-#: constraint:decimal.precision:0
-msgid "Error! You cannot define the decimal precision of 'Account' as greater than the rounding factor of the company's main currency"
-msgstr ""
-
-#. module: product
-#: constraint:product.template:0
+#: code:addons/product/models/product_template.py:243
+#, python-format
msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Everything you love about iPad — the beautiful\n"
-" screen, fast Colors are vivid and text is sharp on the iPad mini display.\n"
-" But what really makes it stand out is its size. At 7.9 inches,\n"
-" it’s perfectly sized to deliver an experience every bit as big as iPad."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-msgid "Everything you love about iPad — the beautiful\n"
-" screen, fast and fluid performance, FaceTime and\n"
-" iSight cameras, thousands of amazing apps, 10-hour\n"
-" battery life* — is everything you’ll love about\n"
-" iPad mini, too. And you can hold it in one hand."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Everything you love about iPad — the beautiful screen,\n"
-" fast and fluid performance, FaceTime and iSight cameras, \n"
-" thousands of amazing apps, 10-hour battery life* — is everything\n"
-" you’ll love about iPad mini, too. And you can hold it in one hand."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_2
-#: model:product.template,description:product.product_product_2_product_template
-msgid "Example of product to invoice based on delivery."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.service_order_01
-#: model:product.template,description:product.service_order_01_product_template
-msgid "Example of product to invoice on order."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.service_cost_01
-#: model:product.template,description:product.service_cost_01_product_template
-msgid "Example of products to invoice based on cost."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_1
-#: model:product.template,description:product.product_product_1_product_template
-msgid "Example of products to invoice based on delivery."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_name
#: model:ir.model.fields,help:product.field_product_pricelist_item_price
msgid "Explicit rule name for this pricelist line."
msgstr ""
-#. module: product
-#: model:product.product,name:product.service_cost_01
-#: model:product.template,name:product.service_cost_01_product_template
-msgid "External Audit"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.External_Hard_Drive
-msgid "External Hard Drive"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Fast connections.The world over."
-msgstr ""
-
#. module: product
#: selection:product.pricelist.item,compute_price:0
msgid "Fix Price"
@@ -999,43 +629,11 @@ msgstr ""
msgid "Formula"
msgstr ""
-#. module: product
-#: model:product.product,description_sale:product.product_product_7
-#: model:product.template,description_sale:product.product_product_7_product_template
-msgid "Frequency: 5Hz to 21kHz\n"
-"Impedance: 23 ohms\n"
-"Sensitivity: 109 dB SPL/mW\n"
-"Drivers: two-way balanced armature\n"
-"Cable length: 1065 mm\n"
-"Weight: 10.2 grams\n"
-" "
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Friendly to the environment."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_1
-#: model:product.template,name:product.product_product_1_product_template
-msgid "GAP Analysis Service"
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "General Information"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Genius. Your own personal DJ."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_product_packaging_ids
#: model:ir.model.fields,help:product.field_product_template_packaging_ids
@@ -1047,11 +645,6 @@ msgstr ""
msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."
msgstr ""
-#. module: product
-#: model:ir.model.fields,help:product.field_product_category_sequence
-msgid "Gives the sequence order when displaying a list of product categories."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_product_sequence
#: model:ir.model.fields,help:product.field_product_template_sequence
@@ -1063,89 +656,19 @@ msgstr ""
msgid "Global"
msgstr ""
-#. module: product
-#: model:product.product,name:product.membership_0
-#: model:product.template,name:product.membership_0_product_template
-msgid "Gold Membership"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_24
-#: model:product.template,name:product.product_product_24_product_template
-msgid "Graphics Card"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_17
-#: model:product.template,name:product.product_product_17_product_template
-msgid "HDD SH-1"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Have Genius call the tunes."
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.Headset
-msgid "Headset"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "Hear, hear."
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_11
-#: model:product.product,description_sale:product.product_product_11b
-#: model:product.template,description_sale:product.product_product_11_product_template
-#: model:product.template,description_sale:product.product_product_11b_product_template
-msgid "Height: 76.5 mm\n"
-"Width: 39.6 mm\n"
-"Depth: 5.4 mm\n"
-"Weight: 31 grams"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Highly rated designs."
-msgstr ""
-
#. module: product
#: model:product.uom,name:product.product_uom_hour
msgid "Hour(s)"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "How did we make an already gorgeous widescreen display even better? By making it 75 percent less reflective. And by re-architecting the LCD and moving it right up against the cover glass. So you see your photos, games, movies, and everything else in vivid, lifelike detail."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_uom_factor_inv
-msgid "How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n"
-"1 * (this unit) = ratio * (reference unit)"
+msgid "How many times this Unit of Measure is bigger than the reference Unit of Measure in this category: 1 * (this unit) = ratio * (reference unit)"
msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_uom_factor
-msgid "How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n"
-"1 * (reference unit) = ratio * (this unit)"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "How to get your groove on."
+msgid "How much bigger or smaller this unit is compared to the reference Unit of Measure for this category: 1 * (reference unit) = ratio * (this unit)"
msgstr ""
#. module: product
@@ -1168,12 +691,6 @@ msgstr ""
msgid "ID"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "If it's made for iPad, it's made for iPad mini."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_active
msgid "If unchecked, it will allow you to hide the pricelist without removing it."
@@ -1205,30 +722,11 @@ msgstr ""
msgid "Image of the product variant (Small-sized image of product template if false)."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Individually calibrated for true-to-life color."
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_product_supplierinfo
msgid "Information about a product vendor"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "Inside each earpiece is a stainless steel mesh cap that protects the precision acoustic\n"
-" components from dust and debris. You can remove the caps for cleaning or replace\n"
-" them with an extra set that’s included in the box."
-msgstr ""
-
-#. module: product
-#: model:product.category,name:product.product_category_2
-msgid "Internal"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_categ_id
#: model:ir.model.fields,field_description:product.field_product_template_categ_id
@@ -1245,6 +743,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_product_barcode
+#: model:ir.model.fields,help:product.field_product_template_barcode
msgid "International Article Number used for product identification."
msgstr ""
@@ -1253,46 +752,6 @@ msgstr ""
msgid "Inventory"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_is_product_variant
-#: model:ir.model.fields,field_description:product.field_product_template_is_product_variant
-msgid "Is a product variant"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "Keep it clean."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Key Features"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.Keyboard_Mouse
-msgid "Keyboard / Mouse"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_27
-#: model:product.template,name:product.product_product_27_product_template
-msgid "Laptop Customized"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_25
-#: model:product.template,name:product.product_product_25_product_template
-msgid "Laptop E5023"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.laptops
-msgid "Laptops"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute___last_update
#: model:ir.model.fields,field_description:product.field_product_attribute_line___last_update
@@ -1376,12 +835,6 @@ msgstr ""
msgid "Liter(s)"
msgstr ""
-#. module: product
-#: model:product.product,name:product.consu_delivery_02
-#: model:product.template,name:product.consu_delivery_02_product_template
-msgid "Little server"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids
#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids
@@ -1404,7 +857,6 @@ msgid "Manage Product Packaging"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_base_config_settings_group_product_variant
#: model:res.groups,name:product.group_product_variant
msgid "Manage Product Variants"
msgstr ""
@@ -1414,11 +866,6 @@ msgstr ""
msgid "Manage Properties of Product"
msgstr ""
-#. module: product
-#: model:res.groups,name:product.group_uos
-msgid "Manage Secondary Unit of Measure"
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Max. Margin"
@@ -1440,11 +887,6 @@ msgstr ""
msgid "Medium-sized image of the product. It is automatically resized as a 128x128px image, with aspect ratio preserved, only when the image exceeds one of those sizes. Use this field in form views or some kanban views."
msgstr ""
-#. module: product
-#: model:product.attribute,name:product.product_attribute_1
-msgid "Memory"
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Min. Margin"
@@ -1465,47 +907,8 @@ msgstr ""
msgid "Minimal Quantity"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "More energy efficient."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "More features."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_20
-#: model:product.template,name:product.product_product_20_product_template
-msgid "Motherboard I9P57"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_10
-#: model:product.template,name:product.product_product_10_product_template
-msgid "Mouse, Optical"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_12
-#: model:product.template,name:product.product_product_12_product_template
-msgid "Mouse, Wireless"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Music. It's what beats inside."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute_name
-#: model:ir.model.fields,field_description:product.field_product_category_complete_name
#: model:ir.model.fields,field_description:product.field_product_category_name
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_name
#: model:ir.model.fields,field_description:product.field_product_product_name
@@ -1515,13 +918,13 @@ msgid "Name"
msgstr ""
#. module: product
-#: model:product.public.category,name:product.network
-msgid "Network"
+#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
+msgid "New Price ="
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
-msgid "New Price ="
+#: selection:base.config.settings,group_product_variant:0
+msgid "No variants on products"
msgstr ""
#. module: product
@@ -1545,12 +948,6 @@ msgstr ""
msgid "Other Pricelist"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Over 375,000 apps."
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_product_packaging
#: model:ir.ui.view,arch_db:product.product_packaging_form_view
@@ -1579,11 +976,6 @@ msgstr ""
msgid "Partner"
msgstr ""
-#. module: product
-#: model:product.public.category,name:product.Pen_Drive
-msgid "Pen Drive"
-msgstr ""
-
#. module: product
#: selection:product.pricelist.item,compute_price:0
msgid "Percentage (discount)"
@@ -1594,37 +986,6 @@ msgstr ""
msgid "Percentage Price"
msgstr ""
-#. module: product
-#: model:product.category,name:product.product_category_5
-msgid "Physical"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Playlists. The perfect mix for every mood."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Plays where you play"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Powered by fourth-generation Intel Core processors, this iMac is the fastest yet. Every model in the lineup comes standard with a quad-core Intel Core i5 processor, starting at 2.7GHz and topping out at 3.4GHz."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.service_order_01
-#: model:product.template,name:product.service_order_01_product_template
-msgid "Prepaid Consulting"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_price
#: model:ir.model.fields,field_description:product.field_product_product_price
@@ -1724,10 +1085,13 @@ msgstr ""
msgid "Pricelist item"
msgstr ""
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_pricelist_item_ids
+msgid "Pricelist item ids"
+msgstr ""
+
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action2
-#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
-#: model:ir.ui.menu,name:product.menu_product_pricelist_main
msgid "Pricelists"
msgstr ""
@@ -1753,18 +1117,6 @@ msgid "Print"
msgstr ""
#. module: product
-#: model:product.public.category,name:product.printer
-msgid "Printer"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_22
-#: model:product.template,name:product.product_product_22_product_template
-msgid "Processor Core i5 2.70 Ghz"
-msgstr ""
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_normal_action
#: model:ir.model,name:product.model_product_product
#: model:ir.model.fields,field_description:product.field_product_packaging_product_tmpl_id
#: model:ir.model.fields,field_description:product.field_product_price_history_product_id
@@ -1798,7 +1150,6 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_category_action_form
-#: model:ir.ui.menu,name:product.menu_product_category_action_form
#: model:ir.ui.view,arch_db:product.product_category_list_view
#: model:ir.ui.view,arch_db:product.product_category_search_view
msgid "Product Categories"
@@ -1810,12 +1161,6 @@ msgstr ""
msgid "Product Category"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_product_manager
-#: model:ir.model.fields,field_description:product.field_product_template_product_manager
-msgid "Product Manager"
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
#: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view
@@ -1844,6 +1189,11 @@ msgstr ""
msgid "Product Unit of Measure"
msgstr ""
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product UoM Categories"
+msgstr ""
+
#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_id
#: model:ir.ui.view,arch_db:product.product_normal_form_view
@@ -1853,31 +1203,26 @@ msgid "Product Variant"
msgstr ""
#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
#: model:ir.actions.act_window,name:product.product_normal_action_sell
#: model:ir.actions.act_window,name:product.product_variant_action
-#: model:ir.ui.menu,name:product.menu_products
+#: model:ir.model.fields,field_description:product.field_base_config_settings_group_product_variant
#: model:ir.ui.view,arch_db:product.product_product_tree_view
msgid "Product Variants"
msgstr ""
-#. module: product
-#: model:ir.model,name:product.model_product_uom_categ
-msgid "Product uom categ"
-msgstr ""
-
#. module: product
#: model:ir.actions.act_window,name:product.product_template_action
-#: model:ir.actions.act_window,name:product.product_template_action_product
+#: model:ir.actions.act_window,name:product.product_template_action_all
#: model:ir.model.fields,field_description:product.field_product_product_product_variant_ids
#: model:ir.model.fields,field_description:product.field_product_template_product_variant_ids
-#: model:ir.ui.menu,name:product.menu_product_template_action
-#: model:ir.ui.menu,name:product.prod_config_main
#: model:ir.ui.view,arch_db:product.product_template_search_view
msgid "Products"
msgstr ""
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
+#: model:ir.actions.report.xml,name:product.report_product_template_label
msgid "Products Labels"
msgstr ""
@@ -1897,13 +1242,18 @@ msgstr ""
msgid "Products Price Search"
msgstr ""
+#. module: product
+#: selection:base.config.settings,group_product_variant:0
+msgid "Products can have several attributes, defining variants (Example: size, color,...)"
+msgstr ""
+
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_search_view
msgid "Products your store in the inventory"
msgstr ""
#. module: product
-#: code:addons/product/product.py:824
+#: code:addons/product/models/product.py:457
#, python-format
msgid "Products: "
msgstr ""
@@ -1931,14 +1281,9 @@ msgstr ""
msgid "Purchase Unit of Measure"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_supplierinfo_qty
-msgid "Quantity"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_packaging_qty
-msgid "Quantity by Package"
+msgid "Quantity per Package"
msgstr ""
#. module: product
@@ -1966,12 +1311,6 @@ msgstr ""
msgid "Quantity-5"
msgstr ""
-#. module: product
-#: model:product.product,name:product.product_product_13
-#: model:product.template,name:product.product_product_13_product_template
-msgid "RAM SR5"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_uom_factor
msgid "Ratio"
@@ -1982,51 +1321,11 @@ msgstr ""
msgid "Reference Unit of Measure for this category"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Remote control for power, volume, track seek"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_category_parent_right
msgid "Right Parent"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Right from the start, apps made for iPad also work with iPad mini.\n"
-" They’re immersive, full-screen apps that let you do almost anything\n"
-" you can imagine. And with automatic updates,\n"
-" you're always getting the best experience possible."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-msgid "Right from the start, there’s a lot to love about\n"
-" iPad. It’s simple yet powerful. Thin and light yet\n"
-" full-featured. It can do just about everything and\n"
-" be just about anything."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Right from the start, there’s a lot to love about iPad.\n"
-" It’s simple yet powerful. Thin and light yet full-\n"
-" featured. It can do just about everything and be just\n"
-" about anything.And because it’s so easy to use, it’s\n"
-" easy to love."
-msgstr ""
-
#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Rounding Method"
@@ -2075,24 +1374,6 @@ msgstr ""
msgid "Sales Pricelists"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Say you’re listening to a song you love and you want to stay in the mood.\n"
-" Just tap Genius. It finds other songs on iPod nano that go great together\n"
-" and makes a Genius playlist for you. For more song combinations\n"
-" you wouldn’t have thought of yourself, create Genius Mixes in iTunes\n"
-" and sync the ones you like to iPod nano. Then tap Genius Mixes and\n"
-" rediscover songs you haven’t heard in a while — or find music you forgot you even had."
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.Screen
-msgid "Screen"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_product_categ_id
#: model:ir.model.fields,help:product.field_product_template_categ_id
@@ -2102,7 +1383,6 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_attribute_sequence
#: model:ir.model.fields,field_description:product.field_product_attribute_value_sequence
-#: model:ir.model.fields,field_description:product.field_product_category_sequence
#: model:ir.model.fields,field_description:product.field_product_packaging_sequence
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_sequence
#: model:ir.model.fields,field_description:product.field_product_product_sequence
@@ -2112,22 +1392,14 @@ msgid "Sequence"
msgstr ""
#. module: product
-#: model:product.product,name:product.consu_delivery_01
-#: model:product.public.category,name:product.server
-#: model:product.template,name:product.consu_delivery_01_product_template
-msgid "Server"
-msgstr ""
-
-#. module: product
-#: code:addons/product/product.py:474
+#: code:addons/product/models/product_template.py:43
+#: selection:product.template,type:0
#, python-format
msgid "Service"
msgstr ""
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_search_view
-#: model:product.category,name:product.product_category_3
-#: model:product.public.category,name:product.services
msgid "Services"
msgstr ""
@@ -2150,18 +1422,6 @@ msgid "Share your product to all companies defined in your instance.\n"
" * Unchecked : Each company can see only its product (product where company is defined). Product not related to a company are visible for all companies."
msgstr ""
-#. module: product
-#: model:product.product,name:product.membership_1
-#: model:product.template,name:product.membership_1_product_template
-msgid "Silver Membership"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Sleek, compact design"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_image_small
#: model:ir.model.fields,field_description:product.field_product_template_image_small
@@ -2178,23 +1438,6 @@ msgstr ""
msgid "Smaller than the reference Unit of Measure"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Soft covers are available separately in blue, green or orange. Pick a color to match your style."
-msgstr ""
-
-#. module: product
-#: model:product.category,name:product.product_category_4
-#: model:product.public.category,name:product.Software
-msgid "Software"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.Speakers
-msgid "Speakers"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_categ_id
msgid "Specify a product category if this rule only applies to products belonging to this category or its children categories. Keep empty otherwise."
@@ -2248,74 +1491,14 @@ msgid "Starting date for the pricelist item validation"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,name:product.product_supplierinfo_type_action
-msgid "Supplier Pricelist"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_2
-#: model:product.template,name:product.product_product_2_product_template
-msgid "Support Contract (on timesheet)"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_delivery_01
-#: model:product.template,name:product.product_delivery_01_product_template
-msgid "Switch, 24 ports"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Sync to your heart’s content."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "Tap to play your favorite songs. Or entire albums.\n"
-" Or everything by one artist. You can even browse by genres or composers.\n"
-" Flip through your music: Album art looks great on the bigger screen.\n"
-" Or to keep things fresh, give iPod nano a shake and it shuffles to a different song in your music library."
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_name_template
-msgid "Template Name"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "The Apple In-Ear Headphones deliver a truly immersive sound experience by drastically\n"
-" reducing unwanted outside noises. The soft, silicone ear tips fit snugly and comfortably\n"
-" in your ear, creating a seal that isolates your music from your surroundings.\n"
-" Three different sizes of ear tips are included so you can find a perfect fit for each ear.\n"
-" Also included are a convenient carrying case for the ear tips and a cable-control case\n"
-" for the headphones themselves."
+#: selection:product.template,type:0
+msgid "Stockable Product"
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "The Bose® SoundLink® mini is Bose's smallest portable Bluetooth speaker. Its ultra-compact size fits in the \n"
-" palm of your hand, yet gives you full, natural sound wirelessly from your iPhone, iPad, or iPod. Grab it and go \n"
-" full-featured. It can do just about everything and\n"
-" experience music just about anywhere."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "The SoundLink® Mini speaker is small and light enough\n"
-" to tuck into your bag. It weighs in at just 1.5 pounds.\n"
-" Its low profile lets you place it almost anywhere and\n"
-" provides a low center of gravity that makes it nearly\n"
-" impossible to tip over."
+#: model:ir.model.fields,help:product.field_product_product_pricelist_id
+#: model:ir.model.fields,help:product.field_product_template_pricelist_id
+msgid "Technical field. Used for searching on pricelists, not stored in database."
msgstr ""
#. module: product
@@ -2333,46 +1516,23 @@ msgstr ""
msgid "The conversion ratio for a unit of measure cannot be 0!"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "The desktop. In its most advanced form ever"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_packaging_sequence
msgid "The first in the sequence is the default one."
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "The full iPad experience."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_9
-#: model:product.template,website_description:product.product_product_9_product_template
-msgid "The incredibly thin Apple Wireless Keyboard uses Bluetooth technology,\n"
-" which makes it compatible with iPad. And you’re free to type wherever\n"
-" you like — with the keyboard in front of your iPad or on your lap."
+#: model:ir.model.fields,help:product.field_product_supplierinfo_min_qty
+msgid "The minimal quantity to purchase from this vendor, expressed in the vendor Product Unit of Measure if not any, in the default unit of measure of the product otherwise."
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_supplierinfo_min_qty
-msgid "The minimal quantity to purchase from this vendor, expressed in the vendor Product Unit of Measure if not any, in the default unit of measure of the product otherwise."
+#: model:ir.model.fields,help:product.field_product_category_product_count
+msgid "The number of products under this category (Does not consider the children categories)"
msgstr ""
#. module: product
-#: code:addons/product/product.py:332
+#: code:addons/product/models/product_attribute.py:74
#, python-format
msgid "The operation cannot be completed:\n"
"You are trying to delete an attribute value with a reference on a product variant."
@@ -2398,33 +1558,13 @@ msgid "The product form contains information to simplify the sale process: price
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "The rechargeable lithium-ion battery delivers up to seven hours of playtime.\n"
-" And at home, you can listen even longer—the charging cradle lets\n"
-" you listen while it charges."
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_9
-#: model:product.template,description_sale:product.product_product_9_product_template
-msgid "The sleek aluminium Apple Wireless Keyboard.\n"
-" "
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "The speaker has a range of about 30 feet, so you can enjoy\n"
-" the sound you want without wires. It pairs easily with your\n"
-" smartphone, iPad® or other Bluetooth device.\n"
-" And it remembers the most recent six devices you've used,\n"
-" so reconnecting is even simpler."
+#: model:ir.model.fields,help:product.field_product_product_lst_price
+msgid "The sale price is managed from the product template. Click on the 'Variant Prices' button to set the extra attribute prices."
msgstr ""
#. module: product
#: model:ir.model.fields,help:product.field_product_packaging_qty
-msgid "The total number of products you can put by pallet or box."
+msgid "The total number of products you can have per pallet or box."
msgstr ""
#. module: product
@@ -2439,35 +1579,6 @@ msgstr ""
msgid "The weight of the contents in Kg, not including any packaging, etc."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-msgid "There is less of it, but no less to it."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "There's less of it, but no less to it."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "There’s another way to get a good mix of music on iPod: Let Genius do the work.\n"
-" Activate Genius in iTunes on your computer, and it automatically finds songs that sound\n"
-" great together. Then it creates Genius Mixes, which you can easily sync to your iPod.\n"
-" It’s the perfect way to rediscover songs you haven’t listened to in forever."
-msgstr ""
-
#. module: product
#: sql_constraint:product.attribute.value:0
msgid "This attribute value already exists !"
@@ -2488,11 +1599,6 @@ msgstr ""
msgid "This field holds the image used as image for the product, limited to 1024x1024px."
msgstr ""
-#. module: product
-#: model:ir.model.fields,help:product.field_product_supplierinfo_qty
-msgid "This is a quantity which is converted into Default Unit of Measure."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_product_price_extra
msgid "This is the sum of the extra price of all attributes"
@@ -2523,33 +1629,14 @@ msgstr ""
msgid "This vendor's product name will be used when printing a request for quotation. Keep empty to use the internal one."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "Two is better than one."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_uom_uom_type
msgid "Type"
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "USB port allows for software update to ensure ongoing Bluetooth device compatibility"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Ultrafast wireless."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_8
-#: model:product.template,website_description:product.product_product_8_product_template
-msgid "Ultrathin design"
+#: model:ir.model.fields,help:product.field_product_uom_active
+msgid "Uncheck the active field to disable a unit of measure without deleting it."
msgstr ""
#. module: product
@@ -2566,15 +1653,9 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
-#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
msgid "Unit of Measure Categories"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_uom_category_id
-msgid "Unit of Measure Category"
-msgstr ""
-
#. module: product
#: model:product.uom,name:product.product_uom_unit
msgid "Unit(s)"
@@ -2582,8 +1663,6 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_form_action
-#: model:ir.ui.menu,name:product.menu_product_uom_form_action
-#: model:ir.ui.menu,name:product.next_id_16
#: model:ir.ui.view,arch_db:product.product_uom_form_view
#: model:ir.ui.view,arch_db:product.product_uom_tree_view
msgid "Units of Measure"
@@ -2597,26 +1676,9 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
msgid "Units of measure belonging to the same category can be\n"
-" converted between each others. For example, in the category\n"
-" <i>'Time'</i>, you will have the following units of measure:\n"
-" Hours, Days."
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Universal iPod docking station fits most iPod/iPhone models"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_7
-#: model:product.template,website_description:product.product_product_7_product_template
-msgid "Unlike many small headphones, each earpiece of the Apple In-Ear Headphones\n"
-" contains two separate high-performance drivers — a woofer to handle bass and\n"
-" mid-range sounds and a tweeter for high-frequency audio. These dedicated\n"
-" drivers help ensure accurate, detailed sound across the entire sonic spectrum.\n"
-" The result: you’re immersed in the music and hear details you never knew existed.\n"
-" Even when listening to an old favorite, you may feel like you’re hearing it for the first time."
+" converted between each others. For example, in the category\n"
+" <i>'Time'</i>, you will have the following units of measure:\n"
+" Hours, Days."
msgstr ""
#. module: product
@@ -2634,11 +1696,6 @@ msgstr ""
msgid "Values"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_price_extra
-msgid "Variant Extra Price"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_image_variant
msgid "Variant Image"
@@ -2649,6 +1706,11 @@ msgstr ""
msgid "Variant Information"
msgstr ""
+#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_price_extra
+msgid "Variant Price Extra"
+msgstr ""
+
#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "Variant Prices"
@@ -2671,6 +1733,7 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_name
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
+#: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view
msgid "Vendor"
msgstr ""
@@ -2680,6 +1743,11 @@ msgstr ""
msgid "Vendor Information"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,name:product.product_supplierinfo_type_action
+msgid "Vendor Pricelists"
+msgstr ""
+
#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_code
msgid "Vendor Product Code"
@@ -2720,18 +1788,6 @@ msgstr ""
msgid "Volume"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Volume control on main system"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_5b
-#: model:product.template,website_description:product.product_product_5b_product_template
-msgid "Wall charger can be plugged into the cradle or directly into the speaker"
-msgstr ""
-
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_warranty
#: model:ir.model.fields,field_description:product.field_product_template_warranty
@@ -2750,67 +1806,37 @@ msgstr ""
msgid "Weights"
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "When one playlist isn’t enough."
-msgstr ""
-
#. module: product
#: model:ir.model.fields,help:product.field_product_supplierinfo_product_id
msgid "When this field is filled in, the vendor data will only apply to the variant."
msgstr ""
#. module: product
-#: model:product.attribute.value,name:product.product_attribute_value_3
-msgid "White"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_4
-#: model:product.product,website_description:product.product_product_4b
-#: model:product.product,website_description:product.product_product_4c
-#: model:product.product,website_description:product.product_product_4d
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_4_product_template
-#: model:product.template,website_description:product.product_product_4b_product_template
-#: model:product.template,website_description:product.product_product_4c_product_template
-#: model:product.template,website_description:product.product_product_4d_product_template
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "Why you'll love an iPad."
-msgstr ""
-
-#. module: product
-#: model:product.attribute,name:product.product_attribute_3
-msgid "Wi-Fi"
+#: model:ir.model.fields,help:product.field_base_config_settings_group_product_variant
+msgid "Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example"
msgstr ""
#. module: product
-#: model:product.product,website_description:product.product_product_6
-#: model:product.template,website_description:product.product_product_6_product_template
-msgid "With advanced Wi‑Fi that’s up to twice as fast as\n"
-" any previous-generation iPad and access to fast\n"
-" cellular data networks around the world, iPad mini\n"
-" lets you download content, stream video,\n"
-" and browse the web at amazing speeds."
+#: model:product.uom.categ,name:product.uom_categ_wtime
+msgid "Working Time"
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_base_config_settings_group_product_variant
-msgid "Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example"
+#: code:addons/product/models/res_currency.py:17
+#, python-format
+msgid "You cannot define a rounding factor for the company's main currency that is smaller than the decimal precision of 'Account'."
msgstr ""
#. module: product
-#: model:product.uom.categ,name:product.uom_categ_wtime
-msgid "Working Time"
+#: code:addons/product/models/decimal_precision.py:16
+#, python-format
+msgid "You cannot define the decimal precision of 'Account' as greater than the rounding factor of the company's main currency"
msgstr ""
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
msgid "You must define a conversion rate between several Units of\n"
-" Measure within the same category."
+" Measure within the same category."
msgstr ""
#. module: product
@@ -2827,24 +1853,6 @@ msgstr ""
msgid "You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to customers."
msgstr ""
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "You probably have multiple playlists in iTunes on your computer.\n"
-" One for your commute. One for the gym. Sync those playlists\n"
-" to iPod, and you can play the perfect mix for whatever\n"
-" mood strikes you. VoiceOver tells you the name of each playlist,\n"
-" so it’s easy to switch between them and find the one you want without looking."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_order_01
-#: model:product.template,name:product.product_order_01_product_template
-msgid "Zed+ Antivirus"
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_base_config_settings
msgid "base.config.settings"
@@ -2905,48 +1913,6 @@ msgstr ""
msgid "gal(s)"
msgstr ""
-#. module: product
-#: model:product.product,name:product.product_product_8
-#: model:product.template,name:product.product_product_8_product_template
-msgid "iMac"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_6
-#: model:product.template,name:product.product_product_6_product_template
-msgid "iPad Mini"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_4
-#: model:product.product,name:product.product_product_4b
-#: model:product.product,name:product.product_product_4c
-#: model:product.product,name:product.product_product_4d
-#: model:product.template,name:product.product_product_4_product_template
-#: model:product.template,name:product.product_product_4b_product_template
-#: model:product.template,name:product.product_product_4c_product_template
-#: model:product.template,name:product.product_product_4d_product_template
-msgid "iPad Retina Display"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_11
-#: model:product.product,name:product.product_product_11b
-#: model:product.template,name:product.product_product_11_product_template
-#: model:product.template,name:product.product_product_11b_product_template
-msgid "iPod"
-msgstr ""
-
-#. module: product
-#: model:product.product,website_description:product.product_product_11
-#: model:product.product,website_description:product.product_product_11b
-#: model:product.template,website_description:product.product_product_11_product_template
-#: model:product.template,website_description:product.product_product_11b_product_template
-msgid "iTunes on your Mac or PC makes it easy to load up\n"
-" your iPod. Just choose the playlists, audiobooks,\n"
-" podcasts, and other audio files you want, then sync."
-msgstr ""
-
#. module: product
#: model:product.uom,name:product.product_uom_inch
msgid "inch(es)"
@@ -3007,20 +1973,6 @@ msgstr ""
msgid "qt"
msgstr ""
-#. module: product
-#: model:product.product,description_sale:product.consu_delivery_02
-#: model:product.template,description_sale:product.consu_delivery_02_product_template
-msgid "raid 1 \n"
-" 512ECC ram"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.consu_delivery_01
-#: model:product.template,description_sale:product.consu_delivery_01_product_template
-msgid "raid 10 \n"
-" 2048ECC ram"
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_report_product_report_pricelist
msgid "report.product.report_pricelist"
@@ -3041,9 +1993,3 @@ msgstr ""
msgid "to"
msgstr ""
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_price_history_company_id
-#: model:ir.model.fields,field_description:product.field_product_pricelist_item_compute_price
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index baa67835dc01df6669f4403dde80e9f4f855540b..d3b7ed133bb2aca3f8835dc79422f8a0a7f6e548 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: product_expiry
+#: model:ir.ui.view,arch_db:product_expiry.report_delivery_document_inherit_product_expiry
+msgid "<span class=\"pull-right\">Expiry Date</span>"
+msgstr ""
+
#. module: product_expiry
#: model:ir.model.fields,field_description:product_expiry.field_stock_production_lot_alert_date
msgid "Alert Date"
@@ -25,18 +30,6 @@ msgstr ""
msgid "Best before Date"
msgstr ""
-#. module: product_expiry
-#: model:product.product,name:product_expiry.product_product_pain
-#: model:product.template,name:product_expiry.product_product_pain_product_template
-msgid "Bread"
-msgstr ""
-
-#. module: product_expiry
-#: model:product.product,name:product_expiry.product_product_lait
-#: model:product.template,name:product_expiry.product_product_lait_product_template
-msgid "Cow milk"
-msgstr ""
-
#. module: product_expiry
#: model:ir.ui.view,arch_db:product_expiry.view_move_form_expiry
msgid "Dates"
@@ -47,18 +40,6 @@ msgstr ""
msgid "End of Life Date"
msgstr ""
-#. module: product_expiry
-#: model:product.product,name:product_expiry.product_product_jambon
-#: model:product.template,name:product_expiry.product_product_jambon_product_template
-msgid "French cheese Camembert"
-msgstr ""
-
-#. module: product_expiry
-#: model:product.product,name:product_expiry.product_product_from
-#: model:product.template,name:product_expiry.product_product_from_product_template
-msgid "Ham"
-msgstr ""
-
#. module: product_expiry
#: model:ir.model,name:product_expiry.model_stock_production_lot
msgid "Lot/Serial"
@@ -112,6 +93,7 @@ msgstr ""
#. module: product_expiry
#: model:ir.model.fields,help:product_expiry.field_stock_production_lot_removal_date
+#: model:ir.model.fields,help:product_expiry.field_stock_quant_removal_date
msgid "This is the date on which the goods with this Serial Number should be removed from the stock."
msgstr ""
diff --git a/addons/product_extended/i18n/product_extended.pot b/addons/product_extended/i18n/product_extended.pot
index 8cdb90b2badb9b22dfae2bd389d006ea628c7e13..bbddea47fac002eead3dfdc012cf33946205704d 100644
--- a/addons/product_extended/i18n/product_extended.pot
+++ b/addons/product_extended/i18n/product_extended.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,101 +16,40 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_extended
-#: code:addons/product_extended/wizard/wizard_price.py:24
-#: code:addons/product_extended/wizard/wizard_price.py:40
-#, python-format
-msgid "Active ID is not set in Context."
+#: model:ir.model.fields,field_description:product_extended.field_product_product_available_in_pos
+msgid "Available in the Point of Sale"
msgstr ""
#. module: product_extended
-#: model:ir.model,name:product_extended.model_mrp_bom
-msgid "Bill of Material"
+#: model:ir.model.fields,help:product_extended.field_product_product_to_weight
+msgid "Check if the product should be weighted using the hardware scale integration"
msgstr ""
#. module: product_extended
-#: model:ir.ui.view,arch_db:product_extended.view_compute_price_wizard
-msgid "Cancel"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.ui.view,arch_db:product_extended.view_compute_price_wizard
-msgid "Change Price"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.ui.view,arch_db:product_extended.view_compute_price_wizard
-msgid "Change Standard Price"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_recursive
-msgid "Change prices of child BoMs too"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.actions.act_window,name:product_extended.action_view_compute_price_wizard
-#: model:ir.model,name:product_extended.model_wizard_price
-msgid "Compute Price Wizard"
+#: model:ir.model.fields,help:product_extended.field_product_product_available_in_pos
+msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
#. module: product_extended
#: model:ir.ui.view,arch_db:product_extended.product_product_ext_form_view2
+#: model:ir.ui.view,arch_db:product_extended.product_product_view_form_normal_inherit_extended
msgid "Compute from BOM"
msgstr ""
#. module: product_extended
#: model:ir.ui.view,arch_db:product_extended.product_product_ext_form_view2
+#: model:ir.ui.view,arch_db:product_extended.product_product_view_form_normal_inherit_extended
msgid "Compute the price of the product using products and operations of related bill of materials, for manufactured products only."
msgstr ""
#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_real_time_accounting
-msgid "Generate accounting entries when real-time"
+#: model:ir.model.fields,field_description:product_extended.field_product_product_pos_categ_id
+msgid "Point of Sale Category"
msgstr ""
#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_id
-msgid "ID"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_info_field
-msgid "Info"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_wizard_price_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_mrp_bom_get_variant_count
-msgid "Number of variant for the product"
+#: model:ir.model,name:product_extended.model_product_product
+msgid "Product"
msgstr ""
#. module: product_extended
@@ -119,23 +58,12 @@ msgid "Product Template"
msgstr ""
#. module: product_extended
-#: model:ir.ui.view,arch_db:product_extended.view_compute_price_wizard
-msgid "Set price on BoM"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model.fields,field_description:product_extended.field_mrp_bom_standard_price
-msgid "Standard Price"
-msgstr ""
-
-#. module: product_extended
-#: model:ir.ui.view,arch_db:product_extended.view_compute_price_wizard
-msgid "The price is computed from the bill of material lines which are not variant specific"
+#: model:ir.model.fields,help:product_extended.field_product_product_pos_categ_id
+msgid "Those categories are used to group similar products for point of sale."
msgstr ""
#. module: product_extended
-#: code:addons/product_extended/wizard/wizard_price.py:38
-#, python-format
-msgid "This wizard is built for product templates, while you are currently running it from a product variant."
+#: model:ir.model.fields,field_description:product_extended.field_product_product_to_weight
+msgid "To Weigh With Scale"
msgstr ""
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index f949a96ca7c6fc26f1a5e9d3624d19088cf419d9..d819c5c45e28d2aa984dfb4fc0266bbc5f929568 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_visible_discount
-#: model:ir.model.fields,field_description:product_visible_discount.field_product_pricelist_discount_policy
-msgid "Discount Policy"
+#: selection:product.pricelist,discount_policy:0
+msgid "Discount included in the price"
msgstr ""
#. module: product_visible_discount
-#: selection:product.pricelist,discount_policy:0
-msgid "Discount included in the price"
+#: model:ir.model.fields,field_description:product_visible_discount.field_product_pricelist_discount_policy
+msgid "Discount policy"
msgstr ""
#. module: product_visible_discount
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 0a5d947763242dc0834413fed909f2b7992a4a7c..640974bdd8c9cc9dbfcf81c04ce5663d3ad3e791 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
#. module: project
#: model:mail.template,body_html:project.mail_template_data_module_install_project
msgid "\n"
-" % set last_created_project = user.env['project.project'].search([], order=\"create_date desc\")[0]\n"
+" % set last_created_project = user.env['project.project'].search([('alias_id','<>',False)], order=\"create_date desc\")[0]\n"
"\n"
" <div style=\"margin: 10px auto;\">\n"
" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
@@ -37,20 +37,21 @@ msgid "\n"
" <tbody>\n"
" <tr>\n"
" <td style=\"padding:15px 10px;font-size:20px\">\n"
-" <p style=\"color:#a24689;margin:0\" >Hooray!</p><br>\n"
" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
" <span>Your Odoo Project application is up and running</span></p><br>\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
" <span style=\"font-size:13px;font-weight:bold;\">What’s next?</span></p>\n"
" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Try creating a task by sending an email to </span>\n"
-" <a href=\"mailto:${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}\">\n"
-" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}</span>\n"
-" </a>\n"
-" </p>\n"
-" </li>\n"
+" % if last_created_project:\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Try creating a task by sending an email to </span>\n"
+" <a href=\"mailto:${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}</span>\n"
+" </a>\n"
+" </p>\n"
+" </li>\n"
+" % endif\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
" <span><a href=\"/web#view_type=list&model=res.users&action=base.action_res_users\">\n"
@@ -106,7 +107,7 @@ msgid "\n"
" <a href=\"https://www.odoo.com/documentation/user/9.0/project.html\">\n"
" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
" </span><span> or with our </span>\n"
-" <a href=\"https://www.odoo.com/documentation/9.0/\">\n"
+" <a href=\"https://www.odoo.com/documentation\">\n"
" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
" </p>\n"
" <br>\n"
@@ -121,15 +122,6 @@ msgid "\n"
" </div>"
msgstr ""
-#. module: project
-#: model:mail.template,body_html:project.mail_template_data_project_task
-msgid "\n"
-"<p>Dear ${object.partner_id.name or 'customer'},</p>\n"
-"<p>Thank you for your enquiry.<br /></p>\n"
-"<p>If you have any questions, please let us know.</p>\n"
-"<p>Best regards,</p>"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_res_partner_task_count
msgid "# Tasks"
@@ -147,9 +139,8 @@ msgid "# of Tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:273
-#: code:addons/project/project.py:294
-#: code:addons/project/project.py:446
+#: code:addons/project/models/project.py:235
+#: code:addons/project/models/project.py:404
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -174,13 +165,48 @@ msgstr ""
msgid "2. Now, take some time to list <strong>the Projects you'll need:</strong>"
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:72
+#, python-format
+msgid "<b>Assign the task</b> to someone. <i>You can create and invite a new user on the fly.</i>"
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:83
+#, python-format
+msgid "<b>Click the save button</b> to apply your changes to the task."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:48
+#, python-format
+msgid "<b>Drag & drop tasks</b> between columns as you work on them."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:97
+#, python-format
+msgid "<b>Invite coworkers</b> via email.<br/><i>Enter one email per line.</i>"
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:54
+#, python-format
+msgid "<b>Star tasks</b> to mark team priorities."
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "<i class=\"fa fa-user\"/> Person Responsible"
msgstr ""
#. module: project
-#: code:addons/project/project.py:151
+#: code:addons/project/models/project.py:122
#, python-format
msgid "<p class=\"oe_view_nocontent_create\">\n"
" Documents are attached to the tasks and issues of your project.</p><p>\n"
@@ -189,6 +215,12 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
" </p>"
msgstr ""
+#. module: project
+#: code:addons/project/models/project.py:145
+#, python-format
+msgid "<p class=\"oe_view_nocontent_create\">Click to create a new project.</p>"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "<span attrs=\"{'invisible':[('use_tasks', '=', False)]}\">as </span>"
@@ -695,8 +727,8 @@ msgid "Activate 'Allow invoicing based on timesheets' from the <i>Human Resource
msgstr ""
#. module: project
-#: selection:project.config.settings,module_project_issue_sheet:0
-msgid "Activate timesheets on issues"
+#: model:ir.actions.server,name:project.activate_sample_project
+msgid "Activate Sample Project"
msgstr ""
#. module: project
@@ -710,6 +742,13 @@ msgstr ""
msgid "Add a description..."
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:38
+#, python-format
+msgid "Add columns to configure <b>stages for your tasks</b>.<br/><i>e.g. Specification > Development > Done</i>"
+msgstr ""
+
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:55
@@ -752,22 +791,6 @@ msgstr ""
msgid "Aliased Model"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:133
-#, python-format
-msgid "All Employees Project: all employees can access"
-msgstr ""
-
-#. module: project
-#: selection:project.config.settings,module_rating_project:0
-msgid "Allow activating customer rating on projects, at issue completion"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,help:project.field_project_config_settings_group_time_work_estimation_tasks
-msgid "Allows you to compute Time Estimation on tasks."
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Also, lead by example. When your team members see how prepared you are it will reinforce the need for each of them to be prepared for status meetings."
@@ -859,7 +882,7 @@ msgid "At the end of the week, each employee should review\n"
msgstr ""
#. module: project
-#: code:addons/project/project.py:144
+#: code:addons/project/models/project.py:115
#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
#, python-format
msgid "Attachments"
@@ -918,11 +941,6 @@ msgstr ""
msgid "Blocked"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_crossovered_budget_line
-msgid "Budget Lines"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "But because change is never easy, we've created this Planner to guide you.<br/>\n"
@@ -930,11 +948,6 @@ msgid "But because change is never easy, we've created this Planner to guide you
" collaborate, or why organizing your projects by role is wrong."
msgstr ""
-#. module: project
-#: model:project.task.type,legend_done:project.project_stage_1
-msgid "Buzz or set as done"
-msgstr ""
-
#. module: project
#: model:ir.filters,name:project.filter_task_report_responsible
msgid "By Responsible"
@@ -950,8 +963,6 @@ msgstr ""
#: code:addons/project/static/src/js/web_planner_project.js:69
#: code:addons/project/static/src/js/web_planner_project.js:84
#: code:addons/project/static/src/js/web_planner_project.js:98
-#: selection:project.project,state:0
-#: model:project.task.type,name:project.project_stage_3
#, python-format
msgid "Cancelled"
msgstr ""
@@ -968,10 +979,15 @@ msgid "Check this box to manage internal activities through this project"
msgstr ""
#. module: project
-#: code:addons/project/project.py:648
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:23
#, python-format
-msgid "Child task still open.\n"
-"Please cancel or complete child task first."
+msgid "Choose a <b>project name</b>. (e.g. Website Launch, Product Development, Office Party, etc.)"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
+msgid "Choose a Project Email"
msgstr ""
#. module: project
@@ -981,6 +997,34 @@ msgstr ""
msgid "Clear description and purpose"
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:59
+#, python-format
+msgid "Click on a card to get the details of the task."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:88
+#, python-format
+msgid "Click on layers in the path to easily <b>return to tasks</b>."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:31
+#, python-format
+msgid "Click on the card to <b>go to your project</b> and start organizing tasks."
+msgstr ""
+
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:67
+#, python-format
+msgid "Click on this button to modify the task."
+msgstr ""
+
#. module: project
#: model:ir.actions.act_window,help:project.project_tags_action
msgid "Click to add a new tag."
@@ -997,13 +1041,8 @@ msgid "Click to add/remove from favorite"
msgstr ""
#. module: project
-#: model:web.tip,description:project.project_tip_1
-msgid "Click to view all the tasks related to this project."
-msgstr ""
-
-#. module: project
-#: selection:project.project,state:0
-msgid "Closed"
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "Click to create a new project.<br>"
msgstr ""
#. module: project
@@ -1049,6 +1088,13 @@ msgstr ""
msgid "Configuration"
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:93
+#, python-format
+msgid "Configuration options are available in the Settings app."
+msgstr ""
+
#. module: project
#: model:ir.actions.act_window,name:project.action_config_settings
msgid "Configure Project"
@@ -1094,8 +1140,8 @@ msgid "Copywriting / Design"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_create_date
-msgid "Create Date"
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
+msgid "Create"
msgstr ""
#. module: project
@@ -1104,7 +1150,11 @@ msgid "Create a Gantt chart with your projects tasks and deadlines"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
+#: model:ir.actions.act_window,name:project.open_create_project
+msgid "Create a Project"
+msgstr ""
+
+#. module: project
#: model:ir.actions.act_window,help:project.open_view_project_all_config
msgid "Create a new project."
msgstr ""
@@ -1124,6 +1174,11 @@ msgstr ""
msgid "Create bills automatically based on Time & Material."
msgstr ""
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_create_date
+msgid "Create date"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Create the Projects"
@@ -1182,7 +1237,7 @@ msgid "Current Timesheet"
msgstr ""
#. module: project
-#: code:addons/project/project.py:868
+#: code:addons/project/models/project.py:663
#: 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
@@ -1191,17 +1246,11 @@ msgid "Customer"
msgstr ""
#. module: project
-#: code:addons/project/project.py:868
+#: code:addons/project/models/project.py:663
#, python-format
msgid "Customer Email"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:132
-#, python-format
-msgid "Customer Project: visible in portal if the customer is a follower"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Customer Service"
@@ -1334,6 +1383,7 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/project.js:50
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
#, python-format
msgid "Discard"
msgstr ""
@@ -1374,16 +1424,6 @@ msgstr ""
msgid "Do not create an email alias automatically"
msgstr ""
-#. module: project
-#: selection:project.config.settings,group_time_work_estimation_tasks:0
-msgid "Do not estimate working time on tasks"
-msgstr ""
-
-#. module: project
-#: selection:project.config.settings,module_project_issue_sheet:0
-msgid "Do not track working hours on issues"
-msgstr ""
-
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:50
@@ -1422,7 +1462,6 @@ msgstr ""
#: code:addons/project/static/src/js/web_planner_project.js:68
#: code:addons/project/static/src/js/web_planner_project.js:83
#: code:addons/project/static/src/js/web_planner_project.js:97
-#: model:project.task.type,name:project.project_stage_2
#, python-format
msgid "Done"
msgstr ""
@@ -1475,17 +1514,13 @@ msgid "Ending Date"
msgstr ""
#. module: project
-#: constraint:project.task:0
+#: code:addons/project/models/project.py:412
+#, python-format
msgid "Error ! Task starting date must be lower than its ending date."
msgstr ""
#. module: project
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project
-#: constraint:project.project:0
+#: sql_constraint:project.project:0
msgid "Error! project start-date must be lower than project end-date."
msgstr ""
@@ -1506,11 +1541,6 @@ msgid "Every business is different.<br/>\n"
" Odoo allows you to customize every application and it's usually a good idea to customize screens to fit your project needs."
msgstr ""
-#. module: project
-#: model:web.tip,description:project.project_tip_3
-msgid "Every event on a task is logged in this section. Send a new message to notify followers or log an internal note."
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Examples"
@@ -1543,11 +1573,6 @@ msgstr ""
msgid "Extra Info"
msgstr ""
-#. module: project
-#: model:ir.ui.view,arch_db:project.view_config_settings
-msgid "Extra features"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Extra useful for when you're with a customer or in a meeting."
@@ -1628,11 +1653,6 @@ msgstr ""
msgid "Generate a timesheet report to attach to your customer invoices"
msgstr ""
-#. module: project
-#: selection:project.config.settings,module_sale_service:0
-msgid "Generate tasks from sale orders"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Get full synchronization with Odoo"
@@ -1686,11 +1706,6 @@ msgstr ""
msgid "Group By"
msgstr ""
-#. module: project
-#: model:ir.ui.view,arch_db:project.view_config_settings
-msgid "Helpdesk & Support"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Here are some of the <strong>available customizations</strong>"
@@ -1715,16 +1730,16 @@ msgstr ""
#. module: project
#: model:ir.model.fields,help:project.field_project_project_privacy_visibility
msgid "Holds visibility of the tasks or issues that belong to the current project:\n"
-"- Portal : employees see everything;\n"
-" if portal is activated, portal users see the tasks or issues followed by\n"
+"- On invitation only: Employees may only see the followed project, tasks or issues\n"
+"- Visible by all employees: Employees may see all project, tasks or issues\n"
+"- Visible by following customers: employees see everything;\n"
+" if website is activated, portal users may see project, tasks or issues followed by\n"
" them or by someone of their company\n"
-"- Employees Only: employees see all tasks or issues\n"
-"- Followers Only: employees see only the followed tasks or issues; if portal\n"
-" is activated, portal users see the followed tasks or issues."
+""
msgstr ""
#. module: project
-#: code:addons/project/project.py:799
+#: code:addons/project/models/project.py:591
#, python-format
msgid "I take it"
msgstr ""
@@ -1818,9 +1833,7 @@ msgid "Improve collaboration with customers"
msgstr ""
#. module: project
-#: selection:project.project,state:0
#: selection:project.task,kanban_state:0
-#: model:project.task.type,name:project.project_stage_1
#: selection:report.project.task.user,state:0
msgid "In Progress"
msgstr ""
@@ -1972,11 +1985,6 @@ msgstr ""
msgid "Last Message"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_write_date
-msgid "Last Modification Date"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_project_config_settings___last_update
#: model:ir.model.fields,field_description:project.field_project_project___last_update
@@ -2017,6 +2025,13 @@ msgstr ""
msgid "Learn how to better organize your company using Projects, Tasks, Issues and Timesheets."
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:18
+#, python-format
+msgid "Let's create your first project."
+msgstr ""
+
#. module: project
#: model:ir.model.fields,help:project.field_project_config_settings_module_pad
msgid "Lets the company customize which Pad installation should be used to link to new pads (for example: http://ietherpad.com/).\n"
@@ -2038,11 +2053,6 @@ msgstr ""
msgid "Low"
msgstr ""
-#. module: project
-#: selection:project.config.settings,group_time_work_estimation_tasks:0
-msgid "Manage time estimation on tasks"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
#: model:res.groups,name:project.group_project_manager
@@ -2084,6 +2094,11 @@ msgstr ""
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
+#. module: project
+#: model:ir.ui.view,arch_db:project.view_config_settings
+msgid "More Info"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "More efficient communication between employees"
@@ -2106,25 +2121,19 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: project
-#: model:project.task.type,legend_blocked:project.project_stage_1
-msgid "Need functional or technical help"
-msgstr ""
-
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:64
#: model:ir.ui.view,arch_db:project.view_task_history_search
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
-#: selection:project.project,state:0
#: model:project.task.type,name:project.project_stage_data_0
#, python-format
msgid "New"
msgstr ""
#. module: project
-#: code:addons/project/project.py:801
+#: code:addons/project/models/project.py:593
#, python-format
msgid "New Task"
msgstr ""
@@ -2136,11 +2145,6 @@ msgstr ""
msgid "New repair added"
msgstr ""
-#. module: project
-#: selection:project.config.settings,module_sale_service:0
-msgid "No automatic task creation"
-msgstr ""
-
#. module: project
#: selection:project.config.settings,module_rating_project:0
msgid "No customer rating"
@@ -2154,11 +2158,6 @@ msgstr ""
msgid "Normal"
msgstr ""
-#. module: project
-#: model:project.task.type,legend_blocked:project.project_stage_0
-msgid "Not validated"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_project_task_notes
msgid "Notes"
@@ -2169,6 +2168,13 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:43
+#, python-format
+msgid "Now that the project is set up, <b>create a few tasks</b>."
+msgstr ""
+
#. module: project
#: model:ir.model.fields,help:project.field_report_project_task_user_opening_days
msgid "Number of Days to Open the task"
@@ -2202,13 +2208,15 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.project_planner
-msgid "Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the"
+#: code:addons/project/models/project.py:198
+#: selection:project.project,privacy_visibility:0
+#, python-format
+msgid "On invitation only"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.view_project_project_filter
-msgid "Open"
+#: model:ir.ui.view,arch_db:project.project_planner
+msgid "Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the"
msgstr ""
#. module: project
@@ -2216,6 +2224,11 @@ msgstr ""
msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "Or"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Or, if you are using Issues, by activating 'Activate timesheets on issues', also in the"
@@ -2227,7 +2240,6 @@ msgid "Organize meetings"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
#: model:ir.actions.act_window,help:project.open_view_project_all_config
msgid "Organize your activities (plan tasks, track issues, invoice timesheets) for internal, personal or customer projects."
msgstr ""
@@ -2248,16 +2260,19 @@ msgid "Overpassed Tasks"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_task_legend_blocked
#: model:ir.model.fields,help:project.field_project_task_type_legend_blocked
msgid "Override the default value displayed for the blocked state for kanban selection, when the task or issue is in that stage."
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_task_legend_done
#: model:ir.model.fields,help:project.field_project_task_type_legend_done
msgid "Override the default value displayed for the done state for kanban selection, when the task or issue is in that stage."
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_task_legend_normal
#: model:ir.model.fields,help:project.field_project_task_type_legend_normal
msgid "Override the default value displayed for the normal state for kanban selection, when the task or issue is in that stage."
msgstr ""
@@ -2282,11 +2297,6 @@ msgstr ""
msgid "Parent Record Thread ID"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_parent_ids
-msgid "Parent Tasks"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,help:project.field_project_project_alias_parent_model_id
msgid "Parent model holding the alias. The model holding the alias reference is not necessarily the model given by alias_model_id (example: project (parent_model) and task (model))"
@@ -2297,12 +2307,6 @@ msgstr ""
msgid "Partner"
msgstr ""
-#. module: project
-#: model:ir.ui.view,arch_db:project.view_project_project_filter
-#: selection:project.project,state:0
-msgid "Pending"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Plan your activities for the day"
@@ -2320,7 +2324,7 @@ msgid "Planner"
msgstr ""
#. module: project
-#: code:addons/project/project.py:961
+#: code:addons/project/models/project.py:743
#, python-format
msgid "Please remove existing tasks in the project linked to the accounts you want to delete."
msgstr ""
@@ -2352,13 +2356,7 @@ msgstr ""
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_privacy_visibility
-msgid "Privacy / Visibility"
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:134
-#, python-format
-msgid "Private Project: followers only"
+msgid "Privacy"
msgstr ""
#. module: project
@@ -2372,7 +2370,7 @@ msgstr ""
#: model:ir.model.fields,field_description:project.field_project_task_project_id
#: model:ir.model.fields,field_description:project.field_report_project_task_user_project_id
#: model:ir.ui.view,arch_db:project.edit_project
-#: model:ir.ui.view,arch_db:project.view_task_form2
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
#: model:ir.ui.view,arch_db:project.view_task_history_search
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -2385,6 +2383,12 @@ msgstr ""
msgid "Project Alias"
msgstr ""
+#. module: project
+#: model:ir.model.fields,field_description:project.field_account_analytic_account_project_count
+#: model:ir.model.fields,field_description:project.field_project_project_project_count
+msgid "Project Count"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.view_config_settings
msgid "Project Management"
@@ -2401,6 +2405,7 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
#: model:ir.ui.view,arch_db:project.view_project
#: model:ir.ui.view,arch_db:project.view_project_project_filter
msgid "Project Name"
@@ -2435,18 +2440,15 @@ msgid "Project's tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:309
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.actions.act_window,name:project.open_view_project_all_config
#: model:ir.model.fields,field_description:project.field_account_analytic_account_project_ids
#: model:ir.model.fields,field_description:project.field_project_project_project_ids
#: model:ir.model.fields,field_description:project.field_project_task_type_project_ids
#: model:ir.ui.menu,name:project.menu_projects_config
-#: model:ir.ui.menu,name:project.portal_services_projects
#: model:ir.ui.view,arch_db:project.analytic_account_inherited_form
#: model:ir.ui.view,arch_db:project.task_company
#: model:ir.ui.view,arch_db:project.view_project
-#, python-format
msgid "Projects"
msgstr ""
@@ -2455,15 +2457,9 @@ msgstr ""
msgid "Projects using this stage"
msgstr ""
-#. module: project
-#: model:ir.model.fields,help:project.field_project_config_settings_module_project_issue_sheet
-msgid "Provides timesheet support for the issues/bugs management in project.\n"
-"-This installs the module project_issue_sheet."
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_project_config_settings_module_rating_project
-msgid "Rating"
+msgid "Rating on task"
msgstr ""
#. module: project
@@ -2507,11 +2503,6 @@ msgstr ""
msgid "Ready to be displayed, published or sent"
msgstr ""
-#. module: project
-#: model:project.task.type,legend_done:project.project_stage_3
-msgid "Ready to reopen"
-msgstr ""
-
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:76
@@ -2520,11 +2511,6 @@ msgstr ""
msgid "Reason for cancellation has been documented"
msgstr ""
-#. module: project
-#: model:mail.template,subject:project.mail_template_data_project_task
-msgid "Reception of ${object.name}"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_project_project_alias_force_thread_id
msgid "Record Thread ID"
@@ -2617,11 +2603,6 @@ msgstr ""
msgid "Runs outside Odoo, always available"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_sale_service
-msgid "Sale Service"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Scrum Methodology"
@@ -2789,22 +2770,11 @@ msgid "Starting Date"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_account_type
-msgid "State"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_state
#: model:ir.model.fields,field_description:project.field_report_project_task_user_state
#: model:ir.ui.view,arch_db:project.view_task_history_search
msgid "Status"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_child_ids
-msgid "Sub-tasks"
-msgstr ""
-
#. module: project
#: sql_constraint:project.tags:0
msgid "Tag name already exists !"
@@ -2935,10 +2905,9 @@ msgstr ""
#. module: project
#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
#: model:ir.actions.act_window,name:project.action_view_task
-#: model:ir.model.fields,field_description:project.field_account_analytic_account_use_tasks
#: model:ir.model.fields,field_description:project.field_project_project_task_count
+#: 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_project_project_use_tasks
#: model:ir.model.fields,field_description:project.field_res_partner_task_ids
#: model:ir.ui.menu,name:project.menu_action_view_task
#: model:ir.ui.menu,name:project.menu_project_task_user_tree
@@ -2987,11 +2956,6 @@ msgstr ""
msgid "Tasks by user and project"
msgstr ""
-#. module: project
-#: model:ir.actions.act_window,name:project.open_view_template_project
-msgid "Templates of Projects"
-msgstr ""
-
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:49
@@ -3055,12 +3019,6 @@ msgstr ""
msgid "This allows customers to give rating on provided services"
msgstr ""
-#. module: project
-#: model:ir.model.fields,help:project.field_project_config_settings_module_sale_service
-msgid "This feature automatically creates project tasks from service products in sale orders. In order to make it work, the product has to be a service and 'Create Task Automatically' has to be flagged on the procurement tab in the product form.\n"
-"-This installs the module sale_service."
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "This is particularly useful to manage help and support: all incoming email from customers will be transformed into an issue that you'll be able to track easily!"
@@ -3089,6 +3047,8 @@ msgid "This will add an Invoice Tasks menu in the Project module, that can be us
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_account_analytic_account_company_uom_id
+#: model:ir.model.fields,help:project.field_project_project_company_uom_id
#: model:ir.model.fields,help:project.field_res_company_project_time_mode_id
#: model:ir.model.fields,help:project.project_time_mode_id_duplicate_xmlid
msgid "This will set the unit of measure used in projects and tasks.\n"
@@ -3100,37 +3060,12 @@ msgstr ""
msgid "Time Estimation on Tasks"
msgstr ""
-#. module: project
-#: model:ir.ui.view,arch_db:project.edit_project
-msgid "Time Scheduling"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_group_time_work_estimation_tasks
-msgid "Time on Tasks"
-msgstr ""
-
#. module: project
#: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
msgid "Timesheet UoM"
msgstr ""
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_timesheet_synchro
-msgid "Timesheet app for Chrome/Android/iOS"
-msgstr ""
-
-#. module: project
-#: model:ir.ui.view,arch_db:project.view_config_settings
-msgid "Timesheets"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_issue_sheet
-msgid "Timesheets Invoicing"
-msgstr ""
-
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Timesheets are often essential for running a company.<br/>\n"
@@ -3156,7 +3091,6 @@ msgstr ""
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:96
-#: model:project.task.type,name:project.project_stage_0
#, python-format
msgid "To Do"
msgstr ""
@@ -3181,6 +3115,11 @@ msgstr ""
msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
msgstr ""
+#. module: project
+#: selection:project.config.settings,module_rating_project:0
+msgid "Track customer satisfaction on tasks"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.view_task_project_user_search
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -3200,7 +3139,8 @@ msgid "Unread Messages"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.edit_project
+#: model:ir.model.fields,field_description:project.field_account_analytic_account_use_tasks
+#: model:ir.model.fields,field_description:project.field_project_project_use_tasks
msgid "Use Tasks"
msgstr ""
@@ -3219,11 +3159,6 @@ msgstr ""
msgid "Use separate meetings to solve big issues or issues that aren’t important for the entire team."
msgstr ""
-#. module: project
-#: model:project.task.type,legend_priority:project.project_stage_0
-msgid "Use the priority for tasks related to gold customers"
-msgstr ""
-
#. module: project
#: model:res.groups,name:project.group_project_user
msgid "User"
@@ -3259,6 +3194,20 @@ msgstr ""
msgid "View statistics for the week"
msgstr ""
+#. module: project
+#: code:addons/project/models/project.py:199
+#: selection:project.project,privacy_visibility:0
+#, python-format
+msgid "Visible by all employees"
+msgstr ""
+
+#. module: project
+#: code:addons/project/models/project.py:200
+#: selection:project.project,privacy_visibility:0
+#, python-format
+msgid "Visible by following customers"
+msgstr ""
+
#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:66
@@ -3275,6 +3224,13 @@ msgstr ""
msgid "Wait. Expert"
msgstr ""
+#. module: project
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:13
+#, python-format
+msgid "Want a better way to <b>manage your projects</b>? <i>It starts here.</i>"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "We can add fields related to your business on any screen, for example:"
@@ -3357,6 +3313,11 @@ msgstr ""
msgid "Workload"
msgstr ""
+#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_write_date
+msgid "Write date"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.task_type_edit
msgid "You can also add a description to help your coworkers understand the meaning and purpose of the stage."
@@ -3393,7 +3354,7 @@ msgid "You can save your reports to easily reuse it later"
msgstr ""
#. module: project
-#: code:addons/project/project.py:94
+#: code:addons/project/models/project.py:70
#, python-format
msgid "You cannot delete a project containing tasks. You can either delete all the project's tasks and then delete the project or simply deactivate the project."
msgstr ""
@@ -3423,11 +3384,21 @@ msgstr ""
msgid "Your Projects:"
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "activate a sample project"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "and activate:"
msgstr ""
+#. module: project
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
+msgid "e.g. Office Party"
+msgstr ""
+
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "etc.."
@@ -3464,7 +3435,7 @@ msgid "send us an email"
msgstr ""
#. module: project
-#: code:addons/project/project.py:605
+#: code:addons/project/models/project.py:460
#, python-format
msgid "tasks"
msgstr ""
@@ -3475,10 +3446,8 @@ msgid "to describe<br/> your experience or to suggest improvements !"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_account_analytic_account_project_count
-#: model:ir.model.fields,field_description:project.field_project_project_project_count
-#: model:ir.model.fields,field_description:project.field_project_project_task_ids
-msgid "unknown"
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "to play with."
msgstr ""
#. module: project
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index b34ccd207954c9804d46c666e10dcfaabc6d3625..fee8d9c4e475b17696b70e9ed4882b56aee7a0c6 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,12 +26,12 @@ msgid "# Issues"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_report_nbr
+#: model:ir.model.fields,field_description:project_issue.field_project_issue_report_nbr_issues
msgid "# of Issues"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:215
+#: code:addons/project_issue/models/project_issue.py:148
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -52,11 +52,8 @@ msgid "<span attrs=\"{'invisible':[('use_issues', '=', False)]}\">as </span>"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_kanban_state
-msgid "A Issue's kanban state indicates special situations affecting it:\n"
-" * Normal is the default situation\n"
-" * Blocked indicates something is preventing the progress of this issue\n"
-" * Ready for next stage indicates the issue is ready to be pulled to the next stage"
+#: selection:project.config.settings,module_project_issue_sheet:0
+msgid "Activate timesheets on issues"
msgstr ""
#. module: project_issue
@@ -69,6 +66,17 @@ msgstr ""
msgid "Add an internal note..."
msgstr ""
+#. module: project_issue
+#: model:ir.model.fields,help:project_issue.field_project_issue_kanban_state
+msgid "An Issue's kanban state indicates special situations affecting it:\n"
+"\n"
+" * Normal is the default situation\n"
+"\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+"\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the next stage"
+msgstr ""
+
#. module: project_issue
#: model:ir.model,name:project_issue.model_account_analytic_account
msgid "Analytic Account"
@@ -134,11 +142,6 @@ msgstr ""
msgid "Check this box to manage customer activities through this project"
msgstr ""
-#. module: project_issue
-#: model:ir.actions.act_window,help:project_issue.open_view_issue
-msgid "Click to create an issue."
-msgstr ""
-
#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_date_closed
msgid "Closed"
@@ -193,17 +196,22 @@ msgstr ""
#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.ui.view,arch_db:project_issue.project_issue_tree_view
msgid "Creation Date"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:384
+#: code:addons/project_issue/models/project_issue.py:286
#, python-format
msgid "Customer"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:386
+#: code:addons/project_issue/models/project_issue.py:288
#, python-format
msgid "Customer Email"
msgstr ""
@@ -284,6 +292,11 @@ msgstr ""
msgid "Display Name"
msgstr ""
+#. module: project_issue
+#: selection:project.config.settings,module_project_issue_sheet:0
+msgid "Do not track working hours on issues"
+msgstr ""
+
#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_duration
msgid "Duration"
@@ -320,6 +333,11 @@ msgstr ""
msgid "Group By"
msgstr ""
+#. module: project_issue
+#: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue
+msgid "Helpdesk & Support"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue,priority:0
#: selection:project.issue.report,priority:0
@@ -327,7 +345,7 @@ msgid "High"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:362
+#: code:addons/project_issue/models/project_issue.py:261
#, python-format
msgid "I take it"
msgstr ""
@@ -401,15 +419,11 @@ msgstr ""
#. module: project_issue
#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
#: model:ir.actions.act_window,name:project_issue.action_view_issues
-#: model:ir.actions.act_window,name:project_issue.open_view_issue
#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
-#: model:ir.model.fields,field_description:project_issue.field_account_analytic_account_use_issues
#: model:ir.model.fields,field_description:project_issue.field_project_project_issue_count
#: model:ir.model.fields,field_description:project_issue.field_project_project_issue_ids
#: model:ir.model.fields,field_description:project_issue.field_project_project_issue_needaction_count
-#: model:ir.model.fields,field_description:project_issue.field_project_project_use_issues
#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
-#: model:ir.ui.menu,name:project_issue.portal_services_issues
#: model:ir.ui.view,arch_db:project_issue.project_issue_calendar_view
#: model:ir.ui.view,arch_db:project_issue.res_partner_issues_button_view
#: model:ir.ui.view,arch_db:project_issue.view_project_form_inherited
@@ -471,6 +485,11 @@ msgstr ""
msgid "Last Updated by"
msgstr ""
+#. module: project_issue
+#: model:ir.model.fields,field_description:project_issue.field_project_issue_write_date
+msgid "Last Updated on"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue,priority:0
#: selection:project.issue.report,priority:0
@@ -489,7 +508,7 @@ msgid "New"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:364
+#: code:addons/project_issue/models/project_issue.py:265
#, python-format
msgid "New Issue"
msgstr ""
@@ -500,11 +519,16 @@ msgid "Next Action"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:413
+#: code:addons/project_issue/models/project_issue.py:312
#, python-format
msgid "No Subject"
msgstr ""
+#. module: project_issue
+#: selection:project.config.settings,module_rating_project_issue:0
+msgid "No customer rating"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue,kanban_state:0
#: selection:project.issue,priority:0
@@ -522,13 +546,28 @@ msgstr ""
msgid "Number of Days to open the project issue."
msgstr ""
+#. module: project_issue
+#: model:ir.model.fields,help:project_issue.field_project_issue_legend_blocked
+msgid "Override the default value displayed for the blocked state for kanban selection, when the task or issue is in that stage."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model.fields,help:project_issue.field_project_issue_legend_done
+msgid "Override the default value displayed for the done state for kanban selection, when the task or issue is in that stage."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model.fields,help:project_issue.field_project_issue_legend_normal
+msgid "Override the default value displayed for the normal state for kanban selection, when the task or issue is in that stage."
+msgstr ""
+
#. module: project_issue
#: model:ir.model,name:project_issue.model_res_partner
msgid "Partner"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:530
+#: code:addons/project_issue/models/account_analytic_account.py:16
#, python-format
msgid "Please remove existing issues in the project linked to the accounts you want to delete."
msgstr ""
@@ -558,6 +597,7 @@ msgid "Project"
msgstr ""
#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue
#: model:ir.ui.view,arch_db:project_issue.view_project_issue_report_graph
#: model:ir.ui.view,arch_db:project_issue.view_project_issue_report_pivot
msgid "Project Issue"
@@ -570,23 +610,19 @@ msgid "Project Issues"
msgstr ""
#. module: project_issue
-#: selection:project.issue,kanban_state:0
-msgid "Ready for next stage"
+#: model:ir.model.fields,help:project_issue.field_project_config_settings_module_project_issue_sheet
+msgid "Provides timesheet support for the issues/bugs management in project.\n"
+"-This installs the module project_issue_sheet."
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_report_team_id
-msgid "Sale Team"
+#: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_rating_project_issue
+msgid "Rating on issue"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_team_id
-msgid "Sales Team"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_team_id
-msgid "Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway."
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
msgstr ""
#. module: project_issue
@@ -633,21 +669,22 @@ msgstr ""
#. module: project_issue
#: model:ir.actions.act_window,help:project_issue.act_project_project_2_project_issue_all
#: model:ir.actions.act_window,help:project_issue.action_view_issues
-msgid "The Odoo issues tacker allows you to efficiently manage things\n"
+msgid "The Odoo issues tracker allows you to efficiently manage things\n"
" like internal requests, software development bugs, customer\n"
" complaints, project troubles, material breakdowns, etc."
msgstr ""
#. module: project_issue
#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
-msgid "The Odoo issues tacker allows you to efficiently manage things\n"
+msgid "The Odoo issues tracker allows you to efficiently manage things\n"
" like internal requests, software development bugs, customer\n"
" complaints, project troubles, material breakdowns, etc."
msgstr ""
#. module: project_issue
#: model:ir.model.fields,help:project_issue.field_project_issue_email_cc
-msgid "These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
+msgid "These email addresses will be added to the CC field of all inbound\n"
+" and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
msgstr ""
#. module: project_issue
@@ -655,12 +692,32 @@ msgstr ""
msgid "These people will receive email."
msgstr ""
+#. module: project_issue
+#: model:ir.model.fields,help:project_issue.field_project_config_settings_module_rating_project_issue
+msgid "This allows customers to give rating on issue"
+msgstr ""
+
#. module: project_issue
#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
#: model:ir.actions.act_window,help:project_issue.action_project_issue_report_filtered
msgid "This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues."
msgstr ""
+#. module: project_issue
+#: model:ir.ui.view,arch_db:project_issue.view_config_settings_form_inherit_project_issue
+msgid "Timesheets"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_project_issue_sheet
+msgid "Timesheets on Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.config.settings,module_rating_project_issue:0
+msgid "Track customer satisfaction on issues"
+msgstr ""
+
#. module: project_issue
#: model:ir.ui.view,arch_db:project_issue.view_project_issue_filter
#: model:ir.ui.view,arch_db:project_issue.view_project_issue_report_filter
@@ -674,12 +731,8 @@ msgid "Unread Messages"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_write_date
-msgid "Update Date"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.ui.view,arch_db:project_issue.view_project_form_inherited
+#: model:ir.model.fields,field_description:project_issue.field_account_analytic_account_use_issues
+#: model:ir.model.fields,field_description:project_issue.field_project_project_use_issues
msgid "Use Issues"
msgstr ""
@@ -714,20 +767,14 @@ msgid "You can link this issue to an existing task or directly create a new one
msgstr ""
#. module: project_issue
-#: model:ir.actions.act_window,help:project_issue.open_view_issue
-msgid "You can track your issues from this menu and the action we \n"
-" will take."
-msgstr ""
-
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:263
+#: code:addons/project_issue/models/project_issue.py:183
#, python-format
msgid "issues"
msgstr ""
#. module: project_issue
-#: model:ir.model,name:project_issue.model_project_issue
-msgid "project issue"
+#: model:ir.model,name:project_issue.model_project_config_settings
+msgid "project.config.settings"
msgstr ""
#. module: project_issue
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index c1caa7a6b604a92cb99ee335c282f8d7b087bea7..63145aa9eb43f4dbadd2d5c1c1754a0a2ab06a77 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
msgid "Analytic Account"
msgstr ""
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: project_issue_sheet
#: model:ir.model.fields,help:project_issue_sheet.field_project_issue_progress
msgid "Computed as: Time Spent / Total Time."
@@ -40,6 +45,11 @@ msgstr ""
msgid "Progress (%)"
msgstr ""
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
#. module: project_issue_sheet
#: model:ir.ui.view,arch_db:project_issue_sheet.project_issue_form_view
msgid "Timesheet Activities"
@@ -51,13 +61,3 @@ msgstr ""
msgid "Timesheets"
msgstr ""
-#. module: project_issue_sheet
-#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
-msgid "account analytic line"
-msgstr ""
-
-#. module: project_issue_sheet
-#: model:ir.model,name:project_issue_sheet.model_project_issue
-msgid "project issue"
-msgstr ""
-
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 66fc56b54805532c14850d87c7ea2619955b4cf8..3ca29ff91f95d2b1197ea178c5dad011e112f2b2 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,6 @@ msgstr ""
#. module: purchase
#: model:mail.template,body_html:purchase.email_template_edi_purchase
-#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
msgid "\n"
"<p>Dear\n"
"% if object.partner_id.is_company and object.child_ids:\n"
@@ -33,7 +32,7 @@ msgid "\n"
"% if object.origin:\n"
" (RFQ origin: ${object.origin})\n"
"% endif\n"
-"amounting <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
+"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
@@ -42,6 +41,31 @@ msgid "\n"
""
msgstr ""
+#. module: purchase
+#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
+msgid "\n"
+"<p>Dear ${object.partner_id.name} \n"
+"% if object.partner_id.parent_id:\n"
+" (<i>${object.partner_id.parent_id.name}</i>)\n"
+"% endif\n"
+",</p>\n"
+"<p>\n"
+"Please find in attachment a <strong>${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} ${object.name}</strong>\n"
+"% if object.partner_ref:\n"
+" with reference: ${object.partner_ref}\n"
+"% endif\n"
+"% if object.origin:\n"
+" (RFQ origin: ${object.origin})\n"
+"% endif\n"
+"amounting <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
+"from ${object.company_id.name}.\n"
+"</p>\n"
+"\n"
+"<p>You can reply to this email if you have any questions.</p>\n"
+"<p>Thank you,</p>\n"
+""
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_config_settings_module_stock_dropshipping
msgid "\n"
@@ -50,7 +74,7 @@ msgid "\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:81
+#: code:addons/purchase/models/stock.py:87
#, python-format
msgid " Buy"
msgstr ""
@@ -68,7 +92,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_count
-msgid "# of Invoices"
+msgid "# of Bills"
msgstr ""
#. module: purchase
@@ -156,28 +180,28 @@ msgid "<strong>Your Order Reference</strong>"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_account_invoice_purchase_id
-msgid "Add Purchase Order"
+#: model:res.groups,name:purchase.group_warning_purchase
+msgid "A warning can be set on a product or a customer (Purchase)"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_advance_bidding
-msgid "Advance bidding process"
+#: model:ir.model.fields,field_description:purchase.field_account_invoice_purchase_id
+msgid "Add Purchase Order"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_advance_purchase_requisition
-msgid "Advanced Calls for Tenders"
+#: selection:purchase.config.settings,group_warning_purchase:0
+msgid "All the products and the customers can be used in purchase orders"
msgstr ""
#. module: purchase
-#: selection:purchase.config.settings,group_advance_purchase_requisition:0
-msgid "Advanced call for tender (choose products from different RFQ)"
+#: selection:purchase.config.settings,module_stock_dropshipping:0
+msgid "Allow suppliers to deliver directly to your customers"
msgstr ""
#. module: purchase
-#: selection:purchase.config.settings,module_stock_dropshipping:0
-msgid "Allow suppliers to deliver directly to your customers"
+#: selection:res.company,po_lock:0
+msgid "Allow to edit purchase orders"
msgstr ""
#. module: purchase
@@ -200,11 +224,21 @@ msgstr ""
msgid "Allows you to select and maintain different units of measure for products."
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_account_config_settings_group_analytic_account_for_purchases
+msgid "Allows you to specify an analytic account on purchase order lines."
+msgstr ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "An administrator can set up default Terms and conditions in your Company settings."
msgstr ""
+#. module: purchase
+#: selection:purchase.config.settings,group_warning_purchase:0
+msgid "An informative or blocking warning can be set on a product or a customer"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_account_analytic_id
#: model:ir.model.fields,field_description:purchase.field_purchase_report_account_analytic_id
@@ -216,6 +250,16 @@ msgstr ""
msgid "Analytic Accounting for Purchases"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_analytic_tag_ids
+msgid "Analytic Tags"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_account_config_settings_group_analytic_account_for_purchases
+msgid "Analytic accounting for purchases"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration
msgid "Apply"
@@ -251,14 +295,40 @@ msgstr ""
msgid "Average Price"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_invoice_lines
+msgid "Bill Lines"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_qty_invoiced
msgid "Billed Qty"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:717
-#: code:addons/purchase/stock.py:75
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status
+msgid "Billing Status"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_ids
+msgid "Bills"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,invoice_status:0
+msgid "Bills Received"
+msgstr ""
+
+#. module: purchase
+#: selection:product.template,purchase_line_warn:0
+#: selection:res.partner,purchase_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:789
+#: code:addons/purchase/models/stock.py:81
#: model:stock.location.route,name:purchase.route_warehouse0_buy
#, python-format
msgid "Buy"
@@ -293,13 +363,13 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:733
+#: code:addons/purchase/models/purchase.py:805
#, 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/stock.py:78
+#: code:addons/purchase/models/stock.py:84
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -317,7 +387,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:612
+#: code:addons/purchase/models/purchase.py:655
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -327,11 +397,6 @@ msgstr ""
msgid "Click here to record a vendor bill."
msgstr ""
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_invoice_pending
-msgid "Click to create a draft invoice."
-msgstr ""
-
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_form_action
msgid "Click to create a quotation that will be converted into a purchase order."
@@ -342,8 +407,14 @@ msgstr ""
msgid "Click to create a request for quotation."
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Click to create a vendor bill."
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.product_normal_action_puchased
+#: model:ir.actions.act_window,help:purchase.product_product_action
msgid "Click to define a new product."
msgstr ""
@@ -352,11 +423,6 @@ msgstr ""
msgid "Click to record a vendor bill related to this purchase."
msgstr ""
-#. module: purchase
-#: model:web.tip,description:purchase.purchase_tip_1
-msgid "Click to scrap products."
-msgstr ""
-
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_report_commercial_partner_id
msgid "Commercial Entity"
@@ -376,7 +442,7 @@ msgid "Company"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:254
+#: code:addons/purchase/models/purchase.py:291
#, python-format
msgid "Compose Email"
msgstr ""
@@ -402,6 +468,11 @@ msgstr ""
msgid "Confirm purchase orders in one step"
msgstr ""
+#. module: purchase
+#: selection:res.company,po_lock:0
+msgid "Confirmed purchase orders are not editable"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_control
msgid "Control"
@@ -502,11 +573,6 @@ msgstr ""
msgid "Double validation amount"
msgstr ""
-#. module: purchase
-#: selection:purchase.order,state:0
-msgid "Draft PO"
-msgstr ""
-
#. module: purchase
#: selection:purchase.report,state:0
msgid "Draft RFQ"
@@ -537,6 +603,11 @@ msgstr ""
msgid "Encoding help. When selected, the associated purchase order lines are added to the vendor bill. Several PO can be selected."
msgstr ""
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
+msgid "Expected Date"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Extended Filters"
@@ -554,11 +625,6 @@ msgstr ""
msgid "Get 2 levels of approvals to confirm a purchase order"
msgstr ""
-#. module: purchase
-#: model:web.tip,description:purchase.purchase_tip_3
-msgid "Get all the shipments related to this order."
-msgstr ""
-
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_report_weight
msgid "Gross Weight"
@@ -585,21 +651,11 @@ msgid "ID"
msgstr ""
#. module: purchase
-#: model:web.tip,description:purchase.purchase_tip_2
-msgid "If a product has been broken or damaged during the transport, you can scrap it with this button."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:186
+#: code:addons/purchase/models/purchase.py:194
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_config_settings_group_advance_purchase_requisition
-msgid "In the process of a public tendering, you can compare the tender lines and choose for each requested product which quantity you will buy from each bid."
-msgstr ""
-
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
msgid "Incoming Products"
@@ -630,28 +686,12 @@ msgstr ""
msgid "Invoice Line"
msgstr ""
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_invoice_lines
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: purchase
-#: selection:purchase.order,invoice_status:0
-msgid "Invoice Received"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status
-msgid "Invoice Status"
-msgstr ""
-
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Invoiced"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_ids
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Invoices"
msgstr ""
@@ -661,6 +701,11 @@ msgstr ""
msgid "Invoices and Incoming Shipments"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_is_shipped
+msgid "Is shipped"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings___last_update
#: model:ir.model.fields,field_description:purchase.field_purchase_order___last_update
@@ -695,7 +740,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Lock Bills"
+msgid "Lock"
msgstr ""
#. module: purchase
@@ -728,6 +773,17 @@ msgstr ""
msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays."
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn_msg
+msgid "Message for Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_product_product_purchase_line_warn_msg
+#: model:ir.model.fields,field_description:purchase.field_product_template_purchase_line_warn_msg
+msgid "Message for Purchase Order Line"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_company_po_double_validation_amount
msgid "Minimum amount for which a double validation is required"
@@ -749,13 +805,19 @@ msgstr ""
msgid "New Mail"
msgstr ""
+#. module: purchase
+#: selection:product.template,purchase_line_warn:0
+#: selection:res.partner,purchase_warn:0
+msgid "No Message"
+msgstr ""
+
#. module: purchase
#: selection:purchase.config.settings,group_product_variant:0
msgid "No variants on products"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:893
+#: code:addons/purchase/models/purchase.py:938
#, python-format
msgid "No vendor associated to product %s. Please set one to fix this procurement."
msgstr ""
@@ -766,13 +828,13 @@ msgid "Not Invoiced"
msgstr ""
#. module: purchase
-#: selection:purchase.order,invoice_status:0
-msgid "Not purchased"
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Notes"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Notes"
+#: selection:purchase.order,invoice_status:0
+msgid "Nothing to Bill"
msgstr ""
#. module: purchase
@@ -783,8 +845,8 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_product_product_purchase_method
#: model:ir.model.fields,help:purchase.field_product_template_purchase_method
-msgid "On ordered quantities: Invoice this product based on ordered quantities.\n"
-"On received quantities: Invoice this product based on received quantity."
+msgid "On ordered quantities: control bills based on ordered quantities.\n"
+"On received quantities: control bills based on received quantity."
msgstr ""
#. module: purchase
@@ -827,6 +889,12 @@ msgstr ""
msgid "Order of Day"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:762
+#, python-format
+msgid "Ordered quantity decreased!"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Orders"
@@ -875,11 +943,6 @@ msgstr ""
msgid "Price Per Vendor"
msgstr ""
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
-msgid "Pricelists"
-msgstr ""
-
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Print RFQ"
@@ -938,7 +1001,9 @@ msgid "Product Unit of Measure"
msgstr ""
#. module: purchase
+#: model:ir.actions.act_window,name:purchase.product_product_action
#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_product_variant
+#: model:ir.ui.menu,name:purchase.product_product_menu
msgid "Product Variants"
msgstr ""
@@ -970,6 +1035,11 @@ msgstr ""
msgid "Provide a double validation mechanism for purchases"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_normal_action_puchased
+msgid "Purchasable Products"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management
msgid "Purchase"
@@ -995,6 +1065,7 @@ msgstr ""
#: model:ir.model,name:purchase.model_purchase_order
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_id
#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_id
+#: model:ir.model.fields,field_description:purchase.field_res_partner_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
@@ -1020,6 +1091,8 @@ msgstr ""
#: model:ir.model,name:purchase.model_purchase_order_line
#: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_line_id
#: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_line_id
+#: model:ir.model.fields,field_description:purchase.field_product_product_purchase_line_warn
+#: model:ir.model.fields,field_description:purchase.field_product_template_purchase_line_warn
#: model:ir.model.fields,field_description:purchase.field_stock_move_purchase_line_id
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
#: model:ir.ui.view,arch_db:purchase.purchase_order_line_form2
@@ -1032,6 +1105,16 @@ msgstr ""
msgid "Purchase Order Lines"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_res_company_po_lock
+msgid "Purchase Order Modification"
+msgstr ""
+
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_res_company_po_lock
+msgid "Purchase Order Modification used when you want to purchase order editable after confirm"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_form_action
#: model:ir.model.fields,field_description:purchase.field_stock_picking_purchase_id
@@ -1048,7 +1131,7 @@ msgid "Purchase Orders Statistics"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:614
+#: code:addons/purchase/models/purchase.py:657
#, python-format
msgid "Purchase order line deleted."
msgstr ""
@@ -1101,6 +1184,11 @@ msgstr ""
msgid "Quotations"
msgstr ""
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "RFQ"
+msgstr ""
+
#. module: purchase
#: model:mail.message.subtype,name:purchase.mt_rfq_approved
msgid "RFQ Approved"
@@ -1132,11 +1220,6 @@ msgstr ""
msgid "RFQs and Purchases"
msgstr ""
-#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Re-Print RFQ"
-msgstr ""
-
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Re-Send RFQ by Email"
@@ -1222,6 +1305,13 @@ msgstr ""
msgid "Search Purchase Order"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,help:purchase.field_product_product_purchase_line_warn
+#: model:ir.model.fields,help:purchase.field_product_template_purchase_line_warn
+#: model:ir.model.fields,help:purchase.field_res_partner_purchase_warn
+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 ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Send PO by Email"
@@ -1232,6 +1322,11 @@ msgstr ""
msgid "Send RFQ by Email"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_sequence
+msgid "Sequence"
+msgstr ""
+
#. module: purchase
#: selection:purchase.config.settings,group_costing_method:0
msgid "Set a fixed cost price on each product"
@@ -1239,7 +1334,7 @@ msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Set a purchase order as done if you don't want to receive vendor bills anymore for this purchase order."
+msgid "Set date to all order lines"
msgstr ""
#. module: purchase
@@ -1257,11 +1352,6 @@ msgstr ""
msgid "Shipment"
msgstr ""
-#. module: purchase
-#: selection:purchase.config.settings,group_advance_purchase_requisition:0
-msgid "Simple call for tender (only choose from one RFQ)"
-msgstr ""
-
#. module: purchase
#: selection:purchase.config.settings,group_uom:0
msgid "Some products may be sold/puchased in different units of measure (advanced)"
@@ -1300,11 +1390,6 @@ msgstr ""
msgid "Supplier Currency"
msgstr ""
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
-msgid "Supplier Pricelist"
-msgstr ""
-
#. module: purchase
#: selection:purchase.config.settings,module_stock_dropshipping:0
msgid "Suppliers always deliver to your warehouse(s)"
@@ -1332,6 +1417,13 @@ msgstr ""
msgid "Terms and Conditions"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.product_product_action
+msgid "The product form contains detailed information to improve the\n"
+" purchase process: prices, procurement logistics, accounting data,\n"
+" available vendors, etc."
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.product_normal_action_puchased
msgid "The product form contains detailed information to improve the\n"
@@ -1364,11 +1456,40 @@ msgstr ""
msgid "This account will be used to value price difference between purchase price and cost price."
msgstr ""
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "This changes the scheduled date of all order lines to the given date"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,help:purchase.field_res_partner_property_purchase_currency_id
msgid "This currency will be used, instead of the default one, for purchases from the current partner"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:966
+#, 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:979
+#, 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:183
+#, python-format
+msgid "This vendor bill has been created from: %s"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/models/account_invoice.py:197
+#, python-format
+msgid "This vendor bill has been modified from: %s"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
msgid "This vendor has no purchase order. Click to create a new RfQ."
@@ -1413,13 +1534,13 @@ msgid "Transfer"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:300
+#: code:addons/purchase/models/purchase.py:342
#, python-format
msgid "Unable to cancel purchase order %s as some receptions have already been done."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:303
+#: code:addons/purchase/models/purchase.py:345
#, python-format
msgid "Unable to cancel this purchase order. You must first cancel related vendor bills."
msgstr ""
@@ -1436,11 +1557,15 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_uom
-#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
msgid "Units of Measure"
msgstr ""
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Unlock"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_tree
msgid "Untaxed"
@@ -1459,7 +1584,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_invoice_pending
msgid "Use this menu to control the invoices to be received from your\n"
-" vendor. When registering a new bill, set the purchase order\n"
+" vendors. When registering a new bill, set the purchase order\n"
" and Odoo will fill the bill automatically according to ordered\n"
" or received quantities."
msgstr ""
@@ -1512,11 +1637,21 @@ msgstr ""
msgid "Vendor Price"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+msgid "Vendor Pricelists"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_partner_ref
msgid "Vendor Reference"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_supplier_name
+msgid "Vendors"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices
msgid "Vendors bills can be pre-generated based on purchase\n"
@@ -1532,7 +1667,7 @@ msgstr ""
#. module: purchase
#: selection:purchase.order,invoice_status:0
-msgid "Waiting Invoices"
+msgid "Waiting Bills"
msgstr ""
#. module: purchase
@@ -1541,6 +1676,30 @@ msgstr ""
msgid "Warehouse"
msgstr ""
+#. module: purchase
+#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_warning_purchase
+#: selection:product.template,purchase_line_warn:0
+#: selection:res.partner,purchase_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:248
+#: code:addons/purchase/models/purchase.py:723
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.res_partner_view_purchase_buttons
+msgid "Warning on the Purchase Order"
+msgstr ""
+
+#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_product_supplier_inherit
+msgid "Warning when Purchasing this Product"
+msgstr ""
+
#. module: purchase
#: model:ir.model.fields,help:purchase.field_stock_warehouse_buy_to_resupply
msgid "When products are bought, they can be delivered to this warehouse"
@@ -1551,12 +1710,26 @@ msgstr ""
msgid "Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:763
+#, python-format
+msgid "You are decreasing the ordered quantity!\n"
+"You must update the quantities on the reception and/or bills."
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_open_invoice
msgid "You can control the invoice from your vendor according to\n"
" what you purchased (services) or received (products)."
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.product_product_action
+msgid "You must define a product for everything you purchase, whether\n"
+" it's a physical product, a consumable or services you buy to\n"
+" subcontractors."
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,help:purchase.product_normal_action_puchased
msgid "You must define a product for everything you purchase, whether\n"
@@ -1565,11 +1738,22 @@ msgid "You must define a product for everything you purchase, whether\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:335
+#: code:addons/purchase/models/purchase.py:382
#, python-format
msgid "You must set a Vendor Location for this partner %s"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/models/purchase.py:312
+#, python-format
+msgid "You need purchase manager access rights to validate an order above %.2f %s."
+msgstr ""
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_config_settings
msgid "purchase.config.settings"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 14108a0f10c00682dd6518ac3a71aac45de10dcc..a2a4578939e47f245e443b87abe88bfdd6de9e11 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -71,65 +71,47 @@ msgid "<strong>Vendor </strong>"
msgstr ""
#. module: purchase_requisition
-#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "A Call for Tenders is a procedure for generating competing offers from\n"
-" different bidders. In the call for tenders, you can record the\n"
-" products you need to buy and generate the creation of RfQs to\n"
-" vendors. Once the tenders have been registered, you can review and\n"
-" compare them and you can validate some and cancel others."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_account_analytic_id
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_account_analytic_id
-msgid "Analytic Account"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Approved by Vendor"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_date_end
+msgid "Agreement Deadline"
msgstr ""
#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_bid_line_qty
-msgid "Bid Line Qty"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_name
+msgid "Agreement Reference"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Bid Selection"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_exclusive
+msgid "Agreement Selection Type"
msgstr ""
#. module: purchase_requisition
-#: model:ir.actions.report.xml,name:purchase_requisition.action_report_purchase_requisitions
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_order_requisition_id
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_requisition_id
-#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_tree
-msgid "Call for Tenders"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_10772
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_name
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_type_form
+msgid "Agreement Type"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_name
-msgid "Call for Tenders Reference"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_account_analytic_id
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_account_analytic_id
+msgid "Analytic Account"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Call for Tenders in negotiation"
+#: selection:purchase.requisition,state:0
+msgid "Bid Selection"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Call for Tenders where tenders are closed"
+#: model:purchase.requisition.type,name:purchase_requisition.type_single
+msgid "Blanket Order"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_bid_line_qty
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_partner
-msgid "Cancel"
+#: model:ir.actions.report.xml,name:purchase_requisition.action_report_purchase_requisitions
+#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
+msgid "Call for Tenders"
msgstr ""
#. module: purchase_requisition
@@ -137,68 +119,20 @@ msgstr ""
msgid "Cancel Call"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.purchase_order_line_tree_tender
-msgid "Cancel Choice"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Cancel Purchase Order"
-msgstr ""
-
#. module: purchase_requisition
#: selection:purchase.requisition,state:0
msgid "Cancelled"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:302
-#, python-format
-msgid "Cancelled by the call for tenders associated to this request for quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:67
+#: code:addons/purchase_requisition/models/purchase_requisition.py:76
#, python-format
-msgid "Cancelled by the tender associated to this quotation."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_bid_line_qty
-msgid "Change Bid line quantity"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.purchase_order_line_tree_tender
-#: model:ir.ui.view,arch_db:purchase_requisition.view_bid_line_qty
-msgid "Change Quantity"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_partner
-msgid "Choose Vendor"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Choose product lines"
+msgid "Cancelled by the agreement associated to this quotation."
msgstr ""
#. module: purchase_requisition
#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "Click to start a new Call for Tenders process."
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Close Call for Tenders"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Closed Tenders"
+msgid "Click to start a new purchase agreement."
msgstr ""
#. module: purchase_requisition
@@ -209,17 +143,7 @@ msgstr ""
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Confirm Call"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.purchase_order_line_tree_tender
-msgid "Confirm Order"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Confirm Purchase Order"
+msgid "Confirm"
msgstr ""
#. module: purchase_requisition
@@ -228,36 +152,33 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_partner
-msgid "Create Request for Quotation"
-msgstr ""
-
#. module: purchase_requisition
#: selection:product.template,purchase_requisition:0
msgid "Create a draft purchase order"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_create_uid
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_create_uid
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_create_uid
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_create_uid
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_create_uid
msgid "Created by"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_create_date
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_create_date
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_create_date
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_create_date
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_create_date
msgid "Created on"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:22
-#, python-format
-msgid "Define product(s) you want to include in the call for tenders."
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_type_form
+msgid "Data for new quotations"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_schedule_date
+msgid "Delivery Date"
msgstr ""
#. module: purchase_requisition
@@ -266,19 +187,26 @@ msgid "Description"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_display_name
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_display_name
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_display_name
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_display_name
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_display_name
msgid "Display Name"
msgstr ""
#. module: purchase_requisition
+#: selection:purchase.requisition.type,line_copy:0
+msgid "Do not create RfQ lines automatically"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
+#: selection:purchase.requisition,state:0
msgid "Done"
msgstr ""
#. module: purchase_requisition
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
#: selection:purchase.requisition,state:0
msgid "Draft"
msgstr ""
@@ -289,10 +217,15 @@ msgid "End Month"
msgstr ""
#. module: purchase_requisition
-#. openerp-web
-#: code:addons/purchase_requisition/static/src/xml/purchase_requisition.xml:5
-#, python-format
-msgid "Generate PO"
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "Example of purchase agreements include call for tenders and blanket orders."
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "For a blanket order, you can record an agreement for a specifc period\n"
+" (e.g. a year) and you order products within this agreement, benefiting\n"
+" from the negociated prices."
msgstr ""
#. module: purchase_requisition
@@ -301,33 +234,42 @@ msgid "Group By"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_id
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_id
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_id
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_id
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id
msgid "ID"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty___last_update
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "In a call for tenders, you can record the products you need to buy\n"
+" and generate the creation of RfQs to vendors. Once the tenders have\n"
+" been registered, you can review and compare them and you can\n"
+" validate some and cancel others."
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
+msgid "In negotiation"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition___last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line___last_update
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner___last_update
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type___last_update
msgid "Last Modified on"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_write_uid
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_write_uid
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_write_uid
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_write_uid
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_write_uid
msgid "Last Updated by"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_write_date
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_write_date
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_write_date
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_write_date
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_write_date
msgid "Last Updated on"
msgstr ""
@@ -338,8 +280,8 @@ msgid "Latest Requisition"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_multiple_rfq_per_supplier
-msgid "Multiple RFQ per vendor"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_line_copy
+msgid "Lines"
msgstr ""
#. module: purchase_requisition
@@ -349,27 +291,28 @@ msgstr ""
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "New"
+msgid "New Agreements"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "New Call for Tenders"
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
+msgid "New Quotation"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Order Date"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_order_count
+msgid "Number of Orders"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Ordering Date"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_qty_ordered
+msgid "Ordered Quantities"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "PO Created"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_ordering_date
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
+msgid "Ordering Date"
msgstr ""
#. module: purchase_requisition
@@ -389,11 +332,6 @@ msgstr ""
msgid "Product"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Product Lines"
-msgstr ""
-
#. module: purchase_requisition
#: model:ir.model,name:purchase_requisition.model_product_template
msgid "Product Template"
@@ -410,11 +348,6 @@ msgstr ""
msgid "Products"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_po_line_ids
-msgid "Products by vendor"
-msgstr ""
-
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_ids
msgid "Products to Purchase"
@@ -426,19 +359,36 @@ msgid "Propose a call for tenders"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Purchase Order"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_order_requisition_id
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_requisition_id
+msgid "Purchase Agreement"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_type
+msgid "Purchase Agreement Type"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.tender_type_action
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_type
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_type_form
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_type_tree
+msgid "Purchase Agreement Types"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order_line
-msgid "Purchase Order Line"
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_tree
+msgid "Purchase Agreements"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.purchase_order_line_tree_tender
-msgid "Purchase Order Lines"
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+msgid "Purchase Order"
msgstr ""
#. module: purchase_requisition
@@ -462,25 +412,14 @@ msgid "Purchase Requisition Line"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:435
+#: code:addons/purchase_requisition/models/purchase_requisition.py:297
#, python-format
msgid "Purchase Requisition created"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions
-msgid "Purchase Requisitions (exclusive)"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Tenders"
+#: model:purchase.requisition.type,name:purchase_requisition.type_multi
+msgid "Purchase Tender"
msgstr ""
#. module: purchase_requisition
@@ -489,41 +428,28 @@ msgid "Purchase orders"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty_qty
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_product_qty
-#: model:ir.ui.view,arch_db:purchase_requisition.view_bid_line_qty
-msgid "Quantity"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_order_line_quantity_tendered
-msgid "Quantity Tendered"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:201
-#, python-format
-msgid "RFQ created"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_quantity_copy
+msgid "Quantities"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "RFQs/Bids"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_product_qty
+msgid "Quantity"
msgstr ""
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Reference"
+msgid "RFQs/Orders"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Request a Quotation"
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_to_so
+msgid "Request for Quotation"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Requests for Quotation"
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_list
+msgid "Request for Quotations"
msgstr ""
#. module: purchase_requisition
@@ -549,39 +475,39 @@ msgstr ""
#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_schedule_date
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_schedule_date
msgid "Scheduled Date"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_ordering_date
-msgid "Scheduled Ordering Date"
-msgstr ""
-
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Search Call for Tenders"
+msgid "Search Purchase Agreements"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
+#: selection:purchase.requisition.type,exclusive:0
msgid "Select multiple RFQ"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
+#: selection:purchase.requisition.type,exclusive:0
msgid "Select only one RFQ (exclusive)"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition_exclusive
-msgid "Select only one RFQ (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\n"
-"Select multiple RFQ: It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"
+#: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition_type_exclusive
+msgid "Select only one RFQ (exclusive): when a purchase order is confirmed, cancel the remaining purchase order.\n"
+"\n"
+" Select multiple RFQ: allows multiple purchase orders. On confirmation of a purchase order it does not cancel the remaining orders"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
-msgid "Send RFQ by Email"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: purchase_requisition
+#: selection:purchase.requisition.type,quantity_copy:0
+msgid "Set quantities manually"
msgstr ""
#. module: purchase_requisition
@@ -600,26 +526,6 @@ msgstr ""
msgid "Status"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.model.fields,help:purchase_requisition.field_purchase_order_line_quantity_tendered
-msgid "Technical field for not loosing the initial information about the quantity proposed in the tender"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_date_end
-msgid "Tender Closing Deadline"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.purchase_line_tree
-msgid "Tender Lines"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_exclusive
-msgid "Tender Selection Type"
-msgstr ""
-
#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
msgid "Terms and Conditions"
@@ -641,42 +547,45 @@ msgid "Unassigned Requisition"
msgstr ""
#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.purchase_order_line_tree_tender
-msgid "Vendor"
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_price_unit
+msgid "Unit Price"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_partner_partner_ids
-msgid "Vendors"
+#: selection:purchase.requisition.type,line_copy:0
+msgid "Use lines of agreement"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_warehouse_id
-msgid "Warehouse"
+#: selection:purchase.requisition.type,quantity_copy:0
+msgid "Use quantities of agreement"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:72
-#, python-format
-msgid "You can not confirm call because there is no product line."
+#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
+msgid "Validate"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:249
-#, python-format
-msgid "You have already generate the purchase order(s)."
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_vendor_id
+msgid "Vendor"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_warehouse_id
+msgid "Warehouse"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:198
+#: code:addons/purchase_requisition/models/purchase_requisition.py:82
#, python-format
-msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation."
+msgid "You cannot confirm call because there is no product line."
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:258
+#: code:addons/purchase_requisition/models/purchase_requisition.py:99
#, python-format
-msgid "You have no line selected for buying."
+msgid "You have to cancel or validate every RfQ before closing the purchase requisition."
msgstr ""
#. module: purchase_requisition
diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot
index a14f6ac13764d16366ad3c20d14c410c5bd33d57..dce81090cf7c8ae2bb8842a124a1250a8fde70d9 100644
--- a/addons/rating/i18n/rating.pot
+++ b/addons/rating/i18n/rating.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,27 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "<br/>\n"
+" on our services on \""
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.view_rating_rating_kanban
+msgid "<span class=\"text-muted\">by </span>"
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.view_rating_rating_kanban
+msgid "<span class=\"text-muted\">for </span>"
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.view_rating_rating_kanban
+msgid "<span class=\"text-muted\">on </span>"
+msgstr ""
+
#. module: rating
#: model:ir.model.fields,help:rating.field_rating_rating_access_token
msgid "Access token to set the rating of the value"
@@ -67,11 +88,26 @@ msgstr ""
msgid "Document Model"
msgstr ""
+#. module: rating
+#: model:ir.model.fields,help:rating.field_rating_rating_consumed
+msgid "Enabled if the rating has been filled."
+msgstr ""
+
#. module: rating
#: model:ir.model.fields,field_description:rating.field_rating_rating_feedback
msgid "Feedback reason"
msgstr ""
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_rating_rating_consumed
+msgid "Filled Rating"
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_external_page_view
+msgid "Go to Odoo"
+msgstr ""
+
#. module: rating
#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
msgid "Group By"
@@ -121,11 +157,6 @@ msgstr ""
msgid "Identifier of the rated object"
msgstr ""
-#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_external_page_view
-msgid "It was"
-msgstr ""
-
#. module: rating
#. openerp-web
#: code:addons/rating/static/src/js/rating_common.js:27
@@ -164,6 +195,11 @@ msgstr ""
msgid "Month"
msgstr ""
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
+msgid "My Ratings"
+msgstr ""
+
#. module: rating
#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
msgid "Okay"
@@ -179,6 +215,11 @@ msgstr ""
msgid "Rated Partner"
msgstr ""
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
+msgid "Rated User"
+msgstr ""
+
#. module: rating
#: model:ir.actions.act_window,name:rating.action_view_rating
#: model:ir.model,name:rating.model_rating_rating
@@ -198,19 +239,42 @@ msgstr ""
msgid "Rating Average"
msgstr ""
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_value
+#: model:ir.model.fields,field_description:rating.field_product_template_rating_last_value
+#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_value
+#: model:ir.model.fields,field_description:rating.field_project_task_rating_last_value
+#: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_value
+msgid "Rating Last Value"
+msgstr ""
+
#. module: rating
#: model:ir.model,name:rating.model_rating_mixin
msgid "Rating Mixin"
msgstr ""
+#. module: rating
+#: model:ir.model.fields,field_description:rating.field_mail_channel_rating_count
+#: model:ir.model.fields,field_description:rating.field_product_template_rating_count
+#: model:ir.model.fields,field_description:rating.field_project_issue_rating_count
+#: model:ir.model.fields,field_description:rating.field_project_task_rating_count
+#: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_count
+msgid "Rating count"
+msgstr ""
+
#. module: rating
#: sql_constraint:rating.rating:0
-msgid "Rating should be between -1 to 10"
+msgid "Rating should be between 0 to 10"
msgstr ""
#. module: rating
+#: model:ir.model.fields,help:rating.field_mail_channel_rating_last_value
+#: model:ir.model.fields,help:rating.field_product_template_rating_last_value
+#: model:ir.model.fields,help:rating.field_project_issue_rating_last_value
+#: model:ir.model.fields,help:rating.field_project_task_rating_last_value
+#: model:ir.model.fields,help:rating.field_rating_mixin_rating_last_value
#: model:ir.model.fields,help:rating.field_rating_rating_rating
-msgid "Rating value"
+msgid "Rating value: 0=Unhappy, 10=Happy"
msgstr ""
#. module: rating
@@ -233,24 +297,19 @@ msgstr ""
msgid "Resource Name"
msgstr ""
-#. module: rating
-#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
-msgid "Responsible"
-msgstr ""
-
#. module: rating
#: model:ir.model.fields,field_description:rating.field_rating_rating_access_token
msgid "Security Token"
msgstr ""
#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_external_page_view
-msgid "Sorry you have already voted !"
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "Send Feedback"
msgstr ""
#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_external_page_view
-msgid "Thanks for voting !"
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "Thanks! We appreciate your feedback."
msgstr ""
#. module: rating
@@ -268,19 +327,51 @@ msgstr ""
msgid "Unhappy"
msgstr ""
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_external_page_view
+msgid "We appreciate your feedback!"
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "Would be great if you can provide more informaion:"
+msgstr ""
+
#. module: rating
#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
msgid "Year"
msgstr ""
#. module: rating
-#: model:ir.ui.view,arch_db:rating.rating_external_page_view
-msgid "Your vote has been taken into account."
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "Your rating has been submitted."
msgstr ""
#. module: rating
-#: code:addons/rating/models/rating.py:57
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "by"
+msgstr ""
+
+#. module: rating
+#: code:addons/rating/controllers/main.py:21
#, python-format
-msgid "rated it"
+msgid "highly dissatisfied"
+msgstr ""
+
+#. module: rating
+#: code:addons/rating/controllers/main.py:20
+#, python-format
+msgid "not satisfied"
+msgstr ""
+
+#. module: rating
+#: code:addons/rating/controllers/main.py:22
+#, python-format
+msgid "satisfied"
+msgstr ""
+
+#. module: rating
+#: model:ir.ui.view,arch_db:rating.rating_external_page_submit
+msgid "you are"
msgstr ""
diff --git a/addons/rating_project/i18n/rating_project.pot b/addons/rating_project/i18n/rating_project.pot
index 122c81b92751f99ebc65cb847bfcca3289a774c0..68b48b6106bb885b0292b7d00a72c23defd4fc7c 100644
--- a/addons/rating_project/i18n/rating_project.pot
+++ b/addons/rating_project/i18n/rating_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,85 +18,198 @@ msgstr ""
#. module: rating_project
#: model:mail.template,body_html:rating_project.rating_project_request_email_template
msgid "\n"
-"<body>\n"
-" <div style=\"max-width:600px; height:auto; margin-left:30px;\">\n"
-" <div style=\"margin-left:30px;align=center;\">\n"
-" Dear ${object.partner_id.name},\n"
-" </div><br>\n"
-" <div style=\"margin-left:30px;align=center;\" width=\"60%\">\n"
-" We hope the services provided have met your expectations.\n"
-" <br>If you have any more questions or comments, do not hesitate to reply to this e-mail.\n"
-" <br><br>Please, help us to improve ourself by rating the service we provide.\n"
-" </div><br>\n"
-" <table style=\"margin-left:50px;\" width=\"70%\">\n"
-" <tr>\n"
-" <td>\n"
-" <a href=\"/rating/${object.access_token}/10\">\n"
-" <img alt=\"Great\" src=\"rating/static/src/img/rating_10.png\" title=\"It was great\"/>\n"
-" </a>\n"
-" </td>\n"
-" <td>\n"
-" <a href=\"/rating/${object.access_token}/5\">\n"
-" <img alt=\"Okay\" src=\"rating/static/src/img/rating_5.png\" title=\"It was okay\"/>\n"
-" </a>\n"
-" </td>\n"
-" <td>\n"
-" <a href=\"/rating/${object.access_token}/0\">\n"
-" <img alt=\"Bad\" src=\"rating/static/src/img/rating_0.png\" title=\"It wasn't good\"/>\n"
-" </a>\n"
-" </td>\n"
-" </tr>\n"
-" </table><br>\n"
-" <h4 style=\"margin-left:30px;font-weight:normal;\">Thank you </h4>\n"
-" <h4 style=\"margin-left:30px;font-weight:normal;\">${object.rated_partner_id.name or ''} </h4>\n"
-" </div>\n"
-"</body>\n"
-" \n"
-" "
+"% set access_token = object.rating_get_access_token()\n"
+"<div style=\"background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;\">\n"
+" <table style=\"width:600px;margin:5px auto;\">\n"
+" <tbody>\n"
+" <tr><td>\n"
+" <a href=\"/\"><img src=\"/web/binary/company_logo\" style=\"vertical-align:baseline;max-width:100px;\" /></a>\n"
+" </td><td style=\"text-align:right;vertical-align:middle;\">\n"
+" Satisfaction Survey\n"
+" </td></tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;\">\n"
+" <tbody>\n"
+" <tr><td style=\"padding:15px 20px 10px 20px;\">\n"
+" <p>Hello,</p>\n"
+" <p>Please take a moment to rate our services related to the task \"<strong>${object.name}</strong>\"\n"
+" assigned to <strong>${object.rating_get_rated_partner_id().name}</strong>.</p>\n"
+" <p>We appreciate your feedback. It helps us to improve continuously.</p>\n"
+" </td></tr>\n"
+" <tr><td style=\"padding:10px 20px\">\n"
+" <table style=\"width:100%;border-top:1px solid #e1e1e1;\">\n"
+" <tr>\n"
+" <td style=\"text-align:center;\">\n"
+" <h2 style=\"font-weight:300;font-size:18px;\">\n"
+" Tell us how you feel about our service:\n"
+" </h2>\n"
+" <div style=\"text-color: #888888\">(click on one of these smileys)</div>\n"
+" </td>\n"
+" </tr>\n"
+" <tr>\n"
+" <td style=\"padding:10px 10px;\">\n"
+" <table style=\"width:100%;text-align:center;\">\n"
+" <tr>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/10\">\n"
+" <img alt=\"Satisfied\" src=\"/rating/static/src/img/rating_10.png\" title=\"Satisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/5\">\n"
+" <img alt=\"Not satisfied\" src=\"/rating/static/src/img/rating_5.png\" title=\"Not satisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" <td>\n"
+" <a href=\"/rating/${access_token}/1\">\n"
+" <img alt=\"Highly Dissatisfied\" src=\"/rating/static/src/img/rating_1.png\" title=\"Highly Dissatisfied\"/>\n"
+" </a>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td></tr>\n"
+" <tr><td style=\"padding:15px 20px 10px 20px;\">${object.user_id.signature | safe}</td></tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:600px;margin:auto;text-align:center;font-size:12px;\">\n"
+" <tbody>\n"
+" <tr><td style=\"padding-top:10px;color:#afafaf;\">\n"
+" % if object.project_id.rating_status == 'stage':\n"
+" <p>This customer survey has been sent because your task has been moved to the stage <b>${object.stage_id.name}</b></p>\n"
+" % endif\n"
+" % if object.project_id.rating_status == 'periodic':\n"
+" <p>This customer survey is send <b>${object.project_id.rating_status_period}</b> as long as the task is in the <b>${object.stage_id.name}</b> stage.\n"
+" % endif\n"
+" <p>Email automatically sent by <a href=\"https://www.odoo.com/page/project-management\" style=\"color:#a24689;text-decoration:none;\">Odoo Project</a> for <a href=\"${object.project_id.company_id.website}\" style=\"color:#a24689;text-decoration:none;\">${object.project_id.company_id.name}</a></p>\n"
+" </td></tr>\n"
+" </tbody>\n"
+" </table>\n"
+"</div>\n"
+""
msgstr ""
#. module: rating_project
#: model:mail.template,subject:rating_project.rating_project_request_email_template
-msgid "${object.res_name}"
+msgid "${object.project_id.company_id.name}: Service Rating Request"
msgstr ""
#. module: rating_project
-#: model:ir.model.fields,field_description:rating_project.field_project_project_percentage_satisfaction_project
-#: model:ir.model.fields,field_description:rating_project.field_project_project_percentage_satisfaction_task
-msgid "% Happy"
+#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_form
+msgid "% On tasks"
msgstr ""
#. module: rating_project
#: model:ir.model.fields,field_description:rating_project.field_project_task_type_auto_validation_kanban_state
-msgid "Auto Kanban state validation"
+msgid "Automatic kanban status"
msgstr ""
#. module: rating_project
#: model:ir.model.fields,help:rating_project.field_project_task_type_auto_validation_kanban_state
msgid "Automatically modify the kanban state when the customer reply to the feedback for this stage.\n"
-" * A great feedback from the customer will update the kanban state to 'ready for the new stage' (green bullet).\n"
+" * A good feedback from the customer will update the kanban state to 'ready for the new stage' (green bullet).\n"
" * A medium or a bad feedback will set the kanban state to 'blocked' (red bullet).\n"
""
msgstr ""
#. module: rating_project
-#: model:ir.model.fields,field_description:rating_project.field_project_project_is_visible_happy_customer
-msgid "Customer Satisfaction"
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_task
+msgid "Customer Ratings"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.actions.act_window,help:rating_project.rating_rating_action_task
+msgid "Customer ratings on tasks. If you have no rating, change your project Settings to activate it."
+msgstr ""
+
+#. module: rating_project
+#: model:ir.actions.act_window,help:rating_project.rating_rating_action_project
+msgid "Customer ratings on tasks/issues. If you have no rating, change your project Settings to activate it."
msgstr ""
#. module: rating_project
-#: model:ir.model.fields,help:rating_project.field_project_project_is_visible_happy_customer
-msgid "Display information about rating of the project on kanban and form view. This buttons will only be displayed if at least a rating exists."
+#: model:ir.model.fields,field_description:rating_project.field_project_project_rating_status
+msgid "Customer(s) Ratings"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.actions.act_window,name:rating_project.rating_rating_action_project
+#: model:ir.ui.menu,name:rating_project.rating_rating_menu_project
+#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
+msgid "Customers Ratings"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status_period:0
+msgid "Daily"
msgstr ""
#. module: rating_project
#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_form
-msgid "On tasks"
+msgid "Edit project's stages and set an email template\n"
+" on the stages on which you want to activate the rating."
+msgstr ""
+
+#. module: rating_project
+#: model:ir.model.fields,field_description:rating_project.field_project_project_percentage_satisfaction_project
+msgid "Happy % on Project"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.model.fields,field_description:rating_project.field_project_project_percentage_satisfaction_task
+msgid "Happy % on Task"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.model.fields,help:rating_project.field_project_project_rating_status
+msgid "How to get the customer's feedbacks?\n"
+"- Rating when changing stage: Email will be sent when a task/issue is pulled in another stage\n"
+"- Periodical Rating: Email will be sent periodically\n"
+"\n"
+"Don't forget to set up the mail templates on the stages for which you want to get the customer's feedbacks."
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.project_task_view_kanban_inherit_rating
+msgid "Latest Rating: Higly Dissatisfied"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.project_task_view_kanban_inherit_rating
+msgid "Latest Rating: Not Satisfied"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.project_task_view_kanban_inherit_rating
+msgid "Latest Rating: Satisfied"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status:0
+msgid "No rating"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
+msgid "No rating yet"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status_period:0
+msgid "Once a Month"
msgstr ""
#. module: rating_project
#: model:ir.ui.view,arch_db:rating_project.view_project_project_rating_kanban
-msgid "Percentage of happy people about this project"
+msgid "Percentage of happy ratings over the past 30 days. Get rating details from the More menu."
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status:0
+msgid "Periodical Rating"
msgstr ""
#. module: rating_project
@@ -105,7 +218,12 @@ msgid "Project"
msgstr ""
#. module: rating_project
-#: model:ir.model,name:rating_project.model_rating_rating
+#: selection:project.project,rating_status_period:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.ui.view,arch_db:rating_project.project_task_view_form_inherit_rating
msgid "Rating"
msgstr ""
@@ -114,6 +232,26 @@ msgstr ""
msgid "Rating Email Template"
msgstr ""
+#. module: rating_project
+#: model:ir.model.fields,field_description:rating_project.field_project_project_rating_status_period
+msgid "Rating Frequency"
+msgstr ""
+
+#. module: rating_project
+#: model:ir.model.fields,field_description:rating_project.field_project_project_rating_request_deadline
+msgid "Rating request deadline"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status:0
+msgid "Rating when changing stage"
+msgstr ""
+
+#. module: rating_project
+#: model:mail.message.subtype,description:rating_project.mt_task_rating
+msgid "Ratings"
+msgstr ""
+
#. module: rating_project
#: model:ir.model.fields,help:rating_project.field_project_task_type_rating_template_id
msgid "Select an email template. An email will be sent to the customer when the task reach this step."
@@ -124,8 +262,29 @@ msgstr ""
msgid "Task"
msgstr ""
+#. module: rating_project
+#: model:mail.message.subtype,name:rating_project.mt_project_task_rating
+#: model:mail.message.subtype,name:rating_project.mt_task_rating
+msgid "Task Rating"
+msgstr ""
+
#. module: rating_project
#: model:ir.model,name:rating_project.model_project_task_type
msgid "Task Stage"
msgstr ""
+#. module: rating_project
+#: selection:project.project,rating_status_period:0
+msgid "Twice a Month"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status_period:0
+msgid "Weekly"
+msgstr ""
+
+#. module: rating_project
+#: selection:project.project,rating_status_period:0
+msgid "Yearly"
+msgstr ""
+
diff --git a/addons/rating_project_issue/i18n/rating_project_issue.pot b/addons/rating_project_issue/i18n/rating_project_issue.pot
index f59ad5997230950b483f2d7658db31e1d272ff5e..eb24feca3739e520db72377e466db3845cb01912 100644
--- a/addons/rating_project_issue/i18n/rating_project_issue.pot
+++ b/addons/rating_project_issue/i18n/rating_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,14 +15,45 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: rating_project_issue
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_rating
+msgid "% On issues"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.actions.act_window,name:rating_project_issue.rating_rating_action_issue
+msgid "Customer Ratings"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.actions.act_window,help:rating_project_issue.rating_rating_action_issue
+msgid "Customer ratings on issues. If you have no rating, change your project Settings to activate it."
+msgstr ""
+
#. module: rating_project_issue
#: model:ir.model.fields,field_description:rating_project_issue.field_project_project_percentage_satisfaction_issue
-msgid "% Happy"
+msgid "Happy % on Issue"
msgstr ""
#. module: rating_project_issue
-#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_rating
-msgid "On issues"
+#: model:mail.message.subtype,name:rating_project_issue.mt_issue_rating
+#: model:mail.message.subtype,name:rating_project_issue.mt_project_issue_rating
+msgid "Issue Rating"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_kanban_inherit_rating
+msgid "Latest Rating: Average"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_kanban_inherit_rating
+msgid "Latest Rating: Happy"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_kanban_inherit_rating
+msgid "Latest Rating: Not Happy"
msgstr ""
#. module: rating_project_issue
@@ -31,12 +62,17 @@ msgid "Project"
msgstr ""
#. module: rating_project_issue
-#: model:ir.model,name:rating_project_issue.model_rating_rating
+#: model:ir.model,name:rating_project_issue.model_project_issue
+msgid "Project Issue"
+msgstr ""
+
+#. module: rating_project_issue
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_form_inherit_rating
msgid "Rating"
msgstr ""
#. module: rating_project_issue
-#: model:ir.model,name:rating_project_issue.model_project_issue
-msgid "project issue"
+#: model:mail.message.subtype,description:rating_project_issue.mt_issue_rating
+msgid "Ratings"
msgstr ""
diff --git a/addons/report/i18n/report.pot b/addons/report/i18n/report.pot
index bf8632c8d53f6177d4cc7728aa2e95d5db721816..abc0d92434adc01266644165375374d7f2b11310 100644
--- a/addons/report/i18n/report.pot
+++ b/addons/report/i18n/report.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -141,7 +141,7 @@ msgid "B9 23 33 x 62 mm"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:288
+#: code:addons/report/models/report.py:273
#, python-format
msgid "Bad Report Reference"
msgstr ""
@@ -193,6 +193,13 @@ msgstr ""
msgid "Default paper format ?"
msgstr ""
+#. module: report
+#. openerp-web
+#: code:addons/report/static/src/xml/report.xml:12
+#, python-format
+msgid "Discard"
+msgstr ""
+
#. module: report
#: model:ir.model.fields,field_description:report.field_ir_qweb_field_barcode_display_name
#: model:ir.model.fields,field_description:report.field_report_abstract_report_display_name
@@ -206,6 +213,13 @@ msgstr ""
msgid "Display a header line"
msgstr ""
+#. module: report
+#. openerp-web
+#: code:addons/report/static/src/xml/report.xml:8
+#, python-format
+msgid "Edit"
+msgstr ""
+
#. module: report
#: model:ir.ui.view,arch_db:report.reporting_settings_form_inherited
msgid "Edit external footer"
@@ -227,7 +241,8 @@ msgid "Email:"
msgstr ""
#. module: report
-#: constraint:report.paperformat:0
+#: code:addons/report/models/report_paperformat.py:68
+#, python-format
msgid "Error ! You cannot select a format AND specific page width/height."
msgstr ""
@@ -251,6 +266,11 @@ msgstr ""
msgid "Folio 27 210 x 330 mm"
msgstr ""
+#. module: report
+#: model:ir.model,name:report.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
#. module: report
#: model:ir.model.fields,field_description:report.field_report_paperformat_header_spacing
msgid "Header spacing"
@@ -390,9 +410,24 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:76
-#: code:addons/report/static/src/js/qwebactionmanager.js:84
-#: code:addons/report/static/src/js/qwebactionmanager.js:91
+#: code:addons/report/static/src/xml/report.xml:5
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: report
+#: model:ir.model.fields,field_description:report.field_ir_act_report_xml_print_report_name
+msgid "Printed Report Name"
+msgstr ""
+
+#. module: report
+#: model:ir.ui.view,arch_db:report.act_report_xml_view_inherit
+msgid "QWeb views"
+msgstr ""
+
+#. module: report
+#. openerp-web
+#: code:addons/report/static/src/js/qwebactionmanager.js:95
#: model:ir.model,name:report.model_report
#, python-format
msgid "Report"
@@ -411,8 +446,10 @@ msgid "Right Margin (mm)"
msgstr ""
#. module: report
-#: model:ir.ui.view,arch_db:report.act_report_xml_view_inherit
-msgid "Search associated QWeb views"
+#. openerp-web
+#: code:addons/report/static/src/xml/report.xml:11
+#, python-format
+msgid "Save"
msgstr ""
#. module: report
@@ -441,7 +478,12 @@ msgid "This is a sample of an internal report."
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:288
+#: model:ir.model.fields,help:report.field_ir_act_report_xml_print_report_name
+msgid "This is the filename of the report going to download. Keep empty to not change the report filename. You can use a python expression with the object and time variables."
+msgstr ""
+
+#. module: report
+#: code:addons/report/models/report.py:273
#, python-format
msgid "This report is not loaded into the database: %s."
msgstr ""
@@ -453,7 +495,7 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:76
+#: code:addons/report/static/src/js/qwebactionmanager.js:18
#, python-format
msgid "Unable to find Wkhtmltopdf on this \n"
"system. The report will be shown in html.<br><br><a href=\"http://wkhtmltopdf.org/\" target=\"_blank\">\n"
@@ -466,14 +508,14 @@ msgid "Website:"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:459
+#: code:addons/report/models/report.py:435
#, python-format
msgid "Wkhtmltopdf failed (error code: %s). Message: %s"
msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:84
+#: code:addons/report/static/src/js/qwebactionmanager.js:19
#, python-format
msgid "You need to start OpenERP with at least two \n"
"workers to print a pdf version of the reports."
@@ -481,7 +523,7 @@ msgstr ""
#. module: report
#. openerp-web
-#: code:addons/report/static/src/js/qwebactionmanager.js:91
+#: code:addons/report/static/src/js/qwebactionmanager.js:20
#, python-format
msgid "You should upgrade your version of\n"
"Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\n"
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 6b571688de3edd1deb4ef9187905ee3938667331..109c61462f5fc108299288015ffd2bbdf15436f7 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,28 +23,36 @@ msgid "\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 object.get_signup_url()\n"
-"\n"
-"<p>Dear\n"
-"% if object.partner_id.is_company and object.child_ids:\n"
-" ${object.partner_id.child_ids[0].name}\n"
-"% else :\n"
-" ${object.partner_id.name}\n"
+"<p>Dear ${object.partner_id.name} \n"
+"% if object.partner_id.parent_id:\n"
+" (<i>${object.partner_id.parent_id.name}</i>)\n"
"% endif\n"
",</p>\n"
-"<p>Thank you for your inquiry.<br />\n"
+"<p>\n"
"Here is your ${doc_name} <strong>${object.name}</strong>\n"
"% if object.origin:\n"
"(with reference: ${object.origin} )\n"
"% endif\n"
-"amounting <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong>\n"
+"amounting in <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong>\n"
"from ${object.company_id.name}.\n"
"</p>\n"
"\n"
-"<p style=\"margin-left: 30px; margin-top: 10 px; margin-bottom: 10px;\">\n"
-" <a href=\"${access_url}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${access_name}</a>\n"
+" <br/><br/>\n"
+" <center>\n"
+" <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">${access_name}</a>\n"
+" <br/><br/>\n"
+" <span style=\"color:#888888\">(or view attached PDF)</span>\n"
+" </center>\n"
+" <br/>\n"
+"\n"
+"<p>You can reply to this email if you have any questions.</p>\n"
+"<p>Thank you,</p>\n"
+"\n"
+"<p style=\"color:#eeeeee;\">\n"
+"% if object.user_id and object.user_id.signature:\n"
+" ${object.user_id.signature | safe}\n"
+"% endif\n"
"</p>\n"
-"<p>If you have any question, do not hesitate to contact us.</p>\n"
-"<p>Best regards,</p>\n"
""
msgstr ""
@@ -89,11 +97,103 @@ msgstr ""
msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
msgstr ""
+#. module: sale
+#: model:mail.template,subject:sale.mail_template_data_notification_email_sale_order
+msgid "${object.subject}"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "&bull;"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "(update)"
msgstr ""
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:44
+#, python-format
+msgid "<b>Invite salespeople or managers</b> via email.<br/><i>Enter one email per line.</i>"
+msgstr ""
+
+#. module: sale
+#: model:mail.template,body_html:sale.mail_template_data_notification_email_sale_order
+msgid "<html>\n"
+" <head></head>\n"
+" <body style=\"margin: 0; padding: 0;\">\n"
+" <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" class=\"o_mail_notification\">\n"
+" <tbody>\n"
+"\n"
+" <!-- HEADER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#a24689\" style=\"min-width: 590px; background-color: rgb(162, 70, 137); padding: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"middle\">\n"
+" <span style=\"font-size:20px; color:white; font-weight: bold;\">\n"
+" ${object.record_name}\n"
+" </span>\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"\n"
+" <!-- CONTENT -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#ffffff\" style=\"min-width: 590px; background-color: rgb(255, 255, 255); padding: 20px;\">\n"
+" <tbody>\n"
+" <td valign=\"top\" style=\"font-family:Arial,Helvetica,sans-serif; color: #555; font-size: 14px;\">\n"
+" ${object.body | safe}\n"
+" </td>\n"
+" </tbody>\n"
+" </table>\n"
+" </td>\n"
+" </tr>\n"
+"\n"
+" <!-- FOOTER -->\n"
+" <tr>\n"
+" <td align=\"center\" style=\"min-width: 590px;\">\n"
+" <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#a24689\" style=\"min-width: 590px; background-color: rgb(162, 70, 137); padding: 20px;\">\n"
+" <tr>\n"
+" <td valign=\"middle\" align=\"left\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
+" ${user.company_id.name}<br/>\n"
+" ${user.company_id.phone or ''}\n"
+" </td>\n"
+" <td valign=\"middle\" align=\"right\" style=\"color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;\">\n"
+" % if user.company_id.email:\n"
+" <a href=\"mailto:${user.company_id.email}\" style=\"text-decoration:none; color: white;\">${user.company_id.email}</a><br/>\n"
+" % endif\n"
+" % if user.company_id.website:\n"
+" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: white;\">\n"
+" ${user.company_id.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 href=\"https://www.odoo.com\">Odoo</a>.\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" </body>\n"
+" </html>\n"
+" "
+msgstr ""
+
#. module: sale
#: model:ir.actions.act_window,help:sale.action_orders_upselling
msgid "<i>Example: pre-paid service offers for which the customer have\n"
@@ -101,6 +201,13 @@ msgid "<i>Example: pre-paid service offers for which the customer have\n"
" hours.</i>"
msgstr ""
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:21
+#, python-format
+msgid "<p><b>Confirm the order</b> if the customer purchases.</p><p><i>The customer can also confirm the order directly from the email he received.</i></p>"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "<strong>Fiscal Position Remark:</strong>"
@@ -117,10 +224,17 @@ msgid "<strong>Salesperson:</strong>"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "<strong>Shipping address:</strong>"
msgstr ""
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
+msgid "<strong>Subtotal: </strong>"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "<strong>Total Without Taxes</strong>"
@@ -141,11 +255,26 @@ msgstr ""
msgid "A single sale price per product"
msgstr ""
+#. module: sale
+#: model:res.groups,name:sale.group_warning_sale
+msgid "A warning can be set on a product or a customer (Sale)"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_advance_payment_inv_deposit_account_id
msgid "Account used for deposits"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_pagebreak
+msgid "Add pagebreak"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_subtotal
+msgid "Add subtotal"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_delivery_address
msgid "Addresses"
@@ -157,7 +286,7 @@ msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:146
#, python-format
msgid "Advance: %s"
msgstr ""
@@ -167,6 +296,16 @@ msgstr ""
msgid "Advanced pricing based on formula"
msgstr ""
+#. module: sale
+#: selection:sale.config.settings,group_warning_sale:0
+msgid "All the products and the customers can be used in sale orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.settings,module_product_visible_discount:0
+msgid "Allow discount policy on sale order line"
+msgstr ""
+
#. module: sale
#: selection:sale.config.settings,group_discount_per_so_line:0
msgid "Allow discounts on sales order lines"
@@ -177,10 +316,15 @@ msgstr ""
msgid "Allow to edit sales order from the 'Sales Order' menu (not from the Quotation menu)"
msgstr ""
+#. module: sale
+#: selection:sale.config.settings,module_sale_order_dates:0
+msgid "Allow to modify the sale order dates to postpone deliveries and procurements"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_config_settings_group_sale_pricelist
msgid "Allows to manage different prices based on rules per category of customers.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+" Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
#. module: sale
@@ -188,13 +332,24 @@ msgstr ""
msgid "Allows you to select and maintain different units of measure for products."
msgstr ""
+#. module: sale
+#: model:ir.model.fields,help:sale.field_account_config_settings_group_analytic_account_for_sales
+msgid "Allows you to specify an analytic account on sales orders."
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_crm_team_sales_to_invoice_amount
msgid "Amount of sales to invoice"
msgstr ""
+#. module: sale
+#: selection:sale.config.settings,group_warning_sale:0
+msgid "An informative or blocking warning can be set on a product or a customer"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_project_id
+#: model:ir.model.fields,field_description:sale.field_sale_order_related_project_id
#: model:ir.model.fields,field_description:sale.field_sale_report_analytic_account_id
msgid "Analytic Account"
msgstr ""
@@ -204,6 +359,52 @@ msgstr ""
msgid "Analytic Accounting for Sales"
msgstr ""
+#. module: sale
+#: model:ir.model,name:sale.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_analytic_tag_ids
+msgid "Analytic Tags"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_account_config_settings_group_analytic_account_for_sales
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: selection:product.template,expense_policy:0
+msgid "At cost"
+msgstr ""
+
+#. module: sale
+#: selection:product.template,expense_policy:0
+msgid "At sale price"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_variants_action
+msgid "Attribute Values"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_attribute_action
+msgid "Attributes"
+msgstr ""
+
+#. module: sale
+#: selection:product.template,sale_line_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
+msgid "Breaks Page"
+msgstr ""
+
#. module: sale
#: model:ir.filters,name:sale.filter_isale_report_product
msgid "By Product"
@@ -246,6 +447,13 @@ msgstr ""
msgid "Check this box to manage quotations in this sales team."
msgstr ""
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:35
+#, python-format
+msgid "Click the <i>Home icon</i> to navigate across apps."
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
msgid "Click to define a team target"
@@ -269,11 +477,23 @@ msgstr ""
msgid "Company"
msgstr ""
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:40
+#, python-format
+msgid "Configuration options are available in the Settings app."
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Confirm Sale"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_confirmation_date
+msgid "Confirmation Date"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Create Invoice"
@@ -305,6 +525,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_create_uid
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_create_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_create_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_line_create_uid
msgid "Created by"
@@ -312,6 +533,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_create_date
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_create_date
#: model:ir.model.fields,field_description:sale.field_sale_order_line_create_date
msgid "Created on"
msgstr ""
@@ -351,6 +573,11 @@ msgstr ""
msgid "Customer portal"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_order_dates
+msgid "Date"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report_date
msgid "Date Order"
@@ -366,6 +593,11 @@ msgstr ""
msgid "Date on which sales order is created."
msgstr ""
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order_confirmation_date
+msgid "Date on which the sale order is confirmed."
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_default_invoice_policy
msgid "Default Invoicing"
@@ -402,6 +634,7 @@ msgid "Delivered quantities"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_account_invoice_partner_shipping_id
#: model:ir.model.fields,field_description:sale.field_sale_order_partner_shipping_id
msgid "Delivery Address"
msgstr ""
@@ -412,14 +645,13 @@ msgid "Delivery Lead Time"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_partner_shipping_id
-msgid "Delivery address for current sales order."
+#: model:ir.model.fields,help:sale.field_account_invoice_partner_shipping_id
+msgid "Delivery address for current invoice."
msgstr ""
#. module: sale
-#: model:product.product,name:sale.advance_product_0
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Deposit"
+#: model:ir.model.fields,help:sale.field_sale_order_partner_shipping_id
+msgid "Delivery address for current sales order."
msgstr ""
#. module: sale
@@ -429,6 +661,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_name
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Description"
msgstr ""
@@ -439,6 +672,7 @@ msgid "Different prices per customer segment"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Disc.(%)"
msgstr ""
@@ -453,6 +687,11 @@ msgstr ""
msgid "Discount (%)"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_product_visible_discount
+msgid "Discount Policy"
+msgstr ""
+
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
msgid "Discount on lines"
@@ -465,6 +704,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_display_name
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_display_name
#: model:ir.model.fields,field_description:sale.field_sale_order_display_name
#: model:ir.model.fields,field_description:sale.field_sale_order_line_display_name
#: model:ir.model.fields,field_description:sale.field_sale_report_display_name
@@ -482,17 +722,12 @@ msgid "Display margins on quotations and sales orders"
msgstr ""
#. module: sale
-#: selection:sale.config.settings,module_sale_layout:0
+#: selection:sale.config.settings,group_sale_layout:0
msgid "Do not personalize sale orders and invoice reports"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:83
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:85
#, python-format
msgid "Down Payment"
msgstr ""
@@ -518,7 +753,7 @@ msgid "Down payment (percentage)"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:80
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:82
#, python-format
msgid "Down payment of %s%%"
msgstr ""
@@ -588,8 +823,14 @@ msgstr ""
msgid "Group By"
msgstr ""
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
+msgid "Group By Name"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_id
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_id
#: model:ir.model.fields,field_description:sale.field_sale_order_id
#: model:ir.model.fields,field_description:sale.field_sale_order_line_id
#: model:ir.model.fields,field_description:sale.field_sale_report_id
@@ -598,7 +839,7 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "If a sale order is done, you cannot modify it manually anymore. However, you will still be able to invoice or deliver. This is used to freeze the sale order."
+msgid "If the sale is locked, you can not modify it anymore. However, you will still be able to invoice or deliver."
msgstr ""
#. module: sale
@@ -617,7 +858,7 @@ msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:840
+#: code:addons/sale/models/account_invoice.py:52
#, python-format
msgid "Invoice %s paid"
msgstr ""
@@ -673,11 +914,6 @@ msgstr ""
msgid "Invoice address for current sales order."
msgstr ""
-#. module: sale
-#: selection:sale.config.settings,default_invoice_policy:0
-msgid "Invoice based on costs (time and material, expenses)"
-msgstr ""
-
#. module: sale
#: selection:sale.config.settings,default_invoice_policy:0
msgid "Invoice delivered quantities"
@@ -739,7 +975,7 @@ msgstr ""
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv
-msgid "Invoices will be created in draft so that you can update\n"
+msgid "Invoices will be created in draft so that you can review\n"
" them before validation."
msgstr ""
@@ -758,11 +994,13 @@ msgid "Invoicing Policy"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Invoicing address:"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Invoicing and shipping address:"
msgstr ""
@@ -779,6 +1017,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv___last_update
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category___last_update
#: model:ir.model.fields,field_description:sale.field_sale_order___last_update
#: model:ir.model.fields,field_description:sale.field_sale_order_line___last_update
#: model:ir.model.fields,field_description:sale.field_sale_report___last_update
@@ -787,6 +1026,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_write_uid
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_write_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_line_write_uid
#: model:ir.model.fields,field_description:sale.field_sale_order_write_uid
msgid "Last Updated by"
@@ -794,11 +1034,35 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_write_date
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_write_date
#: model:ir.model.fields,field_description:sale.field_sale_order_line_write_date
#: model:ir.model.fields,field_description:sale.field_sale_order_write_date
msgid "Last Updated on"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_account_invoice_line_layout_category_sequence
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_layout_category_sequence
+msgid "Layout Sequence"
+msgstr ""
+
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:16
+#, python-format
+msgid "Let's have a look at the quotations of this sales team."
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_order_form
+msgid "Lock"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Locked"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_contract
msgid "Manage subscriptions and recurring invoicing"
@@ -827,6 +1091,27 @@ msgstr ""
msgid "Margins"
msgstr ""
+#. module: sale
+#: model:sale.layout_category,name:sale.sale_layout_cat_2
+msgid "Material"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn_msg
+msgid "Message for Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_product_product_sale_line_warn_msg
+#: model:ir.model.fields,field_description:sale.field_product_template_sale_line_warn_msg
+msgid "Message for Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.view_sales_config
+msgid "More Info"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
msgid "My Orders"
@@ -837,13 +1122,19 @@ msgstr ""
msgid "My Sales Order Lines"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_name
+#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
+msgid "Name"
+msgstr ""
+
#. module: sale
#: selection:sale.config.settings,auto_done_setting:0
msgid "Never allow to modify a confirmed sale order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:101
+#: code:addons/sale/models/sale.py:102
#, python-format
msgid "New"
msgstr ""
@@ -853,11 +1144,27 @@ msgstr ""
msgid "New Quotation"
msgstr ""
+#. module: sale
+#: selection:product.template,expense_policy:0
+msgid "No"
+msgstr ""
+
+#. module: sale
+#: selection:product.template,sale_line_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr ""
+
#. module: sale
#: selection:sale.config.settings,group_discount_per_so_line:0
msgid "No discount on sales order lines, global discount only"
msgstr ""
+#. module: sale
+#: selection:sale.config.settings,module_product_visible_discount:0
+msgid "No discount policy on sale order line"
+msgstr ""
+
#. module: sale
#: selection:sale.config.settings,group_display_incoterm:0
msgid "No incoterm on reports"
@@ -870,6 +1177,11 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
+msgid "Note that once a Quotation becomes a Sale Order, it will be moved\n"
+" from the Quotations list to the Sales Order list."
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
msgid "Note that once a Quotation becomes a Sale Order, it will be moved \n"
" from the Quotations list to the Sales Order list."
@@ -947,6 +1259,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_order_id
#: model:ir.model.fields,field_description:sale.field_sale_order_name
+#: model:ir.model.fields,field_description:sale.field_sale_report_name
msgid "Order Reference"
msgstr ""
@@ -969,8 +1282,7 @@ msgstr ""
#: model:ir.model.fields,help:sale.field_product_product_invoice_policy
#: model:ir.model.fields,help:sale.field_product_template_invoice_policy
msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n"
-"Delivered Quantity: Invoiced based on the quantity the vendor delivered.\n"
-"Reinvoice Costs: Invoice with some additional charges (product transfer, labour charges,...)"
+"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)."
msgstr ""
#. module: sale
@@ -996,6 +1308,13 @@ msgid "Orders to upsell are orders having products with an invoicing\n"
" delivered more than what have been ordered."
msgstr ""
+#. module: sale
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:11
+#, python-format
+msgid "Organize your sales activities with the <b>Sales app</b>."
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Other Information"
@@ -1023,23 +1342,29 @@ msgid "Payment Term"
msgstr ""
#. module: sale
-#: selection:sale.config.settings,module_sale_layout:0
-msgid "Personnalize the sale orders and invoice report with separators, page-breaks or subtotals"
+#: model:res.groups,name:sale.group_sale_layout
+msgid "Personalize sale order and invoice report"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.settings,group_sale_layout:0
+msgid "Personalize the sale orders and invoice report with categories, subtotals and page-breaks"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:246
+#: code:addons/sale/models/sale.py:278
#, python-format
msgid "Please define an accounting sale journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:703
+#: code:addons/sale/models/sale.py:783
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"."
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Price"
msgstr ""
@@ -1049,6 +1374,16 @@ msgstr ""
msgid "Price Reduce"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_reduce_taxexcl
+msgid "Price Reduce Tax excl"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_reduce_taxinc
+msgid "Price Reduce Tax inc"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_pricelist_id
#: model:ir.model.fields,field_description:sale.field_sale_report_pricelist_id
@@ -1060,6 +1395,12 @@ msgstr ""
msgid "Pricelist for current sales order."
msgstr ""
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:sale.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Print"
@@ -1085,6 +1426,11 @@ msgstr ""
msgid "Procurements"
msgstr ""
+#. module: sale
+#: selection:sale.config.settings,module_sale_order_dates:0
+msgid "Procurements and deliveries dates are based on the sale order dates"
+msgstr ""
+
#. module: sale
#: model:ir.model,name:sale.model_product_product
#: model:ir.model.fields,field_description:sale.field_sale_order_line_product_id
@@ -1094,6 +1440,11 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_product_category_action_form
+msgid "Product Categories"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report_categ_id
#: model:ir.ui.view,arch_db:sale.view_order_product_search
@@ -1108,10 +1459,14 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_product_variant
+#: model:ir.ui.menu,name:sale.menu_product
+#: model:ir.ui.menu,name:sale.menu_products
msgid "Product Variants"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.menu_product_template_action
+#: model:ir.ui.menu,name:sale.prod_config_main
#: model:ir.ui.view,arch_db:sale.view_sales_config
msgid "Products"
msgstr ""
@@ -1153,6 +1508,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_product_uom_qty
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Quantity"
msgstr ""
@@ -1237,14 +1593,27 @@ msgstr ""
msgid "Quotations and Sales"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_product_product_expense_policy
+#: model:ir.model.fields,field_description:sale.field_product_template_expense_policy
+msgid "Re-Invoice Expenses"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_order_origin
msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: selection:product.template,invoice_policy:0
-msgid "Reinvoice Costs"
+#: model:ir.actions.act_window,name:sale.report_configuration_action
+#: model:ir.ui.view,arch_db:sale.report_configuration_form_view
+#: model:ir.ui.view,arch_db:sale.report_configuration_tree_view
+msgid "Report Configuration"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.Report_configuration
+msgid "Report Layout Categories"
msgstr ""
#. module: sale
@@ -1280,16 +1649,22 @@ msgid "Sale Price"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_layout
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout
msgid "Sale Reports Layout"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_pricelist_setting
+msgid "Sale pricelist setting"
+msgstr ""
+
#. module: sale
#: model:ir.ui.menu,name:sale.menu_report_product_all
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:sale.product_form_view_sale_order_button
#: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
#: model:ir.ui.view,arch_db:sale.res_partner_view_buttons
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale
#: model:ir.ui.view,arch_db:sale.view_company_inherit_form2
#: model:ir.ui.view,arch_db:sale.view_order_product_search
@@ -1328,6 +1703,7 @@ msgstr ""
#. module: sale
#: 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.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
@@ -1343,6 +1719,8 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: model:ir.model.fields,field_description:sale.field_product_product_sale_line_warn
+#: model:ir.model.fields,field_description:sale.field_product_template_sale_line_warn
msgid "Sales Order Line"
msgstr ""
@@ -1362,11 +1740,6 @@ msgstr ""
msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
#. module: sale
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.actions.act_window,name:sale.action_orders_salesteams
@@ -1420,12 +1793,30 @@ msgstr ""
msgid "Salesperson"
msgstr ""
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
+msgid "Search Name"
+msgstr ""
+
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
msgid "Search Sales Order"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_account_invoice_line_layout_category_id
+#: model:ir.model.fields,field_description:sale.field_sale_order_line_layout_category_id
+msgid "Section"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_product_product_sale_line_warn
+#: model:ir.model.fields,help:sale.field_product_template_sale_line_warn
+#: model:ir.model.fields,help:sale.field_res_partner_sale_warn
+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 ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_sale_digital
msgid "Sell digital products - provide downloadable content on your customer portal"
@@ -1442,10 +1833,16 @@ msgid "Send online quotations based on templates (advanced)"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_layout_category_sequence
#: model:ir.model.fields,field_description:sale.field_sale_order_line_sequence
msgid "Sequence"
msgstr ""
+#. module: sale
+#: model:sale.layout_category,name:sale.sale_layout_cat_1
+msgid "Services"
+msgstr ""
+
#. module: sale
#. openerp-web
#: code:addons/sale/static/src/js/sale.js:19
@@ -1453,11 +1850,6 @@ msgstr ""
msgid "Set an invoicing target: "
msgstr ""
-#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_order_form
-msgid "Set to Done"
-msgstr ""
-
#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Set to Quotation"
@@ -1473,6 +1865,18 @@ msgstr ""
msgid "Show incoterms on sale orders and invoices"
msgstr ""
+#. module: sale
+#: model:res.groups,comment:sale.group_show_price_total
+#: selection:sale.config.settings,sale_show_tax:0
+msgid "Show line subtotals with taxes included (B2C)"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,comment:sale.group_show_price_subtotal
+#: selection:sale.config.settings,sale_show_tax:0
+msgid "Show line subtotals without taxes (B2B)"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_product_pricelist
msgid "Show pricelists On Products"
@@ -1483,6 +1887,16 @@ msgstr ""
msgid "Show pricelists to customers"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_show_price_subtotal
+msgid "Show subtotal"
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_show_price_total
+msgid "Show total"
+msgstr ""
+
#. module: sale
#: selection:sale.config.settings,group_uom:0
msgid "Some products may be sold/purchased in different units of measure (advanced)"
@@ -1510,15 +1924,36 @@ msgstr ""
msgid "Subtotal"
msgstr ""
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.report_invoice_document_inherit_sale
+msgid "TIN:"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,help:sale.field_crm_team_invoiced_target
msgid "Target of invoice revenue for the current month. This is the amount the sales team estimates to be able to invoice this month."
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_show_tax
+msgid "Tax Display"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_show_price_subtotal
+msgid "Tax display B2B"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_show_price_total
+msgid "Tax display B2C"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_amount_tax
#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_tax
#: model:ir.model.fields,field_description:sale.field_sale_order_line_tax_id
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Taxes"
msgstr ""
@@ -1533,12 +1968,6 @@ msgstr ""
msgid "Terms and conditions"
msgstr ""
-#. module: sale
-#: code:addons/sale/sale_analytic.py:56
-#, python-format
-msgid "The Sale Order %s linked to the Analytic Account must be validated before registering expenses."
-msgstr ""
-
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_advance_payment_inv_amount
msgid "The amount to be invoiced in advance, taxes excluded."
@@ -1546,6 +1975,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_order_project_id
+#: model:ir.model.fields,help:sale.field_sale_order_related_project_id
msgid "The analytic account related to a sales order."
msgstr ""
@@ -1555,32 +1985,32 @@ msgid "The printed reports will display the incoterms for the sale orders and th
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:137
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:144
#, 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:135
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
#, 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 ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:77
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:79
#, python-format
msgid "The value of the down payment amount must be positive."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:73
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:75
#, python-format
msgid "There is no income account defined for this product: \"%s\". You may have to install a chart of account from Accounting app, settings menu."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:330
-#: code:addons/sale/sale.py:334
+#: code:addons/sale/models/sale.py:368
+#: code:addons/sale/models/sale.py:372
#, python-format
msgid "There is no invoicable line."
msgstr ""
@@ -1590,12 +2020,6 @@ msgstr ""
msgid "This Year"
msgstr ""
-#. module: sale
-#: model:web.tip,description:sale.sale_tip_1
-msgid "This progress bar shows the stages your quotation will go through.\n"
-" Use buttons on the left to move forward to the next stages."
-msgstr ""
-
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application."
@@ -1628,12 +2052,15 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_amount_total
#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_total
+#: model:ir.model.fields,field_description:sale.field_sale_report_price_total
+#: model:ir.ui.view,arch_db:sale.report_configuration_search_view
#: model:ir.ui.view,arch_db:sale.view_order_line_tree
msgid "Total"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_report_price_total
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
+#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Total Price"
msgstr ""
@@ -1651,6 +2078,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_price_unit
+#: model:ir.ui.view,arch_db:sale.report_invoice_layouted
#: model:ir.ui.view,arch_db:sale.report_saleorder_document
msgid "Unit Price"
msgstr ""
@@ -1662,8 +2090,15 @@ msgstr ""
msgid "Unit of Measure"
msgstr ""
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_product_uom_categ_form_action
+msgid "Unit of Measure Categories"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_uom
+#: model:ir.ui.menu,name:sale.menu_product_uom_form_action
+#: model:ir.ui.menu,name:sale.next_id_16
msgid "Units of Measure"
msgstr ""
@@ -1679,7 +2114,7 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal
-msgid "Untaxed Total Price"
+msgid "Untaxed Total"
msgstr ""
#. module: sale
@@ -1694,14 +2129,22 @@ msgid "Upselling Opportunity"
msgstr ""
#. module: sale
-#: model:web.tip,description:sale.sale_tip_2
-msgid "Use pivot and graph views to analyze your sales pipeline.\n"
-" Select measures, filter and group dimensions to get the perfect report according to your needs."
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_pricelist
+msgid "Use pricelists to adapt your price per customers"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_pricelist
-msgid "Use pricelists to adapt your price per customers"
+#. openerp-web
+#: code:addons/sale/static/src/js/tour.js:26
+#, 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:30
+#, python-format
+msgid "Use this menu to access quotations, sales orders and customers."
msgstr ""
#. module: sale
@@ -1714,6 +2157,29 @@ msgstr ""
msgid "Volume"
msgstr ""
+#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_warning_sale
+#: selection:product.template,sale_line_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/models/sale.py:863
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.res_partner_view_buttons
+msgid "Warning on the Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.view,arch_db:sale.product_template_form_view_sale_order_button
+msgid "Warning when Selling this Product"
+msgstr ""
+
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_advance_payment_method
msgid "What do you want to invoice?"
@@ -1721,7 +2187,8 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,help:sale.field_sale_config_settings_group_product_variant
-msgid "Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example"
+msgid "Work with product variant allows you to define some variant of the same products\n"
+" , an ease the product management in the ecommerce for example"
msgstr ""
#. module: sale
@@ -1732,13 +2199,13 @@ msgid "Wrong value entered!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:163
+#: code:addons/sale/models/sale.py:165
#, python-format
msgid "You can not delete a sent quotation or a sales order! Try to cancel it before."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:797
+#: code:addons/sale/models/sale.py:892
#, python-format
msgid "You can not remove a sale order line.\n"
"Discard changes and try setting the quantity to 0."
@@ -1757,6 +2224,11 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
+msgid "Your next actions should flow efficiently: confirm the Quotation\n"
+" to a Sale Order, then create the Invoice and collect the Payment."
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations_salesteams
msgid "Your next actions should flow efficiently: confirm the Quotation \n"
" to a Sale Order, then create the Invoice and collect the Payment."
@@ -1769,8 +2241,8 @@ msgid "Your next actions should flow efficiently: confirm the Quotation to a Sal
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_account_analytic_line
-msgid "account analytic line"
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
msgstr ""
#. module: sale
@@ -1784,7 +2256,7 @@ msgid "sale.config.settings"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_pricelist_setting
-msgid "unknown"
+#: model:ir.model,name:sale.model_sale_layout_category
+msgid "sale.layout_category"
msgstr ""
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index e585dd1ff9167b8612a12d657c7f05aea5b2835c..dba25e3630f23e11ffb955f375ab7db0e9a0164f 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,6 @@ msgstr ""
msgid "# Issues"
msgstr ""
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_task_count
-msgid "# Tasks"
-msgstr ""
-
#. module: sale_crm
#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_order_count
msgid "# of Sales Order"
@@ -42,12 +37,7 @@ msgstr ""
#. module: sale_crm
#: model:ir.model.fields,help:sale_crm.field_res_users_associate_member
-msgid "A member with whom you want to associate your membership.It will consider the membership state of the associated member."
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_activation
-msgid "Activation"
+msgid "A member with whom you want to associate your membership. It will consider the membership state of the associated member."
msgstr ""
#. module: sale_crm
@@ -61,8 +51,15 @@ msgid "Cancel Membership Date"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_method_count
-msgid "Count Payment Method"
+#. openerp-web
+#: code:addons/sale_crm/static/src/js/tour.js:14
+#, python-format
+msgid "Click here to see more options."
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_token_count
+msgid "Count Payment Token"
msgstr ""
#. module: sale_crm
@@ -95,21 +92,6 @@ msgstr ""
msgid "Free Member"
msgstr ""
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_res_users_partner_weight
-msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_implemented_partner_ids
-msgid "Implementation References"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_assigned_partner_id
-msgid "Implemented by"
-msgstr ""
-
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice
msgid "Invoice"
@@ -131,24 +113,16 @@ msgid "It indicates the membership state.\n"
"-Paying member: A member who has paid the membership fee."
msgstr ""
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_review
-msgid "Latest Partner Review"
-msgstr ""
-
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_lead
msgid "Lead/Opportunity"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_grade_id
-msgid "Level"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_partner_weight
-msgid "Level Weight"
+#. openerp-web
+#: code:addons/sale_crm/static/src/js/tour.js:18
+#, python-format
+msgid "Let's have a look at the quotations of this sales team."
msgstr ""
#. module: sale_crm
@@ -177,13 +151,18 @@ msgid "Membership Start Date"
msgstr ""
#. module: sale_crm
-#: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
-msgid "New Quotation"
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_warn_msg
+msgid "Message for Sales Order"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_review_next
-msgid "Next Partner Review"
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.ui.view,arch_db:sale_crm.crm_case_form_view_oppor
+msgid "New Quotation"
msgstr ""
#. module: sale_crm
@@ -202,13 +181,8 @@ msgid "Orders"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_partnership
-msgid "Partnership Date"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_method_ids
-msgid "Payment Methods"
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_token_ids
+msgid "Payment Tokens"
msgstr ""
#. module: sale_crm
@@ -224,6 +198,7 @@ msgstr ""
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_sale_order
#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_order_ids
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_sale_warn
msgid "Sales Order"
msgstr ""
@@ -232,6 +207,17 @@ msgstr ""
msgid "Select if you want to give free membership."
msgstr ""
+#. module: sale_crm
+#: model:ir.model.fields,help:sale_crm.field_res_users_picking_warn
+#: model:ir.model.fields,help:sale_crm.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 ""
+
+#. module: sale_crm
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_picking_warn
+msgid "Stock Picking"
+msgstr ""
+
#. module: sale_crm
#: model:ir.model.fields,field_description:sale_crm.field_crm_lead_sale_amount_total
msgid "Sum of Orders"
@@ -242,11 +228,6 @@ msgstr ""
msgid "Tags"
msgstr ""
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_task_ids
-msgid "Tasks"
-msgstr ""
-
#. module: sale_crm
#: model:ir.model.fields,help:sale_crm.field_res_users_membership_amount
msgid "The price negotiated by the partner"
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 34b4bf51b171ccb86344ab0a15f3ca8208a2fa42..7e1d1c4e7b3adaf64d3b58dc47849349a94be5b8 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: sale_stock
+#: model:ir.ui.view,arch_db:sale_stock.report_delivery_document_inherit_sale_stock
+msgid "<strong>Customer Reference:</strong>"
+msgstr ""
+
#. module: sale_stock
#: model:ir.ui.view,arch_db:sale_stock.report_invoice_document_inherit_sale_stock
#: model:ir.ui.view,arch_db:sale_stock.report_saleorder_document_inherit_sale_stock
@@ -81,16 +86,6 @@ msgstr ""
msgid "Enable Route on Sales Order Line"
msgstr ""
-#. module: sale_stock
-#: model:ir.model.fields,field_description:sale_stock.field_product_product_expense_policy
-msgid "Expense Invoice Policy"
-msgstr ""
-
-#. module: sale_stock
-#: model:ir.model.fields,help:sale_stock.field_product_product_expense_policy
-msgid "If you invoice at cost, the expense will be invoiced on the sale order at the cost of the analytic line;if you invoice at sales price, the price of the product will be used instead."
-msgstr ""
-
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_account_invoice_incoterms_id
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_incoterm
@@ -138,24 +133,18 @@ msgid "No shipping costs on sales orders"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:156
+#: code:addons/sale_stock/models/sale_order.py:145
#, python-format
msgid "Not enough inventory!"
msgstr ""
-#. module: sale_stock
-#: code:addons/sale_stock/res_config.py:42
-#, python-format
-msgid "Only administrators can change the settings"
-msgstr ""
-
#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_group_route_so_lines
msgid "Order Routing"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:167
+#: code:addons/sale_stock/models/sale_order.py:156
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -190,6 +179,11 @@ msgstr ""
msgid "Properties on SO Lines"
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"
@@ -262,9 +256,19 @@ msgid "Stock Move"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:213
+#: code:addons/sale_stock/models/sale_order.py:202
#, python-format
-msgid "This product is packaged by %s %s. You should sell %s %s."
+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
@@ -272,6 +276,12 @@ msgstr ""
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 Sale 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
@@ -279,22 +289,22 @@ msgid "Warehouse"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:212
+#: code:addons/sale_stock/models/sale_order.py:201
#, python-format
msgid "Warning"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:168
+#: code:addons/sale_stock/models/sale_order.py:157
#, 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/sale_stock.py:157
+#: code:addons/sale_stock/models/sale_order.py:146
#, python-format
-msgid "You plan to sell %.2f %s but you only have %.2f %s available!\n"
-"The stock on hand is %.2f %s."
+msgid "You plan to sell %s %s but you only have %s %s available!\n"
+"The stock on hand is %s %s."
msgstr ""
#. module: sale_stock
@@ -302,3 +312,8 @@ msgstr ""
msgid "sale.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 3bd1df443bfec363e1002810fc1d371f005ebaac..92c68f38045b9d5fe1881c1e847252745f05fbf6 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,22 +15,71 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_res_company
msgid "Companies"
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 sale order validation. This setting must be set for each company."
+msgstr ""
+
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_hr_employee
msgid "Employee"
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.model,name:sale_timesheet.model_procurement_order
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_procurement_id
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model,name:sale_timesheet.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_alert_time
+msgid "Product Alert Time"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_life_time
+msgid "Product Life Time"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_removal_time
+msgid "Product Removal Time"
+msgstr ""
+
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_product_template
msgid "Product Template"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_product_product_use_time
+msgid "Product Use Time"
+msgstr ""
+
+#. module: sale_timesheet
+#: 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
msgid "Project"
msgstr ""
@@ -42,14 +91,40 @@ 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"
msgstr ""
#. module: sale_timesheet
#: model:ir.model,name:sale_timesheet.model_sale_order_line
+#: model:ir.model.fields,field_description:sale_timesheet.field_project_task_sale_line_id
msgid "Sales Order Line"
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:72
+#: code:addons/sale_timesheet/models/procurement.py:74
+#, python-format
+msgid "Task created"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_tasks_count
+#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
+msgid "Tasks"
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_tasks_ids
+msgid "Tasks associated to this sale"
+msgstr ""
+
#. module: sale_timesheet
#: model:ir.model.fields,help:sale_timesheet.project_time_mode_id_duplicate_xmlid
msgid "This will set the unit of measure used in projects and tasks.\n"
@@ -83,13 +158,34 @@ msgid "Timesheets"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_timesheet.py:128
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_alert_time
+msgid "When a new a Serial Number is issued, this is the number of days before an alert should be notified."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_life_time
+msgid "When a new a Serial Number is issued, this is the number of days before the goods may become dangerous and must not be consumed."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_removal_time
+msgid "When a new a Serial Number is issued, this is the number of days before the goods should be removed from the stock."
+msgstr ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,help:sale_timesheet.field_product_product_use_time
+msgid "When a new a Serial Number is issued, this is the number of days before the goods starts deteriorating, without being dangerous yet."
+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 sale order. You should split your order to include only one contract based on time and material."
msgstr ""
#. module: sale_timesheet
-#: model:ir.model,name:sale_timesheet.model_account_analytic_line
-msgid "account analytic line"
+#: code:addons/sale_timesheet/models/project.py:17
+#, python-format
+msgid "You cannot delete a task related to a Sale Order. You can only archive this task."
msgstr ""
diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot
index fa4ccb8349e14a4b0dba826b13762575020c618f..183d38daba69188db7c68823e487f815be1bbef1 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -70,6 +70,26 @@ msgstr ""
msgid "Activities Done"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.view_sale_config_settings
+msgid "Apply"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
+msgid "Archived"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_config_bank_accounts
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.view,arch_db:sales_team.view_sale_config_settings
+msgid "Cancel"
+msgstr ""
+
#. module: sales_team
#: model:ir.actions.act_window,help:sales_team.crm_team_act
#: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
@@ -90,11 +110,6 @@ msgstr ""
msgid "Click to set"
msgstr ""
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_code
-msgid "Code"
-msgstr ""
-
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_color
msgid "Color Index"
@@ -106,23 +121,67 @@ msgstr ""
msgid "Company"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_sale_config
+#: model:ir.ui.menu,name:sales_team.menu_sale_config_sales
+msgid "Configuration"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.actions.act_window,name:sales_team.action_sale_config
+#: model:ir.ui.view,arch_db:sales_team.view_sale_config_settings
+msgid "Configure Sales"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_partner_category_form
+msgid "Contact Tags"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_config_address_book
+msgid "Contacts"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_country_group
+msgid "Country Group"
+msgstr ""
+
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:215
#, python-format
-msgid "Create a few opportunities to activate your dashboard."
+msgid "Create a few opportunities in it."
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_create_uid
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_create_uid
msgid "Created by"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_create_date
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_create_date
msgid "Created on"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_partner_form
+msgid "Customers"
+msgstr ""
+
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:16
@@ -139,9 +198,15 @@ msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_display_name
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_display_name
msgid "Display Name"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_country_state_partner
+msgid "Fed. States"
+msgstr ""
+
#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_view_form
msgid "Follow this salesteam to automatically track the events associated to users of this team."
@@ -168,17 +233,19 @@ msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_id
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_id
msgid "ID"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_crm_team_active
-msgid "If the active field is set to false, it will allow you to hide the sales team without removing it."
+#: model:ir.model.fields,help:sales_team.field_res_partner_team_id
+#: model:ir.model.fields,help:sales_team.field_res_users_team_id
+msgid "If set, sale team used notably for sales and assignations related to this partner"
msgstr ""
#. module: sales_team
-#: model:crm.team,name:sales_team.crm_team_1
-msgid "Indirect Sales"
+#: model:ir.model.fields,help:sales_team.field_crm_team_active
+msgid "If the active field is set to false, it will allow you to hide the sales team without removing it."
msgstr ""
#. module: sales_team
@@ -190,6 +257,7 @@ msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team___last_update
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings___last_update
msgid "Last Modified on"
msgstr ""
@@ -202,14 +270,31 @@ msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_write_uid
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_write_uid
msgid "Last Updated by"
msgstr ""
#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_write_date
+#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_write_date
msgid "Last Updated on"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
+
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_localisation
+msgid "Localization"
+msgstr ""
+
+#. module: sales_team
+#: model:res.groups,name:sales_team.group_sale_manager
+msgid "Manager"
+msgstr ""
+
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:25
@@ -257,11 +342,16 @@ msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:84
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:83
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_crm_config_opportunity
+msgid "Opportunities"
+msgstr ""
+
#. module: sales_team
#: model:ir.model,name:sales_team.model_res_partner
msgid "Partner"
@@ -284,6 +374,13 @@ msgstr ""
msgid "Sale Pricelist"
msgstr ""
+#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_base_partner
+#: model:ir.ui.menu,name:sales_team.menu_sales
+#: model:ir.ui.menu,name:sales_team.menu_sales_config
+msgid "Sales"
+msgstr ""
+
#. module: sales_team
#: model:ir.model,name:sales_team.model_crm_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_name
@@ -322,6 +419,7 @@ msgid "Salesteams Search"
msgstr ""
#. module: sales_team
+#: model:ir.ui.menu,name:sales_team.menu_sale_general_settings
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_view_kanban
msgid "Settings"
msgstr ""
@@ -345,11 +443,6 @@ msgstr ""
msgid "Team Members"
msgstr ""
-#. module: sales_team
-#: sql_constraint:crm.team:0
-msgid "The code of the sales team must be unique !"
-msgstr ""
-
#. module: sales_team
#: model:ir.model.fields,help:sales_team.field_crm_team_color
msgid "The color of the team"
@@ -443,6 +536,16 @@ msgid "Use sales team to organize your different salespersons or\n"
" its own list of opportunities."
msgstr ""
+#. module: sales_team
+#: model:res.groups,name:sales_team.group_sale_salesman_all_leads
+msgid "User: All Documents"
+msgstr ""
+
+#. module: sales_team
+#: model:res.groups,name:sales_team.group_sale_salesman
+msgid "User: Own Documents Only"
+msgstr ""
+
#. module: sales_team
#: model:ir.model,name:sales_team.model_res_users
msgid "Users"
@@ -457,7 +560,7 @@ msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:84
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:83
#, python-format
msgid "Wrong value entered!"
msgstr ""
@@ -469,6 +572,11 @@ msgstr ""
msgid "exp. closing"
msgstr ""
+#. module: sales_team
+#: model:ir.model,name:sales_team.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:79
@@ -476,3 +584,23 @@ msgstr ""
msgid "overdue"
msgstr ""
+#. module: sales_team
+#: model:ir.model,name:sales_team.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sales_team
+#: model:res.groups,comment:sales_team.group_sale_salesman_all_leads
+msgid "the user will have access to all records of everyone in the sales application."
+msgstr ""
+
+#. module: sales_team
+#: model:res.groups,comment:sales_team.group_sale_salesman
+msgid "the user will have access to his own data in the sales application."
+msgstr ""
+
+#. module: sales_team
+#: model:res.groups,comment:sales_team.group_sale_manager
+msgid "the user will have an access to the sales configuration as well as statistic reports."
+msgstr ""
+
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 3242dd50299c43e45265b6daa5e58bf27ffa0d1f..d4d73ea572dba2ed37f9a6ab2a4661d4d8cc1e45 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,24 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_state
-msgid "\n"
-" * Draft: not confirmed yet and will not be scheduled until confirmed\n"
-"\n"
-" * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
-"\n"
-" * Waiting Availability: still waiting for the availability of products\n"
-"\n"
-" * Partially Available: some products are available and reserved\n"
-"\n"
-" * Ready to Transfer: products reserved, simply waiting for confirmation.\n"
-"\n"
-" * Transferred: has been processed, can't be modified or cancelled anymore\n"
-"\n"
-" * Cancelled: has been cancelled, can't be confirmed anymore"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_module_stock_dropshipping
msgid "\n"
@@ -41,63 +23,27 @@ msgid "\n"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1873
+#: code:addons/stock/models/stock_move.py:217
#, python-format
msgid " (%s reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1876
+#: code:addons/stock/models/stock_move.py:220
#, python-format
msgid " (reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3548
-#, python-format
-msgid " MTO"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:211
-#: code:addons/stock/product.py:384
-#, python-format
-msgid " On Hand"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3685
-#: code:addons/stock/stock.py:3978
-#, python-format
-msgid " Sequence in"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3689
-#: code:addons/stock/stock.py:3986
-#, python-format
-msgid " Sequence internal"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3686
-#: code:addons/stock/stock.py:3980
-#, python-format
-msgid " Sequence out"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3687
-#: code:addons/stock/stock.py:3982
-#, python-format
-msgid " Sequence packing"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3688
-#: code:addons/stock/stock.py:3984
-#, python-format
-msgid " Sequence picking"
+#: model:ir.model.fields,help:stock.field_stock_pack_operation_state
+#: model:ir.model.fields,help:stock.field_stock_picking_state
+msgid " * Draft: not confirmed yet and will not be scheduled until confirmed\n"
+" * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n"
+" * Waiting Availability: still waiting for the availability of products\n"
+" * Partially Available: some products are available and reserved\n"
+" * Ready to Transfer: products reserved, simply waiting for confirmation.\n"
+" * Transferred: has been processed, can't be modified or cancelled anymore\n"
+" * Cancelled: has been cancelled, can't be confirmed anymore"
msgstr ""
#. module: stock
@@ -106,19 +52,13 @@ msgid "#Products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2801
-#, python-format
-msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3365
+#: code:addons/stock/models/stock_warehouse.py:449
#, python-format
msgid "%s: Supply Product from %s"
msgstr ""
#. module: stock
-#: code:addons/stock/res_company.py:25
+#: code:addons/stock/models/res_company.py:24
#, python-format
msgid "%s: Transit Location"
msgstr ""
@@ -135,21 +75,13 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_usage
msgid "* Vendor Location: Virtual location representing the source location for products coming from your vendors\n"
-" \n"
"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n"
-" \n"
"* Internal Location: Physical locations inside your own warehouses,\n"
-" \n"
"* Customer Location: Virtual location representing the destination location for products sent to your customers\n"
-" \n"
"* Inventory Loss: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n"
-" \n"
"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (vendor or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n"
-" \n"
"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n"
-" \n"
-"* Transit Location: Counterpart location that should be used in inter-companies or inter-warehouses operations\n"
-" "
+"* Transit Location: Counterpart location that should be used in inter-companies or inter-warehouses operations"
msgstr ""
#. module: stock
@@ -282,6 +214,11 @@ msgid "<span class=\"panel-title\">\n"
" </span>"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "<span class=\"pull-left\">Lot/Serial Number</span>"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_picking
@@ -369,10 +306,16 @@ msgid "<strong>Consumable products</strong> are always assumed to be in sufficie
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Date</strong>"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "<strong>Delivered Quantity</strong>"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_picking
msgid "<strong>Destination</strong>"
@@ -394,11 +337,15 @@ msgid "<strong>Inventory</strong>"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Location</strong>"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_picking
+msgid "<strong>Lot/Serial Number</strong>"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "<strong>Make to Order:</strong> the product is acquired only as demand requires, each time a Sales Order is confirmed. This does not modify stock in the medium term because you restock with the exact amount that was ordered"
@@ -445,6 +392,11 @@ msgstr ""
msgid "<strong>Order (Origin)</strong>"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "<strong>Ordered Quantity</strong>"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_inventory
msgid "<strong>Package</strong>"
@@ -463,23 +415,16 @@ msgid "<strong>Production Lot</strong>"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_inventory
#: model:ir.ui.view,arch_db:stock.report_picking
msgid "<strong>Quantity</strong>"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
#: model:ir.ui.view,arch_db:stock.report_picking
msgid "<strong>Scheduled Date</strong>"
msgstr ""
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-msgid "<strong>Serial Number</strong>"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "<strong>Service products</strong> are non-material products provided by a company or an individual"
@@ -495,11 +440,6 @@ msgstr ""
msgid "<strong>State</strong>"
msgstr ""
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-msgid "<strong>Status</strong>"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "<strong>Stockable products</strong> are subject to the full inventory management system: minimum stock rules, automatic procurement, etc."
@@ -521,16 +461,11 @@ msgid "<strong>When you process an incoming shipment, internal transfer or deliv
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2941
+#: code:addons/stock/models/stock_inventory.py:102
#, python-format
msgid "A Pack"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_type_barcode_nomenclature_id
-msgid "A barcode nomenclature"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "A classic purchase flow looks like the following:"
@@ -548,6 +483,11 @@ msgid "A good inventory management aims to optimize stock levels: not too low (o
" space and may lose value)."
msgstr ""
+#. module: stock
+#: model:res.groups,name:stock.group_warning_stock
+msgid "A warning can be set on a partner (Stock)"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "API Documentation"
@@ -565,6 +505,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_path_active
#: model:ir.model.fields,field_description:stock.field_stock_location_route_active
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_active
+#: model:ir.model.fields,field_description:stock.field_stock_warehouse_active
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_active
msgid "Active"
msgstr ""
@@ -576,7 +517,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Add an internal note..."
+msgid "Add an internal note that will be printed on the Picking Operations sheet"
msgstr ""
#. module: stock
@@ -595,12 +536,6 @@ msgstr ""
msgid "Address"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_module_claim_from_delivery
-msgid "Adds a Claim link to the delivery order.\n"
-"-This installs the module claim_from_delivery."
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "Advanced"
@@ -621,6 +556,11 @@ msgstr ""
msgid "All"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_children_quant_ids
+msgid "All Bulk Content"
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_type_list
msgid "All Operations"
@@ -638,7 +578,12 @@ msgid "All at once"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2927
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "All items couldn't be shipped, the remaining ones will be shipped as soon as they become available."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:90
#, python-format
msgid "All products"
msgstr ""
@@ -654,17 +599,18 @@ msgid "All returned moves"
msgstr ""
#. module: stock
-#: code:addons/stock/procurement.py:360
+#: code:addons/stock/models/procurement.py:221
#, python-format
msgid "All stock moves have been cancelled for this procurement."
msgstr ""
#. module: stock
-#: selection:stock.config.settings,module_claim_from_delivery:0
-msgid "Allow claims on deliveries"
+#: selection:stock.config.settings,group_warning_stock:0
+msgid "All the partners can be used in pickings"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_entire_packs
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_show_entire_packs
msgid "Allow moving packs"
msgstr ""
@@ -677,8 +623,8 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_module_procurement_jit
msgid "Allows you to automatically reserve the available\n"
-" products when confirming a sale order.\n"
-" This installs the module procurement_jit."
+" products when confirming a sale order.\n"
+" This installs the module procurement_jit."
msgstr ""
#. module: stock
@@ -691,6 +637,16 @@ msgstr ""
msgid "Allows you to select and maintain different units of measure for products."
msgstr ""
+#. module: stock
+#: selection:stock.config.settings,group_warning_stock:0
+msgid "An informative or blocking warning can be set on a partner"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_ancestor_ids
+msgid "Ancestors"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
msgid "Applicable On"
@@ -721,6 +677,17 @@ msgstr ""
msgid "Apply"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_incoterms_view_search
+#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
+#: model:ir.ui.view,arch_db:stock.stock_location_route_view_search
+#: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
+#: model:ir.ui.view,arch_db:stock.view_location_search
+#: model:ir.ui.view,arch_db:stock.view_pickingtype_filter
+#: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
+msgid "Archived"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_decimal_precision
msgid "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like: 0.0231 kg."
@@ -741,9 +708,18 @@ msgstr ""
msgid "Assigned Moves"
msgstr ""
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_variants_action
+msgid "Attribute Values"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_attribute_action
+msgid "Attributes"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_path_auto
-#: selection:stock.location.path,auto:0
msgid "Automatic Move"
msgstr ""
@@ -764,7 +740,6 @@ msgstr ""
#. module: stock
#: selection:stock.move,state:0
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
msgid "Available"
msgstr ""
@@ -786,13 +761,13 @@ msgid "Back Orders"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_backorder_confirmation.py:33
+#: code:addons/stock/wizard/stock_backorder_confirmation.py:31
#, python-format
msgid "Back order <em>%s</em> <b>cancelled</b>."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/models/stock_picking.py:974
#, python-format
msgid "Back order <em>%s</em> <b>created</b>."
msgstr ""
@@ -808,7 +783,7 @@ msgid "Backorder creation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4801
+#: code:addons/stock/models/stock_picking.py:66
#, python-format
msgid "Backorder exists"
msgstr ""
@@ -850,8 +825,8 @@ msgid "Before creating your products, here are a few concepts your should unders
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.stock_location_4
-msgid "Big Vendors"
+#: selection:res.partner,picking_warn:0
+msgid "Blocking Message"
msgstr ""
#. module: stock
@@ -876,7 +851,7 @@ msgid "By Unique Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2218
+#: code:addons/stock/models/stock_move.py:397
#, python-format
msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order."
msgstr ""
@@ -888,7 +863,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_procure_method
-msgid "By default, the system will take from the stock in the source location and passively wait for availability. The other possibility allows you to directly create a procurement on the source location (and thus ignore its current stock) to gather products. If we want to chain moves and have this one to wait for the previous, this second option should be chosen."
+msgid "By default, the system will take from the stock in the source location and passively wait for availability.The other possibility allows you to directly create a procurement on the source location (and thus ignore its current stock) to gather products. If we want to chain moves and have this one to wait for the previous,this second option should be chosen."
msgstr ""
#. module: stock
@@ -907,23 +882,24 @@ msgid "Calendar View"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3424
+#: code:addons/stock/models/stock_warehouse.py:396
#, python-format
msgid "Can't find any customer or supplier location."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3532
+#: code:addons/stock/models/stock_warehouse.py:444
#, python-format
msgid "Can't find any generic Make To Order route."
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
+#: model:ir.ui.view,arch_db:stock.view_immediate_transfer
#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
#: model:ir.ui.view,arch_db:stock.view_picking_form
#: model:ir.ui.view,arch_db:stock.view_procurement_compute_wizard
#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
-#: model:ir.ui.view,arch_db:stock.view_stock_move_scrap_wizard
#: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
msgid "Cancel"
msgstr ""
@@ -936,13 +912,12 @@ msgstr ""
#. module: stock
#: selection:stock.inventory,state:0
#: selection:stock.move,state:0
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
msgid "Cancelled"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2048
+#: code:addons/stock/models/stock_move.py:357
#, python-format
msgid "Cannot unreserve a done move"
msgstr ""
@@ -968,19 +943,14 @@ msgstr ""
msgid "Change Product Quantity"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_pack_operation_exist
-msgid "Check the existance of pack operation on the picking"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_quant_reserved_exist
msgid "Check the existance of quants linked to this picking"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_inventory_move_ids_exist
-msgid "Check the existance of stock moves linked to this inventory"
+#: model:ir.model.fields,help:stock.field_stock_picking_pack_operation_exist
+msgid "Check the existence of pack operation on the picking"
msgstr ""
#. module: stock
@@ -990,6 +960,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_scrap_location
+#: model:ir.model.fields,help:stock.field_stock_move_scrapped
msgid "Check this box to allow using this location to put scrapped/damaged goods."
msgstr ""
@@ -1003,11 +974,6 @@ msgstr ""
msgid "Checks if the move has some stock reserved"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_claim_from_delivery
-msgid "Claims"
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_form
#: model:ir.actions.act_window,help:stock.action_picking_tree_all
@@ -1031,6 +997,11 @@ msgstr ""
msgid "Click to add a location."
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid "Click to add a lot/serial number."
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,help:stock.action_orderpoint_form
msgid "Click to add a reordering rule."
@@ -1041,18 +1012,13 @@ msgstr ""
msgid "Click to add a route."
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_production_lot_form
-msgid "Click to add a serial number."
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,help:stock.stock_picking_type_action
msgid "Click to create a new picking type."
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_move_form2
+#: model:ir.actions.act_window,help:stock.stock_move_action
msgid "Click to create a stock movement."
msgstr ""
@@ -1061,6 +1027,11 @@ msgstr ""
msgid "Click to create a stock operation."
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.product_template_action_product
+msgid "Click to define a new product."
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_type_list
msgid "Click to define a new transfer."
@@ -1081,6 +1052,11 @@ msgstr ""
msgid "Click to register a receipt for this product."
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_scrap
+msgid "Click to scrap products."
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,help:stock.action_inventory_form
msgid "Click to start an inventory."
@@ -1192,25 +1168,60 @@ msgid "Corridor (X)"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_immediate_transfer.py:31
+#: code:addons/stock/wizard/stock_immediate_transfer.py:30
#, python-format
msgid "Could not reserve all requested products. Please use the 'Mark as Todo' button to handle the reservation manually."
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking
+msgid "Count picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_backorders
+msgid "Count picking backorders"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_draft
+msgid "Count picking draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_late
+msgid "Count picking late"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_ready
+msgid "Count picking ready"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_waiting
+msgid "Count picking waiting"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
msgid "Create Backorder"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1601
+#: code:addons/stock/models/stock_picking.py:810
#, python-format
msgid "Create Backorder?"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_scrap_tree_view
+msgid "Create Date"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_use_create_lots
-msgid "Create New Lots"
+msgid "Create New Lots/Serial Numbers"
msgstr ""
#. module: stock
@@ -1278,7 +1289,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_create_uid
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_picking_create_uid
@@ -1288,6 +1298,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_create_uid
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_create_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_create_uid
msgid "Created by"
@@ -1310,7 +1321,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_path_create_date
#: model:ir.model.fields,field_description:stock.field_stock_location_route_create_date
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_create_date
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_create_date
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_create_date
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_create_date
#: model:ir.model.fields,field_description:stock.field_stock_picking_create_date
@@ -1318,6 +1328,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_create_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_create_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_create_date
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_create_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_create_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_create_date
msgid "Created on"
@@ -1347,7 +1358,7 @@ msgid "Creation Date, usually the time of the order"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3872
+#: code:addons/stock/models/stock_warehouse.py:401
#, python-format
msgid "Cross-Dock"
msgstr ""
@@ -1378,7 +1389,7 @@ msgid "Current quantity of products.\n"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4897
+#: code:addons/stock/models/stock_picking.py:103
#: model:ir.ui.view,arch_db:stock.view_location_search
#, python-format
msgid "Customer"
@@ -1408,7 +1419,6 @@ msgstr ""
#. module: stock
#: model:stock.location,name:stock.stock_location_customers
-#: selection:stock.picking,picking_type_code:0
#: selection:stock.picking.type,code:0
msgid "Customers"
msgstr ""
@@ -1483,18 +1493,6 @@ msgstr ""
msgid "Day(s) to purchase"
msgstr ""
-#. module: stock
-#: model:res.company,overdue_msg:stock.res_company_1
-msgid "Dear Sir/Madam,\n"
-"\n"
-"Our records indicate that some payments on your account are still due. Please find details below.\n"
-"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
-"If you have any queries regarding your account, Please contact us.\n"
-"\n"
-"Thank you in advance for your cooperation.\n"
-"Best Regards,"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_decimal_precision
msgid "Decimal precision on weight"
@@ -1520,6 +1518,13 @@ msgstr ""
msgid "Default Source Location"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_production_lot_product_uom_id
+#: model:ir.model.fields,help:stock.field_stock_quant_product_uom_id
+#: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint_product_uom
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_warehouse_reception_steps
msgid "Default incoming route to follow"
@@ -1553,11 +1558,11 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_location_form
msgid "Define your locations to reflect your warehouse structure and\n"
-" organization. Odoo is able to manage physical locations\n"
-" (warehouses, shelves, bin, etc), partner locations (customers,\n"
-" vendors) and virtual locations which are the counterpart of\n"
-" the stock operations like the manufacturing orders\n"
-" consumptions, inventories, etc."
+" organization. Odoo is able to manage physical locations\n"
+" (warehouses, shelves, bin, etc), partner locations (customers,\n"
+" vendors) and virtual locations which are the counterpart of\n"
+" the stock operations like the manufacturing orders\n"
+" consumptions, inventories, etc."
msgstr ""
#. module: stock
@@ -1582,7 +1587,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:307
+#: code:addons/stock/models/product.py:340
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1600,8 +1605,7 @@ msgid "Delivery"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3733
-#: model:stock.picking.type,name:stock.chi_picking_type_out
+#: code:addons/stock/models/stock_warehouse.py:206
#: model:stock.picking.type,name:stock.picking_type_out
#, python-format
msgid "Delivery Orders"
@@ -1673,6 +1677,7 @@ msgid "Destination Location"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_destination_location_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_location_dest_id
#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
msgid "Destination Location Zone"
@@ -1710,11 +1715,6 @@ msgstr ""
msgid "Discard"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.location_dispatch_zone
-msgid "Dispatch Zone"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_make_procurement_display_name
#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute_display_name
@@ -1735,7 +1735,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route_display_name
#: model:ir.model.fields,field_description:stock.field_stock_move_display_name
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_display_name
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_display_name
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_display_name
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_display_name
#: model:ir.model.fields,field_description:stock.field_stock_picking_display_name
@@ -1745,6 +1744,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_display_name
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_display_name
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_display_name
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_display_name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_display_name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_display_name
msgid "Display Name"
@@ -1760,11 +1760,6 @@ msgstr ""
msgid "Do not hesitate to send us an email to describe your experience or to suggest improvements!"
msgstr ""
-#. module: stock
-#: selection:stock.config.settings,module_claim_from_delivery:0
-msgid "Do not manage claims"
-msgstr ""
-
#. module: stock
#: selection:stock.config.settings,group_stock_packaging:0
#: selection:stock.config.settings,group_stock_tracking_lot:0
@@ -1782,14 +1777,15 @@ msgid "Do not use Expiration Date on serial numbers"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_is_done
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_qty
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_processed_boolean
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_qty_done
+#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.move,state:0
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
+#: selection:stock.scrap,state:0
msgid "Done"
msgstr ""
@@ -1811,8 +1807,8 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.inventory,state:0
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
+#: selection:stock.scrap,state:0
msgid "Draft"
msgstr ""
@@ -1836,22 +1832,17 @@ msgstr ""
msgid "End"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.stock_location_7
-msgid "European Customers"
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,help:stock.action_location_form
msgid "Every stock operation in Odoo moves the products from one\n"
-" location to another one. For instance, if you receive products\n"
-" from a vendor, Odoo will move products from the Vendor\n"
-" location to the Stock location. Each report can be performed on\n"
-" physical, partner or virtual locations."
+" location to another one. For instance, if you receive products\n"
+" from a vendor, Odoo will move products from the Vendor\n"
+" location to the Stock location. Each report can be performed on\n"
+" physical, partner or virtual locations."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4253
+#: code:addons/stock/models/stock_quant.py:629
#, python-format
msgid "Everything inside a package should be in the same location"
msgstr ""
@@ -1868,6 +1859,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_date_expected
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_date_expected
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
msgid "Expected Date"
msgstr ""
@@ -1883,7 +1875,12 @@ msgid "External note..."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1525
+#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+msgid "Extra Features"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_picking.py:949
#, python-format
msgid "Extra Move: "
msgstr ""
@@ -1943,7 +1940,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:301
+#: code:addons/stock/models/product.py:335
#: 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
@@ -1961,50 +1958,35 @@ msgid "Full Location Name"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:305
+#: code:addons/stock/models/product.py:338
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:311
+#: code:addons/stock/models/product.py:343
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:323
+#: code:addons/stock/models/product.py:353
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:317
+#: code:addons/stock/models/product.py:348
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:295
+#: code:addons/stock/models/product.py:330
#, python-format
msgid "Future Receipts"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.location_gate_a
-msgid "Gate A"
-msgstr ""
-
-#. module: stock
-#: model:stock.location,name:stock.location_gate_b
-msgid "Gate B"
-msgstr ""
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_5
-msgid "Generic IT Vendors"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_fixed_putaway_strat_sequence
msgid "Give to the more specialized category, a higher priority to have them in top of the list."
@@ -2037,6 +2019,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.search_product_lot_filter
+#: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -2062,8 +2045,8 @@ msgid "Has Pack Operations"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_inventory_move_ids_exist
-msgid "Has Stock Moves"
+#: model:ir.model.fields,field_description:stock.field_stock_picking_has_scrap_move
+msgid "Has Scrap Moves"
msgstr ""
#. module: stock
@@ -2140,50 +2123,33 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route_id
#: model:ir.model.fields,field_description:stock.field_stock_move_id
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_id
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_id
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_id
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8069
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8249
#: 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
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_id
msgid "ID"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3243
+#: code:addons/stock/models/stock_inventory.py:374
#, python-format
msgid "INV:"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:101
+#: code:addons/stock/wizard/stock_change_product_qty.py:96
#, python-format
msgid "INV: %s"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.stock_location_3
-msgid "IT Vendors"
-msgstr ""
-
-#. module: stock
-#: model:product.product,name:stock.product_icecream
-#: model:product.template,name:stock.product_icecream_product_template
-msgid "Ice Cream"
-msgstr ""
-
-#. module: stock
-#: model:product.product,description:stock.product_icecream
-#: model:product.template,description:stock.product_icecream_product_template
-msgid "Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events."
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_name
msgid "Identifier"
@@ -2195,6 +2161,7 @@ msgid "If a product is not at the right place, set the checked quantity to 0 and
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking_picking_type_entire_packs
#: model:ir.model.fields,help:stock.field_stock_picking_type_show_entire_packs
msgid "If checked, this shows the packs to be moved as a whole in the Operations tab all the time, even if there was no entire pack reserved."
msgstr ""
@@ -2246,15 +2213,16 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_type_use_create_lots
-msgid "If this is checked only, it will suppose you want to create new Serial Numbers / Lots, so you can provide them in a text field. "
+msgid "If this is checked only, it will suppose you want to create new Lots/Serial Numbers, so you can provide them in a text field. "
msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_picking_type_use_existing_lots
-msgid "If this is checked, you will be able to choose the Serial Number / Lots. You can also decide to not put lots in this picking type. This means it will create stock with no lot or not put a restriction on the lot taken. "
+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 picking type. This means it will create stock with no lot or not put a restriction on the lot taken. "
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_backorder_id
#: model:ir.model.fields,help:stock.field_stock_picking_backorder_id
msgid "If this shipment was split, then this field links to the shipment which contains the already processed part."
msgstr ""
@@ -2296,7 +2264,7 @@ msgid "Immediate Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1584
+#: code:addons/stock/models/stock_picking.py:792
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2346,6 +2314,11 @@ msgid "In short, you will get a more efficient warehouse management that leads\n
" to inventory reduction and better efficiencies in your daily operations."
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_exhausted
+msgid "Include Exhausted Products"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product_incoming_qty
#: model:ir.model.fields,field_description:stock.field_product_template_incoming_qty
@@ -2377,6 +2350,7 @@ msgstr ""
#: model:ir.model,name:stock.model_stock_incoterms
#: model:ir.ui.menu,name:stock.menu_action_incoterm_open
#: model:ir.ui.view,arch_db:stock.stock_incoterms_form
+#: model:ir.ui.view,arch_db:stock.stock_incoterms_view_search
#: model:ir.ui.view,arch_db:stock.view_incoterms_tree
msgid "Incoterms"
msgstr ""
@@ -2386,12 +2360,6 @@ msgstr ""
msgid "Incoterms are series of sales terms. They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices."
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:2217
-#, python-format
-msgid "Information"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Initial Demand"
@@ -2403,7 +2371,7 @@ msgid "Initial Inventory"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3821
+#: code:addons/stock/models/stock_warehouse.py:93
#: model:stock.location,name:stock.stock_location_company
#, python-format
msgid "Input"
@@ -2426,7 +2394,6 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_location_search
-#: selection:stock.picking,picking_type_code:0
#: selection:stock.picking.type,code:0
msgid "Internal"
msgstr ""
@@ -2448,7 +2415,7 @@ msgid "Internal Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3746
+#: code:addons/stock/models/stock_warehouse.py:228
#: model:stock.picking.type,name:stock.picking_type_internal
#, python-format
msgid "Internal Transfers"
@@ -2466,7 +2433,12 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_production_lot_ref
-msgid "Internal reference number in case it differs from the manufacturer's serial number"
+msgid "Internal reference number in case it differs from the manufacturer's lot/serial number"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_category_id
+msgid "Inventoried Category"
msgstr ""
#. module: stock
@@ -2552,11 +2524,6 @@ msgstr ""
msgid "Inventory Line"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_inventory_line_ids
-msgid "Inventory Lines."
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_product_property_stock_inventory
#: model:ir.model.fields,field_description:stock.field_product_template_property_stock_inventory
@@ -2574,13 +2541,8 @@ msgid "Inventory Loss"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_inventory_move_ids
-msgid "Inventory Moves."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_inventory_name
-msgid "Inventory Name."
+#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
+msgid "Inventory Move"
msgstr ""
#. module: stock
@@ -2615,13 +2577,13 @@ msgid "Inventory Value"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_inventory_form
-msgid "Inventory adjustments will be made by comparing the theoretical and the checked quantities."
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory adjustment"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory loss"
+#: model:ir.ui.view,arch_db:stock.view_inventory_form
+msgid "Inventory adjustments will be made by comparing the theoretical and the checked quantities."
msgstr ""
#. module: stock
@@ -2693,7 +2655,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route___last_update
#: model:ir.model.fields,field_description:stock.field_stock_move___last_update
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link___last_update
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap___last_update
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation___last_update
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot___last_update
#: model:ir.model.fields,field_description:stock.field_stock_picking___last_update
@@ -2703,6 +2664,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_package___last_update
#: model:ir.model.fields,field_description:stock.field_stock_return_picking___last_update
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line___last_update
+#: model:ir.model.fields,field_description:stock.field_stock_scrap___last_update
#: model:ir.model.fields,field_description:stock.field_stock_warehouse___last_update
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint___last_update
msgid "Last Modified on"
@@ -2725,7 +2687,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_location_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_write_uid
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_move_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_write_uid
@@ -2736,6 +2697,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_write_uid
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_write_uid
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_write_uid
msgid "Last Updated by"
@@ -2758,7 +2720,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_location_route_write_date
#: model:ir.model.fields,field_description:stock.field_stock_location_write_date
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_write_date
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_write_date
#: model:ir.model.fields,field_description:stock.field_stock_move_write_date
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_write_date
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_write_date
@@ -2769,13 +2730,14 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_quant_write_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_write_date
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_write_date
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_write_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_write_date
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_write_date
msgid "Last Updated on"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4799
+#: code:addons/stock/models/stock_picking.py:64
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#, python-format
@@ -2830,11 +2792,6 @@ msgid "Like with the sales flow, Odoo inventory management is\n"
" fully integrated with the purchase app."
msgstr ""
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_operation_link
-msgid "Link between stock moves and pack operations"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_linked_move_operation_ids
msgid "Linked Moves"
@@ -2856,18 +2813,24 @@ msgid "Localization"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4963
+#: model:ir.ui.view,arch_db:stock.view_production_lot_form
+msgid "Locate"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/barcode.py:12
#: model:ir.model.fields,field_description:stock.field_product_product_location_id
#: model:ir.model.fields,field_description:stock.field_product_template_location_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_location_id
#: model:ir.model.fields,field_description:stock.field_stock_fixed_putaway_strat_fixed_location_id
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_location_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_location_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_location_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_location_id
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_location_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_location_id
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
#: model:ir.ui.view,arch_db:stock.quant_search_view
+#: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search
#, python-format
@@ -2929,15 +2892,8 @@ msgid "Logistics"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4964
-#: model:ir.model.fields,field_description:stock.field_stock_move_restrict_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_restrict_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_quant_lot_id
-#: model:ir.ui.view,arch_db:stock.quant_search_view
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-#: model:ir.ui.view,arch_db:stock.report_lot_barcode
-#: model:ir.ui.view,arch_db:stock.report_package_barcode
-#: model:ir.ui.view,arch_db:stock.report_picking
+#: code:addons/stock/models/barcode.py:13
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_lot_id
#, python-format
msgid "Lot"
msgstr ""
@@ -2948,49 +2904,50 @@ msgid "Lot BarCode"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4542
-#, python-format
-msgid "Lot Details"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Lot Split"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_inventory_tree
-msgid "Lot Inventory"
+#: model:ir.model,name:stock.model_stock_production_lot
+msgid "Lot/Serial"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_lot_id
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prod_lot_id
+#: model:ir.model.fields,field_description:stock.field_stock_move_restrict_lot_id
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_lot_id
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_lot_name
-msgid "Lot Name"
-msgstr ""
-
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Lot Split"
-msgstr ""
-
-#. module: stock
-#: constraint:stock.pack.operation.lot:0
-msgid "Lot is required"
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot_name
+#: model:ir.model.fields,field_description:stock.field_stock_quant_lot_id
+#: model:ir.ui.view,arch_db:stock.quant_search_view
+#: model:ir.ui.view,arch_db:stock.report_lot_barcode
+#: model:ir.ui.view,arch_db:stock.report_package_barcode
+#: model:res.request.link,name:stock.req_link_tracking
+msgid "Lot/Serial Number"
msgstr ""
#. module: stock
-#: model:ir.model,name:stock.model_stock_production_lot
-msgid "Lot/Serial"
+#: code:addons/stock/models/stock_pack_operation.py:198
+#, python-format
+msgid "Lot/Serial Number Details"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_lot_id
-msgid "Lot/Serial Number"
+#: model:ir.ui.view,arch_db:stock.view_inventory_tree
+msgid "Lot/Serial Number Inventory"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_lot_ids
-msgid "Lots"
+#: code:addons/stock/models/stock_pack_operation.py:268
+#, python-format
+msgid "Lot/Serial Number required"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_pack_lot_ids
-msgid "Lots Used"
+#: model:ir.model,name:stock.model_stock_pack_operation_lot
+msgid "Lot/Serial number for pack ops"
msgstr ""
#. module: stock
@@ -3006,6 +2963,31 @@ msgid "Lots can be encoded on incoming shipments, internal transfers and\n"
" all, tracking by lot, or tracking by unique serial number."
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible
+msgid "Lots visible"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model.fields,field_description:stock.field_stock_move_lot_ids
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:ir.ui.view,arch_db:stock.view_production_lot_form
+#: model:ir.ui.view,arch_db:stock.view_production_lot_tree
+msgid "Lots/Serial Numbers"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_pack_lot_ids
+msgid "Lots/Serial Numbers Used"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:504
+#, python-format
+msgid "MTO"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_mto_pull_id
msgid "MTO rule"
@@ -3017,7 +2999,7 @@ msgid "Make Procurements"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3529
+#: code:addons/stock/models/stock_warehouse.py:442
#: model:stock.location.route,name:stock.route_warehouse0_mto
#, python-format
msgid "Make To Order"
@@ -3098,6 +3080,11 @@ msgstr ""
msgid "Manage product manufacturing chains"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+msgid "Manage quality control points, checks and measures"
+msgstr ""
+
#. module: stock
#: selection:stock.config.settings,warehouse_and_location_usage_level:0
msgid "Manage several Warehouses, each one composed by several stock locations"
@@ -3123,6 +3110,11 @@ msgstr ""
msgid "Manual Operation"
msgstr ""
+#. module: stock
+#: selection:stock.picking.type,code:0
+msgid "Manufacturing Operation"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Mark as Todo"
@@ -3138,6 +3130,11 @@ msgstr ""
msgid "Maximum Quantity"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn_msg
+msgid "Message for Stock Picking"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_putaway_method
#: model:ir.model.fields,field_description:stock.field_product_removal_method
@@ -3190,6 +3187,11 @@ msgstr ""
msgid "More <i class=\"fa fa-caret-down\"/>"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+msgid "More Info"
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_tree
msgid "Most operations are prepared automatically by Odoo according\n"
@@ -3204,16 +3206,11 @@ msgid "Move"
msgstr ""
#. module: stock
-#: code:addons/stock/procurement.py:25
+#: code:addons/stock/models/procurement.py:50
#, python-format
msgid "Move From Another Location"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_move_lines_related
-msgid "Move Lines"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_quant_negative_move_id
msgid "Move Negative Quant"
@@ -3234,6 +3231,11 @@ msgstr ""
msgid "Move date: scheduled date until move is done, then date of actual move processing"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_origin_returned_move_id
+msgid "Move that created the return move"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_procurement_order_move_dest_id
msgid "Move which caused (created) the procurement"
@@ -3282,7 +3284,6 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_product_putaway_name
#: model:ir.model.fields,field_description:stock.field_product_removal_name
#: model:ir.model.fields,field_description:stock.field_stock_incoterms_name
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_complete_name
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_name
msgid "Name"
msgstr ""
@@ -3303,7 +3304,11 @@ msgid "Negative Stock"
msgstr ""
#. module: stock
+#: code:addons/stock/models/stock_scrap.py:19
+#: code:addons/stock/models/stock_scrap.py:63
+#: code:addons/stock/models/stock_scrap.py:64
#: selection:stock.move,state:0
+#, python-format
msgid "New"
msgstr ""
@@ -3332,6 +3337,11 @@ msgstr ""
msgid "No Inventory yet"
msgstr ""
+#. module: stock
+#: selection:res.partner,picking_warn:0
+msgid "No Message"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
msgid "No Stock Move yet"
@@ -3348,19 +3358,19 @@ msgid "No automatic routing of products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1614
+#: code:addons/stock/models/stock_picking.py:823
#, python-format
msgid "No negative quantities allowed"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:75
+#: code:addons/stock/wizard/stock_picking_return.py:60
#, python-format
msgid "No products to return (only lines in Done state and not fully returned yet can be returned)!"
msgstr ""
#. module: stock
-#: code:addons/stock/procurement.py:313
+#: code:addons/stock/models/procurement.py:182
#, python-format
msgid "No source location defined!"
msgstr ""
@@ -3370,11 +3380,6 @@ msgstr ""
msgid "No variants on products"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.stock_location_8
-msgid "Non European Customers"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_product_ids
msgid "Non pack"
@@ -3400,7 +3405,7 @@ msgid "Notes"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1063
+#: code:addons/stock/models/stock_picking.py:461
#, python-format
msgid "Nothing to check the availability for."
msgstr ""
@@ -3426,7 +3431,7 @@ msgid "Number of days needed to transfer the goods"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4803
+#: code:addons/stock/models/stock_picking.py:68
#, python-format
msgid "OK"
msgstr ""
@@ -3481,25 +3486,31 @@ msgid "Once it's fully working, give us some feedback: we love to hear from our
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2939
+#: code:addons/stock/models/stock_inventory.py:100
#, python-format
msgid "One Lot/Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2936
+#: code:addons/stock/models/stock_inventory.py:98
#, python-format
msgid "One owner only"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2937
+#: code:addons/stock/models/stock_inventory.py:91
+#, python-format
+msgid "One product category"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:98
#, python-format
msgid "One product for a specific owner"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2927
+#: code:addons/stock/models/stock_inventory.py:92
#, python-format
msgid "One product only"
msgstr ""
@@ -3510,7 +3521,7 @@ msgid "Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4559
+#: code:addons/stock/models/stock_pack_operation.py:215
#, python-format
msgid "Operation Details"
msgstr ""
@@ -3527,6 +3538,11 @@ msgstr ""
msgid "Operation Types"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_operation_id
+msgid "Operation id"
+msgstr ""
+
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
#: model:ir.ui.view,arch_db:stock.view_picking_form
@@ -3576,8 +3592,9 @@ msgid "Order Date"
msgstr ""
#. module: stock
-#: model:stock.location,name:stock.location_order
-msgid "Order Processing"
+#: model:ir.model.fields,field_description:stock.field_stock_move_ordered_qty
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_ordered_qty
+msgid "Ordered Quantity"
msgstr ""
#. module: stock
@@ -3602,7 +3619,12 @@ msgid "Original Move"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:577
+#: model:ir.model.fields,field_description:stock.field_stock_return_picking_original_location_id
+msgid "Original location id"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_quant.py:246
#, python-format
msgid "Otherwise make sure the right stock/owner is set."
msgstr ""
@@ -3624,7 +3646,7 @@ msgid "Outgoing Shippings"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3823
+#: code:addons/stock/models/stock_warehouse.py:95
#: model:stock.location,name:stock.stock_location_output
#, python-format
msgid "Output"
@@ -3642,6 +3664,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_picking_owner_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_owner_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_owner_id
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_owner_id
#: model:ir.ui.view,arch_db:stock.quant_search_view
msgid "Owner"
msgstr ""
@@ -3662,13 +3685,13 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:313
+#: code:addons/stock/models/product.py:345
#, python-format
msgid "P&L Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3758
+#: code:addons/stock/models/stock_warehouse.py:213
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_package_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_pack_ids
#, python-format
@@ -3680,14 +3703,20 @@ msgstr ""
msgid "Pack Details"
msgstr ""
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_operation_link
+msgid "Pack Operation / Moves Link"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_pack_type_id
msgid "Pack Type"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4965
+#: code:addons/stock/models/barcode.py:14
#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_package_id
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
#: model:ir.ui.view,arch_db:stock.quant_search_view
#: model:ir.ui.view,arch_db:stock.view_quant_package_form
@@ -3707,7 +3736,6 @@ msgid "Package BarCode with Contents"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_complete_name
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
msgid "Package Name"
msgstr ""
@@ -3773,7 +3801,7 @@ msgid "Packing Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3824
+#: code:addons/stock/models/stock_warehouse.py:96
#: model:stock.location,name:stock.location_pack_zone
#, python-format
msgid "Packing Zone"
@@ -3800,6 +3828,11 @@ msgstr ""
msgid "Parent Package"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_return_picking_parent_location_id
+msgid "Parent location id"
+msgstr ""
+
#. module: stock
#: selection:stock.picking,move_type:0
msgid "Partial"
@@ -3807,7 +3840,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_partially_available
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
msgid "Partially Available"
msgstr ""
@@ -3833,9 +3865,9 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_inventory_form
msgid "Periodical Inventories are used to count the number of products\n"
-" available per location. You can use it once a year when you do\n"
-" the general inventory or whenever you need it, to adapt the\n"
-" current inventory level of a product."
+" available per location. You can use it once a year when you do\n"
+" the general inventory or whenever you need it, to adapt the\n"
+" current inventory level of a product."
msgstr ""
#. module: stock
@@ -3859,19 +3891,19 @@ msgid "Physical Packages"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3770
+#: code:addons/stock/models/stock_warehouse.py:221
#, python-format
msgid "Pick"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3875
+#: code:addons/stock/models/stock_warehouse.py:403
#, python-format
msgid "Pick + Pack + Ship"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3874
+#: code:addons/stock/models/stock_warehouse.py:402
#, python-format
msgid "Pick + Ship"
msgstr ""
@@ -3888,6 +3920,7 @@ msgid "Pick id"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_picking_id
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Picking"
msgstr ""
@@ -3978,27 +4011,26 @@ msgid "Planner"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1572
+#: code:addons/stock/models/stock_picking.py:779
#, python-format
msgid "Please create some Initial Demand or Mark as Todo and create some Operations. "
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1733
+#: code:addons/stock/models/stock_picking.py:1008
#, python-format
msgid "Please process some quantities to put in the pack first!"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2774
+#: code:addons/stock/wizard/stock_picking_return.py:139
#, python-format
-msgid "Please provide a positive quantity to scrap."
+msgid "Please specify at least one non-zero quantity."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:158
-#, python-format
-msgid "Please specify at least one non-zero quantity."
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_plus_visible
+msgid "Plus visible"
msgstr ""
#. module: stock
@@ -4006,6 +4038,11 @@ msgstr ""
msgid "Positive"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_product_packaging
+msgid "Preferred Packaging"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_make_procurement_route_ids
#: model:ir.model.fields,field_description:stock.field_procurement_order_route_ids
@@ -4109,7 +4146,7 @@ msgid "Procurements"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:325
+#: code:addons/stock/models/product.py:355
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -4118,28 +4155,28 @@ 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_forecast_product_tmpl_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
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_product_id
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_product_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_product_id
#: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_product_id
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_product_id
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_product_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_product_id
#: model:ir.ui.view,arch_db:stock.quant_search_view
#: model:ir.ui.view,arch_db:stock.report_lot_barcode
#: model:ir.ui.view,arch_db:stock.report_package_barcode
#: model:ir.ui.view,arch_db:stock.search_product_lot_filter
+#: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Product"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:254
+#: code:addons/stock/models/stock_location.py:152
#: model:ir.model.fields,field_description:stock.field_stock_location_route_categ_ids
#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
@@ -4180,6 +4217,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_product_template
+#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_product_tmpl_id
#: model:ir.model.fields,field_description:stock.field_stock_move_product_tmpl_id
msgid "Product Template"
msgstr ""
@@ -4191,13 +4229,13 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_product_uom_id
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_product_uom
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_product_uom
msgid "Product Unit of Measure"
msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_product_variant
+#: model:ir.ui.menu,name:stock.product_product_menu
msgid "Product Variants"
msgstr ""
@@ -4214,8 +4252,9 @@ msgid "Production Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:244
+#: code:addons/stock/models/stock_location.py:141
#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.actions.act_window,name:stock.product_template_action_product
#: model:ir.model.fields,field_description:stock.field_stock_location_route_product_ids
#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
#: model:ir.ui.menu,name:stock.menu_product_variant_config_stock
@@ -4239,7 +4278,12 @@ msgid "Products have only one unit of measure (easier)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:43
+#: model:ir.actions.act_window,help:stock.action_stock_scrap
+msgid "Products you scrap will be removed from the stock and moved to a specific scrap location, for reporting purposes."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:318
#, python-format
msgid "Products: "
msgstr ""
@@ -4270,7 +4314,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_location_path
-msgid "Pushed Flows"
+msgid "Pushed Flow"
msgstr ""
#. module: stock
@@ -4289,12 +4333,6 @@ msgstr ""
msgid "Putaway"
msgstr ""
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_delivery_document
-#: model:ir.ui.view,arch_db:stock.report_picking
-msgid "Qty"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_qty_multiple
msgid "Qty Multiple"
@@ -4306,7 +4344,12 @@ msgid "Qty Multiple must be greater than or equal to zero."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3822
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_quality
+msgid "Quality"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:94
#, python-format
msgid "Quality Control"
msgstr ""
@@ -4317,7 +4360,7 @@ msgid "Quality Control Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2146
+#: code:addons/stock/models/stock_move.py:264
#, python-format
msgid "Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)."
msgstr ""
@@ -4326,11 +4369,11 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_make_procurement_qty
#: model:ir.model.fields,field_description:stock.field_report_stock_forecast_quantity
#: model:ir.model.fields,field_description:stock.field_stock_move_operation_link_qty
-#: model:ir.model.fields,field_description:stock.field_stock_move_product_qty
#: model:ir.model.fields,field_description:stock.field_stock_move_product_uom_qty
-#: model:ir.model.fields,field_description:stock.field_stock_move_scrap_product_qty
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_qty
#: model:ir.model.fields,field_description:stock.field_stock_quant_qty
#: model:ir.model.fields,field_description:stock.field_stock_return_picking_line_quantity
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_scrap_qty
#: model:ir.ui.view,arch_db:stock.report_package_barcode
msgid "Quantity"
msgstr ""
@@ -4352,7 +4395,7 @@ msgid "Quantity Reserved"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:90
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
#, python-format
msgid "Quantity cannot be negative."
msgstr ""
@@ -4404,12 +4447,23 @@ msgid "Quantity that has already been reserved for this move"
msgstr ""
#. module: stock
+#: model:ir.actions.act_window,name:stock.lot_open_quants
#: model:ir.model,name:stock.model_stock_quant
#: model:ir.model.fields,field_description:stock.field_stock_production_lot_quant_ids
#: model:ir.ui.view,arch_db:stock.view_quant_package_form
msgid "Quants"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_rate_picking_backorders
+msgid "Rate picking backorders"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_type_rate_picking_late
+msgid "Rate picking late"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_picking_type_kanban
#: model:ir.ui.view,arch_db:stock.view_move_search
@@ -4418,6 +4472,7 @@ msgid "Ready"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_move_product_qty
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "Real Quantity"
msgstr ""
@@ -4434,28 +4489,27 @@ msgid "Receipt Route"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3869
+#: code:addons/stock/models/stock_warehouse.py:400
#, python-format
msgid "Receipt in 1 step"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3870
+#: code:addons/stock/models/stock_warehouse.py:400
#, python-format
msgid "Receipt in 2 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3871
+#: code:addons/stock/models/stock_warehouse.py:401
#, python-format
msgid "Receipt in 3 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3722
+#: code:addons/stock/models/stock_warehouse.py:199
#: model:ir.actions.act_window,name:stock.action_receive_move
#: model:ir.ui.view,arch_db:stock.product_kanban_stock_view
-#: model:stock.picking.type,name:stock.chi_picking_type_in
#: model:stock.picking.type,name:stock.picking_type_in
#, python-format
msgid "Receipts"
@@ -4467,7 +4521,7 @@ msgid "Receive goods directly in stock (1 step)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:297
+#: code:addons/stock/models/product.py:332
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4489,6 +4543,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_name
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_name
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.view_move_tree
#: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking
@@ -4538,7 +4593,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_pack_operation_remaining_qty
-msgid "Remaining quantity in default UoM according to moves matched with this operation. "
+msgid "Remaining quantity in default UoM according to moves matched with this operation."
msgstr ""
#. module: stock
@@ -4553,7 +4608,7 @@ msgid "Removal Strategy"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:533
+#: code:addons/stock/models/stock_quant.py:449
#, python-format
msgid "Removal strategy %s not implemented."
msgstr ""
@@ -4577,6 +4632,18 @@ msgstr ""
msgid "Reordering Rules Search"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_product_reordering_max_qty
+#: model:ir.model.fields,field_description:stock.field_product_template_reordering_max_qty
+msgid "Reordering max qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_product_reordering_min_qty
+#: model:ir.model.fields,field_description:stock.field_product_template_reordering_min_qty
+msgid "Reordering min qty"
+msgstr ""
+
#. module: stock
#: model:ir.ui.menu,name:stock.menu_warehouse_report
msgid "Reports"
@@ -4637,11 +4704,6 @@ msgstr ""
msgid "Resolve Procurement Exceptions"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_warehouse_resupply_from_wh
-msgid "Resupply From Other Warehouses"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_resupply_route_ids
msgid "Resupply Routes"
@@ -4653,6 +4715,7 @@ msgid "Resupply Warehouses"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
#: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form
msgid "Return"
msgstr ""
@@ -4668,16 +4731,11 @@ msgid "Return Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:181
+#: code:addons/stock/wizard/stock_picking_return.py:161
#, python-format
msgid "Returned Picking"
msgstr ""
-#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_picking_form
-msgid "Reverse"
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_return_picking
msgid "Reverse Transfer"
@@ -4693,6 +4751,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_procurement_rule_route_id
#: model:ir.model.fields,field_description:stock.field_stock_location_path_route_id
#: model:ir.ui.view,arch_db:stock.stock_location_route_form_view
+#: model:ir.ui.view,arch_db:stock.stock_location_route_view_search
msgid "Route"
msgstr ""
@@ -4791,50 +4850,55 @@ msgid "Schedulers"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_move_form
-#: model:ir.ui.view,arch_db:stock.view_move_picking_form
-#: model:ir.ui.view,arch_db:stock.view_stock_move_scrap_wizard
+#: code:addons/stock/models/stock_picking.py:1015
+#: 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
+#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view2
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+#, python-format
msgid "Scrap"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_stock_move_scrap_wizard
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_scrap_location_id
+#: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
msgid "Scrap Location"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.move_scrap
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_move_id
msgid "Scrap Move"
msgstr ""
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_scrap
-#: model:ir.ui.view,arch_db:stock.view_inventory_form
-#: model:ir.ui.view,arch_db:stock.view_move_picking_tree
-#: model:ir.ui.view,arch_db:stock.view_move_tree
-#: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking
-#: model:ir.ui.view,arch_db:stock.view_stock_move_scrap_wizard
-msgid "Scrap Products"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_scrapped
#: model:stock.location,name:stock.stock_location_scrapped
msgid "Scrapped"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Scraps"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
msgid "Search Inventory"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_scrap_search_view
+msgid "Search Scrap"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.stock_location_path_filter
msgid "Search Stock Location Paths"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2927
+#: code:addons/stock/models/stock_inventory.py:93
#, python-format
msgid "Select products manually"
msgstr ""
@@ -4844,6 +4908,11 @@ msgstr ""
msgid "Select the places where this route can be selected"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_res_partner_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 ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_path_sequence
#: model:ir.model.fields,field_description:stock.field_stock_location_route_sequence
@@ -4854,28 +4923,38 @@ msgid "Sequence"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prod_lot_id
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_name
-#: model:res.request.link,name:stock.req_link_tracking
-msgid "Serial Number"
+#: code:addons/stock/models/stock_warehouse.py:658
+#, python-format
+msgid "Sequence in"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.view_production_lot_form
-#: model:ir.ui.view,arch_db:stock.view_production_lot_tree
-msgid "Serial Number / Lots"
+#: code:addons/stock/models/stock_warehouse.py:662
+#, python-format
+msgid "Sequence internal"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prodlot_name
-msgid "Serial Number Name"
+#: code:addons/stock/models/stock_warehouse.py:659
+#, python-format
+msgid "Sequence out"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-msgid "Serial Numbers / Lots"
+#: code:addons/stock/models/stock_warehouse.py:660
+#, python-format
+msgid "Sequence packing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_warehouse.py:661
+#, python-format
+msgid "Sequence picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_prodlot_name
+msgid "Serial Number Name"
msgstr ""
#. module: stock
@@ -4919,23 +4998,13 @@ msgstr ""
msgid "Settings"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.stock_location_components
-msgid "Shelf 1"
-msgstr ""
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_14
-msgid "Shelf 2"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_posy
msgid "Shelves (Y)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3873
+#: code:addons/stock/models/stock_warehouse.py:402
#, python-format
msgid "Ship Only"
msgstr ""
@@ -4965,20 +5034,15 @@ msgstr ""
msgid "Show various information on stock availability for this move"
msgstr ""
-#. module: stock
-#: model:stock.location,name:stock.location_refrigerator_small
-msgid "Small Refrigerator"
-msgstr ""
-
#. module: stock
#: selection:stock.config.settings,group_uom:0
msgid "Some products may be sold/purchased in different units of measure (advanced)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1580
+#: code:addons/stock/models/stock_picking.py:787
#, python-format
-msgid "Some products require lots, so you need to specify those first!"
+msgid "Some products require lots/serial numbers, so you need to specify those first!"
msgstr ""
#. module: stock
@@ -4989,6 +5053,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_move_origin
#: model:ir.model.fields,field_description:stock.field_stock_picking_origin
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_origin
msgid "Source Document"
msgstr ""
@@ -5001,6 +5066,7 @@ msgid "Source Location"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_source_location_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_location_id
#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
msgid "Source Location Zone"
@@ -5016,11 +5082,6 @@ msgstr ""
msgid "Source location is action=move"
msgstr ""
-#. module: stock
-#: model:ir.model,name:stock.model_stock_pack_operation_lot
-msgid "Specifies lot/serial number for pack operations that need it"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_inventory_lot_id
msgid "Specify Lot/Serial Number to focus your inventory on a particular Lot/Serial Number."
@@ -5036,6 +5097,11 @@ msgstr ""
msgid "Specify Pack to focus your inventory on a particular Pack."
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_inventory_category_id
+msgid "Specify Product Category to focus your inventory on a particular Category."
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_inventory_product_id
msgid "Specify Product to focus your inventory on a particular Product."
@@ -5055,7 +5121,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_inventory_line_state
#: model:ir.model.fields,field_description:stock.field_stock_inventory_state
#: model:ir.model.fields,field_description:stock.field_stock_move_state
+#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_state
#: model:ir.model.fields,field_description:stock.field_stock_picking_state
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_state
#: model:ir.ui.view,arch_db:stock.view_inventory_filter
#: model:ir.ui.view,arch_db:stock.view_move_search
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -5063,8 +5131,7 @@ msgid "Status"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3820
-#: model:stock.location,name:stock.stock_location_shop0
+#: code:addons/stock/models/stock_warehouse.py:92
#: model:stock.location,name:stock.stock_location_stock
#, python-format
msgid "Stock"
@@ -5110,9 +5177,9 @@ msgid "Stock Move"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.actions.act_window,name:stock.stock_move_action
#: model:ir.model.fields,field_description:stock.field_stock_picking_move_lines
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: model:ir.ui.menu,name:stock.stock_move_menu
#: model:ir.ui.view,arch_db:stock.view_inventory_form
#: model:ir.ui.view,arch_db:stock.view_move_form
#: model:ir.ui.view,arch_db:stock.view_move_picking_form
@@ -5134,16 +5201,27 @@ msgstr ""
msgid "Stock On Hand"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.stock_scrap_form_view
+msgid "Stock Operation"
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree_all
msgid "Stock Operations"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_id
msgid "Stock Picking"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_product_product_stock_move_ids
+msgid "Stock move ids"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_move_search
msgid "Stock moves that are Available (Ready to process)"
@@ -5160,14 +5238,13 @@ msgid "Stock moves that have been processed"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
-msgid "Stockable"
+#: model:ir.model.fields,field_description:stock.field_product_product_stock_quant_ids
+msgid "Stock quant ids"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:400
-#, python-format
-msgid "Stockable Product"
+#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search
+msgid "Stockable"
msgstr ""
#. module: stock
@@ -5222,7 +5299,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_move_restrict_lot_id
-msgid "Technical field used to depict a restriction on the lot of quants to consider when marking this move as 'done'"
+msgid "Technical field used to depict a restriction on the lot/serial number of quants to consider when marking this move as 'done'"
msgstr ""
#. module: stock
@@ -5230,11 +5307,6 @@ msgstr ""
msgid "Technical field used to depict a restriction on the ownership of quants to consider when marking this move as 'done'"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_return_picking_move_dest_exists
-msgid "Technical field used to hide help tooltip if not needed"
-msgstr ""
-
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant_negative_dest_location_id
msgid "Technical field used to record the destination location of a move that created a negative quant"
@@ -5250,6 +5322,17 @@ msgstr ""
msgid "Technical field used to track the origin of a split move, which can be useful in case of debug"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_move_product_tmpl_id
+msgid "Technical: used in views"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,help:stock.field_product_product_stock_move_ids
+#: model:ir.model.fields,help:stock.field_product_product_stock_quant_ids
+msgid "Technical: used to compute quantities."
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_temando
msgid "Temando integration"
@@ -5263,7 +5346,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_location_path_auto
-msgid "The 'Automatic Move' / 'Manual Operation' value will create a stock move after the current one. With 'Automatic No Step Added', the location is replaced in the original move."
+msgid "The 'Manual Operation' value will create a stock move after the current one.With 'Automatic No Step Added', the location is replaced in the original move."
msgstr ""
#. module: stock
@@ -5282,12 +5365,6 @@ msgstr ""
msgid "The barcode for a location must be unique per company !"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:4383
-#, python-format
-msgid "The chosen quantity for product %s is not compatible with the UoM rounding. It will be automatically converted at confirmation"
-msgstr ""
-
#. module: stock
#: sql_constraint:stock.warehouse:0
msgid "The code of the warehouse must be unique per company!"
@@ -5314,13 +5391,13 @@ msgid "The date that will be used for the stock level check of the products and
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4006
+#: code:addons/stock/models/stock_warehouse.py:140
#, python-format
msgid "The default resupply warehouse should be different than the warehouse itself!"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1215
+#: code:addons/stock/models/stock_picking.py:517
#, python-format
msgid "The destination location must be the same for all the moves of the picking."
msgstr ""
@@ -5380,7 +5457,7 @@ 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. "
+msgid "The procurement quantity will be rounded up to this multiple. If it is 0, the exact quantity will be used."
msgstr ""
#. module: stock
@@ -5394,7 +5471,7 @@ msgid "The push rule that created this stock move"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4488
+#: 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 ""
@@ -5405,37 +5482,34 @@ msgid "The quotation becomes a Sale Order and a Transfer Order is created"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1910
+#: code:addons/stock/models/stock_move.py:166
#, python-format
msgid "The requested operation cannot be processed because of a programming error setting the `product_qty` field instead of the `product_uom_qty`."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2703
+#: code:addons/stock/models/stock_move.py:817
#, 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 ""
#. module: stock
-#: code:addons/stock/stock.py:4376
+#: code:addons/stock/models/stock_inventory.py:126
+#: code:addons/stock/models/stock_inventory.py:128
+#: code:addons/stock/models/stock_inventory.py:130
+#: code:addons/stock/models/stock_inventory.py:132
#, python-format
-msgid "The selected UoM for product %s is not compatible with the UoM set on the product form. \n"
-"Please choose an UoM within the same UoM category."
-msgstr ""
-
-#. module: stock
-#: constraint:stock.inventory:0
msgid "The selected inventory options are not coherent."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:577
+#: code:addons/stock/models/stock_quant.py:246
#, python-format
msgid "The serial number %s is already in stock."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1218
+#: code:addons/stock/models/stock_picking.py:515
#, python-format
msgid "The source location must be the same for all the moves of the picking."
msgstr ""
@@ -5483,6 +5557,7 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant_package_packaging_id
+#: model:ir.model.fields,help:stock.field_stock_quant_packaging_type_id
msgid "This field should be completed only if everything inside the package share the same product, otherwise it doesn't really makes sense."
msgstr ""
@@ -5510,7 +5585,7 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,help:stock.action_production_lot_form
msgid "This is the list of all the production lots you recorded. When\n"
-" you select a lot, you can get the traceability of the products contained in lot."
+" you select a lot, you can get the traceability of the products contained in lot."
msgstr ""
#. module: stock
@@ -5529,12 +5604,17 @@ msgid "This is the quantity of products from an inventory point of view. For mov
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_move_form2
+#: model:ir.actions.act_window,help:stock.stock_move_action
msgid "This menu gives you the full traceability of inventory\n"
" operations on a specific product. You can filter on the product\n"
" to see all the past or future movements for the product."
msgstr ""
+#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_config_settings_module_quality
+msgid "This module allows you to generate quality alerts and quality check"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_adv_location
msgid "This option supplements the warehouse application by effectively implementing Push and Pull inventory flows through Routes."
@@ -5555,6 +5635,11 @@ msgstr ""
msgid "This rule can be applied when a move is confirmed that has this location as destination location"
msgstr ""
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "This shipment is a backorder of"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_property_stock_customer
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
@@ -5637,13 +5722,18 @@ msgstr ""
msgid "Today"
msgstr ""
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_inventory_total_qty
+msgid "Total Quantity"
+msgstr ""
+
#. module: stock
#: model:ir.model.fields,field_description:stock.field_product_category_total_route_ids
msgid "Total routes"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1773
+#: code:addons/stock/models/stock_production_lot.py:42
#: 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
@@ -5656,12 +5746,12 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,help:stock.field_stock_config_settings_module_product_expiry
msgid "Track different dates on products and serial numbers.\n"
-" The following dates can be tracked:\n"
-" - end of life\n"
-" - best before date\n"
-" - removal date\n"
-" - alert date.\n"
-" This installs the module product_expiry."
+" The following dates can be tracked:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date.\n"
+" This installs the module product_expiry."
msgstr ""
#. module: stock
@@ -5672,11 +5762,12 @@ 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
msgid "Tracking"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2895
+#: code:addons/stock/models/stock_move.py:959
#: 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
@@ -5716,6 +5807,7 @@ msgid "True if reserved quants changed, which mean we might need to recompute th
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_code
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_code
msgid "Type of Operation"
msgstr ""
@@ -5736,14 +5828,15 @@ msgid "USPS integration"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:731
+#: code:addons/stock/models/stock_quant.py:98
#, python-format
msgid "Under no circumstances should you delete or change quants yourselves!"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_inventory_line_prodlot_name
#: model:ir.model.fields,help:stock.field_stock_production_lot_name
-msgid "Unique Serial Number"
+msgid "Unique Lot/Serial Number"
msgstr ""
#. module: stock
@@ -5765,7 +5858,9 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_make_procurement_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_move_product_uom
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_product_uom_id
+#: model:ir.model.fields,field_description:stock.field_stock_production_lot_product_uom_id
#: model:ir.model.fields,field_description:stock.field_stock_quant_product_uom_id
+#: model:ir.model.fields,field_description:stock.field_stock_scrap_product_uom_id
#: model:ir.ui.view,arch_db:stock.stock_move_tree
#: model:ir.ui.view,arch_db:stock.view_inventory_form
#: model:ir.ui.view,arch_db:stock.view_move_picking_tree
@@ -5794,7 +5889,7 @@ msgid "Units of Measures"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4236
+#: code:addons/stock/models/stock_quant.py:551
#, python-format
msgid "Unknown Pack"
msgstr ""
@@ -5820,7 +5915,7 @@ msgid "Unpack"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:319
+#: code:addons/stock/models/product.py:350
#, python-format
msgid "Unplanned Qty"
msgstr ""
@@ -5830,11 +5925,6 @@ msgstr ""
msgid "Unreserve"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_warehouse_resupply_from_wh
-msgid "Unused field"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "UoM"
@@ -5861,15 +5951,15 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_use_existing_lots
-msgid "Use Existing Lots"
+msgid "Use Existing Lots/Serial Numbers"
msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard
msgid "Use this assistant to generate a procurement request for this\n"
-" product. According to the product configuration, this may\n"
-" trigger a draft purchase order, a manufacturing order or\n"
-" a new task."
+" product. According to the product configuration, this may\n"
+" trigger a draft purchase order, a manufacturing order or\n"
+" a new task."
msgstr ""
#. module: stock
@@ -5903,8 +5993,12 @@ msgid "Validated"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_make_procurement_product_variant_count
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_variant_count
+msgid "Variant Count"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_make_procurement_product_variant_count
msgid "Variant Number"
msgstr ""
@@ -5926,7 +6020,6 @@ msgstr ""
#. module: stock
#: model:stock.location,name:stock.stock_location_suppliers
-#: selection:stock.picking,picking_type_code:0
#: selection:stock.picking.type,code:0
msgid "Vendors"
msgstr ""
@@ -5968,7 +6061,6 @@ msgid "Waiting Another Move"
msgstr ""
#. module: stock
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
msgid "Waiting Another Operation"
msgstr ""
@@ -5976,7 +6068,6 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
#: selection:stock.move,state:0
-#: selection:stock.pack.operation,state:0
#: selection:stock.picking,state:0
msgid "Waiting Availability"
msgstr ""
@@ -6001,6 +6092,7 @@ msgstr ""
#: model:ir.model.fields,field_description:stock.field_stock_move_warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_picking_type_warehouse_id
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_orderpoint_warehouse_id
+#: model:ir.ui.view,arch_db:stock.stock_warehouse_view_search
#: model:ir.ui.view,arch_db:stock.view_partner_stock_form
#: model:ir.ui.view,arch_db:stock.view_warehouse
#: model:ir.ui.view,arch_db:stock.view_warehouse_tree
@@ -6034,7 +6126,7 @@ msgid "Warehouse to consider for the route selection"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4043
+#: code:addons/stock/models/stock_warehouse.py:688
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -6053,21 +6145,20 @@ msgid "Warehouses and Locations usage level"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:340
-#, python-format
-msgid "Warning!"
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_warning_stock
+#: selection:res.partner,picking_warn:0
+msgid "Warning"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4375
-#, python-format
-msgid "Warning: wrong UoM!"
+#: model:ir.ui.view,arch_db:stock.view_partner_stock_warnings_form
+msgid "Warning on the Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4382
+#: code:addons/stock/models/product.py:311
#, python-format
-msgid "Warning: wrong quantity!"
+msgid "Warning!"
msgstr ""
#. module: stock
@@ -6092,7 +6183,7 @@ msgid "We hope this guide helped you implement Odoo Inventory."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4962
+#: code:addons/stock/models/barcode.py:11
#, python-format
msgid "Weighted Product"
msgstr ""
@@ -6191,25 +6282,25 @@ msgid "You can either do it immediately or mark it as Todo for future processing
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:519
+#: code:addons/stock/models/product.py:478
#, 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/stock.py:4499
+#: code:addons/stock/models/stock_pack_operation.py:160
#, python-format
msgid "You can not delete pack operations of a done picking"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:385
+#: code:addons/stock/models/stock_quant.py:143
#, python-format
msgid "You can not reserve a negative quantity or a negative quant."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2758
+#: code:addons/stock/models/stock_move.py:901
#, python-format
msgid "You can only delete draft moves."
msgstr ""
@@ -6220,38 +6311,44 @@ msgid "You can review and edit the predefined units via the"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2492
+#: code:addons/stock/models/stock_move.py:652
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3196
+#: code:addons/stock/models/stock_inventory.py:352
#, 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 validate the first inventory adjustement with this product before creating another one."
+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."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:725
+#: code:addons/stock/models/stock_quant.py:176
#, python-format
msgid "You cannot move to a location of type view %s."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3006
+#: code:addons/stock/models/stock_scrap.py:85
+#, python-format
+msgid "You cannot scrap a move without having available stock for %s. You can correct it with an inventory adjustment."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:144
#, python-format
msgid "You cannot set a negative product quantity in an inventory line:\n"
" %s - qty: %s"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2832
+#: code:addons/stock/models/stock_move.py:918
#, python-format
msgid "You cannot split a draft move. It needs to be confirmed first."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2828
+#: code:addons/stock/models/stock_move.py:914
#, python-format
msgid "You cannot split a move done"
msgstr ""
@@ -6263,7 +6360,7 @@ msgid "You do not have any products reserved for this picking. Please click the
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2654
+#: code:addons/stock/models/stock_move.py:800
#, python-format
msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. "
msgstr ""
@@ -6279,7 +6376,7 @@ msgid "You have already mentioned this lot name in another line"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:132
+#: code:addons/stock/wizard/stock_picking_return.py:114
#, python-format
msgid "You have manually created product lines, please delete them to proceed"
msgstr ""
@@ -6290,55 +6387,51 @@ msgid "You have processed less products than the initial demand."
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:341
+#: code:addons/stock/models/product.py:312
#, 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
-#: constraint:stock.warehouse.orderpoint:0
+#: code:addons/stock/models/stock_warehouse.py:768
+#, 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 ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_immediate_transfer
-msgid "You haven't set processed quantities. If you click <i>apply</i>,\n"
+msgid "You haven't set processed (<i>done</i>) quantities. Click <i>apply</i> and\n"
" Odoo will process all quantities to do."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:48
-#, python-format
-msgid "You may only return one picking at a time!"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:58
+#: code:addons/stock/wizard/stock_picking_return.py:43
#, python-format
-msgid "You may only return pickings that are Done!"
+msgid "You may only return Done pickings"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2376
-#: code:addons/stock/stock.py:4510
+#: code:addons/stock/models/stock_move.py:553
+#: code:addons/stock/models/stock_pack_operation.py:234
#, python-format
msgid "You need to provide a Lot/Serial Number for product %s"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:572
+#: code:addons/stock/models/stock_quant.py:241
#, python-format
msgid "You should only receive by the piece with the same serial number"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4514
+#: code:addons/stock/models/stock_pack_operation.py:238
#, python-format
msgid "You should provide a different serial number for each piece"
msgstr ""
#. module: stock
-#: constraint:stock.move:0
+#: code:addons/stock/models/stock_move.py:226
+#, python-format
msgid "You try to move a product using a UoM that is not compatible with the UoM of the product moved. Please use an UoM in the same UoM category."
msgstr ""
@@ -6371,7 +6464,6 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_backorder_confirmation
#: model:ir.ui.view,arch_db:stock.view_change_product_quantity
-#: model:ir.ui.view,arch_db:stock.view_immediate_transfer
msgid "_Cancel"
msgstr ""
@@ -6453,13 +6545,9 @@ msgstr ""
msgid "is displayed on the transfer if your products supply chain is properly configured. Otherwise, <strong>Check the availability</strong> manually"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_move_origin_returned_move_id
-msgid "move that created the return move"
-msgstr ""
-
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form
+#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "of"
msgstr ""
@@ -6478,11 +6566,6 @@ msgstr ""
msgid "on the sale order form to see Transfer Order"
msgstr ""
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_move_product_packaging
-msgid "preferred Packaging"
-msgstr ""
-
#. module: stock
#: model:ir.model,name:stock.model_report_stock_forecast
msgid "report.stock.forecast"
@@ -6503,6 +6586,11 @@ msgstr ""
msgid "stock.return.picking.line"
msgstr ""
+#. module: stock
+#: model:ir.model,name:stock.model_stock_scrap
+msgid "stock.scrap"
+msgstr ""
+
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "the list of products"
@@ -6514,35 +6602,13 @@ msgid "the list of vendors"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.inventory_planner
-msgid "to mark the products as transferred to your stock location"
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "to"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_product_product_reordering_max_qty
-#: model:ir.model.fields,field_description:stock.field_product_product_reordering_min_qty
-#: model:ir.model.fields,field_description:stock.field_product_template_reordering_max_qty
-#: model:ir.model.fields,field_description:stock.field_product_template_reordering_min_qty
-#: model:ir.model.fields,field_description:stock.field_stock_inventory_total_qty
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_operation_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lot_plus_visible
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_destination_location_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_picking_source_location_id
-#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_state
-#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_code
-#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_entire_packs
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_backorders
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_draft
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_late
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_ready
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_count_picking_waiting
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_rate_picking_backorders
-#: model:ir.model.fields,field_description:stock.field_stock_picking_type_rate_picking_late
-#: model:ir.model.fields,field_description:stock.field_stock_return_picking_original_location_id
-#: model:ir.model.fields,field_description:stock.field_stock_return_picking_parent_location_id
-msgid "unknown"
+#: model:ir.ui.view,arch_db:stock.inventory_planner
+msgid "to mark the products as transferred to your stock location"
msgstr ""
#. module: stock
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 6e9c771b9a2f05c09d1bdb222988dbe2c06a9755..3e167cbb8b67b48e9e856cc8a092bf6b438389d8 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,22 +25,11 @@ msgstr ""
msgid "Account Stock Properties"
msgstr ""
-#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
-msgid "Accounting"
-msgstr ""
-
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_location_form_inherit
msgid "Accounting Information"
msgstr ""
-#. module: stock_account
-#: code:addons/stock_account/wizard/stock_change_standard_price.py:62
-#, python-format
-msgid "Active ID is not set in Context."
-msgstr ""
-
#. module: stock_account
#: model:ir.model.fields,help:stock_account.field_stock_config_settings_group_stock_inventory_valuation
msgid "Allows to configure inventory valuations on products and product categories."
@@ -52,11 +41,6 @@ msgstr ""
msgid "Average Price"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_can_be_expensed
-msgid "Can be expensed"
-msgstr ""
-
#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
#: model:ir.ui.view,arch_db:stock_account.view_wizard_valuation_history
@@ -64,13 +48,13 @@ msgid "Cancel"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:278
+#: code:addons/stock_account/models/stock.py:243
#, 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/stock_account.py:280
+#: code:addons/stock_account/models/stock.py:245
#, 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 ""
@@ -102,11 +86,6 @@ msgstr ""
msgid "Choose your date"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_uos_coeff
-msgid "Coefficient to convert default Unit of Measure to Unit of Sale uos = uom * coeff"
-msgstr ""
-
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_history_company_id
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
@@ -120,7 +99,7 @@ msgid "Compute from average price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:351
+#: code:addons/stock_account/models/stock.py:316
#, python-format
msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation."
msgstr ""
@@ -130,6 +109,12 @@ msgstr ""
msgid "Cost"
msgstr ""
+#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_product_product_cost_method
+#: model:ir.model.fields,field_description:stock_account.field_product_template_cost_method
+msgid "Cost method"
+msgstr ""
+
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category_property_cost_method
#: model:ir.model.fields,field_description:stock_account.field_product_product_property_cost_method
@@ -282,18 +267,18 @@ msgid "Location"
msgstr ""
#. module: stock_account
-#: model:res.groups,name:stock_account.group_inventory_valuation
-msgid "Manage Inventory Valuation and Costing Methods"
+#: model:ir.model.fields,field_description:stock_account.field_stock_history_serial_number
+#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
+msgid "Lot/Serial Number"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Move"
+#: model:res.groups,name:stock_account.group_inventory_valuation
+msgid "Manage Inventory Valuation and Costing Methods"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/product.py:125
-#: code:addons/stock_account/product.py:187
+#: code:addons/stock_account/models/product.py:109
#, python-format
msgid "No difference between standard price and new price!"
msgstr ""
@@ -342,11 +327,6 @@ msgstr ""
msgid "Product"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_alert_time
-msgid "Product Alert Time"
-msgstr ""
-
#. module: stock_account
#: model:ir.model,name:stock_account.model_product_category
#: model:ir.model.fields,field_description:stock_account.field_stock_history_product_categ_id
@@ -354,21 +334,11 @@ msgstr ""
msgid "Product Category"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_life_time
-msgid "Product Life Time"
-msgstr ""
-
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_history_quantity
msgid "Product Quantity"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_removal_time
-msgid "Product Removal Time"
-msgstr ""
-
#. module: stock_account
#: model:ir.model,name:stock_account.model_product_template
#: model:ir.model.fields,field_description:stock_account.field_stock_history_product_template_id
@@ -376,11 +346,6 @@ msgstr ""
msgid "Product Template"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_use_time
-msgid "Product Use Time"
-msgstr ""
-
#. module: stock_account
#: model:ir.model,name:stock_account.model_stock_quant
msgid "Quants"
@@ -402,12 +367,6 @@ msgstr ""
msgid "Retrieve the curent stock valuation."
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_serial_number
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
-msgid "Serial Number"
-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
@@ -419,16 +378,6 @@ msgstr ""
msgid "Source"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_uos_id
-msgid "Specify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_can_be_expensed
-msgid "Specify whether the product can be selected in an HR expense."
-msgstr ""
-
#. module: stock_account
#: selection:product.category,property_cost_method:0
#: selection:product.template,property_cost_method:0
@@ -436,10 +385,8 @@ msgid "Standard Price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/product.py:138
-#: code:addons/stock_account/product.py:145
-#: code:addons/stock_account/product.py:199
-#: code:addons/stock_account/product.py:205
+#: code:addons/stock_account/models/product.py:126
+#: code:addons/stock_account/models/product.py:131
#, python-format
msgid "Standard Price changed"
msgstr ""
@@ -448,8 +395,8 @@ msgstr ""
#: model:ir.model.fields,help:stock_account.field_product_product_property_cost_method
#: model:ir.model.fields,help:stock_account.field_product_template_property_cost_method
msgid "Standard Price: The cost price is manually updated at the end of a specific period (usually once a year).\n"
-" Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
-" Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
+" Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.\n"
+" Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example)."
msgstr ""
#. module: stock_account
@@ -459,6 +406,11 @@ msgid "Standard Price: The cost price is manually updated at the end of a specif
"Real Price: The cost price displayed is the price of the last outgoing product (will be used in case of inventory loss for example)."
msgstr ""
+#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit
+msgid "Stock Accounting"
+msgstr ""
+
#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_product_category_property_stock_account_input_categ_id
#: model:ir.model.fields,field_description:stock_account.field_product_product_property_stock_account_input
@@ -467,7 +419,7 @@ msgid "Stock Input Account"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:464
+#: code:addons/stock_account/models/account_chart_template.py:15
#: model:ir.model.fields,field_description:stock_account.field_product_category_property_stock_journal
#, python-format
msgid "Stock Journal"
@@ -476,6 +428,7 @@ msgstr ""
#. module: stock_account
#: model:ir.model,name:stock_account.model_stock_move
#: model:ir.model.fields,field_description:stock_account.field_stock_history_move_id
+#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
msgid "Stock Move"
msgstr ""
@@ -502,7 +455,7 @@ msgid "Stock Valuation Account (Outgoing)"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/wizard/stock_valuation_history.py:31
+#: code:addons/stock_account/wizard/wizard_valuation_history.py:24
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_graph
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_pivot
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
@@ -517,7 +470,7 @@ msgid "Templates for Account Chart"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:306
+#: code:addons/stock_account/models/stock.py:271
#, 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 ""
@@ -527,16 +480,6 @@ msgstr ""
msgid "Total Value"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_uos_coeff
-msgid "Unit of Measure -> UOS Coeff"
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_uos_id
-msgid "Unit of Sale"
-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."
@@ -548,28 +491,14 @@ msgid "Used for real-time inventory valuation. When set on a virtual location (n
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_stock_history_price_unit_on_quant
-msgid "Value"
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_alert_time
-msgid "When a new a Serial Number is issued, this is the number of days before an alert should be notified."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_life_time
-msgid "When a new a Serial Number is issued, this is the number of days before the goods may become dangerous and must not be consumed."
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_removal_time
-msgid "When a new a Serial Number is issued, this is the number of days before the goods should be removed from the stock."
+#: model:ir.model.fields,field_description:stock_account.field_product_product_valuation
+#: model:ir.model.fields,field_description:stock_account.field_product_template_valuation
+msgid "Valuation"
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,help:stock_account.field_product_product_use_time
-msgid "When a new a Serial Number is issued, this is the number of days before the goods starts deteriorating, without being dangerous yet."
+#: model:ir.model.fields,field_description:stock_account.field_stock_history_price_unit_on_quant
+msgid "Value"
msgstr ""
#. module: stock_account
@@ -610,13 +539,14 @@ msgid "Wizard that opens the stock valuation history table"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:276
+#: code:addons/stock_account/models/stock.py:241
#, 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/stock_account.py:282
+#: code:addons/stock_account/models/product.py:111
+#: code:addons/stock_account/models/stock.py:247
#, 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 ""
@@ -636,11 +566,3 @@ msgstr ""
msgid "stock.history"
msgstr ""
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_cost_method
-#: model:ir.model.fields,field_description:stock_account.field_product_product_valuation
-#: model:ir.model.fields,field_description:stock_account.field_product_template_cost_method
-#: model:ir.model.fields,field_description:stock_account.field_product_template_valuation
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/stock_calendar/i18n/stock_calendar.pot b/addons/stock_calendar/i18n/stock_calendar.pot
index a4227503d2d6d1ae0deef7fa86187b8a91517c6c..412edd424a522f8760aaaf618807c8faaf7de32f 100644
--- a/addons/stock_calendar/i18n/stock_calendar.pot
+++ b/addons/stock_calendar/i18n/stock_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#. module: stock_calendar
#: model:ir.model.fields,help:stock_calendar.field_stock_warehouse_orderpoint_calendar_id
-msgid "In the calendar you can define the days that the goods will be delivered. That way the scheduler will only take into account the goods needed until the second delivery and put the procurement date as the first delivery. "
+msgid "In the calendar you can define the days that the goods will be delivered. That way the scheduler will only take into account the goods needed until the second delivery and put the procurement date as the first delivery."
msgstr ""
#. module: stock_calendar
@@ -55,11 +55,6 @@ msgstr ""
msgid "Next Purchase Date"
msgstr ""
-#. module: stock_calendar
-#: model:ir.model.fields,field_description:stock_calendar.field_resource_calendar_next_day
-msgid "Next day it should trigger"
-msgstr ""
-
#. module: stock_calendar
#: model:ir.model,name:stock_calendar.model_procurement_order
msgid "Procurement"
diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
index 1a2c0e53f9cbff20b8600a4ed7582430f52076b1..5aaded37e15f09d58303b70935519aaed8d900be 100644
--- a/addons/stock_landed_costs/i18n/stock_landed_costs.pot
+++ b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,10 +16,10 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:127
-#: code:addons/stock_landed_costs/stock_landed_costs.py:131
-#: code:addons/stock_landed_costs/stock_landed_costs.py:147
-#: code:addons/stock_landed_costs/stock_landed_costs.py:151
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:355
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:359
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:376
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:380
#, python-format
msgid " already out"
msgstr ""
@@ -104,6 +104,12 @@ msgstr ""
msgid "Cost Lines"
msgstr ""
+#. module: stock_landed_costs
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:79
+#, python-format
+msgid "Cost and adjustments lines do not match. You should maybe recompute the landed costs."
+msgstr ""
+
#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_create_uid
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines_create_uid
@@ -130,7 +136,7 @@ msgid "Description"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/purchase_config_settings.py:18
+#: code:addons/stock_landed_costs/models/purchase_config_settings.py:18
#, python-format
msgid "Disabling the costing methods will prevent you to use the landed costs feature."
msgstr ""
@@ -281,7 +287,13 @@ msgid "Name"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:203
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:77
+#, python-format
+msgid "No valuation adjustments lines. You should maybe recompute the landed costs."
+msgstr ""
+
+#. module: stock_landed_costs
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:75
#, python-format
msgid "Only draft landed costs can be validated"
msgstr ""
@@ -292,7 +304,7 @@ msgid "Pickings"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:90
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:322
#, python-format
msgid "Please configure Stock Expense Account for product: %s."
msgstr ""
@@ -366,7 +378,7 @@ msgid "Stock Valuation Adjustment Lines"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:52
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:171
#, python-format
msgid "The selected picking does not contain any move that would be impacted by landed costs. Landed costs are only possible for products configured in real time valuation with real price costing method. Please make sure it is the case, or you selected the correct picking"
msgstr ""
@@ -382,7 +394,7 @@ msgid "Validate"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:261
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:69
#, python-format
msgid "Validated landed costs cannot be cancelled, but you could create negative landed costs to reverse them"
msgstr ""
@@ -399,7 +411,7 @@ msgid "Volume"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/purchase_config_settings.py:17
+#: code:addons/stock_landed_costs/models/purchase_config_settings.py:17
#, python-format
msgid "Warning!"
msgstr ""
@@ -409,12 +421,6 @@ msgstr ""
msgid "Weight"
msgstr ""
-#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:205
-#, python-format
-msgid "You cannot validate a landed cost which has no valid valuation adjustments lines. Did you click on Compute?"
-msgstr ""
-
#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form
msgid "describe the product characteristics..."
diff --git a/addons/stock_picking_wave/i18n/stock_picking_wave.pot b/addons/stock_picking_wave/i18n/stock_picking_wave.pot
index 423e8cbc6a11ebded9a35aec2992f6434d499595..abf811fcc55e9650814507b34cb878e77449729b 100644
--- a/addons/stock_picking_wave/i18n/stock_picking_wave.pot
+++ b/addons/stock_picking_wave/i18n/stock_picking_wave.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -108,26 +108,6 @@ msgstr ""
msgid "ID"
msgstr ""
-#. module: stock_picking_wave
-#: model:product.product,name:stock_picking_wave.product_product_ice_cream_choco
-#: model:product.template,name:stock_picking_wave.product_product_ice_cream_choco_product_template
-msgid "Ice Cream Chocolate"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:product.product,description_sale:stock_picking_wave.product_product_ice_cream_choco
-#: model:product.template,description_sale:stock_picking_wave.product_product_ice_cream_choco_product_template
-msgid "Ice Cream Chocolate with sticks"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:product.product,description_sale:stock_picking_wave.product_product_ice_cream_vani
-#: model:product.product,name:stock_picking_wave.product_product_ice_cream_vani
-#: model:product.template,description_sale:stock_picking_wave.product_product_ice_cream_vani_product_template
-#: model:product.template,name:stock_picking_wave.product_product_ice_cream_vani_product_template
-msgid "Ice Cream Vanilla"
-msgstr ""
-
#. module: stock_picking_wave
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
msgid "In Progress"
@@ -162,7 +142,7 @@ msgid "Name of the picking wave"
msgstr ""
#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/stock_picking_wave.py:42
+#: code:addons/stock_picking_wave/models/stock_picking_wave.py:52
#, python-format
msgid "Nothing to print."
msgstr ""
@@ -173,10 +153,10 @@ msgid "Person responsible for this wave"
msgstr ""
#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/stock_picking_wave.py:60
+#: code:addons/stock_picking_wave/models/stock_picking_wave.py:64
#: model:ir.model,name:stock_picking_wave.model_stock_picking_wave
#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_wave_id
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_id_9535
+#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_id_9843
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
#, python-format
msgid "Picking Wave"
@@ -199,7 +179,7 @@ msgid "Picking Waves not finished"
msgstr ""
#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_id_9535
+#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_id_9843
msgid "Picking wave associated to this picking"
msgstr ""
@@ -211,7 +191,7 @@ msgstr ""
#. module: stock_picking_wave
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
-msgid "Print all pickings"
+msgid "Print"
msgstr ""
#. module: stock_picking_wave
@@ -235,23 +215,11 @@ msgid "Select a wave"
msgstr ""
#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/stock_picking_wave.py:59
+#: code:addons/stock_picking_wave/models/stock_picking_wave.py:59
#, python-format
msgid "Some pickings are still waiting for goods. Please check or force their availability before setting this wave to done."
msgstr ""
-#. module: stock_picking_wave
-#: model:product.product,name:stock_picking_wave.product_product_dry_specu
-#: model:product.template,name:stock_picking_wave.product_product_dry_specu_product_template
-msgid "Speculoos"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:product.product,description_sale:stock_picking_wave.product_product_dry_specu
-#: model:product.template,description_sale:stock_picking_wave.product_product_dry_specu_product_template
-msgid "Speculoos - A belgian speciality"
-msgstr ""
-
#. module: stock_picking_wave
#: model:mail.message.subtype,description:stock_picking_wave.mt_wave_state
#: model:mail.message.subtype,name:stock_picking_wave.mt_wave_state
@@ -284,7 +252,7 @@ msgid "Transfer"
msgstr ""
#. module: stock_picking_wave
-#: code:addons/stock_picking_wave/stock_picking_wave.py:60
+#: code:addons/stock_picking_wave/models/stock_picking_wave.py:63
#, python-format
msgid "Transferred by"
msgstr ""
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index dd5e73c9734755ce9031e073fbc2c082f822abe2..8cc52fe21a38d68dfd0b17b84f916b1105f27a8b 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgid "#Questions"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:231
+#: code:addons/survey/models/survey.py:136
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -160,11 +160,6 @@ msgid "<span>\n"
" Sorry, No one answered this survey yet"
msgstr ""
-#. module: survey
-#: constraint:survey.label:0
-msgid "A label must be attached to one and only one question"
-msgstr ""
-
#. module: survey
#: sql_constraint:survey.question:0
msgid "A length must be positive!"
@@ -186,12 +181,8 @@ msgid "A problem has occured"
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.frow_2_2_4
-msgid "A process is defined for all enterprise flows"
-msgstr ""
-
-#. module: survey
-#: constraint:survey.user_input_line:0
+#: code:addons/survey/models/survey.py:820
+#, python-format
msgid "A question cannot be unanswered and skipped"
msgstr ""
@@ -200,11 +191,6 @@ msgstr ""
msgid "A token must be unique!"
msgstr ""
-#. module: survey
-#: model:survey.page,title:survey.feedback_1
-msgid "About your Odoo usage"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_active
msgid "Active"
@@ -220,14 +206,6 @@ msgstr ""
msgid "Add list of existing contacts..."
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.fcol_2_1_3
-#: model:survey.label,value:survey.fcol_2_2_3
-#: model:survey.label,value:survey.fcol_2_5_3
-#: model:survey.label,value:survey.fcol_2_7_3
-msgid "Agree"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Allow Comments"
@@ -264,13 +242,14 @@ msgstr ""
#: model:ir.model.fields,field_description:survey.field_survey_question_user_input_line_ids
#: model:ir.model.fields,field_description:survey.field_survey_user_input_user_input_line_ids
#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+#: model:ir.ui.view,arch_db:survey.survey_form
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Answers"
msgstr ""
#. module: survey
-#: model:survey.question,question:survey.feedback_1_1
-msgid "Are you using Odoo on a daily basis?"
+#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
+msgid "Archived"
msgstr ""
#. module: survey
@@ -279,13 +258,13 @@ msgid "Attachments"
msgstr ""
#. module: survey
-#: model:ir.ui.view,arch_db:survey.back
-msgid "Back to Survey"
+#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_attachment_ids
+msgid "Attachments are linked to a document through model / res_id and to the message through this field."
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.choice_1_2_4
-msgid "CRM"
+#: model:ir.ui.view,arch_db:survey.back
+msgid "Back to Survey"
msgstr ""
#. module: survey
@@ -304,16 +283,14 @@ msgid "Choose..."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:125
-#: code:addons/survey/wizard/survey_email_compose_message.py:34
-#, python-format
-msgid "Click here to start survey"
+#: model:ir.actions.server,name:survey.survey_action_server_clean_test_answers
+msgid "Clean test answers"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:92
+#: code:addons/survey/models/survey.py:111
#, python-format
-msgid "Click here to take survey"
+msgid "Click here to start survey"
msgstr ""
#. module: survey
@@ -353,11 +330,6 @@ msgstr ""
msgid "Comment Message"
msgstr ""
-#. module: survey
-#: model:survey.page,title:survey.feedback_3
-msgid "Community and contributors"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_tree
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
@@ -375,11 +347,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.frow_2_7_2
-msgid "Configuration wizard exists for each important setting"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Constraints"
@@ -456,7 +423,7 @@ msgstr ""
#. module: survey
#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_date_deadline
-msgid "Deadline to which the invitation to respond for this survey is valid. If the field is empty, the invitation is still valid."
+msgid "Deadline to which the invitation to respond for this survey is valid. If the field is empty, the invitation is still valid."
msgstr ""
#. module: survey
@@ -476,11 +443,6 @@ msgstr ""
msgid "Description"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.frow_2_7_1
-msgid "Descriptions and help tooltips are clear enough"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_kanban
msgid "Design"
@@ -496,14 +458,6 @@ msgstr ""
msgid "Design easily your survey, send invitations to answer by email and analyse answers."
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.fcol_2_1_2
-#: model:survey.label,value:survey.fcol_2_2_2
-#: model:survey.label,value:survey.fcol_2_5_2
-#: model:survey.label,value:survey.fcol_2_7_2
-msgid "Disagree"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label_display_name
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_display_name
@@ -522,21 +476,6 @@ msgstr ""
msgid "Display mode"
msgstr ""
-#. module: survey
-#: model:survey.question,question:survey.feedback_3_3
-msgid "Do you have a proposition to attract new contributors?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_3_2
-msgid "Do you have a proposition to help people to contribute?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_3
-msgid "Do you have suggestions on how to improve the process view ?"
-msgstr ""
-
#. module: survey
#: model:survey.stage,name:survey.stage_draft
msgid "Draft"
@@ -572,14 +511,8 @@ msgstr ""
msgid "Email composition wizard for Survey"
msgstr ""
-#. module: survey
-#: model:survey.page,title:survey.feedback_2
-msgid "Ergonomy and ease of use"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question_constr_error_msg
-#: model:ir.model.fields,field_description:survey.field_survey_question_validation_error_msg
msgid "Error message"
msgstr ""
@@ -588,16 +521,6 @@ msgstr ""
msgid "Existing contacts"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.frow_2_7_3
-msgid "Extra modules proposed are relevant"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_1_2_3
-msgid "Financial Management"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_stage_fold
msgid "Folded in kanban view"
@@ -626,66 +549,6 @@ msgstr ""
msgid "Group By"
msgstr ""
-#. module: survey
-#: model:survey.question,question:survey.feedback_3_1
-msgid "How do you contribute or plan to contribute to Odoo?"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_1_2_6
-msgid "Human Resources"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_3_1_3
-msgid "I develop new features"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_4_1_4
-msgid "I do not publish my developments"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_3_1_4
-msgid "I help to translate"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_4_1_3
-msgid "I host them on my own website"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_3_1_1
-msgid "I participate to discussion and forums"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_4_1_1
-msgid "I use Github, like all official Odoo projects"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_4_1_2
-msgid "I use another repository system (SourceForge...)"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_1_3
-msgid "I use the contextual help in Odoo"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_3_1_5
-msgid "I write documentations"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_3_1_2
-msgid "I'd like to contribute but I don't know how?"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label_id
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_id
@@ -710,33 +573,16 @@ msgstr ""
#. module: survey
#: model:ir.model.fields,help:survey.field_survey_stage_closed
+#: model:ir.model.fields,help:survey.field_survey_survey_is_closed
msgid "If closed, people won't be able to answer to surveys in this column."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:624
-#: model:survey.question,comments_message:survey.feedback_1_1
-#: model:survey.question,comments_message:survey.feedback_1_2
-#: model:survey.question,comments_message:survey.feedback_2_1
-#: model:survey.question,comments_message:survey.feedback_2_2
-#: model:survey.question,comments_message:survey.feedback_2_3
-#: model:survey.question,comments_message:survey.feedback_2_4
-#: model:survey.question,comments_message:survey.feedback_2_5
-#: model:survey.question,comments_message:survey.feedback_2_6
-#: model:survey.question,comments_message:survey.feedback_2_7
-#: model:survey.question,comments_message:survey.feedback_3_1
-#: model:survey.question,comments_message:survey.feedback_3_2
-#: model:survey.question,comments_message:survey.feedback_3_3
-#: model:survey.question,comments_message:survey.feedback_4_1
+#: code:addons/survey/models/survey.py:485
#, python-format
msgid "If other, please specify:"
msgstr ""
-#. module: survey
-#: model:survey.page,description:survey.feedback_4
-msgid "If you do not contribute or develop in Odoo, skip this page."
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.sfinished
msgid "If you wish, you can"
@@ -747,6 +593,12 @@ msgstr ""
msgid "In progress"
msgstr ""
+#. module: survey
+#: code:addons/survey/wizard/survey_email_compose_message.py:66
+#, python-format
+msgid "Incorrect Email Address: %s"
+msgstr ""
+
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question_validation_email
msgid "Input must be an email"
@@ -758,38 +610,13 @@ msgid "Invitations sent"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_designed
-msgid "Is designed?"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_2_4_2
-msgid "It can be improved"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_1_2
-msgid "It helps in the beginning"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_1_5
-msgid "It is clear"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_1_4
-msgid "It is complete"
+#: model:ir.model.fields,field_description:survey.field_survey_survey_is_closed
+msgid "Is closed"
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.frow_2_1_1
-msgid "It is up-to-date"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_2_5
-msgid "It's easy to find the process you need"
+#: model:ir.model.fields,field_description:survey.field_survey_survey_designed
+msgid "Is designed?"
msgstr ""
#. module: survey
@@ -966,11 +793,6 @@ msgstr ""
msgid "Next page"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.choice_1_1_4
-msgid "No, I just tested it"
-msgstr ""
-
#. module: survey
#: model:ir.actions.act_window,help:survey.action_selected_survey_user_input
msgid "Nobody has replied to your survey yet."
@@ -1042,12 +864,6 @@ msgstr ""
msgid "One choice per row"
msgstr ""
-#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:78
-#, python-format
-msgid "One email at least is incorrect: %s"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_form
#: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -1105,17 +921,11 @@ msgid "Permanent"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:199
+#: code:addons/survey/wizard/survey_email_compose_message.py:164
#, python-format
msgid "Please enter at least one valid recipient."
msgstr ""
-#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:95
-#, python-format
-msgid "Please select a survey"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.page
msgid "Previous page"
@@ -1136,11 +946,6 @@ msgstr ""
msgid "Print link"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.choice_1_2_5
-msgid "Project Management"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_public_url_html
msgid "Public HTML web link"
@@ -1171,20 +976,19 @@ msgstr ""
msgid "Public url"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.choice_1_2_2
-msgid "Purchases Management"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label_question_id
-#: model:ir.model.fields,field_description:survey.field_survey_label_question_id_2
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line_question_id
#: model:ir.ui.view,arch_db:survey.survey_label_search
#: model:ir.ui.view,arch_db:survey.survey_question_search
msgid "Question"
msgstr ""
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_label_question_id_2
+msgid "Question 2"
+msgstr ""
+
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question_question
#: model:ir.ui.view,arch_db:survey.survey_question_form
@@ -1205,14 +1009,9 @@ msgstr ""
msgid "Questions"
msgstr ""
-#. module: survey
-#: model:survey.page,title:survey.feedback_4
-msgid "Questions for developers"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_quizz_mode
-msgid "Quiz mode"
+msgid "Quizz Mode"
msgstr ""
#. module: survey
@@ -1255,16 +1054,6 @@ msgstr ""
msgid "Rows of the Matrix"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.frow_2_7_4
-msgid "Running the configuration wizards is a good way to spare time"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_1_2_1
-msgid "Sales Management"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Save as a new template"
@@ -1326,18 +1115,18 @@ msgid "Send"
msgstr ""
#. module: survey
-#: selection:survey.mail.compose.message,public:0
-msgid "Send by email the public web link to your audience."
+#: model:ir.ui.view,arch_db:survey.survey_user_input_form
+msgid "Send Invitation Again"
msgstr ""
#. module: survey
#: selection:survey.mail.compose.message,public:0
-msgid "Send private invitation to your audience (only one response per recipient and per invitation)."
+msgid "Send by email the public web link to your audience."
msgstr ""
#. module: survey
-#: model:ir.ui.view,arch_db:survey.survey_user_input_form
-msgid "Sent Invitation Again"
+#: selection:survey.mail.compose.message,public:0
+msgid "Send private invitation to your audience (only one response per recipient and per invitation)."
msgstr ""
#. module: survey
@@ -1454,6 +1243,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:survey.survey_page_search
#: model:ir.ui.view,arch_db:survey.survey_question_search
#: model:ir.ui.view,arch_db:survey.survey_response_line_search
+#: model:ir.ui.view,arch_db:survey.survey_survey_view_search
#: model:ir.ui.view,arch_db:survey.survey_tree
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
msgid "Survey"
@@ -1558,141 +1348,63 @@ msgstr ""
msgid "Text answer"
msgstr ""
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_thank_you_message
-msgid "Thank you message"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.sfinished
msgid "Thank you!"
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.frow_2_5_3
-msgid "The 'Usability/Extended View' group helps in daily work"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_5_4
-msgid "The 'Usability/Extended View' group hides only optional fields"
+#: model:ir.model.fields,field_description:survey.field_survey_survey_thank_you_message
+msgid "Thanks Message"
msgstr ""
#. module: survey
-#: constraint:survey.user_input_line:0
+#: code:addons/survey/models/survey.py:833
+#, python-format
msgid "The answer must be in the right type"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:622
-#: model:survey.question,validation_error_msg:survey.feedback_1_1
-#: model:survey.question,validation_error_msg:survey.feedback_1_2
-#: model:survey.question,validation_error_msg:survey.feedback_2_1
-#: model:survey.question,validation_error_msg:survey.feedback_2_2
-#: model:survey.question,validation_error_msg:survey.feedback_2_3
-#: model:survey.question,validation_error_msg:survey.feedback_2_4
-#: model:survey.question,validation_error_msg:survey.feedback_2_5
-#: model:survey.question,validation_error_msg:survey.feedback_2_6
-#: model:survey.question,validation_error_msg:survey.feedback_2_7
-#: model:survey.question,validation_error_msg:survey.feedback_3_1
-#: model:survey.question,validation_error_msg:survey.feedback_3_2
-#: model:survey.question,validation_error_msg:survey.feedback_3_3
-#: model:survey.question,validation_error_msg:survey.feedback_4_1
+#: code:addons/survey/models/survey.py:499
#, python-format
msgid "The answer you entered has an invalid format."
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:174
+#: code:addons/survey/wizard/survey_email_compose_message.py:138
#, python-format
msgid "The content of the text don't contain '__URL__'. __URL__ is automaticaly converted into the special url of the survey."
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.choice_2_4_1
-msgid "The current menu structure is good"
-msgstr ""
-
#. module: survey
#: sql_constraint:survey.user_input:0
msgid "The deadline cannot be in the past"
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.frow_2_5_5
-msgid "The groups set on menu items are relevant"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_2_6_3
-msgid "The number of groups is good"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_5_1
-msgid "The security rules defined on groups are useful"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_2_6_2
-msgid "There are too few groups defined, security isn't accurate enough"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_2_6_1
-msgid "There are too many groups defined, security is too complex to set"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_2_4_3
-msgid "There are too much menus, it's complex to understand"
-msgstr ""
-
-#. module: survey
-#: model:survey.page,description:survey.feedback_2
-msgid "These questions relate to the ergonomy and ease of use of Odoo. Try to remind your firsts days on Odoo and\n"
-"what have been your difficulties."
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_2_2
-msgid "They are clean and correct"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_2_3
-msgid "They are useful on a daily usage"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_2_1
-msgid "They help new users to understand Odoo"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:671
-#: code:addons/survey/tests/test_survey.py:94
+#: code:addons/survey/models/survey.py:558
+#: code:addons/survey/tests/test_survey.py:86
#, python-format
msgid "This answer must be an email address"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:713
-#: code:addons/survey/tests/test_survey.py:115
+#: code:addons/survey/models/survey.py:602
+#: code:addons/survey/tests/test_survey.py:107
#, python-format
msgid "This is not a date/time"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:690
-#: code:addons/survey/tests/test_survey.py:105
+#: code:addons/survey/models/survey.py:579
+#: code:addons/survey/tests/test_survey.py:97
#, python-format
msgid "This is not a number"
msgstr ""
#. module: survey
#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_multi_email
-msgid "This list of emails of recipients will not converted in contacts. Emails separated by commas, semicolons or newline."
+msgid "This list of emails of recipients will not be converted in contacts. Emails must be separated by commas, semicolons or newline."
msgstr ""
#. module: survey
@@ -1701,20 +1413,7 @@ msgid "This message will be displayed when survey is completed"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:621
-#: model:survey.question,constr_error_msg:survey.feedback_1_1
-#: model:survey.question,constr_error_msg:survey.feedback_1_2
-#: model:survey.question,constr_error_msg:survey.feedback_2_1
-#: model:survey.question,constr_error_msg:survey.feedback_2_2
-#: model:survey.question,constr_error_msg:survey.feedback_2_3
-#: model:survey.question,constr_error_msg:survey.feedback_2_4
-#: model:survey.question,constr_error_msg:survey.feedback_2_5
-#: model:survey.question,constr_error_msg:survey.feedback_2_6
-#: model:survey.question,constr_error_msg:survey.feedback_2_7
-#: model:survey.question,constr_error_msg:survey.feedback_3_1
-#: model:survey.question,constr_error_msg:survey.feedback_3_2
-#: model:survey.question,constr_error_msg:survey.feedback_3_3
-#: model:survey.question,constr_error_msg:survey.feedback_4_1
+#: code:addons/survey/models/survey.py:503
#, python-format
msgid "This question requires an answer."
msgstr ""
@@ -1734,37 +1433,11 @@ msgstr ""
msgid "This survey is open only to registered people. Please"
msgstr ""
-#. module: survey
-#: model:survey.survey,description:survey.feedback_form
-msgid "This survey should take less than five minutes."
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.frow_2_5_2
-msgid "Those security rules are standard and can be used out-of-the-box in most cases"
-msgstr ""
-
#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_title
msgid "Title"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.fcol_2_1_4
-#: model:survey.label,value:survey.fcol_2_2_4
-#: model:survey.label,value:survey.fcol_2_5_4
-#: model:survey.label,value:survey.fcol_2_7_4
-msgid "Totally agree"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.fcol_2_1_1
-#: model:survey.label,value:survey.fcol_2_2_1
-#: model:survey.label,value:survey.fcol_2_5_1
-#: model:survey.label,value:survey.fcol_2_7_1
-msgid "Totally disagree"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_search
msgid "Type"
@@ -1792,12 +1465,7 @@ msgstr ""
#. module: survey
#: model:ir.model.fields,help:survey.field_survey_question_description
-msgid "Use this field to add additional explanations about your question"
-msgstr ""
-
-#. module: survey
-#: model:survey.survey,title:survey.feedback_form
-msgid "User Feedback Form"
+msgid "Use this field to add additional explanations about your question"
msgstr ""
#. module: survey
@@ -1848,6 +1516,11 @@ msgstr ""
msgid "Validate entry"
msgstr ""
+#. module: survey
+#: model:ir.model.fields,field_description:survey.field_survey_question_validation_error_msg
+msgid "Validation Error message"
+msgstr ""
+
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_form
msgid "View Results"
@@ -1863,42 +1536,6 @@ msgstr ""
msgid "Vote"
msgstr ""
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_7
-msgid "What do you think about configuration wizards?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_1
-msgid "What do you think about the documentation available on doc.odoo.com?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_5
-msgid "What do you think about the groups of users?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_2
-msgid "What do you think about the process views of Odoo, available in the web client ?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_2_4
-#: model:survey.question,question:survey.feedback_2_6
-msgid "What do you think about the structure of the menus?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_4_1
-msgid "Where do you develop your new features?"
-msgstr ""
-
-#. module: survey
-#: model:survey.question,question:survey.feedback_1_2
-msgid "Which modules are you using/testing?"
-msgstr ""
-
#. module: survey
#: model:ir.ui.view,arch_db:survey.datetime
msgid "YYYY-MM-DD hh:mm:ss"
@@ -1910,21 +1547,6 @@ msgid "YYYY-MM-DD hh:mm:ss\n"
" <i class=\"fa fa-calendar fa-2x\"/>"
msgstr ""
-#. module: survey
-#: model:survey.label,value:survey.choice_1_1_1
-msgid "Yes, I use a version < 7.0"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_1_1_2
-msgid "Yes, I use the 7.0 version, installed locally"
-msgstr ""
-
-#. module: survey
-#: model:survey.label,value:survey.choice_1_1_3
-msgid "Yes, I use the online version of Odoo"
-msgstr ""
-
#. module: survey
#: model:ir.actions.act_window,help:survey.action_survey_form
msgid "You can create surveys for different purposes: customer opinion, services feedback, recruitment interviews, employee's periodical evaluations, marketing campaigns, etc."
@@ -1936,13 +1558,13 @@ msgid "You can share your survey web public link and/or send private invitations
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:424
+#: code:addons/survey/models/survey.py:330
#, python-format
msgid "You cannot send an invitation for a survey that has no questions."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:429
+#: code:addons/survey/models/survey.py:333
#, python-format
msgid "You cannot send invitations for closed surveys."
msgstr ""
@@ -1957,6 +1579,11 @@ msgstr ""
msgid "ans"
msgstr ""
+#. module: survey
+#: model:ir.model,name:survey.model_ir_autovacuum
+msgid "ir.autovacuum"
+msgstr ""
+
#. module: survey
#: model:ir.ui.view,arch_db:survey.auth_required
msgid "log in"
diff --git a/addons/utm/i18n/utm.pot b/addons/utm/i18n/utm.pot
index 821b0c8ddc18eb537bfc810160aadc93918e6c49..8d4f4baecd53b625b65e92ff080756dda353e24f 100644
--- a/addons/utm/i18n/utm.pot
+++ b/addons/utm/i18n/utm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -97,6 +97,11 @@ msgstr ""
msgid "Display Name"
msgstr ""
+#. module: utm
+#: model:utm.campaign,name:utm.utm_campaign_email_campaign_products
+msgid "Email Campaign - Products"
+msgstr ""
+
#. module: utm
#: model:utm.campaign,name:utm.utm_campaign_email_campaign_services
msgid "Email Campaign - Services"
@@ -167,7 +172,6 @@ msgid "Medium"
msgstr ""
#. module: utm
-#: model:utm.campaign,name:utm.utm_campaign_email_campaign_products
#: model:utm.source,name:utm.utm_source_newsletter
msgid "Newsletter"
msgstr ""
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index f4441473390c23ce89fa20265f4e4241c7a261b0..18d3c36dadac39239f493ecd4c429c3bd71aebb8 100644
--- a/addons/web/i18n/web.pot
+++ b/addons/web/i18n/web.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,120 +17,104 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:866
+#: code:addons/web/static/src/js/views/form_common.js:874
#, python-format
msgid " & Close"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:467
+#: code:addons/web/static/src/js/views/search_inputs.js:554
+#: code:addons/web/static/src/js/views/search_view.js:206
#, python-format
-msgid " selected records"
+msgid " or "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:168
+#: code:addons/web/static/src/js/views/form_widgets.js:431
#, python-format
-msgid " view couldn't be loaded"
+msgid " selected records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:115
-#: code:addons/web/static/src/js/views/search_filters.js:290
+#: code:addons/web/static/src/js/view_manager.js:222
#, python-format
-msgid "%(field)s %(operator)s"
+msgid " view couldn't be loaded"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:116
+#: code:addons/web/static/src/js/views/search_filters.js:107
+#: code:addons/web/static/src/js/views/search_filters.js:333
#, python-format
-msgid "%(field)s %(operator)s \"%(value)s\""
+msgid "%(field)s %(operator)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1587
+#: code:addons/web/static/src/js/views/search_filters.js:108
#, python-format
-msgid "%(page)d/%(page_count)d"
+msgid "%(field)s %(operator)s \"%(value)s\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:66
+#: code:addons/web/static/src/js/view_manager.js:65
#, python-format
msgid "%(view_type)s view"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:450
-#, python-format
-msgid "%d / %d"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:134
+#: code:addons/web/static/src/js/framework/translation.js:105
#, python-format
msgid "%d days ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:132
+#: code:addons/web/static/src/js/framework/translation.js:103
#, python-format
msgid "%d hours ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:130
+#: code:addons/web/static/src/js/framework/translation.js:101
#, python-format
msgid "%d minutes ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:136
+#: code:addons/web/static/src/js/framework/translation.js:107
#, python-format
msgid "%d months ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:138
+#: code:addons/web/static/src/js/widgets/debug_manager.js:138
#, python-format
-msgid "%d years ago"
+msgid "%d requests (%d ms) %d queries (%d ms)"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:440
+#: code:addons/web/static/src/js/framework/translation.js:109
#, python-format
-msgid "%d-%d of %d"
+msgid "%d years ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1496
+#: code:addons/web/static/src/js/views/list_view.js:1405
#, python-format
msgid "%s (%d)"
msgstr ""
-#. module: web
-#: model:ir.ui.view,arch_db:web.webclient_bootstrap
-msgid "<!--[if lte IE 9]>"
-msgstr ""
-
-#. module: web
-#: model:ir.ui.view,arch_db:web.webclient_bootstrap
-msgid "<![endif]-->"
-msgstr ""
-
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/framework/formats.js:177
@@ -187,13 +171,6 @@ msgstr ""
msgid "(%d records)"
msgstr ""
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:106
-#, python-format
-msgid "(Community Edition)"
-msgstr ""
-
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/base_common.xml:100
@@ -210,7 +187,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1059
+#: code:addons/web/static/src/xml/base.xml:913
#, python-format
msgid "...Upload in progress..."
msgstr ""
@@ -227,43 +204,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/user_menu.js:79
-#: code:addons/web/static/src/xml/base.xml:84
-#, python-format
-msgid "About"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:25
+#: code:addons/web/static/src/js/framework/crash_manager.js:19
#, python-format
msgid "Access Denied"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:21
+#: code:addons/web/static/src/js/framework/crash_manager.js:15
#, python-format
msgid "Access Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1515
+#: code:addons/web/static/src/xml/base.xml:1305
#, python-format
msgid "Access to all Enterprise Apps"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:24
+#: code:addons/web/static/src/js/widgets/sidebar.js:23
#, python-format
msgid "Action"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1125
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1116
#, python-format
msgid "Action Button"
msgstr ""
@@ -277,79 +246,79 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:685
+#: code:addons/web/static/src/js/views/form_widgets.js:636
#, python-format
msgid "Activate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:96
+#: code:addons/web/static/src/xml/base.xml:112
#, python-format
-msgid "Activate the developer mode"
+msgid "Activate Assets Debugging"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:682
+#: code:addons/web/static/src/js/views/form_widgets.js:633
+#: code:addons/web/static/src/js/views/form_widgets.js:639
#, python-format
msgid "Active"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1384
-#: code:addons/web/static/src/xml/base.xml:1106
-#: code:addons/web/static/src/xml/base.xml:1339
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1369
+#: code:addons/web/static/src/xml/base.xml:1129
#, python-format
msgid "Add"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1212
+#: code:addons/web/static/src/xml/base.xml:954
#, python-format
msgid "Add Custom Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1213
+#: code:addons/web/static/src/xml/base.xml:958
#, python-format
msgid "Add a condition"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1024
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1014
#, python-format
msgid "Add an item"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1223
+#: code:addons/web/static/src/xml/base.xml:1064
#, python-format
msgid "Add custom group"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:325
+#: code:addons/web/static/src/xml/base.xml:271
#, python-format
msgid "Add..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1325
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1296
#, python-format
msgid "Add: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1119
+#: code:addons/web/static/src/xml/base.xml:930
#, python-format
msgid "Advanced Search..."
msgstr ""
@@ -363,79 +332,79 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:562
+#: code:addons/web/static/src/xml/base.xml:500
#, python-format
msgid "All users"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1520
+#: code:addons/web/static/src/xml/base.xml:1310
#, python-format
msgid "And more"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1213
-#: code:addons/web/static/src/xml/base.xml:1233
+#: code:addons/web/static/src/xml/base.xml:957
+#: code:addons/web/static/src/xml/base.xml:1075
#, python-format
msgid "Apply"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:689
-#: code:addons/web/static/src/js/views/list_view.js:307
+#: code:addons/web/static/src/js/views/form_widgets.js:640
+#: code:addons/web/static/src/js/views/list_view.js:289
#, python-format
msgid "Archive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:690
+#: code:addons/web/static/src/js/views/form_widgets.js:641
#, python-format
msgid "Archived"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:243
+#: code:addons/web/static/src/js/views/search_menus.js:245
#, 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:297
+#: code:addons/web/static/src/xml/base.xml:245
#, python-format
msgid "Attachment :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1323
+#: code:addons/web/static/src/xml/base.xml:1125
#, python-format
msgid "Available fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:614
+#: code:addons/web/static/src/xml/base.xml:567
#, python-format
msgid "Bar Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1955
+#: code:addons/web/static/src/js/views/list_view.js:1843
#, python-format
msgid "Binary file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1519
+#: code:addons/web/static/src/xml/base.xml:1309
#, python-format
msgid "Bugfixes guarantee"
msgstr ""
@@ -470,31 +439,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:359
-#, python-format
-msgid "Can't send email to invalid e-mail address"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:182
+#: code:addons/web/static/src/js/framework/crash_manager.js:171
#: code:addons/web/static/src/js/framework/dialog.js:183
-#: code:addons/web/static/src/js/views/form_common.js:1031
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:44
-#: code:addons/web/static/src/js/views/form_widgets.js:1706
-#: code:addons/web/static/src/xml/base.xml:60
+#: code:addons/web/static/src/js/views/form_common.js:1046
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:42
+#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:42
+#: code:addons/web/static/src/xml/base.xml:56
#, python-format
msgid "Cancel"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/controllers/main.py:748
-#: code:addons/web/controllers/main.py:750
-#: code:addons/web/controllers/main.py:756
-#: code:addons/web/controllers/main.py:757
+#: code:addons/web/controllers/main.py:719
+#: code:addons/web/controllers/main.py:721
+#: code:addons/web/controllers/main.py:727
+#: code:addons/web/controllers/main.py:728
#: code:addons/web/static/src/js/widgets/change_password.js:15
-#: code:addons/web/static/src/xml/base.xml:59
+#: code:addons/web/static/src/xml/base.xml:55
#, python-format
msgid "Change Password"
msgstr ""
@@ -508,49 +470,55 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:472
+#: code:addons/web/static/src/js/views/form_widgets.js:436
#, python-format
msgid "Change selection "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:963
-#: code:addons/web/static/src/xml/base.xml:1017
-#: code:addons/web/static/src/xml/base.xml:1019
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:864
#, python-format
msgid "Clear"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:135
-#: code:addons/web/static/src/js/web_client.js:132
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid "Clear Events"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/abstract_web_client.js:112
+#: code:addons/web/static/src/js/framework/crash_manager.js:124
#, python-format
msgid "Client Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:860
-#: code:addons/web/static/src/js/views/form_view.js:1194
-#: code:addons/web/static/src/js/widgets/data_export.js:41
+#: code:addons/web/static/src/js/views/form_common.js:868
+#: code:addons/web/static/src/js/views/form_view.js:1097
+#: code:addons/web/static/src/js/widgets/data_export.js:203
#, python-format
msgid "Close"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:536
+#: code:addons/web/static/src/xml/base.xml:474
#, python-format
msgid "Condition:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:53
+#: code:addons/web/static/src/xml/base.xml:50
#, python-format
-msgid "Confirm New Password:"
+msgid "Confirm New Password"
msgstr ""
#. module: web
@@ -562,28 +530,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base_common.xml:59
+#: code:addons/web/static/src/js/abstract_web_client.js:207
#, python-format
-msgid "Context:"
+msgid "Connection lost"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:116
+#: code:addons/web/static/src/js/abstract_web_client.js:216
#, python-format
-msgid "Copyright © 2004-2015 Odoo S.A."
+msgid "Connection restored"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1379
+#: code:addons/web/static/src/xml/base_common.xml:59
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:1254
#, python-format
msgid "Could not display the selected image."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1109
+#: code:addons/web/static/src/js/views/list_view.js:1019
#, python-format
msgid "Could not find id in dataset"
msgstr ""
@@ -597,87 +572,87 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_view.js:90
-#: code:addons/web/static/src/js/views/graph_widget.js:21
-#: code:addons/web/static/src/js/views/pivot_view.js:186
-#: code:addons/web/static/src/xml/base.xml:627
-#: code:addons/web/static/src/xml/base.xml:659
+#: 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:182
+#: code:addons/web/static/src/xml/base.xml:563
+#: code:addons/web/static/src/xml/base.xml:592
#, python-format
msgid "Count"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1034
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:30
-#: code:addons/web/static/src/js/views/list_view.js:48
-#: code:addons/web/static/src/js/views/list_view.js:2033
-#: code:addons/web/static/src/xml/base.xml:501
+#: code:addons/web/static/src/js/views/form_common.js:1049
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:28
+#: code:addons/web/static/src/js/views/list_view.js:49
+#: code:addons/web/static/src/js/views/list_view.js:1926
+#: code:addons/web/static/src/xml/base.xml:436
#, python-format
msgid "Create"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:225
+#: code:addons/web/static/src/js/views/form_common.js:226
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:27
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:25
#, python-format
msgid "Create a %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:236
+#: code:addons/web/static/src/js/views/form_common.js:237
#, python-format
msgid "Create and Edit..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:40
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:38
#, 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:1083
+#: code:addons/web/static/src/js/views/form_common.js:282
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1074
#, python-format
msgid "Create: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:302
+#: code:addons/web/static/src/xml/base.xml:250
#, python-format
msgid "Created by :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:248
+#: code:addons/web/static/src/xml/base.xml:204
#, python-format
msgid "Creation Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:244
+#: code:addons/web/static/src/xml/base.xml:200
#, python-format
msgid "Creation User:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1067
-#: code:addons/web/static/src/js/views/search_menus.js:175
+#: code:addons/web/static/src/js/views/form_common.js:1096
+#: code:addons/web/static/src/js/views/search_menus.js:177
#, python-format
msgid "Custom Filter"
msgstr ""
@@ -689,88 +664,88 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:110
-#, python-format
-msgid "Database expiration:"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:673
+#: code:addons/web/static/src/xml/base.xml:611
#, python-format
msgid "Day"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:683
+#: code:addons/web/static/src/js/views/form_widgets.js:634
#, python-format
msgid "Deactivate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:519
+#: code:addons/web/static/src/xml/base.xml:457
#, python-format
msgid "Default:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:214
-#: code:addons/web/static/src/js/views/list_view.js:309
-#: code:addons/web/static/src/xml/base.xml:1408
+#: code:addons/web/static/src/js/views/form_view.js:163
+#: code:addons/web/static/src/js/views/list_view.js:291
+#: code:addons/web/static/src/xml/base.xml:1170
#, python-format
msgid "Delete"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:313
+#: code:addons/web/static/src/xml/base.xml:261
#, python-format
msgid "Delete this attachment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1066
+#: code:addons/web/static/src/xml/base.xml:918
#, python-format
msgid "Delete this file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:860
-#: code:addons/web/static/src/xml/base.xml:425
-#: code:addons/web/static/src/xml/base.xml:507
+#: code:addons/web/static/src/xml/base.xml:105
+#, python-format
+msgid "Disable Technical Features"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_common.js:868
+#: code:addons/web/static/src/xml/base.xml:368
+#: code:addons/web/static/src/xml/base.xml:446
#, python-format
msgid "Discard"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:205
+#: code:addons/web/static/src/js/widgets/sidebar.js:214
#, python-format
msgid "Do you really want to delete this attachment ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:803
+#: code:addons/web/static/src/js/views/form_view.js:703
#, 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:629
+#: code:addons/web/static/src/js/views/list_view.js:543
#, python-format
msgid "Do you really want to remove these records?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:1290
#, python-format
msgid "Documentation"
msgstr ""
@@ -791,67 +766,59 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1305
-#: code:addons/web/static/src/js/views/list_view.js:1955
+#: code:addons/web/static/src/js/views/list_view.js:1843
#, python-format
msgid "Download"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1971
+#: code:addons/web/static/src/js/views/list_view.js:1859
#, python-format
msgid "Download \"%s\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot_view.js:122
+#: code:addons/web/static/src/xml/base.xml:598
#, python-format
msgid "Download xls"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:215
+#: code:addons/web/static/src/js/views/form_view.js:164
#, python-format
msgid "Duplicate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:359
-#, python-format
-msgid "E-mail Error"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:219
-#: code:addons/web/static/src/xml/base.xml:496
-#: code:addons/web/static/src/xml/base.xml:962
+#: code:addons/web/static/src/xml/base.xml:180
+#: code:addons/web/static/src/xml/base.xml:432
+#: code:addons/web/static/src/xml/base.xml:833
#, python-format
msgid "Edit"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:221
+#: code:addons/web/static/src/xml/base.xml:148
#, python-format
msgid "Edit Action"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:220
+#: code:addons/web/static/src/xml/base.xml:181
#, python-format
msgid "Edit SearchView"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:179
-#: code:addons/web/static/src/xml/base.xml:222
+#: code:addons/web/static/src/js/widgets/debug_manager.js:279
+#: code:addons/web/static/src/xml/base.xml:152
#, python-format
msgid "Edit Workflow"
msgstr ""
@@ -861,6 +828,13 @@ msgstr ""
msgid "Email"
msgstr ""
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:108
+#, python-format
+msgid "Enable Technical Features"
+msgstr ""
+
#. module: web
#. openerp-web
#: code:addons/web/static/src/xml/website.tour.xml:25
@@ -870,22 +844,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:168
-#: code:addons/web/static/src/js/views/search_menus.js:83
-#: code:addons/web/static/src/js/views/search_menus.js:90
+#: code:addons/web/static/src/js/view_manager.js:222
+#: code:addons/web/static/src/js/views/search_menus.js:85
+#: code:addons/web/static/src/js/views/search_menus.js:92
#, python-format
msgid "Error"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:757
+#: code:addons/web/controllers/main.py:728
#, python-format
msgid "Error, password not changed !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:462
+#: code:addons/web/static/src/js/views/form_widgets.js:426
#, python-format
msgid "Error: Bad domain"
msgstr ""
@@ -899,71 +873,70 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:648
+#: code:addons/web/static/src/xml/base.xml:597
#, python-format
msgid "Expand all"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:306
-#: code:addons/web/static/src/xml/base.xml:1299
+#: code:addons/web/static/src/js/views/list_view.js:288
#, python-format
msgid "Export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:51
+#: code:addons/web/static/src/js/widgets/data_export.js:200
#, python-format
msgid "Export Data"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1317
+#: code:addons/web/static/src/xml/base.xml:1118
#, python-format
-msgid "Export Formats"
+msgid "Export Formats :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:42
+#: code:addons/web/static/src/js/widgets/data_export.js:202
#, python-format
msgid "Export To File"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1311
+#: code:addons/web/static/src/xml/base.xml:1111
#, python-format
-msgid "Export Type:"
+msgid "Export Type :"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1314
+#: code:addons/web/static/src/xml/base.xml:1114
#, python-format
msgid "Export all Data"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:381
+#: code:addons/web/static/src/js/view_manager.js:435
#, python-format
msgid "Failed to evaluate search criterions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1237
+#: code:addons/web/static/src/xml/base.xml:1081
#, python-format
msgid "Favorites"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1358
+#: code:addons/web/static/src/js/views/form_view.js:1270
#, python-format
msgid "Field '%s' specified in view could not be found."
msgstr ""
@@ -977,71 +950,78 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:140
-#: code:addons/web/static/src/xml/base.xml:215
+#: code:addons/web/static/src/js/widgets/debug_manager.js:360
+#: code:addons/web/static/src/xml/base.xml:178
#, python-format
msgid "Fields View Get"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1325
+#: code:addons/web/static/src/js/widgets/debug_manager.js:257
+#, python-format
+msgid "Fields of %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1137
#, python-format
msgid "Fields to export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1220
+#: code:addons/web/static/src/js/views/form_widgets.js:1117
#, python-format
msgid "File Upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1200
+#: code:addons/web/static/src/js/views/form_widgets.js:1097
#, python-format
msgid "File upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:550
+#: code:addons/web/static/src/js/views/search_inputs.js:552
#, python-format
msgid "Filter"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:83
+#: code:addons/web/static/src/js/views/search_menus.js:85
#, python-format
msgid "Filter name is required."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:494
+#: code:addons/web/static/src/js/views/search_inputs.js:496
#, python-format
msgid "Filter on: %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_menus.js:90
+#: code:addons/web/static/src/js/views/search_menus.js:92
#, python-format
msgid "Filter with same name already exists."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1209
+#: code:addons/web/static/src/xml/base.xml:950
#, python-format
msgid "Filters"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:647
+#: code:addons/web/static/src/xml/base.xml:596
#, python-format
msgid "Flip axis"
msgstr ""
@@ -1057,36 +1037,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:119
-#, python-format
-msgid "For more information visit"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:34
-#: code:addons/web/static/src/js/views/form_view.js:361
+#: code:addons/web/static/src/js/views/form_view.js:33
+#: code:addons/web/static/src/js/views/form_view.js:300
#, python-format
msgid "Form"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:118
-#, python-format
-msgid "GNU Lesser General Public License"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1512
+#: code:addons/web/static/src/xml/base.xml:1302
#, 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:24
+#: code:addons/web/static/src/js/framework/crash_manager.js:18
#, python-format
msgid "Global Business Error"
msgstr ""
@@ -1100,24 +1066,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:464
+#: code:addons/web/static/src/js/views/search_inputs.js:699
+#: code:addons/web/static/src/xml/base.xml:1059
#, python-format
-msgid "Group"
+msgid "Group By"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:695
-#: code:addons/web/static/src/xml/base.xml:1219
+#: code:addons/web/static/src/js/views/search_inputs.js:674
#, python-format
-msgid "Group By"
+msgid "Group by: %s"
msgstr ""
#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:670
-#, python-format
-msgid "Group by: %s"
+#: model:ir.model,name:web.model_ir_http
+msgid "HTTP routing"
msgstr ""
#. module: web
@@ -1129,107 +1093,105 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:232
+#: code:addons/web/static/src/xml/base.xml:130
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:188
#, python-format
msgid "ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1379
+#: code:addons/web/static/src/js/views/form_widgets.js:1254
#, python-format
msgid "Image"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1313
+#: code:addons/web/static/src/xml/base.xml:1113
#, python-format
msgid "Import-Compatible Export"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:684
+#: code:addons/web/static/src/js/views/form_widgets.js:635
#, python-format
msgid "Inactive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:198
-#: code:addons/web/static/src/js/views/graph_widget.js:205
+#: code:addons/web/static/src/js/views/graph_widget.js:199
+#: code:addons/web/static/src/js/views/graph_widget.js:206
#, python-format
msgid "Invalid data"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:111
-#: code:addons/web/static/src/xml/base.xml:213
+#: code:addons/web/static/src/js/widgets/debug_manager.js:199
#, python-format
msgid "JS Tests"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:764
+#: code:addons/web/controllers/main.py:735
#, python-format
msgid "Languages"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:212
#, python-format
msgid "Latest Modification Date:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:252
+#: code:addons/web/static/src/xml/base.xml:208
#, python-format
msgid "Latest Modification by:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:225
+#: code:addons/web/static/src/xml/base.xml:123
#, python-format
-msgid "Leave Debug Mode"
+msgid "Leave the Developer Tools"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:118
-#, python-format
-msgid "Licenced under the terms of"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:615
+#: code:addons/web/static/src/xml/base.xml:568
#, python-format
msgid "Line Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:39
+#: code:addons/web/static/src/js/views/list_view.js:59
#, python-format
msgid "List"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/loading.js:12
-#: code:addons/web/static/src/js/widgets/loading.js:46
+#: code:addons/web/static/src/js/widgets/loading.js:47
#, python-format
msgid "Loading"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/loading.js:44
+#: code:addons/web/static/src/js/widgets/loading.js:45
#, python-format
msgid "Loading (%d)"
msgstr ""
@@ -1237,7 +1199,6 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/framework/misc.js:13
-#: code:addons/web/static/src/xml/base.xml:5
#, python-format
msgid "Loading..."
msgstr ""
@@ -1259,7 +1220,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:88
+#: code:addons/web/static/src/xml/base.xml:1295
#, python-format
msgid "Log out"
msgstr ""
@@ -1273,7 +1234,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:450
+#: code:addons/web/static/src/js/views/search_inputs.js:452
#, python-format
msgid "M2O search fields do not currently handle multiple default values"
msgstr ""
@@ -1285,8 +1246,8 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:146
-#: code:addons/web/static/src/xml/base.xml:216
+#: code:addons/web/static/src/js/widgets/debug_manager.js:267
+#: code:addons/web/static/src/xml/base.xml:151
#, python-format
msgid "Manage Filters"
msgstr ""
@@ -1300,21 +1261,15 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:619
-#, python-format
-msgid "Measure"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:651
+#: code:addons/web/static/src/xml/base.xml:555
+#: code:addons/web/static/src/xml/base.xml:584
#, python-format
msgid "Measures"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:94
+#: code:addons/web/static/src/js/widgets/debug_manager.js:347
#, python-format
msgid "Metadata (%s)"
msgstr ""
@@ -1328,28 +1283,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:22
+#: code:addons/web/static/src/js/framework/crash_manager.js:16
#, python-format
msgid "Missing Record"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1517
+#: code:addons/web/static/src/xml/base.xml:1307
#, python-format
msgid "Mobile support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:134
-#, python-format
-msgid "Model %s fields"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:307
+#: code:addons/web/static/src/xml/base.xml:255
#, python-format
msgid "Modified by :"
msgstr ""
@@ -1363,14 +1311,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:675
+#: code:addons/web/static/src/xml/base.xml:613
#, python-format
msgid "Month"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:947
+#: code:addons/web/static/src/xml/base.xml:813
#, python-format
msgid "More"
msgstr ""
@@ -1382,134 +1330,127 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1343
+#: code:addons/web/static/src/xml/base.xml:1133
#, python-format
msgid "Move Down"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1342
+#: code:addons/web/static/src/xml/base.xml:1132
#, python-format
msgid "Move Up"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:87
+#: code:addons/web/static/src/xml/base.xml:1294
#, python-format
msgid "My Odoo.com account"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1362
+#: code:addons/web/static/src/xml/base.xml:131
#, python-format
msgid "Name"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1422
+#: code:addons/web/static/src/xml/base.xml:1187
#, python-format
msgid "Name:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:366
+#: code:addons/web/static/src/js/views/form_view.js:314
#, python-format
msgid "New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:48
+#: code:addons/web/static/src/xml/base.xml:46
#, python-format
-msgid "New Password:"
+msgid "New Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1516
+#: code:addons/web/static/src/xml/base.xml:1306
#, python-format
msgid "New design"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:330
+#: code:addons/web/static/src/js/views/search_inputs.js:332
#, python-format
msgid "No"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:240
+#: code:addons/web/static/src/xml/base.xml:196
#, python-format
msgid "No Update:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:95
+#: code:addons/web/static/src/js/views/graph_widget.js:96
#, 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:691
+#: code:addons/web/static/src/xml/base.xml:628
#, 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."
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:124
-#, python-format
-msgid "No data provided."
+" that there is at least one measure and no active filter in the search bar."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:94
+#: code:addons/web/static/src/js/views/graph_widget.js:95
#, python-format
msgid "No data to display"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:690
+#: code:addons/web/static/src/xml/base.xml:627
#, python-format
msgid "No data to display."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:89
+#: code:addons/web/static/src/js/widgets/debug_manager.js:342
#, python-format
msgid "No metadata available"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:245
+#: 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_widgets.js:481
+#: code:addons/web/static/src/js/views/form_widgets.js:446
#, python-format
msgid "No selected record"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:329
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:324
#, python-format
msgid "No value found for the field %s for value %s"
msgstr ""
@@ -1530,21 +1471,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:688
-#, python-format
-msgid "Not Archived"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:238
+#: code:addons/web/static/src/js/views/graph_widget.js:239
#, python-format
msgid "Not enough data points"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:885
+#: code:addons/web/static/src/xml/base.xml:765
#, python-format
msgid "Not shown in kanban"
msgstr ""
@@ -1559,61 +1493,27 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/framework/dialog.js:37
-#: model:ir.ui.view,arch_db:web.layout
#, python-format
msgid "Odoo"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:101
-#, python-format
-msgid "Odoo (Formerly OpenERP)"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/apps.js:189
+#: code:addons/web/static/src/js/apps.js:195
#, python-format
msgid "Odoo Apps will be available soon"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1717
+#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:53
#, python-format
msgid "Odoo Enterprise"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:117
-#, python-format
-msgid "Odoo S.A."
-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/xml/base.xml:117
-#, python-format
-msgid "Odoo is a trademark of"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:119
-#, python-format
-msgid "Odoo.com"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:702
+#: code:addons/web/static/src/js/views/form_widgets.js:653
#, python-format
msgid "Off"
msgstr ""
@@ -1623,21 +1523,21 @@ msgstr ""
#: 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:1396
+#: code:addons/web/static/src/xml/base.xml:1160
#, python-format
msgid "Ok"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:43
+#: code:addons/web/static/src/xml/base.xml:42
#, python-format
-msgid "Old Password:"
+msgid "Old Password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:700
+#: code:addons/web/static/src/js/views/form_widgets.js:651
#, python-format
msgid "On"
msgstr ""
@@ -1658,24 +1558,31 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:555
+#: code:addons/web/static/src/xml/base.xml:493
#, python-format
msgid "Only you"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:198
+#: code:addons/web/static/src/xml/base.xml:95
+#, python-format
+msgid "Open Developer Tools"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:115
#, python-format
-msgid "Open Debug Menu"
+msgid "Open View"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:153
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:936
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1107
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1341
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:150
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:918
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1098
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1312
#, python-format
msgid "Open: "
msgstr ""
@@ -1687,63 +1594,70 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:616
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Path"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
#, python-format
msgid "Pie Chart"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:206
+#: code:addons/web/static/src/js/views/graph_widget.js:207
#, 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:199
+#: code:addons/web/static/src/js/views/graph_widget.js:200
#, 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:24
+#: code:addons/web/static/src/js/views/pivot_view.js:30
#, python-format
msgid "Pivot"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:166
+#: code:addons/web/static/src/js/widgets/data_export.js:168
#, python-format
msgid "Please enter save field list name"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1356
+#: code:addons/web/static/src/xml/base.xml:1148
#, 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:1353
+#: code:addons/web/static/src/xml/base.xml:1147
#, 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:416
+#: code:addons/web/static/src/js/widgets/data_export.js:420
#, python-format
msgid "Please select fields to export..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/data_export.js:403
+#: code:addons/web/static/src/js/widgets/data_export.js:406
#, python-format
msgid "Please select fields to save export list..."
msgstr ""
@@ -1760,35 +1674,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:86
+#: code:addons/web/static/src/xml/base.xml:1293
#, python-format
msgid "Preferences"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:23
+#: code:addons/web/static/src/js/widgets/sidebar.js:22
#, python-format
msgid "Print"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:223
+#: code:addons/web/static/src/xml/base.xml:175
#, python-format
msgid "Print Workflow"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:694
+#: code:addons/web/static/src/js/views/form_widgets.js:645
#, python-format
msgid "Production Environment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:676
+#: code:addons/web/static/src/xml/base.xml:614
#, python-format
msgid "Quarter"
msgstr ""
@@ -1802,147 +1716,141 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1340
+#: code:addons/web/static/src/xml/base.xml:1130
#, python-format
msgid "Remove"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1341
+#: code:addons/web/static/src/xml/base.xml:1131
#, python-format
msgid "Remove All"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:328
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:323
#, python-format
msgid "Render"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:389
+#: code:addons/web/static/src/xml/base.xml:114
#, python-format
-msgid "Resource Error"
+msgid "Run JS Tests"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:866
-#: code:addons/web/static/src/xml/base.xml:422
-#: code:addons/web/static/src/xml/base.xml:506
-#: code:addons/web/static/src/xml/base.xml:1249
+#: code:addons/web/static/src/js/views/form_common.js:874
+#: code:addons/web/static/src/xml/base.xml:365
+#: code:addons/web/static/src/xml/base.xml:442
+#: code:addons/web/static/src/xml/base.xml:1098
#, python-format
msgid "Save"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:881
+#: code:addons/web/static/src/js/views/form_common.js:889
#, python-format
msgid "Save & New"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1010
-#: code:addons/web/static/src/xml/base.xml:1012
-#, python-format
-msgid "Save As"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1235
+#: code:addons/web/static/src/js/views/form_widgets.js:1134
+#: code:addons/web/static/src/xml/base.xml:863
#, python-format
msgid "Save As..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1394
+#: code:addons/web/static/src/xml/base.xml:1160
#, python-format
msgid "Save as:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1241
+#: code:addons/web/static/src/xml/base.xml:1086
#, python-format
msgid "Save current search"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1195
+#: code:addons/web/static/src/js/views/form_view.js:1098
#, python-format
msgid "Save default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1327
+#: code:addons/web/static/src/xml/base.xml:1137
#, python-format
msgid "Save fields list"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1400
+#: code:addons/web/static/src/xml/base.xml:1163
#, python-format
msgid "Saved exports:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:359
+#: code:addons/web/static/src/js/views/search_inputs.js:361
#, python-format
msgid "Search %(field)s at: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:191
-#: code:addons/web/static/src/js/views/search_inputs.js:210
-#: code:addons/web/static/src/js/views/search_inputs.js:401
+#: 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
#, python-format
msgid "Search %(field)s for: %(value)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1117
+#: code:addons/web/static/src/js/views/form_common.js:212
#, python-format
-msgid "Search Again"
+msgid "Search More..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:211
+#: code:addons/web/static/src/xml/base.xml:932
#, python-format
-msgid "Search More..."
+msgid "Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:281
+#: code:addons/web/static/src/js/views/form_common.js:282
#, python-format
msgid "Search: "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:469
+#: code:addons/web/static/src/js/views/form_widgets.js:433
#, python-format
msgid "See selection "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1039
-#: code:addons/web/static/src/xml/base.xml:1004
+#: code:addons/web/static/src/js/views/form_common.js:1054
+#: code:addons/web/static/src/xml/base.xml:861
+#: code:addons/web/static/src/xml/base.xml:862
#, python-format
msgid "Select"
msgstr ""
@@ -1954,21 +1862,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:493
+#: code:addons/web/static/src/js/widgets/debug_manager.js:179
+#, python-format
+msgid "Select a view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:448
+#, python-format
+msgid "Select records "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:458
#, python-format
msgid "Select records..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1074
+#: code:addons/web/static/src/js/views/form_common.js:1103
#, python-format
msgid "Selected domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:493
+#: code:addons/web/static/src/js/views/form_widgets.js:458
#, python-format
msgid "Selected records"
msgstr ""
@@ -1982,35 +1904,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1192
+#: code:addons/web/static/src/js/views/form_view.js:1095
#, python-format
msgid "Set Default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:172
#, python-format
msgid "Set Defaults"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1017
+#: code:addons/web/static/src/js/views/list_view.js:928
#, python-format
msgid "Setting 'id' attribute on existing record %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1247
+#: code:addons/web/static/src/xml/base.xml:1095
#, python-format
msgid "Share with all users"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/apps.js:189
+#: code:addons/web/static/src/js/apps.js:195
#, python-format
msgid "Showing locally available modules"
msgstr ""
@@ -2023,7 +1945,7 @@ msgid "Size:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1062
+#: code:addons/web/controllers/main.py:1031
#, python-format
msgid "Something horrible happened"
msgstr ""
@@ -2035,6 +1957,13 @@ msgstr ""
msgid "Special:"
msgstr ""
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:116
+#, python-format
+msgid "Start tour"
+msgstr ""
+
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/framework/misc.js:14
@@ -2051,35 +1980,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:83
+#: code:addons/web/static/src/xml/base.xml:1291
#, python-format
msgid "Support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:701
+#: code:addons/web/static/src/js/views/form_widgets.js:652
#, python-format
msgid "Switch Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:703
+#: code:addons/web/static/src/js/views/form_widgets.js:654
#, python-format
msgid "Switch On"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:697
+#: code:addons/web/static/src/js/views/form_widgets.js:648
#, python-format
msgid "Switch to production environment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:695
+#: code:addons/web/static/src/js/views/form_widgets.js:646
#, python-format
msgid "Switch to test environment"
msgstr ""
@@ -2093,147 +2022,140 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:218
+#: code:addons/web/static/src/xml/base.xml:153
#, python-format
msgid "Technical Translation"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:696
+#: code:addons/web/static/src/js/views/form_widgets.js:647
#, python-format
msgid "Test Environment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:462
+#: code:addons/web/static/src/js/views/form_widgets.js:426
#, python-format
msgid "The domain is wrong."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1235
+#: code:addons/web/static/src/js/views/form_widgets.js:1134
#, python-format
msgid "The field is empty, there's nothing to save !"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:954
+#: code:addons/web/static/src/js/views/form_view.js:857
#, python-format
msgid "The following fields are invalid:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view_editable.js:124
+#: code:addons/web/static/src/js/views/list_view_editable.js:123
#, python-format
msgid "The line has been modified, your changes will be discarded. Are you sure you want to discard the changes ?"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:750
+#: code:addons/web/controllers/main.py:721
#, 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:1126
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1117
#, python-format
msgid "The o2m record must be saved before an action can be used"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:756
+#: code:addons/web/controllers/main.py:727
#, 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:361
+#: code:addons/web/static/src/js/views/form_view.js:300
#, 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:825
+#: code:addons/web/static/src/js/views/form_view.js:726
#, python-format
msgid "The record has been modified, your changes will be discarded. Are you sure you want to leave this page ?"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1199
+#: code:addons/web/static/src/js/views/form_widgets.js:1096
#, 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:1550
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1586
#, 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:1220
+#: code:addons/web/static/src/js/views/form_widgets.js:1117
#, 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:242
+#: code:addons/web/static/src/js/views/search_menus.js:244
#, 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/js/views/form_widgets.js:389
-#, python-format
-msgid "This resource is empty"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1304
+#: code:addons/web/static/src/xml/base.xml:1104
#, 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."
+" You can export all data or only the fields that can be reimported after modification."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:971
+#: code:addons/web/static/src/js/views/form_widgets.js:866
#, 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/base.xml:210
+#: code:addons/web/static/src/xml/base.xml:119
#, python-format
-msgid "Toggle Form Layout Outline"
+msgid "Toggle Timelines"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/pivot_view.js:516
-#: code:addons/web/static/src/js/views/pivot_view.js:545
+#: code:addons/web/static/src/js/views/pivot_view.js:515
+#: code:addons/web/static/src/js/views/pivot_view.js:544
#, python-format
msgid "Total"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/web_client.js:134
+#: code:addons/web/static/src/js/abstract_web_client.js:114
#, python-format
msgid "Traceback:"
msgstr ""
@@ -2247,9 +2169,9 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:48
+#: code:addons/web/static/src/js/abstract_web_client.js:208
#, python-format
-msgid "Trying to reconnect... "
+msgid "Trying to reconnect..."
msgstr ""
#. module: web
@@ -2261,53 +2183,53 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:691
-#: code:addons/web/static/src/js/views/list_view.js:308
+#: code:addons/web/static/src/js/views/form_widgets.js:642
+#: code:addons/web/static/src/js/views/list_view.js:290
#, python-format
msgid "Unarchive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:79
-#: code:addons/web/static/src/js/views/list_view.js:1471
-#: code:addons/web/static/src/js/views/list_view.js:1477
-#: code:addons/web/static/src/js/views/list_view.js:1489
-#: code:addons/web/static/src/js/views/pivot_view.js:498
+#: code:addons/web/static/src/js/views/graph_widget.js:80
+#: code:addons/web/static/src/js/views/list_view.js:1374
+#: code:addons/web/static/src/js/views/list_view.js:1380
+#: code:addons/web/static/src/js/views/list_view.js:1398
+#: code:addons/web/static/src/js/views/pivot_view.js:497
#, python-format
msgid "Undefined"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:848
#, python-format
msgid "Underscore prefixed methods cannot be remotely called"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:699
+#: code:addons/web/static/src/xml/base.xml:635
#, python-format
msgid "Unhandled widget"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:911
+#: code:addons/web/static/src/js/views/form_widgets.js:805
#, python-format
msgid "Unknown"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1082
+#: code:addons/web/static/src/js/framework/data.js:1076
#, python-format
msgid "Unknown field %s in domain %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1171
+#: code:addons/web/static/src/js/views/list_view.js:1081
#, python-format
msgid "Unknown m2m command %s"
msgstr ""
@@ -2321,58 +2243,57 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1074
+#: code:addons/web/static/src/js/framework/data.js:1068
#, python-format
msgid "Unknown operator %s in domain %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:367
+#: code:addons/web/static/src/js/framework/data.js:1131
#, python-format
-msgid "Unlimited"
+msgid "Unnamed"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1120
+#: code:addons/web/static/src/js/framework/data.js:1114
#, python-format
msgid "Unsupported operator %s in domain %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1505
+#: code:addons/web/static/src/xml/base.xml:1278
#, python-format
msgid "Update translations"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1700
+#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:36
#, python-format
msgid "Upgrade now"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1518
+#: code:addons/web/static/src/xml/base.xml:1308
#, python-format
msgid "Upgrade to future versions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:966
-#: code:addons/web/static/src/xml/base.xml:1027
+#: code:addons/web/static/src/xml/base.xml:861
#, python-format
-msgid "Uploading ..."
+msgid "Upload your file"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1650
-#: code:addons/web/static/src/js/widgets/sidebar.js:168
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1645
+#: code:addons/web/static/src/js/widgets/sidebar.js:170
#, python-format
msgid "Uploading Error"
msgstr ""
@@ -2380,31 +2301,26 @@ msgstr ""
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/widgets/sidebar.js:196
+#: code:addons/web/static/src/xml/base.xml:836
+#: code:addons/web/static/src/xml/base.xml:866
#, python-format
msgid "Uploading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1244
+#: code:addons/web/static/src/xml/base.xml:1092
#, python-format
msgid "Use by default"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:23
+#: code:addons/web/static/src/js/framework/crash_manager.js:17
#, python-format
msgid "Validation Error"
msgstr ""
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:105
-#, python-format
-msgid "Version"
-msgstr ""
-
#. module: web
#. openerp-web
#: code:addons/web/static/src/js/widgets/priority.js:51
@@ -2414,55 +2330,55 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:2033
-#: code:addons/web/static/src/xml/base.xml:219
+#: code:addons/web/static/src/js/views/list_view.js:1926
+#: code:addons/web/static/src/xml/base.xml:180
#, python-format
msgid "View"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:214
+#: code:addons/web/static/src/xml/base.xml:150
#, python-format
msgid "View Fields"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:208
+#: code:addons/web/static/src/xml/base.xml:174
#, python-format
msgid "View Metadata"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:757
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:737
#, python-format
msgid "View type '%s' is not supported in X2Many."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:19
-#: code:addons/web/static/src/js/framework/crash_manager.js:20
-#: code:addons/web/static/src/js/framework/crash_manager.js:119
-#: code:addons/web/static/src/js/views/form_view.js:830
-#: code:addons/web/static/src/js/views/list_view.js:760
-#: code:addons/web/static/src/js/widgets/sidebar.js:126
+#: 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/framework/crash_manager.js:108
+#: code:addons/web/static/src/js/views/form_view.js:731
+#: code:addons/web/static/src/js/views/list_view.js:673
+#: code:addons/web/static/src/js/widgets/sidebar.js:128
#, python-format
msgid "Warning"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:674
+#: code:addons/web/static/src/xml/base.xml:612
#, python-format
msgid "Week"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1362
+#: code:addons/web/static/src/js/views/form_view.js:1274
#, python-format
msgid "Widget type '%s' is not implemented"
msgstr ""
@@ -2475,7 +2391,7 @@ msgid "Widget:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:491
+#: code:addons/web/controllers/main.py:477
#, python-format
msgid "Wrong login/password"
msgstr ""
@@ -2489,21 +2405,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:192
#, python-format
msgid "XML ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:677
+#: code:addons/web/static/src/xml/base.xml:615
#, python-format
msgid "Year"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:329
+#: code:addons/web/static/src/js/views/search_inputs.js:331
#: code:addons/web/static/src/xml/base_common.xml:71
#, python-format
msgid "Yes"
@@ -2511,27 +2427,27 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:53
+#: code:addons/web/static/src/js/abstract_web_client.js:217
#, python-format
msgid "You are back online"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:49
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:47
#, python-format
msgid "You are creating a new %s, are you sure it does not exist yet?"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:748
+#: code:addons/web/controllers/main.py:719
#, python-format
msgid "You cannot leave any password empty."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1503
+#: code:addons/web/static/src/xml/base.xml:1276
#, python-format
msgid "You have updated"
msgstr ""
@@ -2545,159 +2461,166 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js:126
+#: code:addons/web/static/src/js/widgets/sidebar.js:128
#, 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:760
+#: code:addons/web/static/src/js/views/list_view.js:673
#, python-format
msgid "You must select at least one record."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/crash_manager.js:69
+#: code:addons/web/static/src/js/framework/crash_manager.js:58
#, python-format
msgid "Your Odoo session expired. Please refresh the current web page."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:133
+#: code:addons/web/static/src/js/framework/translation.js:104
#, python-format
msgid "a day ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:129
+#: code:addons/web/static/src/js/framework/translation.js:100
#, python-format
msgid "about a minute ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:135
+#: code:addons/web/static/src/js/framework/translation.js:106
#, python-format
msgid "about a month ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:137
+#: code:addons/web/static/src/js/framework/translation.js:108
#, python-format
msgid "about a year ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:131
+#: code:addons/web/static/src/js/framework/translation.js:102
#, python-format
msgid "about an hour ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:160
+#: code:addons/web/static/src/js/views/search_filters.js:162
#, python-format
msgid "contains"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:161
+#: code:addons/web/static/src/js/views/search_filters.js:163
#, python-format
msgid "doesn't contain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:177
-#: code:addons/web/static/src/js/views/search_filters.js:211
-#: code:addons/web/static/src/js/views/search_filters.js:240
+#: code:addons/web/static/src/js/views/search_filters.js:182
+#: code:addons/web/static/src/js/views/search_filters.js:254
+#: code:addons/web/static/src/js/views/search_filters.js:283
#, python-format
msgid "greater than"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:179
-#: code:addons/web/static/src/js/views/search_filters.js:213
-#: code:addons/web/static/src/js/views/search_filters.js:242
+#: code:addons/web/static/src/js/views/search_filters.js:184
+#: code:addons/web/static/src/js/views/search_filters.js:256
+#: code:addons/web/static/src/js/views/search_filters.js:285
#, python-format
msgid "greater than or equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:232
-#: code:addons/web/static/src/js/views/search_filters.js:267
+#: code:addons/web/static/src/js/views/search_filters.js:275
+#: code:addons/web/static/src/js/views/search_filters.js:310
#, python-format
msgid "is"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:162
-#: code:addons/web/static/src/js/views/search_filters.js:175
-#: code:addons/web/static/src/js/views/search_filters.js:209
-#: code:addons/web/static/src/js/views/search_filters.js:238
+#: code:addons/web/static/src/js/views/search_filters.js:186
+#, 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:252
+#: code:addons/web/static/src/js/views/search_filters.js:281
#, python-format
msgid "is equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:286
+#: code:addons/web/static/src/js/views/search_filters.js:329
#, python-format
msgid "is false"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:268
+#: code:addons/web/static/src/js/views/search_filters.js:311
#, python-format
msgid "is not"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:163
-#: code:addons/web/static/src/js/views/search_filters.js:176
-#: code:addons/web/static/src/js/views/search_filters.js:210
-#: code:addons/web/static/src/js/views/search_filters.js:239
+#: 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:253
+#: code:addons/web/static/src/js/views/search_filters.js:282
#, python-format
msgid "is not equal to"
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:182
-#: code:addons/web/static/src/js/views/search_filters.js:216
-#: code:addons/web/static/src/js/views/search_filters.js:245
-#: code:addons/web/static/src/js/views/search_filters.js:270
+#: code:addons/web/static/src/js/views/search_filters.js:167
+#: code:addons/web/static/src/js/views/search_filters.js:188
+#: 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/views/search_filters.js:313
#, python-format
msgid "is not set"
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:181
-#: code:addons/web/static/src/js/views/search_filters.js:215
-#: code:addons/web/static/src/js/views/search_filters.js:244
-#: code:addons/web/static/src/js/views/search_filters.js:269
+#: code:addons/web/static/src/js/views/search_filters.js:166
+#: code:addons/web/static/src/js/views/search_filters.js:187
+#: code:addons/web/static/src/js/views/search_filters.js:258
+#: code:addons/web/static/src/js/views/search_filters.js:287
+#: code:addons/web/static/src/js/views/search_filters.js:312
#, python-format
msgid "is set"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:285
+#: code:addons/web/static/src/js/views/search_filters.js:328
#, python-format
msgid "is true"
msgstr ""
@@ -2711,46 +2634,46 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:178
-#: code:addons/web/static/src/js/views/search_filters.js:212
-#: code:addons/web/static/src/js/views/search_filters.js:241
+#: code:addons/web/static/src/js/views/search_filters.js:183
+#: code:addons/web/static/src/js/views/search_filters.js:255
+#: code:addons/web/static/src/js/views/search_filters.js:284
#, python-format
msgid "less than"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/core.js:128
+#: code:addons/web/static/src/js/framework/translation.js:99
#, python-format
msgid "less than a minute ago"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:180
-#: code:addons/web/static/src/js/views/search_filters.js:214
-#: code:addons/web/static/src/js/views/search_filters.js:243
+#: code:addons/web/static/src/js/views/search_filters.js:185
+#: code:addons/web/static/src/js/views/search_filters.js:257
+#: code:addons/web/static/src/js/views/search_filters.js:286
#, python-format
msgid "less than or equal to"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:229
+#: code:addons/web/static/src/js/views/search_inputs.js:231
#, python-format
msgid "not a valid integer"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:244
+#: code:addons/web/static/src/js/views/search_inputs.js:246
#, python-format
msgid "not a valid number"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1254
+#: code:addons/web/static/src/xml/base.xml:1027
#: code:addons/web/static/src/xml/website.tour.xml:14
#, python-format
msgid "or"
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index 3cc61d936b925e93ad0e699f9e6c943bc743df23..ed4ce270a42ebcaa5051b8cf024093c911d363e9 100644
--- a/addons/web_editor/i18n/web_editor.pot
+++ b/addons/web_editor/i18n/web_editor.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:900
+#: code:addons/web_editor/static/src/js/rte.summernote.js:872
#, python-format
msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:338
+#: code:addons/web_editor/static/src/xml/editor.xml:193
#, python-format
msgid "(Youtube, Vimeo, Dailymotion)"
msgstr ""
@@ -36,42 +36,47 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:952
+#: code:addons/web_editor/static/src/js/rte.summernote.js:924
#, python-format
msgid "Action"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:224
+#: code:addons/web_editor/static/src/xml/editor.xml:114
#, python-format
msgid "Add"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:221
+#: code:addons/web_editor/static/src/xml/editor.xml:111
#, python-format
msgid "Add an image URL"
msgstr ""
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.snippets
+msgid "Add blocks"
+msgstr ""
+
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:934
+#: code:addons/web_editor/static/src/js/rte.summernote.js:906
#, python-format
msgid "Align center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:933
+#: code:addons/web_editor/static/src/js/rte.summernote.js:905
#, python-format
msgid "Align left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:935
+#: code:addons/web_editor/static/src/js/rte.summernote.js:907
#, python-format
msgid "Align right"
msgstr ""
@@ -83,16 +88,16 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:209
+#: code:addons/web_editor/static/src/xml/editor.xml:99
#, python-format
msgid "Alternate Upload"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:50
+#: code:addons/web_editor/static/src/xml/editor.xml:335
#, python-format
-msgid "Assigning a focal point to ensure that the targeted area will be always visible"
+msgid "Assign a focal point that will always be visible"
msgstr ""
#. module: web_editor
@@ -104,19 +109,19 @@ msgstr ""
#. openerp-web
#: code:addons/web_editor/static/src/xml/snippets.xml:24
#, python-format
-msgid "Auto Resize"
+msgid "Auto size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:359
+#: code:addons/web_editor/static/src/xml/editor.xml:214
#, python-format
msgid "Autoplay"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:941
+#: code:addons/web_editor/static/src/js/rte.summernote.js:913
#: code:addons/web_editor/static/src/xml/snippets.xml:49
#, python-format
msgid "Background Color"
@@ -124,49 +129,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:461
+#: code:addons/web_editor/static/src/js/snippets.options.js:405
#, python-format
msgid "Background Image Options"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:100
+#: code:addons/web_editor/static/src/xml/editor.xml:374
#, python-format
msgid "Background height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:110
+#: code:addons/web_editor/static/src/xml/editor.xml:384
#, python-format
msgid "Background position"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:132
+#: code:addons/web_editor/static/src/xml/editor.xml:406
#, python-format
msgid "Background repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:88
+#: code:addons/web_editor/static/src/xml/editor.xml:362
#, python-format
msgid "Background size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:91
+#: code:addons/web_editor/static/src/xml/editor.xml:365
#, python-format
msgid "Background width"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:404
+#: code:addons/web_editor/static/src/xml/editor.xml:258
#, python-format
msgid "Basic"
msgstr ""
@@ -181,6 +186,13 @@ msgstr ""
msgid "Black"
msgstr ""
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/snippets.editor.js:812
+#, python-format
+msgid "Block"
+msgstr ""
+
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/snippets.xml:8
@@ -190,78 +202,78 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:861
+#: code:addons/web_editor/static/src/js/rte.summernote.js:833
#, python-format
msgid "Bold"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:293
+#: code:addons/web_editor/static/src/js/rte.summernote.js:100
#, python-format
-msgid "Cancel"
+msgid "Center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:127
+#: code:addons/web_editor/static/src/js/widgets.js:53
#, python-format
-msgid "Center"
+msgid "Change media description and tooltip"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:301
+#: code:addons/web_editor/static/src/js/rte.summernote.js:922
+#: code:addons/web_editor/static/src/js/translator.js:74
#, python-format
-msgid "Change media description and tooltip"
+msgid "Close"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:52
+#: code:addons/web_editor/static/src/js/rte.summernote.js:884
#, python-format
-msgid "Click on the picture"
+msgid "Code"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:950
-#: code:addons/web_editor/static/src/xml/translator.xml:16
+#: code:addons/web_editor/static/src/js/rte.summernote.js:899
#, python-format
-msgid "Close"
+msgid "Code View"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:912
+#: code:addons/web_editor/static/src/xml/editor.xml:250
#, python-format
-msgid "Code"
+msgid "Color Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:927
+#: code:addons/web_editor/static/src/js/snippets.editor.js:810
#, python-format
-msgid "Code View"
+msgid "Column"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:396
+#: code:addons/web_editor/static/src/js/rte.summernote.js:66
#, python-format
-msgid "Color Style"
+msgid "Common colors"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:37
+#: code:addons/web_editor/static/src/xml/editor.xml:330
#, python-format
msgid "Contain"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:36
+#: code:addons/web_editor/static/src/xml/editor.xml:329
#, python-format
msgid "Cover"
msgstr ""
@@ -278,7 +290,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:38
+#: code:addons/web_editor/static/src/xml/editor.xml:331
#, python-format
msgid "Custom"
msgstr ""
@@ -292,7 +304,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:424
+#: code:addons/web_editor/static/src/xml/editor.xml:278
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Danger"
@@ -300,15 +312,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/summernote.js:1920
-#: code:addons/web_editor/static/src/xml/editor.xml:444
+#: code:addons/web_editor/static/src/js/summernote.js:1922
+#: code:addons/web_editor/static/src/xml/editor.xml:298
#, python-format
msgid "Default"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:133
+#: code:addons/web_editor/static/src/xml/editor.xml:407
#, python-format
msgid "Define if/how the background image will be repeated"
msgstr ""
@@ -320,31 +332,22 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:136
-#: code:addons/web_editor/static/src/xml/editor.xml:304
+#: code:addons/web_editor/static/src/js/rte.summernote.js:173
+#: code:addons/web_editor/static/src/xml/editor.xml:34
#, python-format
msgid "Description"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:465
-#: code:addons/web_editor/static/src/xml/editor.xml:7
-#: code:addons/web_editor/static/src/xml/editor.xml:29
-#: code:addons/web_editor/static/src/xml/editor.xml:187
-#: code:addons/web_editor/static/src/xml/editor.xml:250
-#: code:addons/web_editor/static/src/xml/editor.xml:292
+#: code:addons/web_editor/static/src/js/snippets.options.js:409
+#: code:addons/web_editor/static/src/js/widgets.js:26
+#: code:addons/web_editor/static/src/xml/editor.xml:12
+#: code:addons/web_editor/static/src/xml/editor.xml:140
#, python-format
msgid "Discard"
msgstr ""
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:285
-#, python-format
-msgid "Discard edition"
-msgstr ""
-
#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name
msgid "Display Name"
@@ -352,28 +355,28 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:154
+#: code:addons/web_editor/static/src/xml/editor.xml:51
#, python-format
msgid "Document"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:954
+#: code:addons/web_editor/static/src/js/rte.summernote.js:926
#, python-format
msgid "Document Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:768
+#: code:addons/web_editor/static/src/js/rte.summernote.js:740
#, python-format
msgid "Double-click to edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:881
+#: code:addons/web_editor/static/src/js/rte.summernote.js:853
#, python-format
msgid "Drag an image here"
msgstr ""
@@ -394,15 +397,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:190
-#: code:addons/web_editor/static/src/js/rte.summernote.js:890
+#: code:addons/web_editor/static/src/js/rte.summernote.js:159
+#: code:addons/web_editor/static/src/js/rte.summernote.js:862
#, python-format
msgid "Edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:345
+#: code:addons/web_editor/static/src/xml/editor.xml:200
#, python-format
msgid "Embed Video (HTML)"
msgstr ""
@@ -428,56 +431,63 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:436
+#: code:addons/web_editor/static/src/xml/editor.xml:290
#, python-format
msgid "Extra Small"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:878
+#: code:addons/web_editor/static/src/xml/snippets.xml:25
+#, python-format
+msgid "Fixed size"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:850
#, python-format
msgid "Float Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:880
+#: code:addons/web_editor/static/src/js/rte.summernote.js:852
#, python-format
msgid "Float None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:879
+#: code:addons/web_editor/static/src/js/rte.summernote.js:851
#, python-format
msgid "Float Right"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:942
+#: code:addons/web_editor/static/src/js/rte.summernote.js:914
#, python-format
msgid "Font Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:869
+#: code:addons/web_editor/static/src/js/rte.summernote.js:841
#, python-format
msgid "Font Family"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:870
+#: code:addons/web_editor/static/src/js/rte.summernote.js:842
#, python-format
msgid "Font Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:926
+#: code:addons/web_editor/static/src/js/rte.summernote.js:898
#, python-format
msgid "Full Screen"
msgstr ""
@@ -519,56 +529,56 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:913
+#: code:addons/web_editor/static/src/js/rte.summernote.js:885
#, python-format
msgid "Header 1"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:914
+#: code:addons/web_editor/static/src/js/rte.summernote.js:886
#, python-format
msgid "Header 2"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:915
+#: code:addons/web_editor/static/src/js/rte.summernote.js:887
#, python-format
msgid "Header 3"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:916
+#: code:addons/web_editor/static/src/js/rte.summernote.js:888
#, python-format
msgid "Header 4"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:917
+#: code:addons/web_editor/static/src/js/rte.summernote.js:889
#, python-format
msgid "Header 5"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:918
+#: code:addons/web_editor/static/src/js/rte.summernote.js:890
#, python-format
msgid "Header 6"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:925
+#: code:addons/web_editor/static/src/js/rte.summernote.js:897
#, python-format
msgid "Help"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:113
+#: code:addons/web_editor/static/src/xml/editor.xml:387
#, python-format
msgid "Horizontal"
msgstr ""
@@ -580,35 +590,35 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:288
+#: code:addons/web_editor/static/src/js/editor.js:137
#, python-format
-msgid "If you discard the current edition,"
+msgid "If you discard the current edition, all unsaved changes will be lost. You can cancel to return to the edition mode."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:153
+#: code:addons/web_editor/static/src/xml/editor.xml:50
#, python-format
msgid "Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:883
+#: code:addons/web_editor/static/src/js/rte.summernote.js:855
#, python-format
msgid "Image URL"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:932
+#: code:addons/web_editor/static/src/js/rte.summernote.js:904
#, python-format
msgid "Indent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:416
+#: code:addons/web_editor/static/src/xml/editor.xml:270
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Info"
@@ -616,57 +626,57 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:906
+#: code:addons/web_editor/static/src/js/rte.summernote.js:878
#, python-format
msgid "Insert Horizontal Rule"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:874
+#: code:addons/web_editor/static/src/js/rte.summernote.js:846
#, python-format
msgid "Insert Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:888
+#: code:addons/web_editor/static/src/js/rte.summernote.js:860
#, python-format
msgid "Insert Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:898
+#: code:addons/web_editor/static/src/js/rte.summernote.js:870
#, python-format
msgid "Insert Video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:862
+#: code:addons/web_editor/static/src/js/rte.summernote.js:834
#, python-format
msgid "Italic"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:936
+#: code:addons/web_editor/static/src/js/rte.summernote.js:908
#, python-format
msgid "Justify full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:949
+#: code:addons/web_editor/static/src/js/rte.summernote.js:921
#, python-format
msgid "Keyboard shortcuts"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:145
-#: code:addons/web_editor/static/src/xml/editor.xml:448
+#: code:addons/web_editor/static/src/js/rte.summernote.js:114
+#: code:addons/web_editor/static/src/xml/editor.xml:302
#, python-format
msgid "Large"
msgstr ""
@@ -688,64 +698,69 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:868
+#: code:addons/web_editor/static/src/js/rte.summernote.js:840
#, python-format
msgid "Line Height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:887
-#: code:addons/web_editor/static/src/xml/editor.xml:400
+#: code:addons/web_editor/static/src/js/rte.summernote.js:859
+#: code:addons/web_editor/static/src/xml/editor.xml:254
#, python-format
msgid "Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:371
+#: code:addons/web_editor/static/src/xml/editor.xml:225
#, python-format
msgid "Link Label"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:366
+#: code:addons/web_editor/static/src/js/widgets.js:949
#, python-format
msgid "Link to"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:144
+#: code:addons/web_editor/static/src/js/rte.summernote.js:113
#, python-format
msgid "Medium"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:940
+#: code:addons/web_editor/static/src/js/rte.summernote.js:912
#, python-format
msgid "More Color"
msgstr ""
+#. module: web_editor
+#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_name
+msgid "Name"
+msgstr ""
+
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:163
+#: code:addons/web_editor/static/src/xml/editor.xml:60
#, python-format
msgid "Next →"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:135
+#: code:addons/web_editor/static/src/xml/editor.xml:409
#, python-format
msgid "No repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:142
+#: code:addons/web_editor/static/src/js/rte.summernote.js:111
#: code:addons/web_editor/static/src/xml/snippets.xml:51
#, python-format
msgid "None"
@@ -753,92 +768,87 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:910
+#: code:addons/web_editor/static/src/js/rte.summernote.js:882
#, python-format
msgid "Normal"
msgstr ""
-#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.layout
-msgid "Odoo Editor layout"
-msgstr ""
-
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/snippets.options.js:464
+#: code:addons/web_editor/static/src/js/snippets.options.js:408
#, python-format
msgid "Ok"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:893
-#: code:addons/web_editor/static/src/xml/editor.xml:381
+#: code:addons/web_editor/static/src/js/rte.summernote.js:865
+#: code:addons/web_editor/static/src/xml/editor.xml:235
#, python-format
msgid "Open in new window"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:922
+#: code:addons/web_editor/static/src/js/rte.summernote.js:894
#, python-format
msgid "Ordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:931
+#: code:addons/web_editor/static/src/js/rte.summernote.js:903
#, python-format
msgid "Outdent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:149
+#: code:addons/web_editor/static/src/js/rte.summernote.js:118
#, python-format
msgid "Padding"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:930
+#: code:addons/web_editor/static/src/js/rte.summernote.js:902
#, python-format
msgid "Paragraph"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:953
+#: code:addons/web_editor/static/src/js/rte.summernote.js:925
#, python-format
msgid "Paragraph formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:155
+#: code:addons/web_editor/static/src/xml/editor.xml:52
#, python-format
msgid "Pictogram"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:873
+#: code:addons/web_editor/static/src/js/rte.summernote.js:845
#, python-format
msgid "Picture"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:341
-#: code:addons/web_editor/static/src/xml/editor.xml:347
-#: code:addons/web_editor/static/src/xml/editor.xml:458
+#: code:addons/web_editor/static/src/xml/editor.xml:196
+#: code:addons/web_editor/static/src/xml/editor.xml:202
+#: code:addons/web_editor/static/src/xml/editor.xml:312
#, python-format
msgid "Preview"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:412
+#: code:addons/web_editor/static/src/xml/editor.xml:266
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Primary"
@@ -846,7 +856,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:911
+#: code:addons/web_editor/static/src/js/rte.summernote.js:883
#, python-format
msgid "Quote"
msgstr ""
@@ -860,21 +870,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:939
+#: code:addons/web_editor/static/src/js/rte.summernote.js:911
#, python-format
msgid "Recent Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:958
+#: code:addons/web_editor/static/src/js/rte.summernote.js:930
#, python-format
msgid "Redo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:194
+#: code:addons/web_editor/static/src/js/rte.summernote.js:163
#, python-format
msgid "Remove"
msgstr ""
@@ -888,49 +898,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:867
+#: code:addons/web_editor/static/src/js/rte.summernote.js:839
#, python-format
msgid "Remove Font Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:884
+#: code:addons/web_editor/static/src/js/rte.summernote.js:856
#, python-format
msgid "Remove Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:75
+#: code:addons/web_editor/static/src/xml/editor.xml:349
#, python-format
msgid "Repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:136
+#: code:addons/web_editor/static/src/xml/editor.xml:410
#, python-format
msgid "Repeat both"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:137
+#: code:addons/web_editor/static/src/xml/editor.xml:411
#, python-format
msgid "Repeat x"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:138
+#: code:addons/web_editor/static/src/xml/editor.xml:412
#, python-format
msgid "Repeat y"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:945
+#: code:addons/web_editor/static/src/js/rte.summernote.js:917
#, python-format
msgid "Reset"
msgstr ""
@@ -944,60 +954,45 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:946
+#: code:addons/web_editor/static/src/js/rte.summernote.js:918
#, python-format
msgid "Reset to default"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:25
-#, python-format
-msgid "Resize"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:875
+#: code:addons/web_editor/static/src/js/rte.summernote.js:847
#, python-format
msgid "Resize Full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:876
+#: code:addons/web_editor/static/src/js/rte.summernote.js:848
#, python-format
msgid "Resize Half"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:877
+#: code:addons/web_editor/static/src/js/rte.summernote.js:849
#, python-format
msgid "Resize Quarter"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:8
-#: code:addons/web_editor/static/src/xml/editor.xml:26
-#: code:addons/web_editor/static/src/xml/editor.xml:185
-#, python-format
-msgid "Save"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:47
+#: code:addons/web_editor/static/src/xml/snippets.xml:25
#, python-format
-msgid "Scale the image to be as large as it needs to fill the whole content area. Part of the image may not be visible."
+msgid "Resize to force the height of this block"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:70
+#: code:addons/web_editor/static/src/js/widgets.js:25
+#: code:addons/web_editor/static/src/xml/editor.xml:13
#, python-format
-msgid "Scale the image to the largest size such that both its width and height can fit inside the content area"
+msgid "Save"
msgstr ""
#. module: web_editor
@@ -1023,107 +1018,107 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:149
+#: code:addons/web_editor/static/src/js/widgets.js:93
#, python-format
msgid "Select a Media"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:243
+#: code:addons/web_editor/static/src/xml/editor.xml:133
#, python-format
msgid "Select a Picture"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:882
+#: code:addons/web_editor/static/src/js/rte.summernote.js:854
#, python-format
msgid "Select from files"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:339
+#: code:addons/web_editor/static/src/xml/editor.xml:194
#, python-format
msgid "Set a video URL"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:111
+#: code:addons/web_editor/static/src/xml/editor.xml:385
#, python-format
msgid "Set the starting position of the background image."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:944
+#: code:addons/web_editor/static/src/js/rte.summernote.js:916
#, python-format
msgid "Set transparent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:89
+#: code:addons/web_editor/static/src/xml/editor.xml:363
#, python-format
msgid "Sets the width and height of the background image in percent of the parent element."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:156
+#: code:addons/web_editor/static/src/js/rte.summernote.js:125
#, python-format
msgid "Shadow"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:432
+#: code:addons/web_editor/static/src/xml/editor.xml:286
#, python-format
msgid "Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:143
-#: code:addons/web_editor/static/src/xml/editor.xml:440
+#: code:addons/web_editor/static/src/js/rte.summernote.js:112
+#: code:addons/web_editor/static/src/xml/editor.xml:294
#, python-format
msgid "Small"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:164
+#: code:addons/web_editor/static/src/js/rte.summernote.js:133
#, python-format
msgid "Spin"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:864
+#: code:addons/web_editor/static/src/js/rte.summernote.js:836
#, python-format
msgid "Strikethrough"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:909
-#: code:addons/web_editor/static/src/xml/editor.xml:392
+#: code:addons/web_editor/static/src/js/rte.summernote.js:881
+#: code:addons/web_editor/static/src/xml/editor.xml:246
#, python-format
msgid "Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:865
+#: code:addons/web_editor/static/src/js/rte.summernote.js:837
#, python-format
msgid "Subscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:408
+#: code:addons/web_editor/static/src/xml/editor.xml:262
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Success"
@@ -1131,35 +1126,35 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:866
+#: code:addons/web_editor/static/src/js/rte.summernote.js:838
#, python-format
msgid "Superscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:903
+#: code:addons/web_editor/static/src/js/rte.summernote.js:875
#, python-format
msgid "Table"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:951
+#: code:addons/web_editor/static/src/js/rte.summernote.js:923
#, python-format
msgid "Text formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:891
+#: code:addons/web_editor/static/src/js/rte.summernote.js:863
#, python-format
msgid "Text to display"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:268
+#: code:addons/web_editor/static/src/xml/editor.xml:158
#, python-format
msgid "The image could not be deleted because it is used in the\n"
" following pages or views:"
@@ -1167,7 +1162,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:93
+#: code:addons/web_editor/static/src/js/rte.summernote.js:58
+#, python-format
+msgid "Theme colors"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/editor.js:91
#: code:addons/web_editor/static/src/js/translator.js:165
#, python-format
msgid "This document is not saved!"
@@ -1175,120 +1177,120 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:892
+#: code:addons/web_editor/static/src/js/rte.summernote.js:864
#, python-format
msgid "To what URL should this link go?"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:310
+#: code:addons/web_editor/static/src/xml/editor.xml:40
#, python-format
msgid "Tooltip"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/translator.xml:10
+#: code:addons/web_editor/static/src/js/translator.js:72
#, python-format
msgid "Translate Attribute"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:943
+#: code:addons/web_editor/static/src/js/rte.summernote.js:915
#, python-format
msgid "Transparent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:384
+#: code:addons/web_editor/static/src/xml/editor.xml:238
#, python-format
msgid "URL or Email Address"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:863
+#: code:addons/web_editor/static/src/js/rte.summernote.js:835
#, python-format
msgid "Underline"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:957
+#: code:addons/web_editor/static/src/js/rte.summernote.js:929
#, python-format
msgid "Undo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:889
+#: code:addons/web_editor/static/src/js/rte.summernote.js:861
#, python-format
msgid "Unlink"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:921
+#: code:addons/web_editor/static/src/js/rte.summernote.js:893
#, python-format
msgid "Unordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:206
+#: code:addons/web_editor/static/src/xml/editor.xml:96
#, python-format
msgid "Upload an image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:213
+#: code:addons/web_editor/static/src/xml/editor.xml:103
#, python-format
msgid "Upload image without optimization"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:217
+#: code:addons/web_editor/static/src/xml/editor.xml:107
#, python-format
msgid "Uploading..."
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:122
+#: code:addons/web_editor/static/src/xml/editor.xml:396
#, python-format
msgid "Vertical"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:896
-#: code:addons/web_editor/static/src/xml/editor.xml:156
+#: code:addons/web_editor/static/src/js/rte.summernote.js:868
+#: code:addons/web_editor/static/src/xml/editor.xml:53
#, python-format
msgid "Video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:897
+#: code:addons/web_editor/static/src/js/rte.summernote.js:869
#, python-format
msgid "Video Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:899
+#: code:addons/web_editor/static/src/js/rte.summernote.js:871
#, python-format
msgid "Video URL?"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:420
+#: code:addons/web_editor/static/src/xml/editor.xml:274
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Warning"
@@ -1301,61 +1303,47 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:104
+#: code:addons/web_editor/static/src/js/editor.js:103
#, python-format
msgid "Write Your Text Here"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:108
+#: code:addons/web_editor/static/src/js/editor.js:107
#, python-format
msgid "Write Your Text or Drag a Block Here"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:146
+#: code:addons/web_editor/static/src/js/rte.summernote.js:115
#, python-format
msgid "Xl"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:289
-#, python-format
-msgid "You can cancel to return to the edition mode."
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:288
-#, python-format
-msgid "all"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:94
-#: code:addons/web_editor/static/src/xml/editor.xml:103
-#: code:addons/web_editor/static/src/xml/editor.xml:116
-#: code:addons/web_editor/static/src/xml/editor.xml:125
+#: code:addons/web_editor/static/src/xml/editor.xml:368
+#: code:addons/web_editor/static/src/xml/editor.xml:377
+#: code:addons/web_editor/static/src/xml/editor.xml:390
+#: code:addons/web_editor/static/src/xml/editor.xml:399
#, python-format
msgid "auto"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:387
+#: code:addons/web_editor/static/src/xml/editor.xml:241
#, python-format
-msgid "http://openerp.com"
+msgid "https://www.odoo.com"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:223
+#: code:addons/web_editor/static/src/xml/editor.xml:113
#, python-format
-msgid "http://openerp.com/logo.png"
+msgid "https://www.odoo.com/logo.png"
msgstr ""
#. module: web_editor
@@ -1458,18 +1446,6 @@ msgstr ""
msgid "ir.ui.view"
msgstr ""
-#. module: web_editor
-#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_name
-msgid "unknown"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:288
-#, python-format
-msgid "unsaved changes will be lost."
-msgstr ""
-
#. module: web_editor
#: model:ir.model,name:web_editor.model_web_editor_converter_test
msgid "web_editor.converter.test"
@@ -1482,15 +1458,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:220
-#: code:addons/web_editor/static/src/xml/editor.xml:345
+#: code:addons/web_editor/static/src/xml/editor.xml:110
+#: code:addons/web_editor/static/src/xml/editor.xml:200
#, python-format
msgid "— or —"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:160
+#: code:addons/web_editor/static/src/xml/editor.xml:57
#, python-format
msgid "↠Previous"
msgstr ""
diff --git a/addons/web_kanban/i18n/web_kanban.pot b/addons/web_kanban/i18n/web_kanban.pot
index f5884fa325794ed5b7598d9bb482322bc215d785..740fb18864cea9b231582f72f5dd20fe73223102 100644
--- a/addons/web_kanban/i18n/web_kanban.pot
+++ b/addons/web_kanban/i18n/web_kanban.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,17 +25,17 @@ msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:53
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:54
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:66
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:67
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:51
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:52
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:64
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:65
#, python-format
msgid "Add"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:50
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48
#, python-format
msgid "Add new Column"
msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:27
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:25
#, python-format
msgid "Archive Records"
msgstr ""
@@ -63,7 +63,7 @@ msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_view.js:515
+#: code:addons/web_kanban/static/src/js/kanban_view.js:541
#, python-format
msgid "Are you sure you want to delete this record ?"
msgstr ""
@@ -78,57 +78,57 @@ msgstr ""
#. module: web_kanban
#. openerp-web
#: code:addons/web_kanban/static/src/js/kanban_relational.js:27
-#: code:addons/web_kanban/static/src/js/kanban_view.js:691
+#: code:addons/web_kanban/static/src/js/kanban_view.js:719
#, python-format
msgid "Create: "
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22
#, python-format
msgid "Delete"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:68
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:53
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:66
#, python-format
msgid "Discard"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:23
+#: code:addons/web_kanban/static/src/js/kanban_column.js:224
#, python-format
-msgid "Edit"
+msgid "Edit Column"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_column.js:224
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:21
#, python-format
-msgid "Edit Column"
+msgid "Edit Stage"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:21
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:19
#, python-format
msgid "Fold"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_view.js:29
+#: code:addons/web_kanban/static/src/js/kanban_view.js:56
#, python-format
msgid "Kanban"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:43
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:41
#, python-format
msgid "Load more... ("
msgstr ""
@@ -149,23 +149,23 @@ msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:28
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:26
#, python-format
msgid "Unarchive Records"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_view.js:222
-#: code:addons/web_kanban/static/src/js/kanban_view.js:237
-#: code:addons/web_kanban/static/src/js/kanban_view.js:244
+#: code:addons/web_kanban/static/src/js/kanban_view.js:238
+#: code:addons/web_kanban/static/src/js/kanban_view.js:253
+#: code:addons/web_kanban/static/src/js/kanban_view.js:260
#, python-format
msgid "Undefined"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/xml/web_kanban.xml:43
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:41
#, python-format
msgid "remaining)"
msgstr ""
diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index 7902856eb4aca8c56933a6c744009f3f129ba329..50dbe1626e577879caa014eeb670b8a26ed766fc 100644
--- a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
+++ b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,6 +23,27 @@ msgid "%\n"
" Implementation"
msgstr ""
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:149
+#, python-format
+msgid "(Community Edition)"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:165
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:167
+#, python-format
+msgid "Activate the developer mode (with assets)"
+msgstr ""
+
#. module: web_settings_dashboard
#. openerp-web
#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:56
@@ -58,12 +79,26 @@ msgstr ""
msgid "Browse the documentation."
msgstr ""
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
+#, python-format
+msgid "Copyright © 2004-2016"
+msgstr ""
+
#. module: web_settings_dashboard
#: model:ir.actions.client,name:web_settings_dashboard.web_settings_dashboard_action
#: model:ir.ui.menu,name:web_settings_dashboard.web_dashboard_menu
msgid "Dashboard"
msgstr ""
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:169
+#, python-format
+msgid "Deactivate the developer mode"
+msgstr ""
+
#. module: web_settings_dashboard
#. openerp-web
#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:66
@@ -80,7 +115,14 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:151
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
+#, python-format
+msgid "GNU LGPL Licenced"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:180
#, python-format
msgid "Get more features with the Enterprise Edition!"
msgstr ""
@@ -143,11 +185,25 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:148
+#, python-format
+msgid "Odoo"
+msgstr ""
+
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:179
#, python-format
msgid "Odoo Enterprise"
msgstr ""
+#. module: web_settings_dashboard
+#. openerp-web
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:156
+#, python-format
+msgid "Odoo S.A."
+msgstr ""
+
#. module: web_settings_dashboard
#. openerp-web
#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
@@ -166,7 +222,7 @@ msgstr ""
#. openerp-web
#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:131
#, python-format
-msgid "Social Share"
+msgid "Share the Love"
msgstr ""
#. module: web_settings_dashboard
@@ -178,7 +234,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:154
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:183
#, python-format
msgid "Upgrade Now"
msgstr ""
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index f168bece8e940d317990eb1faf0c96a47af319eb..d343709995845de8d7adb66a97547855fe45b93f 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,15 +35,15 @@ msgid "×"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.show_website_info
+#: model:ir.ui.view,arch_db:website.layout_footer_copyright
msgid ",\n"
-" updated:"
+" the #1"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout_footer_copyright
+#: model:ir.ui.view,arch_db:website.show_website_info
msgid ",\n"
-" the #1"
+" updated:"
msgstr ""
#. module: website
@@ -140,14 +140,30 @@ msgstr ""
msgid "5s"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:69
+#, python-format
+msgid ": "
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.s_big_picture
msgid "<b>A Small Subtitle</b>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "<b>Choose an image...</b>"
+#. openerp-web
+#: code:addons/website/static/src/js/website.tour.banner.js:15
+#, python-format
+msgid "<b>Click Edit</b> to start designing your homepage."
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.tour.banner.js:24
+#, python-format
+msgid "<b>Click on a text</b> to start editing it. <i>It's that easy to edit your content!</i>"
msgstr ""
#. module: website
@@ -162,7 +178,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.s_text_block
msgid "<b>Great stories have personality.</b> Consider telling\n"
" a great story that provides personality. Writing a story\n"
-" with personality for potential clients will asists with\n"
+" with personality for potential clients will assists with\n"
" making a relationship connection. This shows up in small\n"
" quirks like word choices or phrases. Write from your point\n"
" of view, not from someone else's experience."
@@ -178,6 +194,11 @@ msgstr ""
msgid "<b>No website module found!</b>"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<b>Set Custom Image...</b>"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.show_sign_in
msgid "<b>Sign in</b>"
@@ -189,16 +210,31 @@ msgid "<i class=\"fa fa-arrow-right\"/>\n"
" Contact Us Now"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-book\"/>Style"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-check-square\"/> Feature"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-cog\"/>Background Image Options"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "<i class=\"fa fa-envelope-o\"/> Email Our Website Expert"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-eyedropper\"/>Background Color"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-indent\"/> Content"
@@ -209,12 +245,22 @@ msgstr ""
msgid "<i class=\"fa fa-magic icon-fix\"/> Effect"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-picture-o\"/>Background Image"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.language_selector
msgid "<i class=\"fa fa-plus-circle\"/>\n"
" Add a language..."
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-plus-circle\"/>Add Slide"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.snippets
msgid "<i class=\"fa fa-th-large\"/> Structure"
@@ -225,6 +271,11 @@ msgstr ""
msgid "<i class=\"fa fa-th-large\"/> WEBSITE <b class=\"caret\"/>"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "<i class=\"fa fa-trash-o\"/>Remove Slide"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "<i>\n"
@@ -260,6 +311,13 @@ msgstr ""
msgid "<i>We wish you a fun time!</i>"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.tour.banner.js:53
+#, python-format
+msgid "<p><b>That's it.</b> Your homepage is live.</p><p>Continue adding more pages to your site or edit this page to make it even more awesome.</p>"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.s_image_floating
msgid "<small class=\"text-muted\">A great way to catch your reader's attention is to tell a story. Everything you consider writing can be told as a story.</small>"
@@ -268,14 +326,12 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_parallax_slider
#: model:ir.ui.view,arch_db:website.s_quote
-#: model:ir.ui.view,arch_db:website.s_quotes_slider
#: model:ir.ui.view,arch_db:website.s_references
msgid "<small>Author of this quote</small>"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.s_parallax_slider
-#: model:ir.ui.view,arch_db:website.s_quotes_slider
#: model:ir.ui.view,arch_db:website.s_references
msgid "<small>John Doe, CEO</small>"
msgstr ""
@@ -304,12 +360,12 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span class=\"fa fa-pencil\"/> EDIT PAGE"
+msgid "<span class=\"fa fa-pencil\"/>Edit"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span class=\"fa fa-plus\"/> NEW PAGE"
+msgid "<span class=\"fa fa-plus\"/>New"
msgstr ""
#. module: website
@@ -348,14 +404,6 @@ msgstr ""
msgid "<span class=\"panel-title\"><span class=\"fa fa-magic\"/><strong> 1. Choose your theme</strong></span>"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
@@ -746,6 +794,11 @@ msgid "A/B testing is the process of testing two versions of a page to see which
" than page A. Of course, you now decide to make B your new current page!"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website
+msgid "API Key"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.aboutus
#: model:ir.ui.view,arch_db:website.footer_default
@@ -778,7 +831,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.snippets.gallery.js:248
+#: code:addons/website/static/src/js/website.snippets.gallery.js:247
#: model:ir.ui.view,arch_db:website.s_image_gallery
#, python-format
msgid "Add Images from the 'Customize' menu"
@@ -786,16 +839,11 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:55
+#: code:addons/website/static/src/xml/website.contentMenu.xml:47
#, python-format
msgid "Add Menu Entry"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Add Slide"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.s_feature_grid
msgid "Add a great slogan"
@@ -818,14 +866,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:111
-#, python-format
-msgid "Add new pages"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:68
+#: code:addons/website/static/src/js/website.contentMenu.js:72
#, python-format
msgid "Add page in menu"
msgstr ""
@@ -835,6 +876,13 @@ msgstr ""
msgid "Advanced"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.tour.banner.js:49
+#, python-format
+msgid "After having checked how it looks on mobile, <b>close the preview</b>."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "After working on this step, you may want to go back and refine your objectives or modify your visitors interests. Those 3 first steps are essentially linked, and the more time your spend on polishing them, the better your website will be!"
@@ -937,21 +985,6 @@ msgstr ""
msgid "Back"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Background Color"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Background Image"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Background Image Options"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Background image"
@@ -967,13 +1000,6 @@ msgstr ""
msgid "Basic sales & marketing for up to 2 users"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:70
-#, python-format
-msgid "Be careful !"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Be mobile"
@@ -1020,13 +1046,6 @@ msgstr ""
msgid "Boost your online sales with sleek product pages."
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:14
-#, python-format
-msgid "Build a page"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Build and engage with communities with forums, Q&A, mailing lists."
@@ -1066,7 +1085,8 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:63
+#: code:addons/website/static/src/js/website.backendDashboard.js:85
+#: code:addons/website/static/src/xml/website.xml:57
#: model:ir.ui.view,arch_db:website.500
#: model:ir.ui.view,arch_db:website.view_website_config_settings
#: model:ir.ui.view,arch_db:website.view_website_form
@@ -1084,13 +1104,6 @@ msgstr ""
msgid "Change Icons"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:96
-#, python-format
-msgid "Check Mobile Preview"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Check its availability"
@@ -1118,13 +1131,6 @@ msgstr ""
msgid "Circle"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:43
-#, python-format
-msgid "Click in the text and start editing it."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Click on 'Translate' on the menu bar"
@@ -1136,11 +1142,7 @@ msgid "Click on the icon to adapt it to your feature"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:49
#: model:ir.ui.view,arch_db:website.s_banner
-#: model:ir.ui.view,arch_db:website.website2_homepage
-#, python-format
msgid "Click to customize this text"
msgstr ""
@@ -1153,13 +1155,6 @@ msgstr ""
msgid "Close"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:113
-#, python-format
-msgid "Close Tutorial"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Color Splash"
@@ -1235,6 +1230,13 @@ msgstr ""
msgid "Configure your Gengo API key in"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.snippets.editor.js:31
+#, python-format
+msgid "Confirmation"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Congratulations, you're done !"
@@ -1262,10 +1264,8 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.s_banner
#: model:ir.ui.view,arch_db:website.s_big_message
#: model:ir.ui.view,arch_db:website.s_comparisons
-#: model:ir.ui.view,arch_db:website.website2_homepage
#: model:ir.ui.view,arch_db:website.website_planner
#: model:website.menu,name:website.menu_contactus
-#: model:website.menu,name:website.website2_menu_contactus
msgid "Contact us"
msgstr ""
@@ -1293,11 +1293,8 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:61
-#: code:addons/website/static/src/js/website.tour.banner.js:83
-#: code:addons/website/static/src/js/website.tour.banner.js:105
-#: code:addons/website/static/src/xml/website.contentMenu.xml:28
-#: code:addons/website/static/src/xml/website.xml:62
+#: code:addons/website/static/src/js/website.contentMenu.js:185
+#: code:addons/website/static/src/xml/website.xml:56
#, python-format
msgid "Continue"
msgstr ""
@@ -1324,7 +1321,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.editor.js:133
+#: code:addons/website/static/src/js/website.editor.js:141
#, python-format
msgid "Create page '%s'"
msgstr ""
@@ -1351,6 +1348,13 @@ msgid "Creating your main menu is an important and difficult stage in building y
" In fact, you need to build your navigation menu for your visitors and not for your own purposes or objectives."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:28
+#, python-format
+msgid "Currently there is no data available."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Customize"
@@ -1363,23 +1367,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:60
+#: code:addons/website/static/src/js/website.tour.banner.js:31
#, python-format
msgid "Customize any block through this menu. Try to change the background of the banner."
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:42
-#, python-format
-msgid "Customize banner's text"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:59
-#, python-format
-msgid "Customize the banner"
+#: model:ir.ui.menu,name:website.menu_dashboard
+msgid "Dashboard"
msgstr ""
#. module: website
@@ -1401,7 +1396,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:129
+#: code:addons/website/static/src/js/website.contentMenu.js:133
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Delete Page"
@@ -1452,11 +1447,6 @@ msgstr ""
msgid "Discard"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Discuss and Comments"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Discuss with propects for a face-to-face sales pitch."
@@ -1478,6 +1468,13 @@ msgstr ""
msgid "Do not show this dialog later."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.snippets.editor.js:78
+#, python-format
+msgid "Do you want to edit the company data ?"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.s_faq_collapse
msgid "Does it works offline?"
@@ -1490,48 +1487,41 @@ msgid "Domain"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Don't hesitate to"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:64
+#, python-format
+msgid "Don't forget to update all links referring to this page:"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Download the technical documentation of a product"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:67
-#, python-format
-msgid "Drag & Drop This Block"
+msgid "Don't hesitate to"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:34
-#, python-format
-msgid "Drag & Drop a Banner"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Download the technical documentation of a product"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:50
+#: code:addons/website/static/src/xml/website.contentMenu.xml:42
#, python-format
msgid "Drag a menu to the right to create a sub-menu"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:68
+#: code:addons/website/static/src/js/website.tour.banner.js:35
#, python-format
-msgid "Drag the <em>'Features'</em> block and drop it below the banner."
+msgid "Drag another block in your page, below the cover."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:35
+#: code:addons/website/static/src/js/website.tour.banner.js:19
#, python-format
-msgid "Drag the Banner block and drop it in your page."
+msgid "Drag the <i>Cover</i> block and drop it in your page."
msgstr ""
#. module: website
@@ -1556,7 +1546,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:38
+#: code:addons/website/static/src/js/website.contentMenu.js:207
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Edit Menu"
@@ -1572,6 +1562,13 @@ msgstr ""
msgid "Edit in backend"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:21
+#, python-format
+msgid "Edit my Analytics Client ID"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.page_404
msgid "Edit the content below this line to adapt the default \"page not found\" page."
@@ -1579,9 +1576,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:27
+#: code:addons/website/static/src/js/website.snippets.editor.js:35
#, python-format
-msgid "Edit this page"
+msgid "Edit the menu"
msgstr ""
#. module: website
@@ -1604,13 +1601,6 @@ msgstr ""
msgid "Error"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:28
-#, python-format
-msgid "Every page of your website can be modified through the <i>Edit</i> button."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Example of Good Footer"
@@ -1672,6 +1662,11 @@ msgstr ""
msgid "Fast"
msgstr ""
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_config_settings_favicon
+msgid "Favicon"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.s_three_columns
msgid "Feature One"
@@ -1733,6 +1728,18 @@ msgstr ""
msgid "Folded list"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website
+msgid "Follow"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:22
+#, python-format
+msgid "Follow the"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Fonts"
@@ -1760,7 +1767,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_form_editor
-msgid "Form builder: create and customize forms"
+msgid "Form builde = create and customize forms"
msgstr ""
#. module: website
@@ -1802,16 +1809,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:52
+#: code:addons/website/static/src/js/website.seo.js:361
#, python-format
-msgid "Get banner properties"
+msgid "Get this page efficiently referenced in Google to attract more visitors."
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:361
-#, python-format
-msgid "Get this page efficiently referenced in Google to attract more visitors."
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Girl"
msgstr ""
#. module: website
@@ -1820,6 +1825,20 @@ msgstr ""
msgid "GitHub Account"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.snippets.editor.js:34
+#, python-format
+msgid "Go to Link"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:44
+#, python-format
+msgid "Go to our"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Go to the page you want to translate"
@@ -1827,9 +1846,16 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:81
+#: code:addons/website/static/src/js/website.tour.banner.js:45
+#, python-format
+msgid "Good Job! You created your first page. Let's check how this page looks like on <b>mobile devices</b>."
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.backendDashboard.js:72
#, python-format
-msgid "Good Job!"
+msgid "Google Analytics"
msgstr ""
#. module: website
@@ -1848,6 +1874,16 @@ msgstr ""
msgid "Google Business"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website
+msgid "Google Maps"
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,field_description:website.field_base_config_settings_google_maps_api_key
+msgid "Google Maps API Key"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Google's developer console"
@@ -1904,6 +1940,11 @@ msgstr ""
msgid "HTTP routing"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_cover
+msgid "Headline"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Headline or product description,"
@@ -1930,25 +1971,22 @@ msgstr ""
#: model:ir.ui.view,arch_db:website.500
#: model:ir.ui.view,arch_db:website.footer_default
#: model:website.menu,name:website.menu_homepage
-#: model:website.menu,name:website.website2_menu_homepage
msgid "Home"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:20
#: model:ir.ui.view,arch_db:website.403
#: model:ir.ui.view,arch_db:website.404
#: model:ir.ui.view,arch_db:website.footer_custom
+#, python-format
msgid "Homepage"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.website2_homepage
-msgid "Homepage 0.0.0.0"
-msgstr ""
-
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:110
+#: code:addons/website/static/src/xml/website.xml:92
#, python-format
msgid "I'm sure, I want to delete this page definitively"
msgstr ""
@@ -1956,7 +1994,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_config_settings_id
#: model:ir.model.fields,field_description:website.field_website_id
-#: model:ir.model.fields,field_description:website.field_website_menu_id_2055
+#: model:ir.model.fields,field_description:website.field_website_menu_id_1971
#: model:ir.model.fields,field_description:website.field_website_published_mixin_id
#: model:ir.model.fields,field_description:website.field_website_seo_metadata_id
msgid "ID"
@@ -2022,6 +2060,13 @@ msgstr ""
msgid "Include Asset Bundles"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.backendDashboard.js:95
+#, python-format
+msgid "Incorrect Client ID"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.show_website_info
msgid "Information about the"
@@ -2038,6 +2083,11 @@ msgstr ""
msgid "Install Language"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "Install a language"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Install the"
@@ -2058,11 +2108,6 @@ msgstr ""
msgid "Integrate a contact form that automatically creates leads."
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.500
-msgid "Internal Server Error"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Is the keyword searched for in Google? If there is no search volume,\n"
@@ -2082,7 +2127,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:19
+#: code:addons/website/static/src/xml/website.xml:13
#, python-format
msgid "It might be possible to edit the relevant items or fix the issue in"
msgstr ""
@@ -2179,9 +2224,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:90
+#: code:addons/website/static/src/xml/website.editor.xml:21
#, python-format
-msgid "Let's check how your homepage looks like on mobile devices."
+msgid "Let's start designing."
msgstr ""
#. module: website
@@ -2189,6 +2234,13 @@ msgstr ""
msgid "Limited customization"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:29
+#, python-format
+msgid "Link my Analytics Account"
+msgstr ""
+
#. module: website
#: model:ir.model.fields,field_description:website.field_website_config_settings_social_linkedin
#: model:ir.model.fields,field_description:website.field_website_social_linkedin
@@ -2212,11 +2264,6 @@ msgstr ""
msgid "Logo"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "Logout"
-msgstr ""
-
#. module: website
#: model:ir.model.fields,field_description:website.field_website_menu_id
msgid "Main Menu"
@@ -2254,7 +2301,7 @@ msgid "Meet your existing customers and encourage them to 'repeat buy'."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:320
+#: code:addons/website/models/website.py:322
#: model:ir.model.fields,field_description:website.field_website_menu_name
#: model:ir.ui.view,arch_db:website.view_website_config_settings
#, python-format
@@ -2262,26 +2309,27 @@ msgid "Menu"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:324
+#. openerp-web
+#: code:addons/website/static/src/js/website.mobile.js:42
#, python-format
-msgid "Menu <b>%s</b> seems to have a link to this page !"
+msgid "Mobile preview"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Message"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Mode"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.mobile.js:42
+#: code:addons/website/static/src/xml/website.backend.xml:50
#, python-format
-msgid "Mobile preview"
+msgid "Month"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Mode"
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "More Info"
msgstr ""
#. module: website
@@ -2326,26 +2374,19 @@ msgstr ""
msgid "Move to previous"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "My Website"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Narrow"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:125
-#, python-format
-msgid "New Name"
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "New Language"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:60
+#: code:addons/website/static/src/js/website.contentMenu.js:64
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "New Page"
@@ -2358,14 +2399,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:123
-#, python-format
-msgid "New name"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.editor.js:118
+#: code:addons/website/static/src/js/website.editor.js:126
#, python-format
msgid "New or existing page"
msgstr ""
@@ -2391,15 +2425,6 @@ msgstr ""
msgid "None"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.backend.js:22
-#: model:ir.ui.view,arch_db:website.publish_management
-#: model:ir.ui.view,arch_db:website.publish_short
-#, python-format
-msgid "Not Published"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.show_website_info
msgid "Note: To hide this page, uncheck it from the top Customize menu."
@@ -2456,12 +2481,6 @@ msgid "Odoo provides essential platform for our project management.\n"
" Things are better organized and more visible with it."
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_quotes_slider
-msgid "Odoo provides essential platform for our project management.\n"
-" Things are better organized and more visible with it."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.s_references
msgid "Odoo provides essential platform for our project management.\n"
@@ -2518,26 +2537,11 @@ msgstr ""
msgid "Open Source eCommerce"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.view_website_config_settings
-msgid "Optimization"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Optimize AdWords Campaign"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Optimize SEO"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Optimize your AdWords account"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Orange Red"
@@ -2592,32 +2596,25 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/models/website.py:298
-#: code:addons/website/static/src/xml/website.editor.xml:11
+#: code:addons/website/models/website.py:301
+#: code:addons/website/static/src/xml/website.editor.xml:10
#, python-format
msgid "Page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:303
+#: code:addons/website/models/website.py:307
#, python-format
-msgid "Page <b>%s</b> seems to have a link to this page !"
+msgid "Page <b>%s</b> contains a link to this page"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:61
+#: code:addons/website/static/src/js/website.contentMenu.js:65
#, python-format
msgid "Page Title"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:103
-#, python-format
-msgid "Pages and menus"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.s_panel
msgid "Panels are a great tool to compare offers or to emphasize on\n"
@@ -2636,7 +2633,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_menu_parent_right
-msgid "Parent Right"
+msgid "Parent Rigth"
msgstr ""
#. module: website
@@ -2645,13 +2642,13 @@ msgid "Partner"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_post
-msgid "Partner Detail"
+#: model:ir.model.fields,help:website.field_website_partner_id
+msgid "Partner-related data of the user"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Partners"
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "Performance Optimization"
msgstr ""
#. module: website
@@ -2758,9 +2755,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:76
+#: code:addons/website/static/src/js/website.tour.banner.js:41
#, python-format
-msgid "Publish your page by clicking on the <em>'Save'</em> button."
+msgid "Publish your page by clicking on the <b>Save</b> button."
msgstr ""
#. module: website
@@ -2802,44 +2799,38 @@ msgstr ""
msgid "Real professional translators will translate all your contents"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Recipient"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Reduce the time and resources spent on support."
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:96
-#, python-format
-msgid "Reference(s) found:"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Remove all images"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove Slide"
+msgid "Remove from gallery"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove all images"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Rename Page"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove from gallery"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:105
+#, python-format
+msgid "Rename Page To:"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:95
-#: model:ir.ui.view,arch_db:website.user_navbar
+#: code:addons/website/static/src/js/website.contentMenu.js:99
#, python-format
-msgid "Rename Page"
+msgid "Rename This Page"
msgstr ""
#. module: website
@@ -2874,31 +2865,18 @@ msgstr ""
#. module: website
#. openerp-web
+#: code:addons/website/static/src/js/website.backendDashboard.js:76
#: code:addons/website/static/src/js/website.seo.js:363
#: code:addons/website/static/src/xml/website.ace.xml:12
#, python-format
msgid "Save"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:75
-#, python-format
-msgid "Save your modifications"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Scroll Speed"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:97
-#, python-format
-msgid "Scroll to check rendering and then close the mobile preview."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.menu_search
msgid "Search Menus"
@@ -2926,7 +2904,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:27
+#: code:addons/website/static/src/js/website.contentMenu.js:184
#, python-format
msgid "Select a Menu"
msgstr ""
@@ -2936,13 +2914,6 @@ msgstr ""
msgid "Select and delete blocks to remove some features."
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:53
-#, python-format
-msgid "Select the parent container to get the global options of the banner."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Select the untranslated language"
@@ -2958,16 +2929,6 @@ msgstr ""
msgid "Sell more online"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Send <span class=\"fa fa-long-arrow-right\"/>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_comment
-msgid "Send a Message to our Partners"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Send an email to all your contacts"
@@ -2983,6 +2944,11 @@ msgstr ""
msgid "Sequence"
msgstr ""
+#. module: website
+#: model:ir.ui.menu,name:website.menu_website_website_settings
+msgid "Settings"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Settings > Website"
@@ -3013,13 +2979,6 @@ msgstr ""
msgid "Simple and obvious"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:21
-#, python-format
-msgid "Skip It"
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Slideshow"
@@ -3046,28 +3005,19 @@ msgstr ""
msgid "Social Media"
msgstr ""
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:70
-#, python-format
-msgid "Some dependencies can exist ..."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Special effects and animations"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Square"
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "Speed"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:21
-#, python-format
-msgid "Start Tutorial"
+#: model:ir.ui.view,arch_db:website.snippet_options
+msgid "Square"
msgstr ""
#. module: website
@@ -3096,13 +3046,15 @@ msgid "Static"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Still in the left-side menu, go to <strong>APIs and auth > Credentials</strong> and click on <strong>'Create New Client ID'</strong>"
+#. openerp-web
+#: code:addons/website/static/src/js/website.snippets.editor.js:43
+#, python-format
+msgid "Stay on this page"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Style"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Still in the left-side menu, go to <strong>APIs and auth > Credentials</strong> and click on <strong>'Create New Client ID'</strong>"
msgstr ""
#. module: website
@@ -3151,14 +3103,14 @@ msgid "Tell what's the value for the<br/>customer for this feature."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:308
+#: code:addons/website/models/website.py:312
#, python-format
-msgid "Template <b>%s (id:%s)</b> seems to have a link to this page !"
+msgid "Template <b>%s (id:%s)</b> contains a link to this page"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.ace.js:246
+#: code:addons/website/static/src/js/website.ace.js:256
#, python-format
msgid "Template ID: %s"
msgstr ""
@@ -3169,27 +3121,15 @@ msgid "Template fallback"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:89
-#, python-format
-msgid "Test Your Mobile Version"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.template_partner_post
-msgid "Thank you for posting a message !"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "The Banner or Big Picture building blocks are good choices for that."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:104
+#: code:addons/website/static/src/js/website.backendDashboard.js:95
#, python-format
-msgid "The 'Content' menu allows you to rename and delete pages or add them to the top menu."
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "The Banner or Big Picture building blocks are good choices for that."
+msgid "The Google Analytics Client ID you have entered seems incorrect."
msgstr ""
#. module: website
@@ -3294,7 +3234,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:18
+#: code:addons/website/static/src/xml/website.xml:12
#, python-format
msgid "The web site has encountered an error."
msgstr ""
@@ -3341,16 +3281,27 @@ msgstr ""
msgid "Third Feature"
msgstr ""
+#. module: website
+#: model:ir.model.fields,help:website.field_website_config_settings_favicon
+#: model:ir.model.fields,help:website.field_website_favicon
+msgid "This field holds the image used to display a favicon on the website."
+msgstr ""
+
+#. module: website
+#: model:ir.model.fields,help:website.field_website_config_settings_default_lang_code
+#: model:ir.model.fields,help:website.field_website_default_lang_code
+msgid "This field is used to set/get locales for user"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.page_404
msgid "This page does not exists, but you can create it as you are administrator of this site."
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:20
+#: code:addons/website/models/website.py:326
#, python-format
-msgid "This tutorial will guide you to build your home page. We will start by adding a banner."
+msgid "This page is in the menu <b>%s</b>"
msgstr ""
#. module: website
@@ -3390,9 +3341,8 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:175
+#: code:addons/website/static/src/js/website.contentMenu.js:179
#: model:website.menu,name:website.main_menu
-#: model:website.menu,name:website.website2_main_menu
#, python-format
msgid "Top Menu"
msgstr ""
@@ -3404,7 +3354,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.snippets.editor.js:771
+#: code:addons/website/static/src/js/website.snippets.editor.js:717
#, python-format
msgid "Transform the picture (click twice to reset transformation)"
msgstr ""
@@ -3460,6 +3410,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,help:website.field_website_cdn_filters
+#: model:ir.model.fields,help:website.field_website_config_settings_cdn_filters
msgid "URL matching those filters will be rewritten using the CDN Base URL"
msgstr ""
@@ -3478,6 +3429,15 @@ msgstr ""
msgid "Unlimited customization"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/js/website.backend.js:22
+#: model:ir.ui.view,arch_db:website.publish_management
+#: model:ir.ui.view,arch_db:website.publish_short
+#, python-format
+msgid "Unpublished"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Update your internal documents: footer of sales order, contracts,invoices, business cards, etc."
@@ -3529,9 +3489,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:112
+#: code:addons/website/static/src/xml/website.backend.xml:44
#, python-format
-msgid "Use this button to add pages"
+msgid "User Documentation"
msgstr ""
#. module: website
@@ -3562,15 +3522,12 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_blog_post_website_published
-#: model:ir.model.fields,field_description:website.field_delivery_carrier_website_published
#: model:ir.model.fields,field_description:website.field_event_track_website_published
#: model:ir.model.fields,field_description:website.field_hr_employee_website_published
#: model:ir.model.fields,field_description:website.field_hr_job_website_published
#: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_published
#: model:ir.model.fields,field_description:website.field_product_template_website_published
#: model:ir.model.fields,field_description:website.field_project_project_website_published
-#: model:ir.model.fields,field_description:website.field_res_partner_grade_website_published
-#: model:ir.model.fields,field_description:website.field_res_partner_tag_website_published
#: model:ir.model.fields,field_description:website.field_res_partner_website_published
#: model:ir.model.fields,field_description:website.field_slide_channel_website_published
#: model:ir.model.fields,field_description:website.field_slide_slide_website_published
@@ -3583,6 +3540,25 @@ msgstr ""
msgid "Visitors might not be interested in your products or services when they come to your site. They could want to learn something, improve their life, grow their business, find out more about you, etc. What great content can you offer your visitors? Why should they stay on your website?"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:18
+#, python-format
+msgid "Visits"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.company_description
+msgid "Visualize on Google Maps"
+msgstr ""
+
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:64
+#, python-format
+msgid "Warning!"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.aboutus
msgid "We are a team of passionate people whose goal is to improve everyone's\n"
@@ -3633,11 +3609,21 @@ msgstr ""
msgid "Website Apps"
msgstr ""
+#. module: website
+#: model:ir.actions.client,name:website.backend_dashboard
+msgid "Website Dashboard"
+msgstr ""
+
#. module: website
#: model:ir.model.fields,field_description:website.field_website_domain
msgid "Website Domain"
msgstr ""
+#. module: website
+#: model:ir.model.fields,field_description:website.field_website_favicon
+msgid "Website Favicon"
+msgstr ""
+
#. module: website
#: model:ir.actions.act_url,name:website.action_website_homepage
msgid "Website Homepage"
@@ -3655,16 +3641,6 @@ msgstr ""
msgid "Website Name"
msgstr ""
-#. module: website
-#: model:ir.actions.server,name:website.action_partner_post
-msgid "Website Partner Post and Thanks Demo"
-msgstr ""
-
-#. module: website
-#: model:ir.actions.server,name:website.action_partner_comment
-msgid "Website Partners Comment Form"
-msgstr ""
-
#. module: website
#: model:ir.model.fields,field_description:website.field_ir_act_server_website_path
msgid "Website Path"
@@ -3694,7 +3670,6 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_hr_employee_website_url
#: model:ir.model.fields,field_description:website.field_hr_job_website_url
#: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_url
-#: model:ir.model.fields,field_description:website.field_ir_act_server_website_url
#: model:ir.model.fields,field_description:website.field_payment_acquirer_website_url
#: model:ir.model.fields,field_description:website.field_product_template_website_url
#: model:ir.model.fields,field_description:website.field_project_project_website_url
@@ -3708,13 +3683,13 @@ msgid "Website URL"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Website Versioning."
+#: model:ir.model.fields,field_description:website.field_ir_act_server_website_url
+msgid "Website Url"
msgstr ""
#. module: website
-#: model:ir.actions.act_url,name:website.action_website_tutorial
-msgid "Website With Tutorial"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Website Versioning."
msgstr ""
#. module: website
@@ -3795,6 +3770,13 @@ msgstr ""
msgid "Websites to translate"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:49
+#, python-format
+msgid "Week"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Welcome"
@@ -3802,16 +3784,16 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:19
+#: code:addons/website/static/src/xml/website.editor.xml:20
#, python-format
-msgid "Welcome to your website!"
+msgid "Welcome to your"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:82
+#: code:addons/website/static/src/xml/website.editor.xml:26
#, python-format
-msgid "Well done, you created your homepage."
+msgid "What do you want to do?"
msgstr ""
#. module: website
@@ -3841,6 +3823,11 @@ msgid "With Odoo, you can automatically check which keywords are ranked best for
" specific query, then add them in the content of your page."
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_cover
+msgid "With a great subtitle"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Wood"
@@ -3852,12 +3839,6 @@ msgid "Write a quote here from one of your customers. Quotes are a\n"
" great way to build confidence in your products or services."
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_quotes_slider
-msgid "Write a quote here from one of your customers. Quotes are a\n"
-" great way to build confidence in your products or services."
-msgstr ""
-
#. module: website
#: model:ir.ui.view,arch_db:website.s_references
msgid "Write a quote here from one of your customers. Quotes are a\n"
@@ -3884,6 +3865,11 @@ msgid "Write one or two paragraphs describing your product,\n"
" your content needs to be useful to your readers."
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.s_cover
+msgid "Write one or two paragraphs describing your product, services or a specific feature. To be successful your content needs to be useful to your readers."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.s_big_message
msgid "Write one sentence to convince visitor about your message."
@@ -3894,6 +3880,13 @@ msgstr ""
msgid "Write what the customer would like to know,<br/>not what you want to show."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:51
+#, python-format
+msgid "Year"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Yellow Green"
@@ -3945,11 +3938,25 @@ msgid "You can set Odoo on a custom domain name (e.g. yourcompany.com) for both
" for a proper domain, or change it to one you already own."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:39
+#, python-format
+msgid "You do not seem to have access to this Analytics Account."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "You have a lot of choices for that: the References, Quotes Slider, Twitter Scroller,..."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:38
+#, python-format
+msgid "You need to log in to your Google Account before:"
+msgstr ""
+
#. module: website
#: model:ir.actions.act_window,help:website.action_module_theme
#: model:ir.actions.act_window,help:website.action_module_website
@@ -3962,10 +3969,7 @@ msgid "You will get your leads filled up automatically in our integrated CRM app
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:48
#: model:ir.ui.view,arch_db:website.s_banner
-#, python-format
msgid "Your Banner Title"
msgstr ""
@@ -3979,6 +3983,13 @@ msgstr ""
msgid "Your Footer"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:42
+#, python-format
+msgid "Your Google Analytic Client ID:"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Your Homepage"
@@ -3999,6 +4010,13 @@ msgstr ""
msgid "Your Website Title"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:27
+#, python-format
+msgid "Your current changes will be saved automatically."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Your homepage is the most important page of your website. This is where visitors get their first impressions of you. An excellent homepage will encourage them to stay on your site, guide them towards your content, reinforce your company's branding and more.<br/>\n"
@@ -4044,6 +4062,11 @@ msgstr ""
msgid "and we'll configure your website and/or email for you."
msgstr ""
+#. module: website
+#: model:ir.model,name:website.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "button."
@@ -4066,6 +4089,13 @@ msgstr ""
msgid "describing your page content"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:107
+#, python-format
+msgid "e.g. About Us"
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "ex: About us"
@@ -4091,6 +4121,13 @@ msgstr ""
msgid "for a free evaluation of the usability of your homepage."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:70
+#, python-format
+msgid "found(s)"
+msgstr ""
+
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:62
@@ -4221,6 +4258,13 @@ msgstr ""
msgid "send us an email"
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:22
+#, python-format
+msgid "signs to start."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.robots
msgid "sitemap.xml"
@@ -4228,11 +4272,21 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:19
+#: code:addons/website/static/src/xml/website.xml:13
#, python-format
msgid "the classic Odoo interface"
msgstr ""
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website
+msgid "the instructions"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.view_general_configuration_inherit_website
+msgid "to create your key."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "to describe\n"
@@ -4245,6 +4299,13 @@ msgid "to do that (make sure the Advanced Options are set to your country and\n"
" language)."
msgstr ""
+#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:44
+#, python-format
+msgid "to get more information."
+msgstr ""
+
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "to get started."
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index e44f3c999a9ed0ac6d27ef8770a6cb0f1674b4a8..a3b70419aa12596c1c6c5c5a4d52cd834fb35a49 100644
--- a/addons/website_blog/i18n/website_blog.pot
+++ b/addons/website_blog/i18n/website_blog.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,66 +16,51 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:117
-#, python-format
-msgid " Click on this button to send your blog post online."
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+msgid "&mdash;"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "\"Finally, the leading edge is being brought to the masses.\n"
-" It will now be the turn of the big players to catch up to\n"
-" the superior technologies of the SME.\""
+#: model:ir.ui.view,arch_db:website_blog.latest_blogs
+msgid "&times;"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "\"Odoo now competes on many fronts, with no real\n"
-" competition out there to knock them off the top spot.\n"
-" With the launch of their integrated CMS and Ecommerce\n"
-" systems,it only elevates their position as one of the leading\n"
-" lights in the open source revolution. It will be at least 5\n"
-" years before another ERP or CMS provider will be able to\n"
-" compete at this level due to the technology currently\n"
-" employed by most industry providers.\""
+#: model:ir.ui.view,arch_db:website_blog.blog_feed
+msgid "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "\"Odoo's latest launch will allow a business to go from\n"
-" zero to trading online quicker than ever before,†Stuart\n"
-" Mackintosh, MD of Open Source specialist and Odoo\n"
-" integration partner, OpusVL, explains. “The investment\n"
-" required to have a fully automated business system is\n"
-" dramatically reduced, enabling the small and medium\n"
-" enterprise to compete at a level of functionality and\n"
-" performance previously reserved for the big IT investors.\""
+#: model:ir.ui.view,arch_db:website_blog.view_blog_blog_form
+msgid "(Un)archiving a blog automatically (un)archives its posts. Do you want to proceed?"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "\"This is another clever and highly disruptive move by\n"
-" Odoo,which will force other technology providers to\n"
-" take another look at the value they are providing to ensure\n"
-" that their 'solutions' can still compete.\""
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:53
+#, python-format
+msgid "<b>Click on Save</b> to record yoru changes."
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.latest_blogs
-msgid "&times;"
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:69
+#, python-format
+msgid "<b>Publish your blog post</b> to make it visible to your visitors."
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_feed
-msgid "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:73
+#, python-format
+msgid "<b>That's it, your blog post is published!</b> Discover more features through the <i>Customize</i> menu."
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "A mix of push & pull: Today, people\n"
-" are victims of what others decide to push to them.\n"
-" Odoo differentiates:"
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:44
+#, python-format
+msgid "<b>Write your story here.</b> Use the top toolbar to style your text: add an image or table, set bold or italic, etc. Drag and drop building blocks for more graphical blogs."
msgstr ""
#. module: website_blog
@@ -94,15 +79,15 @@ msgid "Access post"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:24
-#, python-format
-msgid "Add Content"
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog_active
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_active
+msgid "Active"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "Adding to industry leading technology"
+#: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
+#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
+msgid "Archived"
msgstr ""
#. module: website_blog
@@ -110,23 +95,6 @@ msgstr ""
msgid "Archives"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "As it comes, there is a default website based on Bootstrap\n"
-" 3, the latest industry standard for rapid development of\n"
-" multi-device websites backed by Twitter, so can be directly\n"
-" integrated with many web tools and works across all devices\n"
-" by default."
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "At Odoo, we build tools to bring productivity to\n"
-" enterprises. As emails and information flows are one of\n"
-" the biggest wastes of time in companies, we have to fix\n"
-" this."
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_short
msgid "Atom Feed"
@@ -134,7 +102,6 @@ msgstr ""
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_author_id
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_create_uid
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Author"
msgstr ""
@@ -144,9 +111,15 @@ msgstr ""
msgid "Avatar"
msgstr ""
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.website_blog
+msgid "Black"
+msgstr ""
+
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_blog_id
#: model:ir.ui.menu,name:website_blog.menu_website_blog_root
+#: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
#: model:ir.ui.view,arch_db:website_blog.view_blog_blog_form
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
#: model:website.menu,name:website_blog.menu_news
@@ -159,7 +132,7 @@ msgid "Blog Name"
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:283
+#: code:addons/website_blog/models/website.py:23
#: model:ir.model,name:website_blog.model_blog_post
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
@@ -168,20 +141,14 @@ msgid "Blog Post"
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:287
+#: code:addons/website_blog/models/website.py:27
#, python-format
msgid "Blog Post <b>%s</b> seems to have a link to this page !"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:37
-#, python-format
-msgid "Blog Post Created"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_read_next
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
msgid "Blog Post Title"
msgstr ""
@@ -223,14 +190,9 @@ msgstr ""
msgid "Blue"
msgstr ""
-#. module: website_blog
-#: model:blog.post,subtitle:website_blog.blog_post_2
-msgid "Building your company's website and selling your products online easy."
-msgstr ""
-
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:58
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:29
#: model:ir.ui.view,arch_db:website_blog.website_blog
#, python-format
msgid "Change Cover"
@@ -238,30 +200,16 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:54
-#, python-format
-msgid "Change and customize your blog post cover."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:108
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:35
#, python-format
-msgid "Check Mobile Preview"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:68
-#, python-format
-msgid "Choose an image"
+msgid "Choose an image from the library."
msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:69
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:30
#, python-format
-msgid "Choose an image from the library."
+msgid "Clich here to change your post cover."
msgstr ""
#. module: website_blog
@@ -271,23 +219,9 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:94
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:40
#, python-format
-msgid "Click on '<em>Save</em>' button to record changes on the page."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:77
-#, python-format
-msgid "Click on '<em>Save</em>' to set the picture as cover."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:102
-#, python-format
-msgid "Click on the mobile icon to preview how your blog post will be displayed on a mobile device."
+msgid "Click on <b>Save</b> to set the picture as cover."
msgstr ""
#. module: website_blog
@@ -296,59 +230,19 @@ msgid "Click to create a new blog post."
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:124
-#, python-format
-msgid "Close Tutorial"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.website_blog
-msgid "Color"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
-msgid "Contact us"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:84
#: model:ir.model.fields,field_description:website_blog.field_blog_post_content
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
-#, python-format
msgid "Content"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:39
-#, python-format
-msgid "Continue"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:60
-#, python-format
-msgid "Cover"
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_cover_properties
msgid "Cover Properties"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:14
-#, python-format
-msgid "Create a blog post"
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog_create_uid
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_create_uid
#: model:ir.model.fields,field_description:website_blog.field_blog_tag_create_uid
msgid "Created by"
msgstr ""
@@ -360,13 +254,6 @@ msgstr ""
msgid "Created on"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:53
-#, python-format
-msgid "Customize Cover"
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_mail_compose_message_path
#: model:ir.model.fields,field_description:website_blog.field_mail_message_path
@@ -397,40 +284,13 @@ msgid "Email composition wizard for Survey"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Emails are broken."
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Emails make me waste my time. But I need them.\n"
-" Given the importance that emails have in our lives,\n"
-" it's incredible it's still one of the only software\n"
-" areas that did not evolve in the past 20 years!"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Focus on the Content: Everything is\n"
-" stripped to emphasize on the real message. No more\n"
-" welcome introductions, greetings, signatures and legal\n"
-" notes.We standardize the layout of each message.\n"
-" (signatures are on the profile of a contact, not in\n"
-" every message)"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Folders and mailing lists are great tools but too\n"
-" complex in traditional email clients. In Odoo, a\n"
-" group of contacts that share a discussion can be\n"
-" created with one click. Every group should have it's\n"
-" own email address."
+#: model:ir.ui.view,arch_db:website_blog.website_blog
+msgid "Filter Color"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
-msgid "Follow us"
+#: model:ir.ui.view,arch_db:website_blog.website_blog
+msgid "Filter Intensity"
msgstr ""
#. module: website_blog
@@ -438,15 +298,6 @@ msgstr ""
msgid "Full Screen"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Get Things Done: your inbox is a\n"
-" todo list. You should be able to process (not only\n"
-" read) the inbox and easily mark messages for future\n"
-" actions. Every inbox should be empty after having\n"
-" been processed; no more overload of information."
-msgstr ""
-
#. module: website_blog
#: model:blog.blog,subtitle:website_blog.blog_blog_1
msgid "Get in touch with us"
@@ -462,25 +313,11 @@ msgstr ""
msgid "Group By"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Here are the ideas behind the Odoo communication tools:"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "High"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "However, unlike other web content management systems, it\n"
-" fully integrates into the back-end database. This means\n"
-" that when you edit a product description, image or price,\n"
-" it updates the product database in real time, providing a\n"
-" true self-service window into the business."
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog_id
#: model:ir.model.fields,field_description:website_blog.field_blog_post_id
@@ -488,29 +325,11 @@ msgstr ""
msgid "ID"
msgstr ""
-#. module: website_blog
-#: model:blog.post,subtitle:website_blog.blog_post_1
-msgid "Ideas behind the Odoo communication tools."
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.latest_blogs
msgid "In"
msgstr ""
-#. module: website_blog
-#: model:blog.post,name:website_blog.blog_post_2
-msgid "Integrating your CMS and E-Commerce"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Keep control of what you want to receive or don't want\n"
-" to receive. People should never receive spam. You\n"
-" should follow/unfollow any kind of information in one\n"
-" click."
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_write_uid
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
@@ -542,20 +361,6 @@ msgstr ""
msgid "Latest Posts"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:18
-#, python-format
-msgid "Let's go through the first steps to write beautiful blog posts."
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "Like many modern website editors, with Odoo you can edit\n"
-" content in-line, enabling you to see exactly what you are\n"
-" changing and ensure your changes suit the context."
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Low"
@@ -572,29 +377,8 @@ msgid "Message"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Messages \"for action\": they\n"
-" require your immediate attention and you need\n"
-" to process them all. This accounts for 10%\n"
-" of your daily emails. Use the \"To: me\" menu\n"
-" for these."
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Messages \"for information\":\n"
-" you can pull them when you need some specific\n"
-" information; they are not required to be read\n"
-" every day.You receive only what you decided\n"
-" to follow.This accounts for 90% of your daily\n"
-" emails.Use the \"Inbox\" menu for these."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:101
-#, python-format
-msgid "Mobile Preview"
+#: model:ir.ui.view,arch_db:website_blog.website_blog
+msgid "Mid screen"
msgstr ""
#. module: website_blog
@@ -609,19 +393,12 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:17
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:31
#: code:addons/website_blog/static/src/js/website_blog.editor.js:21
#: model:ir.ui.view,arch_db:website_blog.content_new_blogpost
#, python-format
msgid "New Blog Post"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "New Features Launched"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.header_footer_custom
msgid "News"
@@ -654,26 +431,9 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:9
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:63
#, python-format
-msgid "Not Published"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "Odoo claims to be 'the Open Source software that makes\n"
-" building your company's website and selling your products\n"
-" online easy'. So how true is this statement?"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,website_meta_keywords:website_blog.blog_post_1
-msgid "Odoo, email"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.website_blog
-msgid "Opacity"
+msgid "Once you have reviewed the content on mobile, close the preview."
msgstr ""
#. module: website_blog
@@ -691,53 +451,27 @@ msgstr ""
msgid "Participate on our social stream."
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:28
-#, python-format
-msgid "Please"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:31
-#, python-format
-msgid "Post"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:44
-#, python-format
-msgid "Post Headline"
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_tag_post_ids
msgid "Posts"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Productivity is key: our smart user\n"
-" interface does not require you to click on every mail\n"
-" to read a thread. Reading a full thread, replying,\n"
-" attaching documents is super fast."
-msgstr ""
-
-#. module: website_blog
-#: code:addons/website_blog/controllers/main.py:268
+#: code:addons/website_blog/controllers/main.py:262
#, python-format
msgid "Public user cannot post comments on blog post."
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:10
-#, python-format
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
msgid "Published"
msgstr ""
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_published_date
+msgid "Published Date"
+msgstr ""
+
#. module: website_blog
#: model:mail.message.subtype,description:website_blog.mt_blog_blog_published
#: model:mail.message.subtype,name:website_blog.mt_blog_blog_published
@@ -745,10 +479,13 @@ msgid "Published Post"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:116
-#, python-format
-msgid "Publishing status"
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_post_date
+msgid "Published date"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
+msgid "Publishing Options"
msgstr ""
#. module: website_blog
@@ -762,22 +499,10 @@ msgid "Ranking"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_read_next
msgid "Read Next <span class=\"fa fa-long-arrow-right\"/>"
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "Reading my inbox is the most unproductive task I do\n"
-" on a daily basis. I have to spend one full hour a\n"
-" day to process my emails. All the junk flows in the\n"
-" same inbox; spams, information that doesn't matter,\n"
-" quoted answers of quoted answers, etc. At the end\n"
-" of the hour, only 10 emails actually requested an\n"
-" answer from me. With a good tool, I could have done\n"
-" my job in 10 minutes!"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.website_blog
msgid "Red"
@@ -785,44 +510,16 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:76
-#, python-format
-msgid "Save"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:93
-#, python-format
-msgid "Save your modifications once you are done"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:109
-#, python-format
-msgid "Scroll to check rendering and then close the mobile preview."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:61
-#, python-format
-msgid "Select this menu item to change blog cover."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:32
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:15
#, python-format
msgid "Select this menu item to create a new blog post."
msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:29
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:26
#, python-format
-msgid "Sign in"
+msgid "Set a blog post <b>cover</b>."
msgstr ""
#. module: website_blog
@@ -831,32 +528,26 @@ msgid "Size"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:19
-#, python-format
-msgid "Skip"
+#: model:ir.model.fields,help:website_blog.field_blog_post_author_avatar
+msgid "Small-sized image of this contact. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:19
+#: code:addons/website_blog/models/website_blog.py:100
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:52
#, python-format
-msgid "Start Tutorial"
+msgid "Start writing here..."
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/models/website_blog.py:91
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:90
-#, python-format
-msgid "Start writing here..."
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
+msgid "Status"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:85
-#, python-format
-msgid "Start writing your story here."
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Stay updated :"
msgstr ""
#. module: website_blog
@@ -866,6 +557,7 @@ msgstr ""
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_complete
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_read_next
msgid "Subtitle"
msgstr ""
@@ -891,26 +583,18 @@ msgid "Tags"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
-msgid "Technical"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "The Communication Mechanism of Odoo"
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser
+msgid "Teaser"
msgstr ""
#. module: website_blog
-#: model:blog.post,name:website_blog.blog_post_1
-#: model:blog.post,website_meta_description:website_blog.blog_post_1
-msgid "The Future of Emails"
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_teaser_manual
+msgid "Teaser Content"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:38
-#, python-format
-msgid "This is your new blog post. Let's edit it."
+#: model:ir.ui.view,arch_db:website_blog.view_blog_post_form
+msgid "Technical"
msgstr ""
#. module: website_blog
@@ -919,37 +603,14 @@ msgid "This page is great to improve your <strong>Search Engine Optimization</st
" You can review titles, keywords and descriptions of all blogs at once."
msgstr ""
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "This provides a single source of data for your company and\n"
-" removes the need to create offline synchronisation between\n"
-" website and product database."
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:123
-#, python-format
-msgid "This tutorial is over. To discover more features and improve the content of this page, go to the upper left customize menu. You can also add some cool content with your text in the edit mode with the upper right button."
-msgstr ""
-
#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_name
msgid "Title"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "To add to an already comprehensive set of Odoo\n"
-" features, a website content management system (CMS\n"
-" or WMS) has been developed and a beta release is\n"
-" available from today, 31st January 2014."
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "To disrupt emails, you need more than just another user\n"
-" interface. We need to rethink the whole communication flow."
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
+msgid "Unpublished"
msgstr ""
#. module: website_blog
@@ -959,9 +620,9 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:25
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:58
#, python-format
-msgid "Use this button to create a new blog post like any other document (page, menu, products, event, ...)."
+msgid "Use this icon to preview your blog post on <b>mobile devices</b>."
msgstr ""
#. module: website_blog
@@ -977,7 +638,7 @@ msgid "Used to display messages in a paragraph-based chatter using a unique path
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:262
+#: code:addons/website_blog/models/website_blog.py:212
#, python-format
msgid "View Blog Post"
msgstr ""
@@ -1003,10 +664,8 @@ msgid "Website communication history"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:26
-#, python-format
-msgid "Write a comment..."
+#: model:ir.ui.view,arch_db:website_blog.website_blog
+msgid "White"
msgstr ""
#. module: website_blog
@@ -1017,7 +676,7 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:46
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:20
#, python-format
msgid "Write a title, the subtitle is optional."
msgstr ""
@@ -1038,13 +697,6 @@ msgstr ""
msgid "blog. Click here to access the blog :"
msgstr ""
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:14
-#, python-format
-msgid "by"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_short
#: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -1062,11 +714,6 @@ msgstr ""
msgid "has been published on the"
msgstr ""
-#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.blog_post_short
-msgid "not published"
-msgstr ""
-
#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.blog_post_short
#: model:ir.ui.view,arch_db:website_blog.latest_blogs
@@ -1074,10 +721,8 @@ msgid "pull-right"
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:29
-#, python-format
-msgid "to comment."
+#: model:ir.ui.view,arch_db:website_blog.blog_post_short
+msgid "unpublished"
msgstr ""
#. module: website_blog
diff --git a/addons/website_crm/i18n/website_crm.pot b/addons/website_crm/i18n/website_crm.pot
index ea64ede7069a8b999a0d23cc9eb3b3f8c882fa47..bac2dd0565b104156688a115fd6c2a8cfc6d8808 100644
--- a/addons/website_crm/i18n/website_crm.pot
+++ b/addons/website_crm/i18n/website_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:35
+#, python-format
+msgid "% Leads"
+msgstr ""
+
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_thanks
msgid "&times;"
@@ -41,6 +48,27 @@ msgstr ""
msgid "Lead/Opportunity"
msgstr ""
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:34
+#, python-format
+msgid "Leads"
+msgstr ""
+
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:8
+#, python-format
+msgid "Leads Acquisition /"
+msgstr ""
+
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:13
+#, python-format
+msgid "Leads Analysis"
+msgstr ""
+
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_form
msgid "Phone Number"
@@ -56,6 +84,13 @@ msgstr ""
msgid "Thanks!"
msgstr ""
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:15
+#, python-format
+msgid "There is no recent lead."
+msgstr ""
+
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_thanks
msgid "We will get back to you shortly."
diff --git a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
index 9f035ff7f1e63014e873323d8bcd7691c5cea7fb..d3223607794ab839279c7e8626ad57048950d8b0 100644
--- a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
+++ b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,35 +16,690 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:60
+#: model:mail.template,body_html:website_crm_partner_assign.email_template_lead_forward_mail
+msgid "\n"
+" \n"
+"<p>Hello,</p>\n"
+"\n"
+"\n"
+"<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>\n"
+"\n"
+"<ol>\n"
+"% for lead in ctx['partner_leads']:\n"
+" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>\n"
+"% endfor\n"
+"</ol>\n"
+"\n"
+"% if ctx.get('partner_in_portal'):\n"
+"<p>Please connect to your <a href=\"${object.get_portal_url()}\">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: \"I'm interested\" & \"I'm not interested\".</p>\n"
+"% else:\n"
+"<p>\n"
+" You do not have yet a portal access to our database. Please contact \n"
+" ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.\n"
+"</p>\n"
+"% endif\n"
+"<p>The lead will be sent to another partner if you do not contact the lead before 20 days.</p>\n"
+"\n"
+"<p>Thanks,</p>\n"
+"\n"
+"<pre>\n"
+"${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
+"</pre>\n"
+"% if not ctx['partner_id'].user_id:\n"
+"PS: It looks like you do not have an account manager assigned to you, please contact us.\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_nbr_cases
+msgid "# of Cases"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_nbr_opportunities
+msgid "# of Opportunity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "&times;"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "<i class=\"fa fa-file-text-o\"/> I'm interested"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "<i class=\"fa fa-fw fa-times\"/> I'm not interested"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:192
+#, python-format
+msgid "<p>I am interested by this lead.</p>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:203
+#, python-format
+msgid "<p>I am not interested by this lead. I contacted the lead.</p>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:205
+#, python-format
+msgid "<p>I am not interested by this lead. I have not contacted the lead.</p>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "<span class=\"oe_grey\" attrs=\"{'invisible':[('partner_latitude','<=',0)]}\">N </span>\n"
+" <span class=\"oe_grey\" attrs=\"{'invisible':[('partner_latitude','>=',0)]}\">S </span>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "<span class=\"oe_grey\" attrs=\"{'invisible':[('partner_longitude','<=',0)]}\">E </span>\n"
+" <span class=\"oe_grey\" attrs=\"{'invisible':[('partner_longitude','>=',0)]}\">W </span>\n"
+" <span class=\"oe_grey\">) </span>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "<span class=\"text-danger error_partner_assign_desinterested\" style=\"display:none;\">You need to fill up the next action and contact the customer before accepting the lead</span>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "<span class=\"text-danger error_partner_assign_interested\" style=\"display:none;\">You need to fill up the next action and contact the customer before accepting the lead</span>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "<span>at </span>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "<strong>Message and communication history</strong>"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_activation
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.res_partner_activation_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.res_partner_activation_tree
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_res_partner_filter_assign
+msgid "Activation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_active
+msgid "Active"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:230
+#, python-format
+msgid "Activity Done"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Address"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:88
+#, python-format
+msgid "All"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:202
+#, python-format
+msgid "All Categories"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:219
+#, python-format
+msgid "All Countries"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_date_assign
+msgid "Assign Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+msgid "Assign Month"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.actions.server,name:website_crm_partner_assign.action_assign_salesman_according_assigned_partner
+msgid "Assign salesman of assigned partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_date_assign
+msgid "Assignation Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_partner_assigned_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_assigned_id
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_partner_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_opportunity_partner_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "Automatic Assignation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_forward_to_partner_body
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_probability
+msgid "Avg Probability"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Campaign"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_forward_to_partner_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Cancel"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "City"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_date_closed
+msgid "Close Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_company_id
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+msgid "Company"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Confirm"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:44
+#: code:addons/website_crm_partner_assign/controllers/main.py:100
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+#, python-format
+msgid "Contact Name"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "Contact a reseller"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_body
+msgid "Contents"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Countries..."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_country_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_country_id
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+msgid "Country"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_create_date
+msgid "Create Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_create_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_create_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_create_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_create_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_create_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_create_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+msgid "Current stage of the lead"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+msgid "Current stage of the opp"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_partner_id
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Customer"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Customer Name"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Date Partnership"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Date Review"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_delay_open
+msgid "Delay to Assign"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_delay_close
+msgid "Delay to Close"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Details Next Activity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_display_name
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_display_name
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_display_name
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_display_name
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_display_name
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Do you have contacted the customer?"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Edit Contact"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Edit Opportunity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Email"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_forward_to_partner_form
+msgid "Email Template"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Expected Closing"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Expected Closing:"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:101
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+#, python-format
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "Filter by Country"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "Filter by Level"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_partner_id
+msgid "Forward Leads To"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_forward_type
+msgid "Forward selected leads to"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.actions.act_window,name:website_crm_partner_assign.action_crm_send_mass_forward
+#: model:ir.actions.act_window,name:website_crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:mail.template,subject:website_crm_partner_assign.email_template_lead_forward_mail
+msgid "Fwd: Lead: ${ctx['partner_id'].name}"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_latitude
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_longitude
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "Geolocation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_res_partner_grade_partner_weight
+#: model:ir.model.fields,help:website_crm_partner_assign.field_res_partner_partner_weight
+msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_grade_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_grade_id
+msgid "Grade"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Group By"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id
+msgid "ID"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_implemented_partner_ids
+msgid "Implementation References"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_assigned_partner_id
+msgid "Implemented by"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_date
+msgid "Invoice Account Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation___last_update
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner___last_update
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign___last_update
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign___last_update
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation___last_update
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_write_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_write_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_write_uid
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_write_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_write_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_write_date
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_date_assign
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_date_review
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_review
+msgid "Latest Partner Review"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_id
+msgid "Lead"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Lead -"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_graph
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_pivot
+msgid "Lead Assign"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Lead Feedback"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_location
+msgid "Lead Location"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_link
+msgid "Lead Single Links"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
+msgid "Leads"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+msgid "Leads Analysis"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_9884
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
+msgid "Level"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_name
+msgid "Level Name"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_partner_weight
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_partner_weight
+msgid "Level Weight"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "Looking For a Local Store?"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:94
#, python-format
-msgid "All Categories"
+msgid "Lost"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_probability_max
+msgid "Max Probability"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Medium"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Mobile"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_partner_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_opportunity_partner_filter
+msgid "My Assigned Partners"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "My Leads"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "My Opportunities"
msgstr ""
#. module: website_crm_partner_assign
-#: code:addons/website_crm_partner_assign/controllers/main.py:79
+#: code:addons/website_crm_partner_assign/controllers/main.py:43
+#: code:addons/website_crm_partner_assign/controllers/main.py:99
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_name
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
#, python-format
-msgid "All Countries"
+msgid "Name"
msgstr ""
#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
-msgid "Contact a reseller"
+#: code:addons/website_crm_partner_assign/controllers/main.py:42
+#: code:addons/website_crm_partner_assign/controllers/main.py:98
+#, python-format
+msgid "Newest"
msgstr ""
#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
-msgid "Filter by Country"
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Next Activity"
msgstr ""
#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
-msgid "Filter by Level"
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Next Activity Date"
msgstr ""
#. module: website_crm_partner_assign
-#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
-msgid "Looking For a Local Store?"
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_review_next
+msgid "Next Partner Review"
msgstr ""
#. module: website_crm_partner_assign
@@ -52,21 +707,182 @@ msgstr ""
msgid "No result found"
msgstr ""
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_report_assign_delay_close
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_report_assign_delay_open
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_opening_date
+msgid "Opening Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.actions.act_window,name:website_crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:website_crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
+msgid "Opportunities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_graph
+msgid "Opportunities Assignment Analysis"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Opportunity -"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.partner
msgid "Our Partners"
msgstr ""
#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:92
+#, python-format
+msgid "Overdue Activities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_delay_expected
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_res_partner
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_partner_assigned_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_partner_id
#: model:ir.ui.view,arch_db:website_crm_partner_assign.grade_in_detail
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
msgid "Partner"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_partner_assign_form
+msgid "Partner Activation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.actions.act_window,name:website_crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:website_crm_partner_assign.res_partner_activation_config_mi
+msgid "Partner Activations"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_forward_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_forward_to_partner_assignation_lines
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.actions.act_window,name:website_crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:website_crm_partner_assign.menu_res_partner_grade_action
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_tree
+msgid "Partner Level"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_partner_location
+msgid "Partner Location"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_partner_assign_form
+msgid "Partner Review"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Partner assigned Analysis"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_partner_declined_ids
+msgid "Partner not interested"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_partner_assigned_id
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
msgid "Partners"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.actions.act_window,name:website_crm_partner_assign.action_report_crm_partner_assign
+msgid "Partnership Analysis"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_date_partnership
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_partnership
+msgid "Partnership Date"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.menu,name:website_crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnerships"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Phone"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_planned_revenue
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_priority
+msgid "Priority"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:102
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+#, python-format
+msgid "Probability"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_probable_revenue
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Rating"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.references_block
msgid "References"
@@ -78,16 +894,239 @@ msgstr ""
msgid "Resellers"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_team_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_team_id
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Sales Team"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_lead_assign_filter
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_report_crm_partner_assign_filter
+msgid "Salesperson"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
msgid "Search"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_forward_to_partner_form
+msgid "Send"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_lead_geo_assign_form
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_crm_opportunity_geo_assign_form
+msgid "Send Email"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.crm_lead_forward_to_partner_form
+msgid "Send Mail"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_sequence
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/wizard/crm_forward_to_partner.py:72
+#, python-format
+msgid "Set an email address for the partner %s"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/wizard/crm_forward_to_partner.py:70
+#, python-format
+msgid "Set an email address for the partner(s): %s"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:103
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "States..."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Street"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Street2"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_tag_ids
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Tags"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/wizard/crm_forward_to_partner.py:60
+#, python-format
+msgid "The Forward Email Template is not in the database"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+msgid "There are currently no leads for your account."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+msgid "There are currently no opportunities for your account."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+msgid "There are no leads."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+msgid "There are no opportunities."
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:90
+#, python-format
+msgid "This Week Activities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:89
+#, python-format
+msgid "Today Activities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_turnover
+msgid "Turnover"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_type
+msgid "Type"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,help:website_crm_partner_assign.field_crm_lead_report_assign_type
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_user_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_user_id
+msgid "User"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Very High"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "What is the next action? When? What is the expected revenue?"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Why aren't you interested by this lead?"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:93
+#, python-format
+msgid "Won"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.ref_country
msgid "World Map"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "YYYY-MM-DD"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads
+msgid "Your Leads"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+msgid "Your Opportunities"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "ZIP"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: selection:crm.lead.forward.to.partner,forward_type:0
+msgid "a single partner: manual selection of partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunities
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "at"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead_assignation
+msgid "crm.lead.assignation"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "crm.lead.forward.to.partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
+msgid "e.g. Gold Partner"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "on"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "or"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
msgid "pull-left"
@@ -98,8 +1137,18 @@ msgstr ""
msgid "reference(s)"
msgstr ""
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_res_partner_activation
+msgid "res.partner.activation"
+msgstr ""
+
#. module: website_crm_partner_assign
#: model:ir.model,name:website_crm_partner_assign.model_res_partner_grade
msgid "res.partner.grade"
msgstr ""
+#. module: website_crm_partner_assign
+#: selection:crm.lead.forward.to.partner,forward_type:0
+msgid "several partners: automatic assignation, using GPS coordinates and partner's grades"
+msgstr ""
+
diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot
index 1e37bcb4b4a4c81e116d807b550e43a9f6554b59..a3541aa530aa27cfcdbe80b24755939fc32bca4c 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Active"
msgstr ""
#. module: website_customer
-#: code:addons/website_customer/controllers/main.py:68
+#: code:addons/website_customer/controllers/main.py:65
#, python-format
msgid "All Countries"
msgstr ""
@@ -154,6 +154,11 @@ msgstr ""
msgid "Trusted by millions worldwide"
msgstr ""
+#. module: website_customer
+#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag_website_published
+msgid "Visible in Website"
+msgstr ""
+
#. module: website_customer
#: model:ir.actions.act_window,name:website_customer.action_partner_tag_form
#: model:ir.ui.menu,name:website_customer.menu_partner_tag_form
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 9fb34c45ac769489fa6b064c5060f71c0e611f3f..f4db50673cdfc79a996c0088d29694f1c335f175 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,12 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:219
-#, python-format
-msgid "%(month)s %(start_day)s%(end_day)s"
-msgstr ""
-
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.country_events_list
msgid "<b>Upcoming Events</b>"
@@ -94,20 +88,13 @@ msgid "<strong>Phone</strong> <span class=\"text-muted\">(Optional)</span>"
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:25
-#, python-format
-msgid "Add Content"
-msgstr ""
-
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:106
+#: code:addons/website_event/controllers/main.py:96
#, python-format
msgid "All Categories"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:117
+#: code:addons/website_event/controllers/main.py:103
#, python-format
msgid "All Countries"
msgstr ""
@@ -129,73 +116,42 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:48
+#: code:addons/website_event/static/src/js/website.tour.event.js:24
#, python-format
msgid "Click <em>Continue</em> to create the event."
msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:33
+#: code:addons/website_event/static/src/js/website.tour.event.js:15
#, python-format
msgid "Click here to create a new event."
msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:82
+#: code:addons/website_event/static/src/js/website.tour.event.js:43
#, python-format
msgid "Click here to customize your event further."
msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:75
+#: code:addons/website_event/static/src/js/website.tour.event.js:38
#, python-format
msgid "Click to publish your event."
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:54
#: model:ir.ui.view,arch_db:website_event.registration_attendee_details
-#, python-format
msgid "Continue"
msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:47
-#, python-format
-msgid "Create Event"
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:41
-#, python-format
-msgid "Create a name for your new event and click <em>'Continue'</em>. e.g: Technical Training"
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:18
-#, python-format
-msgid "Create an Event"
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:40
-#, python-format
-msgid "Create an Event Name"
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:15
+#: code:addons/website_event/static/src/js/website.tour.event.js:19
#, python-format
-msgid "Create an event"
+msgid "Create a name for your new event and click <em>\"Continue\"</em>. e.g: Technical Training"
msgstr ""
#. module: website_event
@@ -203,13 +159,6 @@ msgstr ""
msgid "Creates menus Introduction, Location and Register on the page of the event on the website."
msgstr ""
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:81
-#, python-format
-msgid "Customize your event"
-msgstr ""
-
#. module: website_event
#: model:ir.model.fields,field_description:website_event.field_event_event_show_menu
msgid "Dedicated Menu"
@@ -217,16 +166,9 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:59
+#: code:addons/website_event/static/src/js/website.tour.event.js:28
#, python-format
-msgid "Drag & Drop a block"
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:60
-#, python-format
-msgid "Drag the 'Image-Text' block and drop it in your page."
+msgid "Drag this block and drop it in your page."
msgstr ""
#. module: website_event
@@ -241,7 +183,7 @@ msgstr ""
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "End of Subscription"
+msgid "End of Registration"
msgstr ""
#. module: website_event
@@ -271,7 +213,7 @@ msgstr ""
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
-msgid "Event Subscription"
+msgid "Event Registration"
msgstr ""
#. module: website_event
@@ -285,6 +227,11 @@ msgstr ""
msgid "Event published"
msgstr ""
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_template
+msgid "Event registration is closed."
+msgstr ""
+
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
msgid "Event registration not yet started."
@@ -330,20 +277,18 @@ msgid "Free"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:44
+#: code:addons/website_event/models/event.py:54
#, python-format
msgid "Introduction"
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:19
-#, python-format
-msgid "Let's go through the first steps to publish a new event."
+#: model:ir.model.fields,field_description:website_event.field_event_event_is_participating
+msgid "Is Participating"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:45
+#: code:addons/website_event/models/event.py:55
#, python-format
msgid "Location"
msgstr ""
@@ -360,8 +305,7 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/controllers/main.py:201
-#: code:addons/website_event/static/src/js/website.tour.event.js:32
+#: code:addons/website_event/controllers/main.py:184
#: 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
@@ -369,26 +313,19 @@ msgid "New Event"
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:52
-#, python-format
-msgid "New Event Created"
-msgstr ""
-
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:38
+#: code:addons/website_event/controllers/main.py:34
#, python-format
msgid "Next Events"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:47
+#: code:addons/website_event/controllers/main.py:43
#, python-format
msgid "Next Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:55
+#: code:addons/website_event/controllers/main.py:51
#, python-format
msgid "Next month"
msgstr ""
@@ -399,14 +336,14 @@ msgid "No event found"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:59
+#: code:addons/website_event/controllers/main.py:55
#, python-format
msgid "Old Events"
msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:67
+#: code:addons/website_event/static/src/js/website.tour.event.js:33
#, python-format
msgid "Once you click on save, your event is updated."
msgstr ""
@@ -436,6 +373,12 @@ msgstr ""
msgid "Our Trainings"
msgstr ""
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.event_details
+#: model:ir.ui.view,arch_db:website_event.index
+msgid "Participating"
+msgstr ""
+
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_complete
msgid "Phone"
@@ -451,13 +394,6 @@ msgstr ""
msgid "Price"
msgstr ""
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:74
-#, python-format
-msgid "Publish your event"
-msgstr ""
-
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
msgid "Quantity"
@@ -469,7 +405,7 @@ msgid "Reference"
msgstr ""
#. module: website_event
-#: code:addons/website_event/models/event.py:53
+#: code:addons/website_event/models/event.py:63
#, python-format
msgid "Register"
msgstr ""
@@ -484,13 +420,6 @@ msgstr ""
msgid "Return to the event list."
msgstr ""
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:66
-#, python-format
-msgid "Save your modifications"
-msgstr ""
-
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.country_events_list
msgid "See all events from"
@@ -501,13 +430,6 @@ msgstr ""
msgid "See all upcoming events"
msgstr ""
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:20
-#, python-format
-msgid "Skip It"
-msgstr ""
-
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "Social Stream"
@@ -524,34 +446,13 @@ msgid "Sorry, the requested event is not available anymore."
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:20
-#, python-format
-msgid "Start Tutorial"
-msgstr ""
-
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:43
+#: code:addons/website_event/controllers/main.py:39
#, python-format
msgid "This Week"
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:26
-#, python-format
-msgid "This button allows you to create new pages, events, menus, etc."
-msgstr ""
-
-#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:53
-#, python-format
-msgid "This is your new event page. We will edit the event presentation page."
-msgstr ""
-
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:51
+#: code:addons/website_event/controllers/main.py:47
#, python-format
msgid "This month"
msgstr ""
@@ -567,7 +468,7 @@ msgid "Ticket Type #"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:39
+#: code:addons/website_event/controllers/main.py:35
#, python-format
msgid "Today"
msgstr ""
@@ -592,9 +493,14 @@ msgstr ""
msgid "Visible in Website"
msgstr ""
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.event_description_full
+msgid "Visualize on Google Maps"
+msgstr ""
+
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_complete
-msgid "We are glad to confirm your subscription to our event"
+msgid "We are glad to confirm your registration to our event"
msgstr ""
#. module: website_event
@@ -602,6 +508,16 @@ msgstr ""
msgid "Website Home"
msgstr ""
+#. module: website_event
+#: model:ir.model.fields,field_description:website_event.field_event_event_website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: website_event
+#: model:ir.model.fields,help:website_event.field_event_event_website_message_ids
+msgid "Website communication history"
+msgstr ""
+
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "When"
@@ -621,12 +537,7 @@ msgstr ""
#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_complete
-msgid "Your subscription"
-msgstr ""
-
-#. module: website_event
-#: model:ir.ui.view,arch_db:website_event.index
-msgid "not published"
+msgid "Your registration"
msgstr ""
#. module: website_event
@@ -644,3 +555,8 @@ msgstr ""
msgid "to"
msgstr ""
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.index
+msgid "unpublished"
+msgstr ""
+
diff --git a/addons/website_event_questions/i18n/website_event_questions.pot b/addons/website_event_questions/i18n/website_event_questions.pot
index d961dba6b47f726e265a3e120ccd5c02baaf7cbf..f61efb9b4fdb4846b74680ff433f22fff7fa5878 100644
--- a/addons/website_event_questions/i18n/website_event_questions.pot
+++ b/addons/website_event_questions/i18n/website_event_questions.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,12 +17,7 @@ msgstr ""
#. module: website_event_questions
#: model:ir.ui.view,arch_db:website_event_questions.registration_attendee_details_questions
-msgid "<strong>Last questions</strong>"
-msgstr ""
-
-#. module: website_event_questions
-#: model:event.question,title:website_event_questions.event_question_2
-msgid "Accommodation"
+msgid "<strong>Common Questions</strong>"
msgstr ""
#. module: website_event_questions
@@ -49,11 +44,6 @@ msgstr ""
msgid "Attendee"
msgstr ""
-#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_0_2
-msgid "Bronze"
-msgstr ""
-
#. module: website_event_questions
#: model:ir.model.fields,field_description:website_event_questions.field_event_answer_create_uid
#: model:ir.model.fields,field_description:website_event_questions.field_event_question_create_uid
@@ -99,8 +89,8 @@ msgid "Event registration id"
msgstr ""
#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_0_0
-msgid "Gold"
+#: model:ir.model.fields,field_description:website_event_questions.field_event_event_general_question_ids
+msgid "General Questions"
msgstr ""
#. module: website_event_questions
@@ -121,16 +111,6 @@ msgstr ""
msgid "If True, this question will be asked for every attendee of a reservation. If not it will be asked only once and its value propagated to every attendees."
msgstr ""
-#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_2_1
-msgid "In Charge"
-msgstr ""
-
-#. module: website_event_questions
-#: model:event.question,title:website_event_questions.event_question_0
-msgid "Kind of partner"
-msgstr ""
-
#. module: website_event_questions
#: model:ir.model.fields,field_description:website_event_questions.field_event_answer___last_update
#: model:ir.model.fields,field_description:website_event_questions.field_event_question___last_update
@@ -153,16 +133,6 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
-#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_1_1
-msgid "No"
-msgstr ""
-
-#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_2_0
-msgid "Personal"
-msgstr ""
-
#. module: website_event_questions
#: model:ir.model.fields,field_description:website_event_questions.field_event_question_report_question_id
#: model:ir.ui.view,arch_db:website_event_questions.view_event_answer_simplified_form
@@ -177,9 +147,7 @@ msgid "Question id"
msgstr ""
#. module: website_event_questions
-#: model:ir.model.fields,field_description:website_event_questions.field_event_event_general_question_ids
#: model:ir.model.fields,field_description:website_event_questions.field_event_event_question_ids
-#: model:ir.model.fields,field_description:website_event_questions.field_event_event_specific_question_ids
#: model:ir.ui.menu,name:website_event_questions.menu_report_event_questions
#: model:ir.ui.view,arch_db:website_event_questions.view_event_form_inherit_question
msgid "Questions"
@@ -206,8 +174,8 @@ msgid "Sequence"
msgstr ""
#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_0_1
-msgid "Silver"
+#: model:ir.model.fields,field_description:website_event_questions.field_event_event_specific_question_ids
+msgid "Specific Questions"
msgstr ""
#. module: website_event_questions
@@ -215,16 +183,6 @@ msgstr ""
msgid "Title"
msgstr ""
-#. module: website_event_questions
-#: model:event.question,title:website_event_questions.event_question_1
-msgid "Veggie"
-msgstr ""
-
-#. module: website_event_questions
-#: model:event.answer,name:website_event_questions.event_suggestion_1_0
-msgid "Yes"
-msgstr ""
-
#. module: website_event_questions
#: model:ir.model,name:website_event_questions.model_event_answer
msgid "event.answer"
diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot
index ef15848e4bf894b5b73f191f5a980f40e855dc65..332b7c5e2ed894218f75398e2ac7e60dcf4c1140 100644
--- a/addons/website_event_sale/i18n/website_event_sale.pot
+++ b/addons/website_event_sale/i18n/website_event_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,6 +50,12 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: website_event_sale
+#: code:addons/website_event_sale/controllers/main.py:63
+#, python-format
+msgid "Registration"
+msgstr ""
+
#. module: website_event_sale
#: model:ir.ui.view,arch_db:website_event_sale.index
msgid "Remaining"
@@ -67,23 +73,17 @@ msgid "Sold Out"
msgstr ""
#. module: website_event_sale
-#: code:addons/website_event_sale/models/sale_order.py:71
+#: code:addons/website_event_sale/models/sale_order.py:67
#, python-format
msgid "Sorry, The %(ticket)s tickets for the %(event)s event are sold out."
msgstr ""
#. module: website_event_sale
-#: code:addons/website_event_sale/models/sale_order.py:77
+#: code:addons/website_event_sale/models/sale_order.py:73
#, python-format
msgid "Sorry, only %(remaining_seats)d seats are still available for the %(ticket)s ticket for the %(event)s event."
msgstr ""
-#. module: website_event_sale
-#: code:addons/website_event_sale/controllers/main.py:65
-#, python-format
-msgid "Subscription"
-msgstr ""
-
#. module: website_event_sale
#: code:addons/website_event_sale/models/sale_order.py:36
#, python-format
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index ece6ea616959335687356d866f5717f8af2520cf..a557aa8829287634abbab6fa7e237d9ca016d84e 100644
--- a/addons/website_event_track/i18n/website_event_track.pot
+++ b/addons/website_event_track/i18n/website_event_track.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -89,28 +89,18 @@ msgid "<strong>Regular Talks</strong>. These are standard talks with slides,\n"
" alocated in slots of 60 minutes."
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track7
-msgid "A technical explanation of Odoo as a CMS and a eCommerce platform for version 8."
-msgstr ""
-
#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.track_view
msgid "About The Author"
msgstr ""
#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track19
-msgid "Advanced lead management with Odoo: tips and tricks from the fields"
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_active
+msgid "Active"
msgstr ""
#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track13
-msgid "Advanced reporting with Google Spreadsheets integration."
-msgstr ""
-
-#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:160
+#: code:addons/website_event_track/models/event.py:26
#, python-format
msgid "Agenda"
msgstr ""
@@ -136,6 +126,11 @@ msgstr ""
msgid "Application"
msgstr ""
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
+msgid "Archived"
+msgstr ""
+
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_event_allowed_track_tag_ids
msgid "Available Track Tags"
@@ -201,21 +196,6 @@ msgstr ""
msgid "Delete"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track6
-msgid "Detailed roadmap of accounting new modules and improvements for version 8."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track8
-msgid "Discover Odoo CRM: How to optimize your sales, from leads to sales orders."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track11
-msgid "Discover Odoo Point-of-Sale: Your shop ready to use in 30 minutes."
-msgstr ""
-
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_display_name
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_display_name
@@ -309,7 +289,7 @@ msgstr ""
#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_social
-msgid "Find out what people see and say about this event, \n"
+msgid "Find out what people see and say about this event,\n"
" and join the conversation."
msgstr ""
@@ -333,36 +313,6 @@ msgstr ""
msgid "Highest"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track18
-msgid "How to build your marketing strategy for the purpose of generating leads with Odoo."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track1
-msgid "How to develop a website module."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track4
-msgid "How to develop automated tests in the Odoo web client."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track3
-msgid "How to develop real time apps, the website live chat module explained."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track2
-msgid "How to integrate hardware materials with the Odoo point of sale."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track9
-msgid "How to use Odoo for your HR process: recruitment, leaves management, appraisals, expenses, etc."
-msgstr ""
-
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_id
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_id
@@ -382,11 +332,6 @@ msgstr ""
msgid "Introduction"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track23
-msgid "Key Success factors selling Odoo."
-msgstr ""
-
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor___last_update
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type___last_update
@@ -429,21 +374,6 @@ msgstr ""
msgid "Low"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track31
-msgid "Lunch"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track22
-msgid "Manage your KPIs (recomended to openERP partners)."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track12
-msgid "Manage your events with Odoo, the new training modules."
-msgstr ""
-
#. module: website_event_track
#: selection:event.track,priority:0
msgid "Medium"
@@ -455,36 +385,11 @@ msgstr ""
msgid "Medium-sized image of this contact. It is automatically resized as a 128x128px image, with aspect ratio preserved. Use this field in form views or some kanban views."
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track25
-msgid "Merge proposals review, code sprint (entire afternoon)"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track24
-msgid "Merge proposals review, code sprint (entire day)."
-msgstr ""
-
#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
msgid "More"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track30
-msgid "Morning break"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track20
-msgid "New Certification Program (valid from Oct. 2013)."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track14
-msgid "New Paypal modules (portal, handling, installments)."
-msgstr ""
-
#. module: website_event_track
#: model:mail.message.subtype,name:website_event_track.mt_event_track
msgid "New Track"
@@ -505,26 +410,6 @@ msgstr ""
msgid "No tracks found!"
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track15
-msgid "Odoo Mobile for Notes, Meetings and Messages."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track28
-msgid "Odoo Status & Strategy 2014"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track16
-msgid "Odoo as your Enterprise Social Network."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track27
-msgid "Odoo in 2014"
-msgstr ""
-
#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_sponsor
msgid "Our Sponsors"
@@ -588,16 +473,6 @@ msgid "Put here the list of documents, like slides of\n"
" it's implemented."
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track10
-msgid "Raising qualitive insights with the survey app"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track21
-msgid "Recruiting high skilled talents with Odoo HR apps"
-msgstr ""
-
#. module: website_event_track
#: selection:event.track,state:0
msgid "Refused"
@@ -610,7 +485,7 @@ msgid "Responsible"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_8478
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_8493
#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_name
msgid "Room"
msgstr ""
@@ -642,7 +517,7 @@ msgid "Speaker Biography"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:116
+#: code:addons/website_event_track/models/website_event_track.py:122
#: model:ir.model.fields,field_description:website_event_track.field_event_track_speaker_ids
#, python-format
msgid "Speakers"
@@ -696,11 +571,6 @@ msgstr ""
msgid "Submit Proposal"
msgstr ""
-#. module: website_event_track
-#: model:web.tip,description:website_event_track.event_track_tip_1
-msgid "Switch to the calendar view to see the availability of each room."
-msgstr ""
-
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_name
msgid "Tag"
@@ -723,7 +593,7 @@ msgid "Talk Introduction"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:162
+#: code:addons/website_event_track/models/event.py:28
#, python-format
msgid "Talk Proposals"
msgstr ""
@@ -734,7 +604,7 @@ msgid "Talk Title"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:159
+#: code:addons/website_event_track/models/event.py:25
#, python-format
msgid "Talks"
msgstr ""
@@ -749,21 +619,6 @@ msgstr ""
msgid "Thank you for your proposal."
msgstr ""
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track17
-msgid "The Art of Making an Odoo Demo."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track29
-msgid "The new marketing strategy."
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track5
-msgid "The new way to promote your modules in the Apps platform and Odoo website."
-msgstr ""
-
#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "This event does not accept proposals."
@@ -908,12 +763,12 @@ msgid "hours"
msgstr ""
#. module: website_event_track
-#: model:ir.ui.view,arch_db:website_event_track.tracks
-msgid "not published"
+#: model:ir.ui.view,arch_db:website_event_track.agenda
+msgid "talks"
msgstr ""
#. module: website_event_track
-#: model:ir.ui.view,arch_db:website_event_track.agenda
-msgid "talks"
+#: model:ir.ui.view,arch_db:website_event_track.tracks
+msgid "unpublished"
msgstr ""
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index d1ea3b482379ca17d559beb834bedda76f6b7d32..2fa0c06fbec8304e00be0091b4924e5edef88ffe 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -58,11 +58,16 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:23
+#: code:addons/website_forum/static/src/js/website_forum.js:21
#, python-format
msgid " karma is required to perform this action. You can earn karma by having your answers upvoted by the community."
msgstr ""
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_res_users_task_count
+msgid "# Tasks"
+msgstr ""
+
#. module: website_forum
#: model:mail.template,subject:website_forum.validation_email
msgid "${object.company_id.name} Forums validation"
@@ -83,6 +88,16 @@ msgstr ""
msgid "(The above section was adapted from Stackoverflow’s FAQ.)"
msgstr ""
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
+msgid "(Un)archiving a forum automatically (un)archives its posts. Do you want to proceed?"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.view_forum_post_form
+msgid "(Un)archiving a post automatically (un)archives its answers. Do you want to proceed?"
+msgstr ""
+
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
msgid "(votes - 1) **"
@@ -331,13 +346,6 @@ msgstr ""
msgid "Accept <i class=\"fa fa-check\"/>"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:114
-#, python-format
-msgid "Accept Answer"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_answer_accept_own
msgid "Accept an answer on own questions"
@@ -360,6 +368,7 @@ msgstr ""
#. module: website_forum
#: selection:forum.post,state:0
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum_active
#: model:ir.model.fields,field_description:website_forum.field_forum_post_active
msgid "Active"
msgstr ""
@@ -369,13 +378,6 @@ msgstr ""
msgid "Activity"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:19
-#, python-format
-msgid "Add Content"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_answer
msgid "Add a Comment"
@@ -394,7 +396,7 @@ msgid "After posting the user will be proposed to share its question or answer o
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:187
+#: code:addons/website_forum/controllers/main.py:188
#: model:ir.ui.view,arch_db:website_forum.forum_index
#, python-format
msgid "All"
@@ -406,28 +408,18 @@ msgid "Allow Bump"
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:94
#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
-#, python-format
msgid "Answer"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:498
+#: code:addons/website_forum/models/forum.py:504
#: model:mail.message.subtype,description:website_forum.mt_answer_edit
#: model:mail.message.subtype,name:website_forum.mt_answer_edit
#, python-format
msgid "Answer Edited"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:108
-#, python-format
-msgid "Answer Posted"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_gen_answer_accepted
msgid "Answer accepted"
@@ -506,6 +498,12 @@ msgstr ""
msgid "Answers"
msgstr ""
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_view_search
+#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
+msgid "Archived"
+msgstr ""
+
#. module: website_forum
#: selection:forum.post,post_type:0
msgid "Article"
@@ -517,10 +515,7 @@ msgid "Ask Your Question"
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:53
#: model:ir.ui.view,arch_db:website_forum.header
-#, python-format
msgid "Ask a Question"
msgstr ""
@@ -536,7 +531,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:56
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:29
#, python-format
msgid "Ask the question in this forum by clicking on the button."
msgstr ""
@@ -602,19 +597,13 @@ msgid "Back to"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:322
-#: code:addons/website_forum/controllers/main.py:389
+#: code:addons/website_forum/controllers/main.py:323
+#: code:addons/website_forum/controllers/main.py:394
#, python-format
msgid "Bad Request"
msgstr ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.badge_user
-msgid "Badge \""
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_res_users_badge_ids
#: model:ir.ui.view,arch_db:website_forum.badge
#: model:ir.ui.view,arch_db:website_forum.header
#: model:ir.ui.view,arch_db:website_forum.user_detail_full
@@ -748,14 +737,14 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:44
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:24
#, python-format
msgid "Click <em>Continue</em> to create the forum."
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:117
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:71
#, python-format
msgid "Click here to accept this answer."
msgstr ""
@@ -777,14 +766,14 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:105
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:64
#, python-format
msgid "Click to post your answer."
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:85
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:51
#, python-format
msgid "Click to post your question."
msgstr ""
@@ -797,13 +786,6 @@ msgstr ""
msgid "Close"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:123
-#, python-format
-msgid "Close Tutorial"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_close_all
msgid "Close all posts"
@@ -856,6 +838,8 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_p_2
#: model:gamification.challenge,name:website_forum.challenge_commentator
+#: model:gamification.challenge.line,name:website_forum.line_chief_commentator
+#: model:gamification.challenge.line,name:website_forum.line_commentator
#: model:gamification.goal.definition,name:website_forum.definition_commentator
msgid "Commentator"
msgstr ""
@@ -878,24 +862,11 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,description:website_forum.badge_p_1
+#: model:gamification.challenge.line,name:website_forum.line_configure_profile
#: model:gamification.goal.definition,name:website_forum.definition_configure_profile
msgid "Completed own biography"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:120
-#, python-format
-msgid "Congratulations"
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:122
-#, python-format
-msgid "Congratulations! You just created and post your first question and answer."
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "Congratulations! Your email has just been validated. You may now participate to our forums."
@@ -907,15 +878,6 @@ msgstr ""
msgid "Content"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:50
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:91
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:111
-#, python-format
-msgid "Continue"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_comment_convert_all
msgid "Convert all answers to comments and vice versa"
@@ -956,27 +918,6 @@ msgstr ""
msgid "Create Date"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:40
-#, python-format
-msgid "Create Forum"
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:14
-#, python-format
-msgid "Create a Question!"
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:11
-#, python-format
-msgid "Create a question"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_tag_create
msgid "Create new tags"
@@ -1012,6 +953,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_5
#: model:gamification.challenge,name:website_forum.challenge_critic
+#: model:gamification.challenge.line,name:website_forum.line_critic
#: model:gamification.goal.definition,name:website_forum.definition_critic
msgid "Critic"
msgstr ""
@@ -1059,6 +1001,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_6
#: model:gamification.challenge,name:website_forum.challenge_disciplined
+#: model:gamification.challenge.line,name:website_forum.line_disciplined
#: model:gamification.goal.definition,name:website_forum.definition_disciplined
msgid "Disciplined"
msgstr ""
@@ -1141,6 +1084,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_7
#: model:gamification.challenge,name:website_forum.challenge_editor
+#: model:gamification.challenge.line,name:website_forum.line_editor
#: model:gamification.goal.definition,name:website_forum.definition_editor
msgid "Editor"
msgstr ""
@@ -1168,13 +1112,14 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_a_5
#: model:gamification.challenge,name:website_forum.challenge_enlightened
+#: model:gamification.challenge.line,name:website_forum.line_enlightened
#: model:gamification.goal.definition,name:website_forum.definition_enlightened
msgid "Enlightened"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:37
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:19
#, python-format
msgid "Enter a name for your new forum."
msgstr ""
@@ -1202,16 +1147,19 @@ msgid "Favourite"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_favorite_question_1
#: model:gamification.goal.definition,name:website_forum.definition_favorite_question_1
msgid "Favourite Question (1)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_stellar_question_25
#: model:gamification.goal.definition,name:website_forum.definition_stellar_question_25
msgid "Favourite Question (25)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_favorite_question_5
#: model:gamification.goal.definition,name:website_forum.definition_favorite_question_5
msgid "Favourite Question (5)"
msgstr ""
@@ -1290,6 +1238,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_forum_id
#: model:ir.model.fields,field_description:website_forum.field_forum_tag_forum_id
#: model:ir.ui.menu,name:website_forum.menu_website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_view_search
#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
#: model:website.menu,name:website_forum.menu_questions
@@ -1308,10 +1257,7 @@ msgid "Forum Karma"
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:33
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_name
-#, python-format
msgid "Forum Name"
msgstr ""
@@ -1362,14 +1308,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:74
-#, python-format
-msgid "Give Tag"
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:63
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:33
#, python-format
msgid "Give your question title."
msgstr ""
@@ -1386,6 +1325,7 @@ msgid "Good Answer"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_good_answer
#: model:gamification.goal.definition,name:website_forum.definition_good_answer
msgid "Good Answer (6)"
msgstr ""
@@ -1408,6 +1348,7 @@ msgid "Great Answer"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_great_answer
#: model:gamification.goal.definition,name:website_forum.definition_great_answer
msgid "Great Answer (15)"
msgstr ""
@@ -1436,6 +1377,7 @@ msgid "Guru"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_guru
#: model:gamification.goal.definition,name:website_forum.definition_guru
msgid "Guru (15)"
msgstr ""
@@ -1495,7 +1437,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:78
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:43
#, python-format
msgid "Insert tags related to your question."
msgstr ""
@@ -1601,11 +1543,6 @@ msgstr ""
msgid "Last activity date"
msgstr ""
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_res_users_calendar_last_notif_ack
-msgid "Last notification marked as read from base Calendar"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "Last updated:"
@@ -1616,13 +1553,6 @@ msgstr ""
msgid "Left 10 answers with score of 10 or more"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:15
-#, python-format
-msgid "Let's go through the first steps to create a new question."
-msgstr ""
-
#. module: website_forum
#: selection:forum.forum,default_post_type:0
msgid "Link"
@@ -1669,6 +1599,13 @@ msgstr ""
msgid "Most voted"
msgstr ""
+#. module: website_forum
+#. openerp-web
+#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:48
+#, python-format
+msgid "Move this question to the top of the list by sharing it on social networks."
+msgstr ""
+
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post_user_vote
msgid "My Vote"
@@ -1695,19 +1632,11 @@ msgstr ""
#. module: website_forum
#. openerp-web
#: code:addons/website_forum/static/src/js/website_forum.editor.js:14
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:26
#: model:ir.ui.view,arch_db:website_forum.content_new_forum
#, python-format
msgid "New Forum"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:47
-#, python-format
-msgid "New Forum Created"
-msgstr ""
-
#. module: website_forum
#: model:mail.message.subtype,description:website_forum.mt_question_new
#: model:mail.message.subtype,name:website_forum.mt_forum_question_new
@@ -1715,13 +1644,6 @@ msgstr ""
msgid "New Question"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:88
-#, python-format
-msgid "New Question Created"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.new_discussion
msgid "New Topic"
@@ -1741,6 +1663,7 @@ msgid "Nice Answer"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_nice_answer
#: model:gamification.goal.definition,name:website_forum.definition_nice_answer
msgid "Nice Answer (4)"
msgstr ""
@@ -1757,20 +1680,20 @@ msgid "Nofollow links"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:833
-#: code:addons/website_forum/models/forum.py:853
+#: code:addons/website_forum/models/forum.py:848
+#: code:addons/website_forum/models/forum.py:868
#, python-format
msgid "Not allowed to vote for its own post"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:897
+#: code:addons/website_forum/models/forum.py:912
#, python-format
msgid "Not enough karma to create a new Tag"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:488
+#: code:addons/website_forum/models/forum.py:494
#, python-format
msgid "Not enough karma to retag."
msgstr ""
@@ -1842,6 +1765,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_23
#: model:gamification.challenge,name:website_forum.challenge_peer_pressure
+#: model:gamification.challenge.line,name:website_forum.line_peer_pressure
#: model:gamification.goal.definition,name:website_forum.definition_peer_pressure
msgid "Peer Pressure"
msgstr ""
@@ -1878,16 +1802,19 @@ msgid "Popular Question"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_popular_question
#: model:gamification.goal.definition,name:website_forum.definition_popular_question
msgid "Popular Question (150)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_notable_question
#: model:gamification.goal.definition,name:website_forum.definition_notable_question
msgid "Popular Question (250)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_famous_question
#: model:gamification.goal.definition,name:website_forum.definition_famous_question
msgid "Popular Question (500)"
msgstr ""
@@ -1902,10 +1829,7 @@ msgid "Post"
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:101
#: model:ir.ui.view,arch_db:website_forum.post_answer
-#, python-format
msgid "Post Answer"
msgstr ""
@@ -1924,13 +1848,6 @@ msgstr ""
msgid "Post Messages"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:81
-#, python-format
-msgid "Post Question"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.new_link
msgid "Post Title"
@@ -1967,7 +1884,7 @@ msgid "Posted 100 comments"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:432
+#: code:addons/website_forum/models/forum.py:438
#, python-format
msgid "Posting answer on a [Deleted] or [Closed] question is not possible"
msgstr ""
@@ -1992,27 +1909,21 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_25
#: model:gamification.challenge,name:website_forum.challenge_pundit
+#: model:gamification.challenge.line,name:website_forum.line_pundit
#: model:gamification.goal.definition,name:website_forum.definition_pundit
msgid "Pundit"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:48
-#, python-format
-msgid "Put this question back in the top list by sharing it on social networks."
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:98
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:58
#, python-format
msgid "Put your answer here."
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:71
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:37
#, python-format
msgid "Put your question here."
msgstr ""
@@ -2023,30 +1934,20 @@ msgid "Q&amp;A"
msgstr ""
#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:66
#: selection:forum.forum,default_post_type:0
#: selection:forum.post,post_type:0
#: model:ir.model.fields,field_description:website_forum.field_forum_post_parent_id
-#, python-format
msgid "Question"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:501
+#: code:addons/website_forum/models/forum.py:507
#: model:mail.message.subtype,description:website_forum.mt_question_edit
#: model:mail.message.subtype,name:website_forum.mt_question_edit
#, python-format
msgid "Question Edited"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:59
-#, python-format
-msgid "Question Title"
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_gen_question_downvote
msgid "Question downvoted"
@@ -2111,7 +2012,7 @@ msgid "Questions"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:515
+#: code:addons/website_forum/models/forum.py:525
#, python-format
msgid "Re: %s"
msgstr ""
@@ -2198,6 +2099,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_26
#: model:gamification.challenge,name:website_forum.challenge_scholar
+#: model:gamification.challenge.line,name:website_forum.line_scholar
#: model:gamification.goal.definition,name:website_forum.definition_scholar
msgid "Scholar"
msgstr ""
@@ -2229,7 +2131,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:29
+#: code:addons/website_forum/static/src/js/website_tour_forum.js:15
#, python-format
msgid "Select this menu item to create a new forum."
msgstr ""
@@ -2237,6 +2139,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_a_8
#: model:gamification.challenge,name:website_forum.challenge_self_learner
+#: model:gamification.challenge.line,name:website_forum.line_self_learner
#: model:gamification.goal.definition,name:website_forum.definition_self_learner
msgid "Self-Learner"
msgstr ""
@@ -2278,28 +2181,28 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:16
+#: code:addons/website_forum/static/src/js/website_forum.js:23
#, python-format
-msgid "Skip It"
+msgid "Sorry you must be logged in to perform this action"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:66
+#: code:addons/website_forum/static/src/js/website_forum.js:70
#, python-format
msgid "Sorry you must be logged to flag a post"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:114
+#: code:addons/website_forum/static/src/js/website_forum.js:118
#, python-format
msgid "Sorry you must be logged to vote"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:145
+#: code:addons/website_forum/static/src/js/website_forum.js:149
#, python-format
msgid "Sorry, anonymous users cannot choose correct answer."
msgstr ""
@@ -2311,7 +2214,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:109
+#: code:addons/website_forum/static/src/js/website_forum.js:113
#, python-format
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
@@ -2321,13 +2224,6 @@ msgstr ""
msgid "Sort by"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:16
-#, python-format
-msgid "Start Tutorial"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "Stats"
@@ -2359,6 +2255,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_31
#: model:gamification.challenge,name:website_forum.challenge_supporter
+#: model:gamification.challenge.line,name:website_forum.line_supporter
#: model:gamification.goal.definition,name:website_forum.definition_supporter
msgid "Supporter"
msgstr ""
@@ -2389,9 +2286,15 @@ msgstr ""
msgid "Tags"
msgstr ""
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_res_users_task_ids
+msgid "Tasks"
+msgstr ""
+
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_32
#: model:gamification.challenge,name:website_forum.challenge_taxonomist
+#: model:gamification.challenge.line,name:website_forum.line_taxonomist
#: model:gamification.goal.definition,name:website_forum.definition_taxonomist
msgid "Taxonomist"
msgstr ""
@@ -2399,6 +2302,7 @@ msgstr ""
#. module: website_forum
#: model:gamification.badge,name:website_forum.badge_a_1
#: model:gamification.challenge,name:website_forum.challenge_teacher
+#: model:gamification.challenge.line,name:website_forum.line_teacher
#: model:gamification.goal.definition,name:website_forum.definition_teacher
msgid "Teacher"
msgstr ""
@@ -2466,42 +2370,21 @@ msgid "This formula is used in order to sort by relevance. The variable 'votes'
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:408
+#: code:addons/website_forum/models/forum.py:414
#, python-format
msgid "This forum does not allow %s"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:49
-#, python-format
-msgid "This page contains all the information related to the new forum."
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:110
-#, python-format
-msgid "This page contains the newly created questions and its answers."
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:90
-#, python-format
-msgid "This page contains the newly created questions."
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:76
+#: code:addons/website_forum/static/src/js/website_forum.js:80
#, python-format
msgid "This post can not be flagged"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:71
+#: code:addons/website_forum/static/src/js/website_forum.js:75
#, python-format
msgid "This post is already flagged"
msgstr ""
@@ -2528,8 +2411,8 @@ msgid "Title must not be empty"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/controllers/main.py:322
-#: code:addons/website_forum/controllers/main.py:389
+#: code:addons/website_forum/controllers/main.py:323
+#: code:addons/website_forum/controllers/main.py:394
#, python-format
msgid "Title should not be empty."
msgstr ""
@@ -2539,17 +2422,17 @@ msgstr ""
msgid "To"
msgstr ""
-#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.new_question
-msgid "To improve your chance getting an answer:"
-msgstr ""
-
#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
msgid "To prevent your question from being flagged and possibly removed, avoid asking\n"
" subjective questions where …"
msgstr ""
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_count
+msgid "Total Votes"
+msgstr ""
+
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "Trending"
@@ -2611,32 +2494,29 @@ msgid "Upvote"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_student
#: model:gamification.goal.definition,name:website_forum.definition_student
msgid "Upvoted question (1)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_great_question
#: model:gamification.goal.definition,name:website_forum.definition_great_question
msgid "Upvoted question (15)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_nice_question
#: model:gamification.goal.definition,name:website_forum.definition_nice_question
msgid "Upvoted question (4)"
msgstr ""
#. module: website_forum
+#: model:gamification.challenge.line,name:website_forum.line_good_question
#: model:gamification.goal.definition,name:website_forum.definition_good_question
msgid "Upvoted question (6)"
msgstr ""
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:22
-#, python-format
-msgid "Use this button to create a new forum like any other document (page, menu, products, event, ...)."
-msgstr ""
-
#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_user_id
msgid "User"
@@ -2658,7 +2538,7 @@ msgid "Validate question"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:777
+#: code:addons/website_forum/models/forum.py:801
#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
#, python-format
msgid "View"
@@ -2676,7 +2556,6 @@ msgid "Vote"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_count
#: model:ir.model.fields,field_description:website_forum.field_forum_post_vote_ids
#: model:ir.ui.view,arch_db:website_forum.user_detail_full
msgid "Votes"
@@ -2692,6 +2571,11 @@ msgstr ""
msgid "Waiting for validation"
msgstr ""
+#. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_res_users_forum_waiting_posts_count
+msgid "Waiting post"
+msgstr ""
+
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.new_link
msgid "We keep a high level of quality in showcased posts, around 20% of the submited\n"
@@ -2742,7 +2626,13 @@ msgid "Why can other people edit my questions/answers?"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:141
+#: model:ir.ui.view,arch_db:website_forum.new_question
+msgid "You already have one pending post.<br/>\n"
+" Please wait for a moderator to validate your previous post before continuing."
+msgstr ""
+
+#. module: website_forum
+#: code:addons/website_forum/models/forum.py:139
#, python-format
msgid "You cannot choose %s as default post since the forum does not allow it."
msgstr ""
@@ -3053,11 +2943,6 @@ msgstr ""
msgid "racist and hate speech"
msgstr ""
-#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.badge_user
-msgid "received this badge:"
-msgstr ""
-
#. module: website_forum
#: selection:gamification.badge,level:0
msgid "silver"
@@ -3108,16 +2993,6 @@ msgstr ""
msgid "upvote, add comments"
msgstr ""
-#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.badge_user
-msgid "user"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.badge_user
-msgid "users"
-msgstr ""
-
#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "views"
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index fae9506b83c724e210b05025c44afb53a2aa5eea..416536f09b76610ef2919fe5c4f780a5d9d9e1ae 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,12 +15,57 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "$15k"
+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.default_website_description
+msgid "3 months"
+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.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.default_website_description
+msgid "<strong>Challenges</strong>"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<strong>Must Have</strong>"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<strong>Responsibilities</strong>"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "<strong>What's great in the job?</strong>"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Achieve monthly targets"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.job_countries
msgid "All Countries"
@@ -41,19 +86,44 @@ msgstr ""
msgid "Applicant"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
+msgid "Apply Job"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.detail
-msgid "Apply"
+msgid "Apply Now!"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
-msgid "Apply Job"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Avg Deal Size:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Benefits"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Brand-name product and services in categories like travel, electronics, health, fitness, cellular, and more"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Company Growth:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Company Maturity:"
msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "Click on \"Content\" to define a new job offer or \"Help\" for more informations."
+msgid "Contact us"
msgstr ""
#. module: website_hr_recruitment
@@ -61,11 +131,51 @@ msgstr ""
msgid "Continue To Our Website"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.index
+msgid "Create new job pages from the <strong><i>+New</i></strong> top-right button."
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Direct coordination with functional consultants for qualification and follow ups"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Discount Programs"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Eat & Drink"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Full sales cycle"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Healthcare, dental, vision, life insurance, Flexible Spending Account (FSA), Health Savings Account (HSA)"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "High commissions for good performers"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "Job Application Form"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Job Complexity:"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.detail
msgid "Job Detail"
@@ -77,6 +187,18 @@ msgid "Job Position"
msgstr ""
#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Job Security:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: code:addons/website_hr_recruitment/controllers/main.py:72
+#, python-format
+msgid "Job Title"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.detail
#: model:ir.ui.view,arch_db:website_hr_recruitment.job_footer_custom
#: model:website.menu,name:website_hr_recruitment.menu_jobs
msgid "Jobs"
@@ -95,15 +217,28 @@ msgid "Join us, we offer you an extraordinary chance to learn, to\n"
msgstr ""
#. module: website_hr_recruitment
-#: code:addons/website_hr_recruitment/controllers/main.py:74
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+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.default_website_description
+msgid "Need More Info?"
+msgstr ""
+
+#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.content_new_job_offer
-#, python-format
msgid "New Job Offer"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "No job offer found"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "No outbound calls, you get leads and focus on providing value to them"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Only a couple blocs from BART, Caltrain, Highway 101, carpool pickup, and Bay Bridge."
msgstr ""
#. module: website_hr_recruitment
@@ -112,8 +247,43 @@ msgid "Our Job Offers"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.detail
-msgid "Our Jobs"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Overachieving Possibilities:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "PTOs"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Peet's and Philz coffee provided all day to order and pantry snacks"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Personal Evolution:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Play any sport with colleagues and the bill is covered"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Pre-tax commuter benefitsbr <br/>(parking and transit)"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Prime location"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Profitable"
msgstr ""
#. module: website_hr_recruitment
@@ -121,24 +291,73 @@ msgstr ""
msgid "Resume"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Sales Cycle:"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Save on commute"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
msgid "Short Introduction"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Short summary of the job: A sales job for smart people and can\n"
+" learn quickly new industries management practices. You will be\n"
+" in charge of the full sales cycle from the opportunity\n"
+" qualification to the negotiation, going through astonishing\n"
+" product demos."
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.model,name:website_hr_recruitment.model_hr_recruitment_source
msgid "Source of Applicants"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Sponsored Events"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Sport Activity"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+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.index
-msgid "There isn't job offer published now, click"
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "The culture"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "The founder’s story"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Tuesday Dinners, Monthly Lunch Mixers, Monthly Happy Hour, Annual day event"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "US + Canada Territory"
msgstr ""
#. module: website_hr_recruitment
@@ -146,6 +365,16 @@ msgstr ""
msgid "Url Parameters"
msgstr ""
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Vacation, Sick, and Holiday paid leaves"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "Variability of the Job:"
+msgstr ""
+
#. module: website_hr_recruitment
#: model:ir.actions.act_url,name:website_hr_recruitment.action_open_website
msgid "Website Recruitment Form"
@@ -157,12 +386,13 @@ msgid "Website description"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "With a small team of smart people, we released the most\n"
-" disruptive enterprise management software in the world.\n"
-" Odoo is fully open source, super easy, full featured\n"
-" (3000+ apps) and its online offer is 3 times cheaper than\n"
-" traditional competitors like SAP and Ms Dynamics."
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "What people say about us?"
+msgstr ""
+
+#. module: website_hr_recruitment
+#: model:ir.ui.view,arch_db:website_hr_recruitment.default_website_description
+msgid "You sell management software to directors of SMEs: interesting projects and people"
msgstr ""
#. module: website_hr_recruitment
@@ -188,12 +418,7 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "here"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "not published"
+msgid "for job opportunities."
msgstr ""
#. module: website_hr_recruitment
@@ -203,6 +428,6 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "to contact us"
+msgid "unpublished"
msgstr ""
diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot
index 774e2f49806c9e817cf94169d78994e43859d0d1..a1b67b1e47a9ceb19f0f6254f426046f646a2364 100644
--- a/addons/website_mail/i18n/website_mail.pot
+++ b/addons/website_mail/i18n/website_mail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,20 +37,18 @@ msgid "\n"
" <td style=\"padding:15px 10px;font-size:20px\">\n"
" <p style=\"color:#a24689;margin:0\" >Awesome!</p><br>\n"
" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Your website is now online !</span></p><br>\n"
+" <span>Your website is now online!</span></p><br>\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span style=\"font-size:13px;font-weight:bold; \">Did you know ?</span></p>\n"
+" <span style=\"font-size:13px;font-weight:bold; \">Did you know?</span></p>\n"
" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Enhance your online business with astonishing apps like : Forum, Blog, e-Commerce, Events, online jobs...</span>\n"
+" <span>From the Customize / Install Apps menu, you can install new features (forum, blog, eCommerce, jobs, ...)</span>\n"
" </p>\n"
" </li>\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
-" <span>Customize the look of your website with our </span>\n"
-" <span style=\"font-weight:bold;text-decoration:underline;\"><a href=\"https://www.odoo.com/apps/themes\">magnificent themes</a></span>\n"
-" <span>to easily create a unique website.</span>\n"
+" <span>Customize the look of your website with the Customize menu.</span>\n"
" </p>\n"
" </li>\n"
" </ul> <br>\n"
@@ -69,22 +67,17 @@ msgid "\n"
" </li>\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Test different versions of a page to perform better in reaching your business objectives,</span>\n"
-" </p>\n"
-" </li>\n"
-" <li dir=\"ltr\">\n"
-" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
" <span>Improve your conversion from visitor to customer with the Website Live support,</span>\n"
" </p>\n"
" </li>\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Broaden your audience by translating your website automatically with Gengo,</span>\n"
+" <span>Broaden your audience with the multi-language support,</span>\n"
" </p>\n"
" </li>\n"
" <li dir=\"ltr\">\n"
" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
-" <span>Go further into the customizing with our advanced HTML editor,</span>\n"
+" <span>Go further into the customization with our advanced HTML editor,</span>\n"
" </p>\n"
" </li>\n"
" <li dir=\"ltr\">\n"
@@ -103,13 +96,12 @@ msgid "\n"
" <a href=\"mailto:help@odoo.com\"><span style=\"text-decoration:underline;\">\n"
" help@odoo.com</span></a> if you have any question. You can also discover \n"
" how to get the best out of Odoo with our </span>\n"
-" <a href=\"https://www.odoo.com/documentation/user/9.0/project.html\">\n"
+" <a href=\"https://www.odoo.com/documentation/user\">\n"
" <span style=\"text-decoration:underline;\">User Documentation</span></a>\n"
" </span><span> or with our </span>\n"
-" <a href=\"https://www.odoo.com/documentation/9.0/\">\n"
+" <a href=\"https://www.odoo.com/documentation\">\n"
" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
" </p>\n"
-" <br>\n"
" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
" </td>\n"
" </tr>\n"
@@ -122,18 +114,10 @@ msgid "\n"
msgstr ""
#. module: website_mail
-#: model:ir.model,name:website_mail.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_event_registration
-msgid "Attendee"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_hr_department
-msgid "Department"
+#: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
+#: model:ir.model.fields,field_description:website_mail.field_mail_message_description
+#: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message_description
+msgid "Description"
msgstr ""
#. module: website_mail
@@ -141,16 +125,6 @@ msgstr ""
msgid "Discussion Group"
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_mail_channel
-msgid "Discussion channel"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_mail_thread
-msgid "Email Thread"
-msgstr ""
-
#. module: website_mail
#: model:ir.model,name:website_mail.model_mail_compose_message
msgid "Email composition wizard"
@@ -161,46 +135,11 @@ msgstr ""
msgid "Email composition wizard for Survey"
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_hr_employee
-msgid "Employee"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_event_event
-msgid "Event"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_gamification_badge
-msgid "Gamification badge"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_gamification_challenge
-msgid "Gamification challenge"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_fleet_vehicle
-msgid "Information on a vehicle"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_hr_job
-msgid "Job Position"
-msgstr ""
-
#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.message_thread
msgid "Leave a comment"
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_mail_mass_mailing_contact
-msgid "Mass Mailing Contact"
-msgstr ""
-
#. module: website_mail
#: model:ir.model,name:website_mail.model_mail_message
msgid "Message"
@@ -213,31 +152,11 @@ msgstr ""
msgid "Message description: either the subject, or the beginning of the body"
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_note_note
-msgid "Note"
-msgstr ""
-
#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.message_thread
msgid "Oops! Something went wrong. Try to reload the page and to log in."
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_product_product
-msgid "Product"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_product_template
-msgid "Product Template"
-msgstr ""
-
#. module: website_mail
#: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_website_published
#: model:ir.model.fields,field_description:website_mail.field_mail_message_website_published
@@ -245,11 +164,6 @@ msgstr ""
msgid "Published"
msgstr ""
-#. module: website_mail
-#: model:ir.model,name:website_mail.model_crm_team
-msgid "Sales Team"
-msgstr ""
-
#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.message_thread
msgid "Send"
@@ -261,12 +175,7 @@ msgid "Subscribe"
msgstr ""
#. module: website_mail
-#: model:ir.model,name:website_mail.model_survey_survey
-msgid "Survey"
-msgstr ""
-
-#. module: website_mail
-#: code:addons/website_mail/models/mail_message.py:69
+#: code:addons/website_mail/models/mail_message.py:57
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -285,123 +194,6 @@ msgstr ""
msgid "Visible on the website as a comment"
msgstr ""
-#. module: website_mail
-#: model:ir.model.fields,field_description:website_mail.field_product_template_website_message_ids
-msgid "Website Comments"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model.fields,field_description:website_mail.field_account_analytic_account_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_account_asset_asset_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_account_bank_statement_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_account_invoice_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_account_voucher_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_blog_blog_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_calendar_event_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_crm_lead_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_crm_team_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_crossovered_budget_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_event_event_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_event_registration_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_event_track_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_fleet_vehicle_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_forum_forum_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_forum_tag_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_gamification_badge_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_gamification_challenge_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_applicant_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_contract_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_department_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_employee_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_equipment_category_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_equipment_request_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_equipment_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_expense_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_holidays_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_job_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_hr_timesheet_sheet_sheet_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mail_channel_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mail_mass_mailing_contact_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mail_thread_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mrp_bom_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mrp_production_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mrp_production_workcenter_line_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_mrp_repair_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_note_note_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_procurement_order_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_product_product_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_project_issue_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_project_project_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_project_task_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_purchase_order_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_purchase_requisition_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_res_partner_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_sale_order_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_slide_channel_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_stock_landed_cost_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_stock_picking_wave_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_stock_picking_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_stock_production_lot_website_message_ids
-#: model:ir.model.fields,field_description:website_mail.field_survey_survey_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model.fields,help:website_mail.field_account_analytic_account_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_account_asset_asset_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_account_bank_statement_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_account_invoice_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_account_voucher_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_blog_blog_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_calendar_event_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_crm_lead_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_crm_team_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_crossovered_budget_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_event_event_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_event_registration_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_event_track_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_fleet_vehicle_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_forum_forum_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_forum_tag_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_gamification_badge_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_gamification_challenge_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_applicant_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_contract_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_department_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_employee_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_equipment_category_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_equipment_request_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_equipment_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_expense_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_holidays_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_job_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_hr_timesheet_sheet_sheet_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mail_channel_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mail_mass_mailing_contact_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mail_thread_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mrp_bom_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mrp_production_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mrp_production_workcenter_line_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_mrp_repair_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_note_note_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_procurement_order_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_product_product_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_project_issue_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_project_project_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_project_task_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_purchase_order_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_purchase_requisition_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_res_partner_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_sale_order_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_slide_channel_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_stock_landed_cost_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_stock_picking_wave_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_stock_picking_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_stock_production_lot_website_message_ids
-#: model:ir.model.fields,help:website_mail.field_survey_survey_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.message_thread
msgid "Write a message..."
@@ -444,13 +236,6 @@ msgstr ""
msgid "to post a comment."
msgstr ""
-#. module: website_mail
-#: model:ir.model.fields,field_description:website_mail.field_mail_compose_message_description
-#: model:ir.model.fields,field_description:website_mail.field_mail_message_description
-#: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message_description
-msgid "unknown"
-msgstr ""
-
#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.follow
msgid "your email..."
diff --git a/addons/website_mail_channel/i18n/website_mail_channel.pot b/addons/website_mail_channel/i18n/website_mail_channel.pot
index 0699581ab7f9e5ba3cbc3d31e17741a1ddc6bf7b..91de2c977aafe8c469921ba6465a93efdd492db9 100644
--- a/addons/website_mail_channel/i18n/website_mail_channel.pot
+++ b/addons/website_mail_channel/i18n/website_mail_channel.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,28 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid "<?xml version=\"1.0\"?>\n"
+"<data><p>Hello,</p>\n"
+"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
+"<p>To confirm, please visit the following link:</p>\n"
+"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
+"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
+"</data>"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_unsubscribe
+msgid "<?xml version=\"1.0\"?>\n"
+"<data><p>Hello,</p>\n"
+"<p>You have requested to be unsubscribed to the mailing list <strong>${object.name}</strong></p>\n"
+"<p>To confirm, please visit the following link:</p>\n"
+"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
+"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
+"</data>"
+msgstr ""
+
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "<span class=\"oe_snippet_thumbnail_title\">Discussion Group</span>"
@@ -59,6 +81,11 @@ msgstr ""
msgid "Change Discussion List"
msgstr ""
+#. module: website_mail_channel
+#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_description
+msgid "Description"
+msgstr ""
+
#. module: website_mail_channel
#. openerp-web
#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
@@ -81,6 +108,11 @@ msgstr ""
msgid "Follow-Ups"
msgstr ""
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.invalid_token_subscription
+msgid "Invalid or expired confirmation link."
+msgstr ""
+
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.footer_mailing_list
msgid "Mailing List"
@@ -93,7 +125,7 @@ msgid "Mailing Lists"
msgstr ""
#. module: website_mail_channel
-#: code:addons/website_mail_channel/models/mail_mail.py:23
+#: code:addons/website_mail_channel/models/mail_mail.py:20
#, python-format
msgid "Mailing-List"
msgstr ""
@@ -114,7 +146,17 @@ msgid "Outgoing Mails"
msgstr ""
#. module: website_mail_channel
-#: code:addons/website_mail_channel/models/mail_mail.py:24
+#: model:mail.template,subject:website_mail_channel.mail_template_list_subscribe
+msgid "Please confirm subscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:mail.template,subject:website_mail_channel.mail_template_list_unsubscribe
+msgid "Please confirm unsubscription to ${object.name}"
+msgstr ""
+
+#. module: website_mail_channel
+#: code:addons/website_mail_channel/models/mail_mail.py:21
#, python-format
msgid "Post to"
msgstr ""
@@ -141,7 +183,8 @@ msgid "Subscribe"
msgstr ""
#. module: website_mail_channel
-#: code:addons/website_mail_channel/models/mail_mail.py:25
+#: code:addons/website_mail_channel/models/mail_mail.py:22
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#, python-format
msgid "Unsubscribe"
msgstr ""
@@ -156,6 +199,16 @@ msgstr ""
msgid "Visible on the website as a comment"
msgstr ""
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "You have been correctly"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
+msgid "a confirmation email has been sent."
+msgstr ""
+
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
@@ -212,8 +265,13 @@ msgid "show"
msgstr ""
#. module: website_mail_channel
-#: model:ir.model.fields,field_description:website_mail_channel.field_mail_mail_description
-msgid "unknown"
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "subscribed"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "to the mailing list."
msgstr ""
#. module: website_mail_channel
@@ -222,6 +280,11 @@ msgstr ""
msgid "unsubscribe"
msgstr ""
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "unsubscribed"
+msgstr ""
+
#. module: website_mail_channel
#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
diff --git a/addons/website_payment/i18n/website_payment.pot b/addons/website_payment/i18n/website_payment.pot
index f233a7e4000e72283b95ed17b0065ae880e7950b..66627b5d23a87d1cda6a1ba05ccf7ef6574a36c0 100644
--- a/addons/website_payment/i18n/website_payment.pot
+++ b/addons/website_payment/i18n/website_payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -77,12 +77,7 @@ msgid "Manage your payment methods"
msgstr ""
#. module: website_payment
-#: model:ir.ui.view,arch_db:website_payment.pay_methods
-msgid "My Account"
-msgstr ""
-
-#. module: website_payment
-#: code:addons/website_payment/controllers/main.py:43
+#: code:addons/website_payment/controllers/main.py:44
#, python-format
msgid "Pay Now"
msgstr ""
@@ -108,6 +103,11 @@ msgstr ""
msgid "Payment Methods"
msgstr ""
+#. module: website_payment
+#: model:ir.model,name:website_payment.model_payment_transaction
+msgid "Payment Transaction"
+msgstr ""
+
#. module: website_payment
#: model:ir.ui.view,arch_db:website_payment.confirm
msgid "Payment processed by"
@@ -119,6 +119,16 @@ msgstr ""
msgid "Reference"
msgstr ""
+#. module: website_payment
+#: model:ir.model.fields,field_description:website_payment.field_payment_transaction_sale_order_id
+msgid "Sale Order"
+msgstr ""
+
+#. module: website_payment
+#: model:ir.model,name:website_payment.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
#. module: website_payment
#: model:ir.ui.view,arch_db:website_payment.pay
msgid "This transaction will be processed by"
diff --git a/addons/website_portal/i18n/website_portal.pot b/addons/website_portal/i18n/website_portal.pot
index f92b6f6d9e61508e4fbba8aaaae03c29246e9a0f..b89e6749b425e419ca46ca4da08facedeb8310bf 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,19 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_portal
-#: model:ir.ui.view,arch_db:website_portal.account
+#: model:ir.ui.view,arch_db:website_portal.portal_layout
+msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
+" <span class=\"icon-bar\"/>\n"
+" <span class=\"icon-bar\"/>"
+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.portal_layout
msgid "Change"
msgstr ""
@@ -72,14 +84,14 @@ msgid "Email"
msgstr ""
#. module: website_portal
-#: code:addons/website_portal/controllers/main.py:73
+#: code:addons/website_portal/controllers/main.py:103
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
#. module: website_portal
-#: model:ir.ui.view,arch_db:website_portal.details
#: model:ir.ui.view,arch_db:website_portal.my_account_link
+#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "My Account"
msgstr ""
@@ -94,7 +106,7 @@ msgid "Place your content here."
msgstr ""
#. module: website_portal
-#: code:addons/website_portal/controllers/main.py:88
+#: code:addons/website_portal/controllers/main.py:119
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -115,7 +127,7 @@ msgid "VAT Number"
msgstr ""
#. module: website_portal
-#: model:ir.ui.view,arch_db:website_portal.account
+#: model:ir.ui.view,arch_db:website_portal.portal_layout
msgid "Your Details"
msgstr ""
diff --git a/addons/website_portal_sale/i18n/website_portal_sale.pot b/addons/website_portal_sale/i18n/website_portal_sale.pot
index 0daa3d59118f3dc871aa999f28c8d929219cdb2f..5f73bde81aede29589e8e69091ae8532829c07e1 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,33 +16,33 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "<span class=\"label label-danger\"><i class=\"fa fa-fw fa-warning\"/> Problem</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/> Done</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
msgstr ""
@@ -52,12 +52,12 @@ msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/> Invoiced</span>"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting for Payment</span>"
msgstr ""
@@ -66,13 +66,6 @@ msgstr ""
msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa fa-fw fa-check\"/> Paid</span>"
msgstr ""
-#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
-msgid "<span>Show more</span><span class=\"hidden\">Show less</span>"
-msgstr ""
-
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.orders_followup
msgid "<strong>Contact</strong>"
@@ -129,12 +122,24 @@ msgid "Access the complete Sale application"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Amount Due"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: code:addons/website_portal_sale/controllers/main.py:181
+#, 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:184
+#, 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
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Due Date"
msgstr ""
@@ -144,18 +149,28 @@ msgid "If you wish to access the complete application to manage your orders, you
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Invoice #"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Invoice Date"
msgstr ""
+#. module: website_portal_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_sale
+msgid "Invoices"
+msgstr ""
+
+#. module: website_portal_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.orders_followup
+msgid "My Orders"
+msgstr ""
+
#. module: website_portal_sale
#: model:ir.ui.view,arch_db:website_portal_sale.orders_followup
-msgid "My Account"
+msgid "My Quotes"
msgstr ""
#. module: website_portal_sale
@@ -164,12 +179,17 @@ msgid "Order"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "Order Date"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: 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 ""
@@ -179,12 +199,17 @@ msgid "Quotation"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "Quotation #"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_menu_sale
+msgid "Quotes"
+msgstr ""
+
+#. module: website_portal_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "Sale Order #"
msgstr ""
@@ -199,23 +224,26 @@ msgid "Taxes:"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "There are currently no invoices for your account."
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "There are currently no orders for your account."
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "There are currently no quotes for your account."
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: 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"
msgstr ""
@@ -225,22 +253,25 @@ msgid "Untaxed Amount:"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "Valid Until"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.invoices
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices
msgid "Your Invoices and Payments"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.sale_orders
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders
msgid "Your Orders"
msgstr ""
#. module: website_portal_sale
-#: model:ir.ui.view,arch_db:website_portal_sale.quotations
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale
+#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations
msgid "Your Quotes"
msgstr ""
diff --git a/addons/website_project_issue/i18n/website_project_issue.pot b/addons/website_project_issue/i18n/website_project_issue.pot
index 05a045d2e5e977e28512ae30a567e2af6ea4773a..b2a637ce147ea9d89af3d967888c31f0065a9cd4 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,73 +16,120 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
-msgid "<span>Show more</span><span class=\"hidden\">Show less</span>"
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
+msgid "<strong>Assigned to</strong>"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
-msgid "<strong>Assigned to</strong>"
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
+msgid "<strong>Date:</strong>"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
-msgid "<strong>Date:</strong>"
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
+msgid "<strong>Description</strong>"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
msgid "<strong>Message and communication history</strong>"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
msgid "<strong>Reported by</strong>"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
+#: code:addons/website_project_issue/controllers/main.py:36
+#, python-format
+msgid "All"
+msgstr ""
+
+#. module: website_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
+msgid "Current stage of the issue"
+msgstr ""
+
+#. module: website_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
msgid "Current stage of this issue"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
msgid "Description"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
msgid "Edit Issue"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
msgid "Issue"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.issues_followup
-msgid "My Account"
+#: model:ir.ui.view,arch_db:website_project_issue.portal_layout
+msgid "Issues"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
-msgid "Status"
+#: code:addons/website_project_issue/controllers/main.py:30
+#, python-format
+msgid "Last Stage Update"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
-msgid "There are currently no issues for your account."
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue
+msgid "My Issues"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
-msgid "Your Issues"
+#: code:addons/website_project_issue/controllers/main.py:28
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: website_project_issue
+#: code:addons/website_project_issue/controllers/main.py:27
+#, python-format
+msgid "Newest"
msgstr ""
#. module: website_project_issue
#: model:ir.model,name:website_project_issue.model_project_issue
-msgid "project issue"
+msgid "Project Issue"
+msgstr ""
+
+#. module: website_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
+msgid "Projects:"
+msgstr ""
+
+#. module: website_project_issue
+#: code:addons/website_project_issue/controllers/main.py:29
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: website_project_issue
+#: model:ir.ui.view,arch_db:website_project_issue.portal_my_home
+msgid "There are currently no issues for your account."
+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
+#: model:ir.ui.view,arch_db:website_project_issue.my_issues
+#: model:ir.ui.view,arch_db:website_project_issue.portal_my_home
+msgid "Your Issues"
msgstr ""
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index 65172f8c61a3e306a65b3eca6817e7b3a146169e..0cd5163d38058776d5301a84f62a6f563514f41d 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -80,11 +80,8 @@ msgid "% discount"
msgstr ""
#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "&nbsp;"
+#: model:ir.ui.view,arch_db:website_quote.pricing
+msgid "&bull;"
msgstr ""
#. module: website_quote
@@ -112,6 +109,11 @@ msgstr ""
msgid "<i class=\"fa fa-check\"/> Accept"
msgstr ""
+#. module: website_quote
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "<i class=\"fa fa-check\"/> Accept & Pay"
+msgstr ""
+
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "<i class=\"fa fa-check\"/> Accept Order"
@@ -132,30 +134,6 @@ msgstr ""
msgid "<i class=\"fa fa-times\"/> Reject"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<i>You will be able to create dynamic page interacting with the ORM.</i>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<i>You will be able to develop a full application with backend and user interface.</i>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<i>You will be able to develop simple dynamic compenents in HTML pages.</i>"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.quotations
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Expired</span>"
@@ -166,23 +144,6 @@ msgstr ""
msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Cancelled</span>"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-msgid "<span style=\"text-align: -webkit-center\">This course is dedicated to developers who need to grasp knowledge of the <strong>business applications development </strong>process. This course is for new developers or for IT professionals eager to learn more about technical aspects.</span>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<span style=\"text-align: -webkit-center; \">This course is dedicated to developers who need to grasp knowledge of the <strong>business applications development </strong>process. This course is for new developers or for IT professionals eager to learn more about technical aspects.</span>"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "<span style=\"text-align: -webkit-center; \">Upon completion of the training, the participant will be able to:</span>"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "<span>, for an amount of </span>"
@@ -220,50 +181,6 @@ msgstr ""
msgid "<strong>Expiration Date:</strong>"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "<strong>Get high billing rates</strong> as you deliver a\n"
-" highly valuable software."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "<strong>Grow with your existing customer base</strong>\n"
-" by continuously proposing new modules."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Having attended this course, participants should be able to:</strong>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Objectives:</strong>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Our prices include:</strong>"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Requirements:</strong>"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.pricing
msgid "<strong>Subtotal:</strong>"
@@ -276,14 +193,6 @@ msgid "<strong>Template Header:</strong> this content\n"
" template."
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "<strong>There are three components to the training</strong>"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "<strong>This offer expired!</strong><br/>\n"
@@ -305,46 +214,14 @@ msgstr ""
msgid "<strong>Total:</strong>"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "A Dedicated Account Manager"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "A Strong Demand"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "A Valuable Product"
-msgstr ""
-
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "About us"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Access to the Lead"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,name:website_quote.product_product_quote_3
-#: model:product.template,name:website_quote.product_product_quote_3_product_template
-#: model:product.template,name:website_quote.product_template_quote_3
-#: model:sale.quote.option,name:website_quote.website_sale_option_line_1
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Advanced CRM Functional"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Advanced JQuery"
+#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
+msgid "Add to order lines"
msgstr ""
#. module: website_quote
@@ -357,14 +234,6 @@ msgstr ""
msgid "An administrator can set up default Terms and conditions in your Company settings."
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Arrays"
-msgstr ""
-
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "As a leading professional services firm,\n"
@@ -387,78 +256,16 @@ msgstr ""
msgid "Back to Sale Order"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Become an Odoo Consultant."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Benefit from the OpenERP branding"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Benefit from the growing customer demand\n"
-" and our Odoo brand."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Better comfort to facilitate your learning process"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
msgid "Bill To:"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Bootstrap CSS"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Bring your own laptop."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Building a Full Application"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Calling the ORM"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "Cancel"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Change the look and feel from the front-end (GUI) rather than a need of technical knowledge."
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.opt_quotation_signature
msgid "Clear"
@@ -469,16 +276,6 @@ msgstr ""
msgid "Click here to create your template."
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Company Configuration and Multi Company Management"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Configure Odoo using the standard modules."
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_mail_template_id
msgid "Confirmation Mail"
@@ -489,27 +286,6 @@ msgstr ""
msgid "Contact us"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Controllers and Views"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Convert Lead to Opportunity & Customer management"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Course Summary"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_create_uid
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_create_uid
@@ -531,50 +307,6 @@ msgstr ""
msgid "Customer:"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Customers/Vendors"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Database management"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Day 1"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Day 2"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Day 3"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Deliver <strong>strong value added services</strong> as you can\n"
-" rely on a leading open source software, with\n"
-" the support of the publisher."
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_name
#: model:ir.model.fields,field_description:website_quote.field_sale_order_website_description
@@ -597,14 +329,6 @@ msgstr ""
msgid "Description for the website"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Develop a new module for a particular application."
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.pricing
msgid "Discount"
@@ -625,19 +349,6 @@ msgstr ""
msgid "Display Name"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Dive into Strings"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Do the GAP analysis of any Business Process."
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
msgid "Edit Quote"
@@ -648,80 +359,19 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Enjoy the traction of the <strong>fastest growing\n"
-" management software</strong> in the world."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Every year, we redirect more than 100,000 customer\n"
-" requests to our official partners. These are prospects\n"
-" that filled a form on the Odoo website and wanted to\n"
-" use Odoo. The right partner to fulfill the customer\n"
-" request is selected based on the customer localization\n"
-" (nearest partner) and the grade of the partner."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Every year, we redirect more than 100,000 customer\n"
-" requests to our official partners. These are prospects\n"
-" that filled a form on the Odoo website and wanted to\n"
-" use Odoo. The right partner to fulfill the customer\n"
-" request is selected based on the customer localization\n"
-" (nearest partner) and the grade of the partner."
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
msgid "Expiration Date:"
msgstr ""
#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Fetchmail Configuration"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "For an extra fee, partners can get access to Odoo's\n"
-" core developers and functional experts. This can help\n"
-" you succeed in delivering more complex or bigger\n"
-" projects by getting the support of highly experienced\n"
-" consultants on demand."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,name:website_quote.product_product_quote_1
-#: model:product.template,name:website_quote.product_product_quote_1_product_template
-#: model:product.template,name:website_quote.product_template_quote_1
-#: model:sale.quote.line,name:website_quote.website_sale_order_line_1
-msgid "Functional Training"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Functions"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Generate Sale Order & direct mail to customer"
+#: model:ir.model.fields,help:website_quote.field_sale_quote_line_sequence
+msgid "Gives the sequence order when displaying a list of sale quote lines."
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Get access to our experts"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.model.fields,help:website_quote.field_sale_quote_line_sequence
-msgid "Gives the sequence order when displaying a list of sale quote lines."
+#: model:ir.model.fields,help:website_quote.field_sale_order_option_sequence
+msgid "Gives the sequence order when displaying a list of suggested product."
msgstr ""
#. module: website_quote
@@ -733,47 +383,11 @@ msgid "Great quotation templates will significantly\n"
" guarantees, your team, SLA, terms and conditions, etc."
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Grow by developing a <strong>recurring\n"
-" revenue flow</strong> from Odoo\n"
-" Enterprise's commission system."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Hands-on exercises and their solutions"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Hello World"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "High Margins"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.chatter
msgid "History"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "How to Debug"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_id
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_id
@@ -791,8 +405,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:76
-#: code:addons/website_quote/controllers/main.py:227
+#: code:addons/website_quote/controllers/main.py:78
+#: code:addons/website_quote/controllers/main.py:213
#, python-format
msgid "If we store your payment information on our server, subscription payments will be made automatically."
msgstr ""
@@ -804,78 +418,21 @@ msgid "Immediate after website order validation"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Incl. tax)"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Install and administer Odoo."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Install and administer your own server;"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Installation and Configuration"
+#: selection:sale.order,require_payment:0
+#: selection:sale.quote.template,require_payment:0
+msgid "Immediate after website order validation and save a token"
msgstr ""
#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Integrated Help"
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "Incl. tax)"
msgstr ""
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.navigation_menu
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
msgid "Introduction"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Introduction to JQuery"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Introduction to Javascript"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Introduction to QWeb"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "It includes <strong>discounts on Odoo\n"
-" Enterprise</strong>, technical and/or functional\n"
-" <strong>trainings</strong>,\n"
-" <strong>support</strong> services,\n"
-" <strong>marketing documents</strong>, access to\n"
-" the <strong>partner portal</strong>, rights to\n"
-" <strong>use the trademark</strong>, sales support\n"
-" from a <strong>dedicated account manager</strong>."
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option___last_update
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line___last_update
@@ -900,23 +457,6 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
-#. module: website_quote
-#: model:product.product,description_sale:website_quote.product_product_quote_1
-#: model:product.product,description_sale:website_quote.product_product_quote_3
-#: model:product.template,description_sale:website_quote.product_product_quote_1_product_template
-#: model:product.template,description_sale:website_quote.product_product_quote_3_product_template
-#: model:product.template,description_sale:website_quote.product_template_quote_1
-#: model:product.template,description_sale:website_quote.product_template_quote_3
-msgid "Learn directly from our team and network of Odoo experts. Choose from the available training sessions for a better functional understanding of Odoo"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,description_sale:website_quote.product_product_quote_2
-#: model:product.template,description_sale:website_quote.product_product_quote_2_product_template
-#: model:product.template,description_sale:website_quote.product_template_quote_2
-msgid "Learn directly from our team and network of Odoo experts. Choose from the available training sessions for a better technical understanding of Odoo"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_line_website_description
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_website_description
@@ -925,76 +465,18 @@ msgid "Line Description"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
-msgid "Lines"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Live Q&A sessions with a trainer"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Loops"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Lower training budget for the same quality courses"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Modular approach applied to the learning method"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Module Installation"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Modules"
+#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_line_id
+msgid "Line id"
msgstr ""
#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Multi Language Management"
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
+msgid "Lines"
msgstr ""
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "My Account"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Negotiation and Quotation Revisions"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "New interactive learning experience"
+msgid "My Quotations"
msgstr ""
#. module: website_quote
@@ -1008,61 +490,6 @@ msgstr ""
msgid "Number of days for the validity date computation of the quotation"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Objectives"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Odoo Official Website"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Odoo Web Client"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Odoo promotes its partners through various ways:\n"
-" publication on our website, official communication,\n"
-" publication of your success stories, etc. As soon as\n"
-" you become an Odoo partner and have followed the\n"
-" official trainings, you will be visible on the partner\n"
-" directory listing."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Official certified partner"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Online Training"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Opening Stock and Physical Inventory"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Operate/Work with Odoo Smoothly on regular basis."
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_website_description
msgid "Option Description"
@@ -1081,13 +508,13 @@ msgid "Optional Products Lines"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/models/order.py:294
+#: code:addons/website_quote/models/sale_order.py:170
#, python-format
msgid "Order paid by %s. Transaction: %s. Amount: %s."
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:94
+#: code:addons/website_quote/controllers/main.py:92
#, python-format
msgid "Order signed by %s"
msgstr ""
@@ -1102,11 +529,6 @@ msgstr ""
msgid "Our Offer"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Our Partnership Offer"
-msgstr ""
-
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "Our Quality"
@@ -1118,46 +540,8 @@ msgid "Our Service"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Our automated testing server software is called Runbot,\n"
-" and you can try it out here: http://runbot.odoo.com.\n"
-" A dedicated runbot server is available for every\n"
-" partner."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Our partnership offer includes all you need to\n"
-" grow your business and deliver quality services\n"
-" with the Odoo Partner Program."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Partial and Full Shipment / Delivery"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended."
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Participants preferably have a functional knowledge of our software (see Functional Training)."
-msgstr ""
-
-#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:66
-#: code:addons/website_quote/controllers/main.py:231
+#: code:addons/website_quote/controllers/main.py:67
+#: code:addons/website_quote/controllers/main.py:206
#, python-format
msgid "Pay & Confirm"
msgstr ""
@@ -1173,21 +557,11 @@ msgstr ""
msgid "Payment Method:"
msgstr ""
-#. module: website_quote
-#: model:ir.model,name:website_quote.model_payment_transaction
-msgid "Payment Transaction"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
msgid "Preview"
msgstr ""
-#. module: website_quote
-#: model:web.tip,description:website_quote.quotation_tip_1
-msgid "Preview the online quotation. You'll be able to edit the quotation content before send it to the customer."
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.pricing
@@ -1195,11 +569,6 @@ msgstr ""
msgid "Price"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Pricelist and auto Segmentation"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.pricing
msgid "Pricing"
@@ -1218,16 +587,6 @@ msgstr ""
msgid "Product"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Product Category & product Configuration with Order point"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Product Expiry and Warranty"
-msgstr ""
-
#. module: website_quote
#: model:ir.model,name:website_quote.model_product_template
msgid "Product Template"
@@ -1251,19 +610,6 @@ msgstr ""
msgid "Products"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Purchase Requisition and Purchase Order Management"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Python Objects"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_quantity
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_product_uom_qty
@@ -1318,7 +664,7 @@ msgid "Quotation Viewed"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:32
+#: code:addons/website_quote/controllers/main.py:25
#, python-format
msgid "Quotation viewed by customer"
msgstr ""
@@ -1338,39 +684,17 @@ msgstr ""
msgid "Reject This Quote"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Report Engine"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,help:website_quote.field_sale_order_require_payment
#: model:ir.model.fields,help:website_quote.field_sale_quote_template_require_payment
msgid "Require immediate payment by the customer when validating the order from the website quote"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Requirements"
-msgstr ""
-
#. module: website_quote
#: model:ir.model,name:website_quote.model_sale_order_option
msgid "Sale Options"
msgstr ""
-#. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_payment_transaction_sale_order_id
-msgid "Sale Order"
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_order_id
msgid "Sale Order Reference"
@@ -1400,18 +724,10 @@ msgid "Sales Quotation Template Lines"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Save time in your implementation project by having your\n"
-" developments tested automatically by our automated test\n"
-" servers. At every code commit, you get a full Odoo\n"
-" instance that you can try out online. When this\n"
-" instance is deployed, your code is automatically put\n"
-" through our 2000+ automated unit tests."
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Schedule Phone Calls and Meetings"
+#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_layout_category_id
+#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_layout_category_id
+#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_layout_category_id
+msgid "Section"
msgstr ""
#. module: website_quote
@@ -1420,6 +736,7 @@ msgid "Security Token"
msgstr ""
#. module: website_quote
+#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_sequence
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_sequence
msgid "Sequence"
msgstr ""
@@ -1429,24 +746,11 @@ msgstr ""
msgid "Ship To:"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Shop, Location & Warehouse Configuration"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "Sign & Confirm"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Structure of the Training"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
@@ -1464,18 +768,6 @@ msgstr ""
msgid "Taxes:"
msgstr ""
-#. module: website_quote
-#: model:product.product,name:website_quote.product_product_quote_2
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,name:website_quote.product_product_quote_2_product_template
-#: model:product.template,name:website_quote.product_template_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,name:website_quote.website_sale_order_line_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Technical Training"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "Tell us why you are refusing this quotation, this will help us improve our services."
@@ -1492,19 +784,6 @@ msgstr ""
msgid "Terms and conditions"
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Test developments automatically"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live sessions by our senior instructors."
-msgstr ""
-
#. module: website_quote
#: model:ir.model.fields,help:website_quote.field_sale_quote_template_mail_template_id
msgid "This e-mail template will be sent on confirmation. Leave empty to send nothing."
@@ -1542,41 +821,8 @@ msgid "Titles with style <i>Heading 1</i> and\n"
msgstr ""
#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "To get more information, visit the"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Training Center Module"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Underscore"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Understand the development concepts and architecture;"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Understand the functional concepts, business processes by Odoo."
+#: model:ir.ui.view,arch_db:website_quote.pricing
+msgid "Total Price"
msgstr ""
#. module: website_quote
@@ -1607,27 +853,6 @@ msgstr ""
msgid "Validate Order"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Variables & Operators"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Videos with detailed demos"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Warehouse Management Introduction"
-msgstr ""
-
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "We always ensure that our products are\n"
@@ -1635,16 +860,6 @@ msgid "We always ensure that our products are\n"
" happy to buy them."
msgstr ""
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "We will assign you a dedicated account manager, an\n"
-" experienced sales person, to help you develop your\n"
-" Odoo business. The account manager helps you get\n"
-" leads, close deals, gives you feedback and best\n"
-" practices, delivers sales training and is your direct\n"
-" point of contact for any request you may have."
-msgstr ""
-
#. module: website_quote
#: model:ir.actions.report.xml,name:website_quote.report_web_quote
msgid "Web Quotation"
@@ -1655,23 +870,6 @@ msgstr ""
msgid "Website Description"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "What you will learn?"
-msgstr ""
-
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Workflows"
-msgstr ""
-
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
msgid "You can <strong>set a description per product</strong>. Odoo will\n"
@@ -1682,7 +880,7 @@ msgid "You can <strong>set a description per product</strong>. Odoo will\n"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:143
+#: code:addons/website_quote/controllers/main.py:136
#, python-format
msgid "You cannot add options to a confirmed order."
msgstr ""
@@ -1717,14 +915,6 @@ msgstr ""
msgid "Your advantage:"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_1
-#: model:product.template,quote_description:website_quote.product_product_quote_1_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_1
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Your advantages"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "Your feedback....."
@@ -1766,14 +956,6 @@ msgstr ""
msgid "days"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "drinks and lunch;"
-msgstr ""
-
#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "for\n"
@@ -1806,16 +988,3 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: website_quote
-#: model:product.product,quote_description:website_quote.product_product_quote_2
-#: model:product.template,quote_description:website_quote.product_product_quote_2_product_template
-#: model:product.template,quote_description:website_quote.product_template_quote_2
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "training material."
-msgstr ""
-
-#. module: website_quote
-#: model:ir.model.fields,field_description:website_quote.field_sale_order_option_line_id
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/website_rating_project_issue/i18n/website_rating_project_issue.pot b/addons/website_rating_project_issue/i18n/website_rating_project_issue.pot
index 893b40ccc82420c2231f9991dc04d335e4c21e73..c960a725c94b32e947361c043d7bcc2f5194ea48 100644
--- a/addons/website_rating_project_issue/i18n/website_rating_project_issue.pot
+++ b/addons/website_rating_project_issue/i18n/website_rating_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,44 +32,44 @@ msgstr ""
#. module: website_rating_project_issue
#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
-msgid "Bad Feedback"
+msgid "Average"
msgstr ""
#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_page
-msgid "Customer Satisfaction"
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
+msgid "Bad"
+msgstr ""
+
+#. module: website_rating_project_issue
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
+msgid "Customer Satisfaction of"
msgstr ""
#. module: website_rating_project_issue
#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
-msgid "Happy Feedback"
+msgid "Happy"
msgstr ""
#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_page
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
msgid "Last 3 months"
msgstr ""
#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_page
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
msgid "Last 30 days"
msgstr ""
#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_page
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
msgid "Last 7 days"
msgstr ""
#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_page
+#: model:ir.ui.view,arch_db:website_rating_project_issue.project_data_satisfaction
msgid "Latest Feedbacks"
msgstr ""
-#. module: website_rating_project_issue
-#: model:ir.ui.view,arch_db:website_rating_project_issue.project_rating_data
-msgid "Normal Feedback"
-msgstr ""
-
#. module: website_rating_project_issue
#: model:ir.model,name:website_rating_project_issue.model_project_project
msgid "Project"
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index 617e21feee81f4cbc2617d7b393cc26256a6c2b5..87fc71d9107647c07b9aa7fca9d6c98ea0d603c0 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 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:06+0000\n"
-"PO-Revision-Date: 2016-08-18 14:06+0000\n"
+"POT-Creation-Date: 2016-08-26 10:25+0000\n"
+"PO-Revision-Date: 2016-08-26 10:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,16 +30,11 @@ msgstr ""
msgid ", go to the 'Variants' tab"
msgstr ""
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "-- Create a new address --"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.product
msgid "30-day money-back guarantee<br/>\n"
-" Free Shipping in U.S.<br/>\n"
-" Buy now, get in 2 days"
+" Free Shipping in U.S.<br/>\n"
+" Buy now, get in 2 days"
msgstr ""
#. module: website_sale
@@ -60,6 +55,11 @@ msgid "<br/>\n"
" <strong>Payment Status:</strong>"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address_kanban
+msgid "<i class=\"fa fa-check\"/> Ship to this address"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.order_state_message
msgid "<i class=\"fa fa-cog\"/> Configure Transfer Details"
@@ -75,6 +75,11 @@ msgstr ""
msgid "<i class=\"fa fa-envelope-o\"/> Email Our Website Expert"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.checkout
+msgid "<i class=\"fa fa-plus-square\" aria-hidden=\"true\"/> Add an address"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
msgid "<i class=\"fa fa-print\"/> Print"
@@ -83,7 +88,18 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.header
msgid "<i class=\"fa fa-shopping-cart\"/>\n"
-" My cart"
+" My cart"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.cart_lines
+msgid "<small><i class=\"fa fa-trash-o\"/> Remove</small>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "<span class=\"btn btn-primary btn-lg o_website_form_send o_default_snippet_text\">Send</span>\n"
+" <span id=\"o_website_form_result\" class=\"text-danger ml8\"/>"
msgstr ""
#. module: website_sale
@@ -102,13 +118,9 @@ msgid "<span class=\"col-xs-6 text-right text-muted\">Subtotal:</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<span class=\"fa fa-arrow-right\"/> Change Address"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "<span class=\"fa fa-arrow-right\"/> change"
+#: model:ir.ui.view,arch_db:website_sale.product
+msgid "<span class=\"fa fa-check\"/>\n"
+" <span>In Stock</span>"
msgstr ""
#. module: website_sale
@@ -136,7 +148,14 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.continue_shopping
-msgid "<span class=\"fa fa-long-arrow-left\"/> <span class=\"hidden-xs\">Continue Shopping</span><span class=\"visible-xs-inline\">Continue</span>"
+msgid "<span class=\"fa fa-long-arrow-left\"/>\n"
+" <span class=\"hidden-xs\">Continue Shopping</span>\n"
+" <span class=\"visible-xs-inline\">Continue</span>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "<span class=\"fa fa-long-arrow-left\"/> Back"
msgstr ""
#. module: website_sale
@@ -146,7 +165,9 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart
-msgid "<span class=\"hidden-xs\">Process Checkout</span><span class=\"visible-xs-inline\">Checkout</span> <span class=\"fa fa-long-arrow-right\"/>"
+msgid "<span class=\"hidden-xs\">Process Checkout</span>\n"
+" <span class=\"visible-xs-inline\">Checkout</span>\n"
+" <span class=\"fa fa-long-arrow-right\"/>"
msgstr ""
#. module: website_sale
@@ -200,7 +221,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "<span class=\"panel-title\"><span class=\"fa fa-sitemap\"/><strong> Importation</strong><br/>by using a CSV file</span>"
+msgid "<span class=\"panel-title\"><span class=\"fa fa-sitemap\"/><strong> Import</strong><br/>by using a CSV file</span>"
msgstr ""
#. module: website_sale
@@ -214,8 +235,14 @@ msgid "<span class=\"panel-title\"><span class=\"fa fa-table\"/><strong> Flat ra
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "<span class=\"text-danger\">* </span>Field 2"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "<span>Next </span><span class=\"fa fa-long-arrow-right\"/>"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.sort
+msgid "<span>Sort by</span>\n"
+" <span class=\"caret\"/>"
msgstr ""
#. module: website_sale
@@ -393,6 +420,21 @@ msgstr ""
msgid "<strong>Variants</strong> of the product like size or color (see below)"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "A document to provide ?"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_orders_abandonned_orders
+msgid "Abandonned Orders"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.actions.act_window,name:website_sale.action_abandonned_orders_ecommerce
+msgid "Abandonned eCommerce Orders"
+msgstr ""
+
#. module: website_sale
#: 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
@@ -414,6 +456,11 @@ msgstr ""
msgid "Activate the payment options you want to use"
msgstr ""
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_delivery
+msgid "Add Delivery Costs to Online Sales"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Add as many variants as you need from 3 different types: radio buttons, drop-down menu or color buttons."
@@ -435,6 +482,13 @@ msgstr ""
msgid "Allow the end user to choose this price list"
msgstr ""
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:32
+#, python-format
+msgid "Amount"
+msgstr ""
+
#. module: website_sale
#: 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
@@ -453,8 +507,22 @@ msgid "Apply"
msgstr ""
#. module: website_sale
-#: model:product.pricelist,name:website_sale.list_benelux
-msgid "Benelux Pricelist"
+#: 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_product_product_availability_warning
+#: model:ir.model.fields,field_description:website_sale.field_product_template_availability_warning
+msgid "Availability Warning"
+msgstr ""
+
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:22
+#, python-format
+msgid "Best Sellers"
msgstr ""
#. module: website_sale
@@ -465,7 +533,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Billing Information"
+msgid "Billing Address"
msgstr ""
#. module: website_sale
@@ -484,16 +552,14 @@ msgid "Cart Quantity"
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."
+#: model:ir.ui.menu,name:website_sale.menu_catalog
+msgid "Catalog"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:59
-#, python-format
-msgid "Change the price"
+#: 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
@@ -503,68 +569,42 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:72
-#, python-format
-msgid "Choose an image"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:73
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:37
#, python-format
msgid "Choose an image from the library."
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:39
-#, python-format
-msgid "Choose name"
-msgstr ""
-
-#. module: website_sale
-#: model:product.pricelist,name:website_sale.list_christmas
-msgid "Christmas Pricelist"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "City"
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:25
-#, python-format
-msgid "Click here to add a new product."
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:67
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:33
#, python-format
msgid "Click here to set an image describing your product."
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:47
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:42
#, python-format
-msgid "Click on <em>Continue</em> to create the product."
+msgid "Click on <b>Save</b> to add the image to the product description."
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:106
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:23
#, python-format
-msgid "Click on <em>Publish</em> your product so your customers can see it."
+msgid "Click on <em>Continue</em> to create the product."
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:84
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:57
#, python-format
-msgid "Click on <em>Save</em> to add the image to the product description."
+msgid "Click on this button so your customers can see it."
msgstr ""
#. module: website_sale
@@ -572,20 +612,13 @@ msgstr ""
msgid "Click to define a new category."
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:112
-#, python-format
-msgid "Close Tutorial"
-msgstr ""
-
#. module: website_sale
#: selection:product.attribute,type:0
msgid "Color"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Company Name"
msgstr ""
@@ -604,6 +637,11 @@ msgstr ""
msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.payment
+msgid "Confirm Order"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "Confirm Order <span class=\"fa fa-long-arrow-right\"/>"
@@ -620,29 +658,8 @@ msgid "Confirmed"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:110
-#, python-format
-msgid "Congratulations"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:111
-#, python-format
-msgid "Congratulations! You just created and published your first product."
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:53
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-#, python-format
-msgid "Continue"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.model,name:website_sale.model_res_country
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Country"
msgstr ""
@@ -657,7 +674,7 @@ msgid "Country Groups"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Country..."
msgstr ""
@@ -666,34 +683,6 @@ msgstr ""
msgid "Coupon Code"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:46
-#, python-format
-msgid "Create Product"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:31
-#, python-format
-msgid "Create a new product"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:14
-#, python-format
-msgid "Create a product"
-msgstr ""
-
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:24
-#, python-format
-msgid "Create your first product"
-msgstr ""
-
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_create_uid
#: model:ir.model.fields,field_description:website_sale.field_product_style_create_uid
@@ -764,11 +753,6 @@ msgstr ""
msgid "Determine the display order in the Website E-commerce"
msgstr ""
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order_line_discounted_price
-msgid "Discounted price"
-msgstr ""
-
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_display_name
#: model:ir.model.fields,field_description:website_sale.field_product_style_display_name
@@ -777,15 +761,13 @@ msgid "Display Name"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:90
-#, python-format
-msgid "Drag & Drop a block"
+#: selection:product.template,availability:0
+msgid "Display Nothing"
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:91
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:47
#, python-format
msgid "Drag this website block and drop it in your page."
msgstr ""
@@ -797,24 +779,29 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:60
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:27
#, python-format
msgid "Edit the price of this product by clicking on the amount."
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address_kanban
+msgid "Edit this address"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Electronic payments have the advantage of being integrated into the buying process. This means your customers will be less likely to drop out before the payment, resulting in a higher conversion rate at the end."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Email"
msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:40
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:19
#, python-format
msgid "Enter a name for your new product"
msgstr ""
@@ -839,7 +826,8 @@ msgid "Equal : Cost will be equally divided.\n"
msgstr ""
#. module: website_sale
-#: constraint:product.public.category:0
+#: code:addons/website_sale/models/product.py:57
+#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
@@ -884,43 +872,28 @@ msgid "Fedex integration"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field 1"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field 3"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field not custom"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field not required"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Focus on adding content and improving the pages for your best-selling products: don't try to create complete pages for all your products at first!"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field required"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Free and easy to setup"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Focus on adding content and improving the pages for your best-selling products: don't try to create complete pages for all your products at first!"
+#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce
+msgid "From Website"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Free and easy to setup"
+msgid "From a"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "From a"
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "Give us your feedback..."
msgstr ""
#. module: website_sale
@@ -933,6 +906,11 @@ msgstr ""
msgid "Go to the"
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"
@@ -971,7 +949,7 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_id
#: model:ir.model.fields,field_description:website_sale.field_product_style_id
-#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_id_11000
+#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_id_11056
msgid "ID"
msgstr ""
@@ -999,6 +977,11 @@ msgstr ""
msgid "Import Your Products"
msgstr ""
+#. module: website_sale
+#: selection:product.template,availability:0
+msgid "In Stock"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "In order to take money from customers, you need a way of accepting payments.<br/>\n"
@@ -1017,13 +1000,19 @@ msgid "Increase your chances to make a sale by displaying suggested products."
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:567
+#: code:addons/website_sale/controllers/main.py:470
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:86
+#: model:ir.actions.act_window,name:website_sale.action_invoices_ecommerce
+#: model:ir.ui.menu,name:website_sale.menu_orders_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: website_sale
+#: code:addons/website_sale/models/sale_order.py:115
#, python-format
msgid "It is forbidden to modify a sale order which is not in draft status"
msgstr ""
@@ -1064,6 +1053,11 @@ msgstr ""
msgid "Last Updated on"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form
+msgid "Manage Deliveries"
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_image_medium
msgid "Medium-sized image"
@@ -1080,13 +1074,8 @@ msgid "Merchant Connectors"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_purchase_line_warn_msg
-msgid "Message for Purchase Order Line"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_sale_line_warn_msg
-msgid "Message for Sales Order Line"
+#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form
+msgid "More Info"
msgstr ""
#. module: website_sale
@@ -1097,32 +1086,20 @@ msgid "My Cart"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_public_category_complete_name
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_name
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Name"
msgstr ""
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Name (Shipping)"
-msgstr ""
-
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/controllers/main.py:976
+#: code:addons/website_sale/controllers/main.py:906
#: 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
msgid "New Product"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:51
-#, python-format
-msgid "New product created"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "No monthly fees for standard offer"
@@ -1147,7 +1124,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Odoo offers an importation service to handle the whole process for you!"
+msgid "Odoo offers an import service to handle the whole process for you!"
msgstr ""
#. module: website_sale
@@ -1162,9 +1139,9 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:98
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:52
#, python-format
-msgid "Once you click on <em>Save</em>, your product is updated."
+msgid "Once you click on <b>Save</b>, your product is updated."
msgstr ""
#. module: website_sale
@@ -1187,6 +1164,12 @@ msgstr ""
msgid "Order Lines to be displayed on the website. They should not be used for computation purpose."
msgstr ""
+#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_orders
+#: model:ir.ui.menu,name:website_sale.menu_orders_orders
+msgid "Orders"
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_parent_id
msgid "Parent Category"
@@ -1198,8 +1181,8 @@ msgid "Partner"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:779
-#: code:addons/website_sale/controllers/main.py:859
+#: code:addons/website_sale/controllers/main.py:719
+#: code:addons/website_sale/controllers/main.py:778
#, python-format
msgid "Pay Now"
msgstr ""
@@ -1214,6 +1197,11 @@ msgstr ""
msgid "Payment Acquirer"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers
+msgid "Payment Acquirers"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document
msgid "Payment Information"
@@ -1229,11 +1217,6 @@ msgstr ""
msgid "Payment Methods"
msgstr ""
-#. module: website_sale
-#: model:ir.model,name:website_sale.model_payment_transaction
-msgid "Payment Transaction"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info_option
#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
@@ -1241,7 +1224,7 @@ msgid "Payment<span class=\"chevron\"/>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Phone"
msgstr ""
@@ -1273,9 +1256,22 @@ msgid "Pricelist Name"
msgstr ""
#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_catalog_pricelists
+msgid "Pricelists"
+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:30
#: model:ir.model,name:website_sale.model_product_product
#: model:ir.ui.view,arch_db:website_sale.cart_lines
#: model:ir.ui.view,arch_db:website_sale.payment
+#, python-format
msgid "Product"
msgstr ""
@@ -1321,6 +1317,8 @@ msgid "Product not found!"
msgstr ""
#. module: website_sale
+#: model:ir.actions.act_window,name:website_sale.product_template_action
+#: model:ir.ui.menu,name:website_sale.menu_catalog_products
#: model:ir.ui.view,arch_db:website_sale.confirmation
#: model:ir.ui.view,arch_db:website_sale.product
msgid "Products"
@@ -1341,23 +1339,12 @@ msgstr ""
msgid "Promote"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:105
-#, python-format
-msgid "Publish your product"
-msgstr ""
-
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_rating_rating_website_published
+#: model:ir.ui.view,arch_db:website_sale.product_template_search_view_website
msgid "Published"
msgstr ""
-#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_purchase_line_warn
-msgid "Purchase Order Line"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_sale
msgid "Push down"
@@ -1383,6 +1370,13 @@ msgstr ""
msgid "Put the practical details (shipping, payment options,...) as links in the footer; that way, they will be accessible from all your product pages."
msgstr ""
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:31
+#, python-format
+msgid "Qty Sold"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_popover
msgid "Qty:"
@@ -1411,6 +1405,21 @@ msgstr ""
msgid "Rating"
msgstr ""
+#. module: website_sale
+#: 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_product_product_rating_count
+msgid "Rating count"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_product_product_rating_last_value
+msgid "Rating value: 0=Unhappy, 10=Happy"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Read the"
@@ -1431,6 +1440,13 @@ msgstr ""
msgid "Sale"
msgstr ""
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:10
+#, python-format
+msgid "Sales /"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Sales / Settings"
@@ -1442,12 +1458,7 @@ msgid "Sales Order"
msgstr ""
#. module: website_sale
-#: model:ir.model,name:website_sale.model_sale_order_line
-#: model:ir.model.fields,field_description:website_sale.field_product_product_sale_line_warn
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: website_sale
+#: model:ir.model,name:website_sale.model_crm_team
#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesteam_id
#: model:ir.model.fields,field_description:website_sale.field_website_salesteam_id
msgid "Sales Team"
@@ -1459,25 +1470,11 @@ msgstr ""
msgid "Salesperson"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:83
-#, python-format
-msgid "Save"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Save and import the modified CSV file from the 'More' menu of the"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:97
-#, python-format
-msgid "Save your modifications"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart
msgid "Secure Payment"
@@ -1490,9 +1487,9 @@ msgstr ""
#. module: website_sale
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:32
+#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:15
#, python-format
-msgid "Select <em>New Product</em> to create it and manage its properties to boost your sales."
+msgid "Select <b>New Product</b> to create it and manage its properties to boost your sales."
msgstr ""
#. module: website_sale
@@ -1501,14 +1498,13 @@ msgid "Select a product from the"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_selectable
-msgid "Selectable"
+#: model:ir.ui.view,arch_db:website_sale.address_kanban
+msgid "Select this address"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_product_purchase_line_warn
-#: model:ir.model.fields,help:website_sale.field_product_product_sale_line_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."
+#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_selectable
+msgid "Selectable"
msgstr ""
#. module: website_sale
@@ -1522,9 +1518,7 @@ msgid "Sell More"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_website_sequence
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_sequence
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_sequence
msgid "Sequence"
msgstr ""
@@ -1535,20 +1529,14 @@ msgid "Ship To:"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-#: model:ir.ui.view,arch_db:website_sale.confirmation
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Ship to the same address"
+#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
+msgid "Shipping &"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Shipping"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.wizard_checkout
-msgid "Shipping &"
+msgid "Shipping Address"
msgstr ""
#. module: website_sale
@@ -1556,11 +1544,6 @@ msgstr ""
msgid "Shipping Connectors"
msgstr ""
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Shipping Information"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.products
#: model:website.menu,name:website_sale.menu_shop
@@ -1588,8 +1571,8 @@ msgid "Shopping Cart"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Sign in"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "Sign Up"
msgstr ""
#. module: website_sale
@@ -1619,13 +1602,6 @@ msgstr ""
msgid "Size Y"
msgstr ""
-#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:19
-#, python-format
-msgid "Skip It"
-msgstr ""
-
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_image_small
msgid "Small-sized image"
@@ -1642,7 +1618,7 @@ msgid "Some customers prefer to pay this way"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:589
+#: code:addons/website_sale/controllers/main.py:481
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -1658,25 +1634,23 @@ msgid "Split Method"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:19
-#, python-format
-msgid "Start Tutorial"
+#: 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.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "State / Province"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "State / Province..."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Street"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "Street <span class=\"hidden-xs\"> and Number</span>"
msgstr ""
#. module: website_sale
@@ -1696,6 +1670,16 @@ msgstr ""
msgid "Subtotal"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.confirmation
+msgid "Subtotal:"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.suggested_products_list
+msgid "Suggested Accessories:"
+msgstr ""
+
#. module: website_sale
#: 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
@@ -1704,17 +1688,17 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.recommended_products
-msgid "Suggested alternatives:"
+msgid "Suggested Products:"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.suggested_products_list
-msgid "Suggested products:"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "TIN / VAT"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.confirmation
-msgid "Taxes"
+msgid "Taxes:"
msgstr ""
#. module: website_sale
@@ -1743,6 +1727,13 @@ msgstr ""
msgid "The payment seems to have been canceled."
msgstr ""
+#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:24
+#, python-format
+msgid "There is no recent online sale."
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.order_state_message
msgid "There seems to be an error with your request."
@@ -1754,10 +1745,9 @@ msgid "This field holds the image used as image for the category, limited to 102
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:52
-#, python-format
-msgid "This page contains all the information related to the new product."
+#: model:ir.model.fields,help:website_sale.field_product_product_availability
+#: model:ir.model.fields,help:website_sale.field_product_template_availability
+msgid "This field is used to display a availability banner with a message on the ecommerce"
msgstr ""
#. module: website_sale
@@ -1812,30 +1802,23 @@ msgid "Unit Price"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:66
-#, python-format
-msgid "Update image"
+#: model:ir.ui.menu,name:website_sale.menu_orders_unpaid_orders
+msgid "Unpaid Orders"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.products
-msgid "Use the <i>'Content'</i> top menu to create a new product."
+#: model:ir.actions.act_window,name:website_sale.action_unpaid_orders_ecommerce
+msgid "Unpaid eCommerce Orders"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Users will buy more accessories and services if they can add them to their cart in one click."
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "VAT Number"
+#: model:ir.ui.view,arch_db:website_sale.products
+msgid "Use the <i>'New Page'</i> top menu to create your first product."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "Validate Order"
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "Users will buy more accessories and services if they can add them to their cart in one click."
msgstr ""
#. module: website_sale
@@ -1853,6 +1836,11 @@ msgstr ""
msgid "Visible on the website as a comment"
msgstr ""
+#. module: website_sale
+#: selection:product.template,availability:0
+msgid "Warning"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Web Service technical documentation."
@@ -1870,6 +1858,12 @@ msgstr ""
msgid "Website Categories"
msgstr ""
+#. module: website_sale
+#: 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"
+msgstr ""
+
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_res_country_group_website_pricelist_ids
msgid "Website Price Lists"
@@ -1889,13 +1883,14 @@ msgid "Website Pricelist"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:427
+#: code:addons/website_sale/models/sale_order.py:454
#, python-format
msgid "Website Pricelist for %s"
msgstr ""
#. module: website_sale
#: model:ir.actions.act_window,name:website_sale.product_public_category_action
+#: model:ir.ui.menu,name:website_sale.menu_catalog_categories
#: model:ir.ui.menu,name:website_sale.menu_product_public_category
msgid "Website Product Categories"
msgstr ""
@@ -1912,6 +1907,12 @@ msgstr ""
msgid "Website Public Categories"
msgstr ""
+#. module: website_sale
+#: 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"
+msgstr ""
+
#. module: website_sale
#: model:ir.actions.act_url,name:website_sale.action_open_website
msgid "Website Shop"
@@ -1938,10 +1939,13 @@ msgid "Website meta title"
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:17
-#, python-format
-msgid "Welcome to your shop"
+#: model:ir.model.fields,field_description:website_sale.field_crm_team_website_ids
+msgid "Websites"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,help:website_sale.field_crm_team_website_ids
+msgid "Websites using this sales team"
msgstr ""
#. module: website_sale
@@ -1955,32 +1959,47 @@ msgid "You can setup 3 types of <strong>payment methods in Odoo:</strong>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "You have to reconcile the payment manually"
+#: model:ir.actions.act_window,help:website_sale.action_abandonned_orders_ecommerce
+msgid "You don't have any cancelled order from the website."
msgstr ""
#. module: website_sale
-#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:18
-#, python-format
-msgid "You successfully installed the e-commerce. This guide will help you to create your product and promote your sales."
+#: model:ir.actions.act_window,help:website_sale.action_orders_ecommerce
+msgid "You don't have any confirmed order from the website."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
+#: model:ir.actions.act_window,help:website_sale.action_unpaid_orders_ecommerce
+msgid "You don't have any unpaid order from the website."
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.website_planner
+msgid "You have to reconcile the payment manually"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address
msgid "Your Address"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Your Name"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "Your Address \n"
+" <small> or </small>"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.address
#: model:ir.ui.view,arch_db:website_sale.checkout
msgid "Your Order"
msgstr ""
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "Your Reference"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_lines
#: model:ir.ui.view,arch_db:website_sale.cart_popover
@@ -2008,8 +2027,8 @@ msgid "Your transaction is waiting confirmation."
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Zip / Postal Code"
+#: model:ir.ui.view,arch_db:website_sale.address
+msgid "Zip Code"
msgstr ""
#. module: website_sale
@@ -2038,10 +2057,21 @@ msgid "eBay connector"
msgstr ""
#. module: website_sale
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_settings
#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form
msgid "eCommerce"
msgstr ""
+#. module: website_sale
+#: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce
+msgid "eCommerce Orders"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.search count
+msgid "found)"
+msgstr ""
+
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_popover
msgid "items)"
@@ -2052,14 +2082,9 @@ msgstr ""
msgid "of the Sales module"
msgstr ""
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "or"
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.products
-msgid "pagination form-inline"
+msgid "pagination form-inline o_website_sale_search"
msgstr ""
#. module: website_sale
@@ -2072,11 +2097,6 @@ msgstr ""
msgid "product.style"
msgstr ""
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "select..."
-msgstr ""
-
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "using one or several of the strategies above"
diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
index bc3d2a7ab5d83fc210224402841bb31e19f68cf2..6a7a5706349d491e055448feb8315a39b430df25 100644
--- a/addons/website_sale_delivery/i18n/website_sale_delivery.pot
+++ b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Delivery will be updated after choosing a new delivery method\"> Delivery:</span>"
msgstr ""
+#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_website_description
+msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"
+msgstr ""
+
#. module: website_sale_delivery
#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_accessory_product_ids
msgid "Accessory Products"
@@ -36,23 +41,18 @@ msgid "Appear on the shopping cart"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_available_in_pos
-msgid "Available in the Point of Sale"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model,name:website_sale_delivery.model_delivery_carrier
-msgid "Carrier"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_availability
+msgid "Availability"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_to_weight
-msgid "Check if the product should be weighted using the hardware scale integration"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_availability_warning
+msgid "Availability Warning"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_available_in_pos
-msgid "Check if you want this product to appear in the Point of Sale"
+#: model:ir.model,name:website_sale_delivery.model_delivery_carrier
+msgid "Carrier"
msgstr ""
#. module: website_sale_delivery
@@ -61,18 +61,18 @@ msgid "Choose your Delivery Method"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.country_state_shipping
-msgid "Country..."
+#: model:ir.model,name:website_sale_delivery.model_res_country
+msgid "Country"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_project_id
-msgid "Create a task under this project on sale order validation."
+#: model:ir.model.fields,field_description:website_sale_delivery.field_sale_order_amount_delivery
+msgid "Delivery Amount"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_sale_order_amount_delivery
-msgid "Delivery Amount"
+#: model:ir.ui.menu,name:website_sale_delivery.menu_ecommerce_delivery
+msgid "Delivery Methods"
msgstr ""
#. module: website_sale_delivery
@@ -82,7 +82,7 @@ msgstr ""
#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery
-msgid "Description displayed on the eCommerce and on the Online Quotations."
+msgid "Description displayed on the eCommerce and on online quotations."
msgstr ""
#. module: website_sale_delivery
@@ -135,17 +135,7 @@ msgid "Landed Costs"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_purchase_line_warn_msg
-msgid "Message for Purchase Order Line"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_sale_line_warn_msg
-msgid "Message for Sales Order Line"
-msgstr ""
-
-#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:138
+#: code:addons/website_sale_delivery/models/sale_order.py:99
#, python-format
msgid "No shipping method is available for your current order and shipping address. Please contact us for more information."
msgstr ""
@@ -155,11 +145,6 @@ msgstr ""
msgid "Optional Products"
msgstr ""
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_pos_categ_id
-msgid "Point of Sale Category"
-msgstr ""
-
#. module: website_sale_delivery
#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_purchase_requisition
msgid "Procurement"
@@ -171,13 +156,8 @@ msgid "Products to propose when add to cart."
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_project_id
-msgid "Project"
-msgstr ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_purchase_line_warn
-msgid "Purchase Order Line"
+#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_search_inherit_website_sale_delivery
+msgid "Published"
msgstr ""
#. module: website_sale_delivery
@@ -186,29 +166,23 @@ msgid "Rating"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model,name:website_sale_delivery.model_sale_order
-msgid "Sales Order"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_value
+msgid "Rating Last Value"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_sale_line_warn
-msgid "Sales Order Line"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_count
+msgid "Rating count"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.country_state_shipping
-msgid "Select..."
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_rating_last_value
+msgid "Rating value: 0=Unhappy, 10=Happy"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_purchase_line_warn
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_sale_line_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 ""
-
-#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_sequence
-msgid "Sequence"
+#: model:ir.model,name:website_sale_delivery.model_sale_order
+msgid "Sales Order"
msgstr ""
#. module: website_sale_delivery
@@ -222,7 +196,7 @@ msgid "Size Y"
msgstr ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:137
+#: code:addons/website_sale_delivery/models/sale_order.py:98
#, python-format
msgid "Sorry, we are unable to ship your order"
msgstr ""
@@ -247,24 +221,29 @@ msgstr ""
msgid "The amount without tax."
msgstr ""
+#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_availability
+msgid "This field is used to display a availability banner with a message on the ecommerce"
+msgstr ""
+
#. module: website_sale_delivery
#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_public_categ_ids
msgid "Those categories are used to group similar products for e-commerce."
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_pos_categ_id
-msgid "Those categories are used to group similar products for point of sale."
+#: model:ir.ui.view,arch_db:website_sale_delivery.shipping_tracking
+msgid "Tracking:"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_to_weight
-msgid "To Weigh With Scale"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_published
+msgid "Visible in Website"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.shipping_tracking
-msgid "Tracking:"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_message_ids
+msgid "Website Comments"
msgstr ""
#. module: website_sale_delivery
@@ -272,6 +251,11 @@ msgstr ""
msgid "Website Product Category"
msgstr ""
+#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_sequence
+msgid "Website Sequence"
+msgstr ""
+
#. module: website_sale_delivery
#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_meta_description
msgid "Website meta description"
diff --git a/addons/website_sale_digital/i18n/website_sale_digital.pot b/addons/website_sale_digital/i18n/website_sale_digital.pot
index b329135cdefc05e7cc3db07ff0144be6f3bf4d7f..0cbb9008669178a36643feadd4bc12fb76275492 100644
--- a/addons/website_sale_digital/i18n/website_sale_digital.pot
+++ b/addons/website_sale_digital/i18n/website_sale_digital.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,26 +16,15 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_sale_digital
-#: model:product.template,description_sale:website_sale_digital.product_1
-msgid "Alice's Adventures in Wonderland (commonly shortened to Alice in Wonderland) is an 1865 novel written by English author Charles Lutwidge Dodgson under the pseudonym Lewis Carroll. It tells of a girl named Alice falling through a rabbit hole into a fantasy world populated by peculiar, anthropomorphic creatures. The tale plays with logic, giving the story lasting popularity with adults as well as with children. It is considered to be one of the best examples of the literary nonsense genre. Its narrative course and structure, characters and imagery have been enormously influential in both popular culture and literature, especially in the fantasy genre."
-msgstr ""
-
-#. module: website_sale_digital
-#: model:product.template,name:website_sale_digital.product_1
-msgid "Alice's Adventures in Wonderland - Lewis Caroll"
-msgstr ""
-
-#. module: website_sale_digital
-#: code:addons/website_sale_digital/product.py:29
-#: code:addons/website_sale_digital/product.py:56
+#: code:addons/website_sale_digital/models/product.py:23
+#: code:addons/website_sale_digital/models/product.py:54
#, python-format
msgid "Digital Attachments"
msgstr ""
#. module: website_sale_digital
-#: code:addons/website_sale_digital/product.py:22
-#, python-format
-msgid "Digital Content"
+#: model:ir.model.fields,field_description:website_sale_digital.field_ir_attachment_product_downloadable
+msgid "Downloadable from product portal"
msgstr ""
#. module: website_sale_digital
@@ -56,11 +45,6 @@ msgstr ""
msgid "Invoice Line"
msgstr ""
-#. module: website_sale_digital
-#: model:product.template,description:website_sale_digital.product_1
-msgid "Novel by Lewis Caroll."
-msgstr ""
-
#. module: website_sale_digital
#: model:ir.model,name:website_sale_digital.model_product_product
msgid "Product"
@@ -71,3 +55,8 @@ msgstr ""
msgid "Product Template"
msgstr ""
+#. module: website_sale_digital
+#: model:ir.model,name:website_sale_digital.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index 923cc81fd528c3b992ed07bcd8b42e3ce1e35eb8..9ff4a3650d7331a1261f44dc7d16fb0103bb9934 100644
--- a/addons/website_slides/i18n/website_slides.pot
+++ b/addons/website_slides/i18n/website_slides.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -75,6 +75,11 @@ msgstr ""
msgid "${user.name} shared a ${object.slide_type} with you!"
msgstr ""
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.view_slide_channel_form
+msgid "(Un)archiving a channel automatically (un)archives its slides. Do you want to proceed?"
+msgstr ""
+
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slides_search
msgid ". Please try again with different keywords."
@@ -251,13 +256,20 @@ msgid "Actions"
msgstr ""
#. module: website_slides
-#: selection:slide.slide,download_security:0
-msgid "Authentified Users Only"
+#: model:ir.model.fields,field_description:website_slides.field_slide_channel_active
+#: model:ir.model.fields,field_description:website_slides.field_slide_slide_active
+msgid "Active"
+msgstr ""
+
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slide_channel_view_search
+#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
+msgid "Archived"
msgstr ""
#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_5
-msgid "Awesome Timesheet by Odoo"
+#: selection:slide.slide,download_security:0
+msgid "Authentified Users Only"
msgstr ""
#. module: website_slides
@@ -293,6 +305,7 @@ msgstr ""
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category_channel_id
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_channel_id
+#: model:ir.ui.view,arch_db:website_slides.slide_channel_view_search
#: model:ir.ui.view,arch_db:website_slides.view_slide_channel_tree
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
msgid "Channel"
@@ -346,26 +359,19 @@ msgid "Content Preview"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:289
+#: code:addons/website_slides/controllers/main.py:290
#, python-format
msgid "Could not fetch data from url. Document or access right not available.\n"
"Here is the received response: %s"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:294
+#: code:addons/website_slides/models/slides.py:307
#, python-format
msgid "Could not fetch data from url. Document or access right not available:\n"
"%s"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_1
-msgid "Create a beautiful and professional eCommerce on your website with Odoo. \n"
-"\n"
-"Find out more at https://www.odoo.com/page/e-commerce"
-msgstr ""
-
#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/js/slides_upload.js:220
@@ -414,13 +420,6 @@ msgstr ""
msgid "Discard"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_2
-msgid "Discover the all-in-one business management software solution that fits any business size and use case.\n"
-"\n"
-"Learn more at https://odoo.com"
-msgstr ""
-
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_dislikes
msgid "Dislikes"
@@ -467,14 +466,6 @@ msgstr ""
msgid "Download"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_5
-msgid "Download Awesome Timesheet by Odoo and discover how easy time tracking and employee management can be!\n"
-"\n"
-"Chrome: http://bit.ly/2613LcY\n"
-"iOS: http://bit.ly/1ZUZsZD"
-msgstr ""
-
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_download_security
msgid "Download Security"
@@ -541,11 +532,6 @@ msgstr ""
msgid "Featured Presentation"
msgstr ""
-#. module: website_slides
-#: model:slide.category,name:website_slides.category_1
-msgid "Featured Presentations"
-msgstr ""
-
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel_promoted_slide_id
msgid "Featured Slide"
@@ -558,10 +544,10 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/controllers/main.py:299
+#: code:addons/website_slides/controllers/main.py:300
#: code:addons/website_slides/static/src/js/slides_upload.js:90
#, python-format
-msgid "File is too big. File size cannot exceed 15MB"
+msgid "File is too big. File size cannot exceed 25MB"
msgstr ""
#. module: website_slides
@@ -624,7 +610,7 @@ msgid "Infographics"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:321
+#: code:addons/website_slides/controllers/main.py:322
#, python-format
msgid "Internal server error, please try again later or contact administrator.\n"
"Here is the error message: %s"
@@ -747,11 +733,6 @@ msgstr ""
msgid "No presentation published yet."
msgstr ""
-#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
-msgid "Not Published"
-msgstr ""
-
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category_nbr_documents
#: model:ir.model.fields,field_description:website_slides.field_slide_channel_nbr_documents
@@ -776,74 +757,6 @@ msgstr ""
msgid "Number of Videos"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_2
-msgid "Odoo All-in-One Software Demonstration"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.category,name:website_slides.category_2
-msgid "Odoo Days"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_0
-msgid "Odoo Explained"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_6
-msgid "Odoo Marketing - part 1: ATTRACT"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_7
-msgid "Odoo Marketing - part 1: ATTRACT_2"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_8
-msgid "Odoo Marketing - part 1: ATTRACT_3"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_10
-msgid "Odoo Roadmap & Strategy - Fabien Pinckaers"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_3
-msgid "Odoo Sign Demonstration"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_1
-msgid "Odoo Website & E-commerce Demonstration"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_6
-msgid "Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_7
-#: model:slide.slide,description:website_slides.slide_8
-msgid "Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com\n"
-"\n"
-"Video made by Miroslava Ganzarcikova and Sophia Eribo."
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_9
-msgid "Open Days 2014 Infographic"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_11
-msgid "OpenSource CMS, A performance comparison - Mantavya Gajjar"
-msgstr ""
-
#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/xml/website_slides.xml:28
@@ -863,20 +776,20 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/static/src/js/slides.js:55
+#: code:addons/website_slides/static/src/js/slides.js:56
#, python-format
msgid "Please <a href=\"/web?redirect=%s\">login</a> to vote this slide"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:297
-#: code:addons/website_slides/models/slides.py:518
+#: code:addons/website_slides/models/slides.py:310
+#: code:addons/website_slides/models/slides.py:535
#, python-format
msgid "Please enter valid Youtube or Google Doc URL"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:281
+#: code:addons/website_slides/controllers/main.py:282
#, python-format
msgid "Please enter valid youtube or google doc url"
msgstr ""
@@ -960,13 +873,6 @@ msgstr ""
msgid "Review your channel settings to promote your most viewed or recent published presentation"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_0
-msgid "Run your business with a comprehensive suite of business apps. Do it easily with Odoo! \n"
-"\n"
-"http://odoo.com/start"
-msgstr ""
-
#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/xml/website_slides.xml:70
@@ -1073,13 +979,6 @@ msgstr ""
msgid "Sorry, but nothing matches your search criteria"
msgstr ""
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_3
-msgid "Stop doing manual printing and scanning. Move to electronic signature with Odoo Sign!\n"
-"\n"
-"Discover more at https://www.odoo.com/page/sign"
-msgstr ""
-
#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.view_slide_tag_form
msgid "Tag"
@@ -1130,7 +1029,7 @@ msgid "This channel is private and its content is restricted to some users."
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:285
+#: code:addons/website_slides/controllers/main.py:286
#, python-format
msgid "This video already exists in this channel <a target=\"_blank\" href=\"/slides/slide/%s\">click here to view it </a>"
msgstr ""
@@ -1172,7 +1071,7 @@ msgid "Type"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/controllers/main.py:140
+#: code:addons/website_slides/controllers/main.py:141
#, python-format
msgid "Uncategorized"
msgstr ""
@@ -1183,11 +1082,16 @@ msgid "Uncategorized presentation"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:507
+#: code:addons/website_slides/models/slides.py:524
#, python-format
msgid "Unknown document"
msgstr ""
+#. module: website_slides
+#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
+msgid "Unpublished"
+msgstr ""
+
#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel_upload_group_ids
msgid "Upload Groups"
@@ -1234,7 +1138,7 @@ msgid "Videos"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:436
+#: code:addons/website_slides/models/slides.py:449
#, python-format
msgid "View Slide"
msgstr ""
@@ -1294,7 +1198,7 @@ msgstr ""
#. module: website_slides
#. openerp-web
-#: code:addons/website_slides/static/src/js/slides.js:64
+#: code:addons/website_slides/static/src/js/slides.js:65
#, python-format
msgid "You have already voted for this slide"
msgstr ""
diff --git a/addons/website_twitter/i18n/website_twitter.pot b/addons/website_twitter/i18n/website_twitter.pot
index b8e982428b22228516818338d202f5496d77731c..e779db251f9a6c56675be5209c964c7acecb1a25 100644
--- a/addons/website_twitter/i18n/website_twitter.pot
+++ b/addons/website_twitter/i18n/website_twitter.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:08+0000\n"
-"PO-Revision-Date: 2016-08-18 14:08+0000\n"
+"POT-Creation-Date: 2016-08-26 10:27+0000\n"
+"PO-Revision-Date: 2016-08-26 10:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid "Accept terms of use and click on the Create button at the bottom"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:38
+#: code:addons/website_twitter/models/website_twitter_config.py:14
#, python-format
msgid "Authentication credentials were missing or incorrect. Maybe screen name tweets are protected."
msgstr ""
@@ -88,7 +88,7 @@ msgid "Get favorites from this screen name"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:49
+#: code:addons/website_twitter/models/website_twitter_config.py:46
#, python-format
msgid "HTTP Error: Something is misconfigured"
msgstr ""
@@ -104,7 +104,7 @@ msgid "ID"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:62
+#: code:addons/website_twitter/models/website_twitter_config.py:57
#, python-format
msgid "Internet connection refused"
msgstr ""
@@ -125,20 +125,20 @@ msgid "Last Updated on"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:64
-#: code:addons/website_twitter/models/twitter_config.py:65
+#: code:addons/website_twitter/models/website_twitter_config.py:59
+#: code:addons/website_twitter/models/website_twitter_config.py:60
#, python-format
msgid "Please double-check your Twitter API Key and Secret!"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/controllers/main.py:25
+#: code:addons/website_twitter/controllers/main.py:27
#, python-format
msgid "Please set a Twitter screen name to load favorites from, in the Website Settings (it does not have to be yours)"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/controllers/main.py:21
+#: code:addons/website_twitter/controllers/main.py:23
#, python-format
msgid "Please set the Twitter API Key and Secret in the Website Settings."
msgstr ""
@@ -151,7 +151,7 @@ msgid "Reload"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:40
+#: code:addons/website_twitter/models/website_twitter_config.py:16
#, python-format
msgid "Request cannot be served due to the applications rate limit having been exhausted for the resource."
msgstr ""
@@ -183,31 +183,31 @@ msgid "Switch to the API Keys tab: <br/>"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:43
+#: code:addons/website_twitter/models/website_twitter_config.py:19
#, python-format
msgid "The Twitter servers are up, but overloaded with requests. Try again later."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:44
+#: code:addons/website_twitter/models/website_twitter_config.py:20
#, python-format
msgid "The Twitter servers are up, but the request could not be serviced due to some failure within our stack. Try again later."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:39
+#: code:addons/website_twitter/models/website_twitter_config.py:15
#, python-format
msgid "The request is understood, but it has been refused or access is not allowed. Please check your Twitter API Key and Secret."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:37
+#: code:addons/website_twitter/models/website_twitter_config.py:13
#, python-format
msgid "The request was invalid or cannot be otherwise served. Requests without authentication are considered invalid and will yield this response."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:36
+#: code:addons/website_twitter/models/website_twitter_config.py:12
#, python-format
msgid "There was no new data to return."
msgstr ""
@@ -267,37 +267,32 @@ msgid "Twitter Configuration"
msgstr ""
#. module: website_twitter
-#: model:ir.model,name:website_twitter.model_website_twitter_tweet
-msgid "Twitter Tweets"
-msgstr ""
-
-#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:65
+#: code:addons/website_twitter/models/website_twitter_config.py:60
#, python-format
msgid "Twitter authorization error!"
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:42
+#: code:addons/website_twitter/models/website_twitter_config.py:18
#, python-format
msgid "Twitter is down or being upgraded."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:41
+#: code:addons/website_twitter/models/website_twitter_config.py:17
#, python-format
msgid "Twitter seems broken. Please retry later. You may consider posting an issue on Twitter forums to get help."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/controllers/main.py:36
+#: code:addons/website_twitter/controllers/main.py:37
#, python-format
msgid "Twitter user @%(username)s has less than 12 favorite tweets. Please add more or choose a different screen name."
msgstr ""
#. module: website_twitter
-#: code:addons/website_twitter/models/twitter_config.py:61
-#: code:addons/website_twitter/models/twitter_config.py:62
+#: code:addons/website_twitter/models/website_twitter_config.py:56
+#: code:addons/website_twitter/models/website_twitter_config.py:57
#, python-format
msgid "We failed to reach a twitter server."
msgstr ""
@@ -323,6 +318,11 @@ msgstr ""
msgid "website.config.settings"
msgstr ""
+#. module: website_twitter
+#: model:ir.model,name:website_twitter.model_website_twitter_tweet
+msgid "website.twitter.tweet"
+msgstr ""
+
#. module: website_twitter
#: model:ir.ui.view,arch_db:website_twitter.view_website_config_settings
msgid "with the following values:"
diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index 50f1fb0f7a9f5d8b424f122aae8d18e3be7dc545..9b21851aaaa82891247748ab53ac9fd07ca3988c 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1c\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
+"POT-Creation-Date: 2016-08-26 10:26+0000\n"
+"PO-Revision-Date: 2016-08-26 10:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -137,6 +137,12 @@ msgid "\n"
" Allows to use python code to define taxes"
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_hr_maintenance
+msgid "\n"
+" Bridge between HR and Maintenance."
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_pos_data_drinks
msgid "\n"
@@ -186,9 +192,18 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_hr_equipment
+#: model:ir.module.module,description:base.module_maintenance
+msgid "\n"
+" Track equipment and manage maintenance requests."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment_survey
msgid "\n"
-" Track employees' equipment and manage maintenance requests."
+" Use interview forms during recruitment process.\n"
+" This module is integrated with the survey module\n"
+" to allow you to define interviews for different jobs.\n"
+" "
msgstr ""
#. module: base
@@ -226,6 +241,22 @@ msgid "\n"
""
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_attendance
+msgid "\n"
+" Module linking the attendance module to the timesheet app.\n"
+" "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_payment_payumoney
+msgid "\n"
+" PayuMoney Payment Acquirer for India.\n"
+"\n"
+" PayUmoney payment gateway supports only INR currency.\n"
+" "
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_report_intrastat
msgid "\n"
@@ -255,23 +286,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_account_tax_adjustments
-msgid "\n"
-"Accounting Tax Adjustments.\n"
-"===========================\n"
-"\n"
-"This module adds a wizard to deal with manual Tax adjustments, to manually correct the VAT declaration through a miscellaneous operation for example.\n"
-"\n"
-"The correct definition of an adjustment tax is\n"
-"- type_tax_use: none\n"
-"- amount_type: fixed\n"
-"- amount: 0\n"
-"- tags: a grid used in your vat report for manual correction.\n"
-"\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_website_mass_mailing
msgid "\n"
@@ -511,31 +525,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_sale_service
-msgid "\n"
-"Automatically creates project tasks from procurement lines.\n"
-"===========================================================\n"
-"\n"
-"This module will automatically create a new task for each procurement order line\n"
-"(e.g. for sale order lines), if the corresponding product meets the following\n"
-"characteristics:\n"
-"\n"
-" * Product Type = Service\n"
-" * Create Task Automatically = True\n"
-"\n"
-"If on top of that a project is specified on the product form (in the Procurement\n"
-"tab), then the new task will be created in that specific project. Otherwise, the\n"
-"new task will not belong to any project, and may be added to a project manually\n"
-"later.\n"
-"\n"
-"When the project task is completed or cancelled, the corresponding procurement\n"
-"is updated accordingly. For example, if this procurement corresponds to a sale\n"
-"order line, the sale order line will be considered delivered when the task is\n"
-"completed.\n"
-""
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_hw_scanner
msgid "\n"
@@ -729,8 +718,6 @@ msgstr ""
msgid "\n"
"Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases.\n"
"=================================================================================================\n"
-"\n"
-"The decimal precision is configured per company.\n"
""
msgstr ""
@@ -877,6 +864,14 @@ msgid "\n"
" "
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_website_project_timesheet
+msgid "\n"
+"Display Timesheet on Task in the Website Portal\n"
+"===============================================\n"
+" "
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_website_twitter
msgid "\n"
@@ -1108,16 +1103,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_web_analytics
-msgid "\n"
-"Google Analytics.\n"
-"=================\n"
-"\n"
-"Collects web application usage with Google Analytics.\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_hw_proxy
msgid "\n"
@@ -1315,7 +1300,7 @@ msgid "\n"
"\n"
"This application allows you to easily keep track of jobs, vacancies, applications, interviews...\n"
"\n"
-"It is integrated with the mail gateway to automatically fetch email sent to <jobs@yourcompany.com> in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it is integrated with the survey module to allow you to define interviews for different jobs.\n"
+"It is integrated with the mail gateway to automatically fetch email sent to <jobs@yourcompany.com> in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it may integrated with the survey module to allow you to define interviews for different jobs. \n"
"You can define the different phases of interviews and easily rate the applicant from the kanban view.\n"
""
msgstr ""
@@ -1330,7 +1315,7 @@ msgid "\n"
"\n"
"You can configure several kinds of leaves (sickness, paid days, ...) and allocate leaves to an employee or department quickly using leave allocation. An employee can also make a request for more days off by making a new Leave allocation. It will increase the total of available days for that leave type (if the request is accepted).\n"
"\n"
-"You can keep track of leaves in different ways by following reports: \n"
+"You can keep track of leaves in different ways by following reports:\n"
"\n"
"* Leaves Summary\n"
"* Leaves by Department\n"
@@ -1397,6 +1382,8 @@ msgid "\n"
"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
"* *Before Delivery*: A Draft invoice is created and must be paid before delivery\n"
"\n"
+"With this module you can personnalize the sale order and invoice report with\n"
+"categories, subtotals or page-breaks.\n"
"\n"
"The Dashboard for the Sales Manager will include\n"
"------------------------------------------------\n"
@@ -1427,17 +1414,6 @@ msgid "\n"
""
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_product_uos
-msgid "\n"
-"Manage secondary units of sale\n"
-"==============================\n"
-"\n"
-"Sell products in one unit of measure that is different from the one\n"
-"you manage the inventory.\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_mrp
msgid "\n"
@@ -1454,7 +1430,7 @@ msgid "\n"
"* Multi-level bill of materials, no limit\n"
"* Multi-level routing, no limit\n"
"* Routings and work center integrated with analytic accounting\n"
-"* Periodical scheduler computation \n"
+"* Periodical scheduler computation\n"
"* Allows to browse bills of materials in a complete structure that includes child and phantom bills of materials\n"
"\n"
"Dashboard / Reports for MRP will include:\n"
@@ -1465,16 +1441,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_sale_layout
-msgid "\n"
-"Manage your sales reports\n"
-"=========================\n"
-"With this module you can personnalize the sale order and invoice report with\n"
-"separators, page-breaks or subtotals.\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_l10n_mx
msgid "\n"
@@ -1522,17 +1488,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_warning
-msgid "\n"
-"Module to trigger warnings in Odoo objects.\n"
-"==============================================\n"
-"\n"
-"Warning messages can be displayed for objects like sale order, purchase order,\n"
-"picking and invoice. The message is triggered by the form's onchange event.\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_sale_expense
msgid "\n"
@@ -1633,17 +1588,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_im_odoo_support
-msgid "\n"
-"Odoo Live Support\n"
-"=================\n"
-"\n"
-"Ask your functional question directly to the Odoo Operators with the livechat support.\n"
-"\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_website_mail_channel
msgid "\n"
@@ -1700,9 +1644,9 @@ msgid "\n"
msgstr ""
#. module: base
-#: model:ir.module.module,description:base.module_web_tip
+#: model:ir.module.module,description:base.module_web_tour
msgid "\n"
-"Odoo Web tips.\n"
+"Odoo Web tours.\n"
"========================\n"
"\n"
""
@@ -1749,15 +1693,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_mail_tip
-msgid "\n"
-"Odoo link module for web tips.\n"
-"=================================\n"
-"\n"
-""
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_website_event_track
msgid "\n"
@@ -1805,13 +1740,13 @@ msgid "\n"
"Organization and management of Events.\n"
"======================================\n"
"\n"
-"The event module allows you to efficiently organise events and all related tasks: planification, registration tracking,\n"
+"The event module allows you to efficiently organize events and all related tasks: planning, registration tracking,\n"
"attendances, etc.\n"
"\n"
"Key Features\n"
"------------\n"
"* Manage your Events and Registrations\n"
-"* Use emails to automatically confirm and send acknowledgements for any event registration\n"
+"* Use emails to automatically confirm and send acknowledgments for any event registration\n"
""
msgstr ""
@@ -1944,7 +1879,7 @@ msgid "\n"
"Record and validate timesheets and attendances easily\n"
"=====================================================\n"
"\n"
-"This application supplies a new screen enabling you to manage both attendances (Sign in/Sign out) and your work encoding (timesheet) by period. Timesheet entries are made by employees each day. At the end of the defined period, employees validate their sheet and the manager must then approve his team's entries. Periods are defined in the company forms and you can set them to run monthly or weekly.\n"
+"This application supplies a new screen enabling you to manage your work encoding (timesheet) by period. Timesheet entries are made by employees each day. At the end of the defined period, employees validate their sheet and the manager must then approve his team's entries. Periods are defined in the company forms and you can set them to run monthly or weekly.\n"
"\n"
"The complete timesheet validation process is:\n"
"---------------------------------------------\n"
@@ -2139,6 +2074,23 @@ msgid "\n"
" "
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_repair
+msgid "\n"
+"The aim is to have a complete module to manage all products repairs.\n"
+"====================================================================\n"
+"\n"
+"The following topics are covered by this module:\n"
+"------------------------------------------------------\n"
+" * Add/remove products in the reparation\n"
+" * Impact for stocks\n"
+" * Invoicing (products and/or services)\n"
+" * Warranty concept\n"
+" * Repair quotation report\n"
+" * Notes for the technician and for the final customer\n"
+""
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_lunch
msgid "\n"
@@ -2538,19 +2490,6 @@ msgid "\n"
""
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_crm_partner_assign
-msgid "\n"
-"This is the module used by Odoo SA to redirect customers to its partners, based on geolocation.\n"
-"======================================================================================================\n"
-"\n"
-"This modules lets you geolocate Leads, Opportunities and Partners based on their address.\n"
-"\n"
-"Once the coordinates of the Lead/Opportunity is known, they can be automatically assigned\n"
-"to an appropriate local partner, based on the distance and the weight that was assigned to the partner.\n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_rating_project
msgid "\n"
@@ -2588,57 +2527,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_report_webkit
-msgid "\n"
-"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS.\n"
-"=====================================================================================================================\n"
-"\n"
-"The module structure and some code is inspired by the report_openoffice module.\n"
-"\n"
-"The module allows:\n"
-"------------------\n"
-" - HTML report definition\n"
-" - Multi header support\n"
-" - Multi logo\n"
-" - Multi company support\n"
-" - HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
-" - JavaScript support\n"
-" - Raw HTML debugger\n"
-" - Book printing capabilities\n"
-" - Margins definition\n"
-" - Paper size definition\n"
-"\n"
-"Multiple headers and logos can be defined per company. CSS style, header and\n"
-"footer body are defined per company.\n"
-"\n"
-"For a sample report see also the webkit_report_sample module, and this video:\n"
-" http://files.me.com/nbessi/06n92k.mov\n"
-"\n"
-"Requirements and Installation:\n"
-"------------------------------\n"
-"This module requires the ``wkhtmltopdf`` library to render HTML documents as\n"
-"PDF. Version 0.9.9 or later is necessary, and can be found at\n"
-"http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).\n"
-"\n"
-"After installing the library on the Odoo Server machine, you may need to set\n"
-"the path to the ``wkhtmltopdf`` executable file in a system parameter named\n"
-"``webkit_path`` in Settings -> Customization -> Parameters -> System Parameters\n"
-"\n"
-"If you are experiencing missing header/footer problems on Linux, be sure to\n"
-"install a 'static' version of the library. The default ``wkhtmltopdf`` on\n"
-"Ubuntu is known to have this issue.\n"
-"\n"
-"\n"
-"TODO:\n"
-"-----\n"
-" * JavaScript support activation deactivation\n"
-" * Collated and book format support\n"
-" * Zip return for separated PDF\n"
-" * Web client WYSIWYG\n"
-""
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_sale_crm
msgid "\n"
@@ -2678,38 +2566,6 @@ msgid "\n"
" "
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_mrp_operations
-msgid "\n"
-"This module adds state, date_start, date_stop in manufacturing order operation lines (in the 'Work Orders' tab).\n"
-"================================================================================================================\n"
-"\n"
-"Status: draft, confirm, done, cancel\n"
-"When finishing/confirming, cancelling manufacturing orders set all state lines\n"
-"to the according state.\n"
-"\n"
-"Create menus:\n"
-"-------------\n"
-" **Manufacturing** > **Manufacturing** > **Work Orders**\n"
-"\n"
-"Which is a view on 'Work Orders' lines in manufacturing order.\n"
-"\n"
-"Add buttons in the form view of manufacturing order under workorders tab:\n"
-"-------------------------------------------------------------------------\n"
-" * start (set state to confirm), set date_start\n"
-" * done (set state to done), set date_stop\n"
-" * set to draft (set state to draft)\n"
-" * cancel set state to cancel\n"
-"\n"
-"When the manufacturing order becomes 'ready to produce', operations must\n"
-"become 'confirmed'. When the manufacturing order is done, all operations\n"
-"must become done.\n"
-"\n"
-"The field 'Working Hours' is the delay(stop date - start date).\n"
-"So, that we can compare the theoretic delay and real delay. \n"
-" "
-msgstr ""
-
#. module: base
#: model:ir.module.module,description:base.module_barcodes
msgid "\n"
@@ -2759,8 +2615,8 @@ msgstr ""
#. module: base
#: model:ir.module.module,description:base.module_stock_picking_wave
msgid "\n"
-"This module adds the picking wave option in warehouse management.\n"
-"=================================================================\n"
+"This module adds the picking wave option in warehouse management\n"
+"================================================================\n"
" "
msgstr ""
@@ -2771,7 +2627,7 @@ msgid "\n"
"==================================================\n"
"\n"
"Keeps account of the attendances of the employees on the basis of the\n"
-"actions(Sign in/Sign out) performed by them.\n"
+"actions(Check in/Check out) performed by them.\n"
" "
msgstr ""
@@ -2782,6 +2638,13 @@ msgid "\n"
""
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_sale_service_rating
+msgid "\n"
+"This module allows a customer to give rating on task which are created from sale order.\n"
+""
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_rating
msgid "\n"
@@ -2795,23 +2658,23 @@ msgid "\n"
"This module allows accountants to manage analytic and crossovered budgets.\n"
"==========================================================================\n"
"\n"
-"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers \n"
+"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers\n"
"can set the planned amount on each Analytic Account.\n"
"\n"
"The accountant has the possibility to see the total of amount planned for each\n"
-"Budget in order to ensure the total planned is not greater/lower than what he \n"
-"planned for this Budget. Each list of record can also be switched to a graphical \n"
+"Budget in order to ensure the total planned is not greater/lower than what he\n"
+"planned for this Budget. Each list of record can also be switched to a graphical\n"
"view of it.\n"
"\n"
"Three reports are available:\n"
"----------------------------\n"
-" 1. The first is available from a list of Budgets. It gives the spreading, for \n"
+" 1. The first is available from a list of Budgets. It gives the spreading, for\n"
" these Budgets, of the Analytic Accounts.\n"
"\n"
-" 2. The second is a summary of the previous one, it only gives the spreading, \n"
+" 2. The second is a summary of the previous one, it only gives the spreading,\n"
" for the selected Budgets, of the Analytic Accounts.\n"
"\n"
-" 3. The last one is available from the Analytic Chart of Accounts. It gives \n"
+" 3. The last one is available from the Analytic Chart of Accounts. It gives\n"
" the spreading, for the selected Analytic Accounts of Budgets.\n"
""
msgstr ""
@@ -2918,6 +2781,14 @@ msgid "\n"
" "
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_contacts
+msgid "\n"
+"This module gives you a quick view of your contacts directory, accessible from your home page.\n"
+"You can track your vendors, customers and other contacts.\n"
+""
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_base_setup
msgid "\n"
@@ -3010,6 +2881,17 @@ msgid "\n"
" "
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_mrp
+msgid "\n"
+"This module provides facility to the user to install mrp and purchase modules at a time.\n"
+"====================================================================================\n"
+"\n"
+"It is basically used when we want to keep track of production orders generated\n"
+"from purchase order.\n"
+" "
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_sale_mrp
msgid "\n"
@@ -3100,7 +2982,7 @@ msgstr ""
msgid "\n"
"Track Issues/Bugs Management for Projects\n"
"=========================================\n"
-"This application allows you to manage the issues you might face in a project like bugs in a system, client complaints or material breakdowns. \n"
+"This application allows you to manage the issues you might face in a project like bugs in a system, client complaints or material breakdowns.\n"
"\n"
"It allows the manager to quickly check the issues, assign them and decide on their status quickly as they evolve.\n"
" "
@@ -3196,7 +3078,7 @@ msgid "\n"
" rules for the country, usually a simple check digit. This is quick and \n"
" always available, but allows numbers that are perhaps not truly allocated,\n"
" or not valid anymore.\n"
-" \n"
+"\n"
" * When the \"VAT VIES Check\" option is enabled (in the configuration of the user's\n"
" Company), VAT numbers will be instead submitted to the online EU VIES\n"
" database, which will truly verify that the number is valid and currently\n"
@@ -3292,10 +3174,18 @@ msgid "\n"
" "
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_website_project
+msgid "\n"
+"Website portal for Project and Tasks\n"
+"====================================\n"
+" "
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_hw_scale
msgid "\n"
-"Weighting Scale Hardware Driver\n"
+"Weighing Scale Hardware Driver\n"
"================================\n"
"\n"
"This module allows the point of sale to connect to a scale using a USB HSM Serial Scale Interface,\n"
@@ -3379,17 +3269,17 @@ msgid "%p - Equivalent of either AM or PM.\""
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_filters.py:18
-#: code:addons/base/res/res_partner.py:287
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:311
#: code:addons/base/res/res_users.py:141
-#: code:addons/base/res/res_users.py:406
-#: code:addons/base/res/res_users.py:408
+#: code:addons/base/res/res_users.py:396
+#: code:addons/base/res/res_users.py:398
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: base
-#: code:addons/models.py:6334
+#: code:addons/models.py:6210
#, python-format
msgid "%s This might be '%s' in the current model, or a field of the same name in an o2m."
msgstr ""
@@ -3405,31 +3295,31 @@ msgid "%y - Year without century [00,99].\""
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:1082
+#: code:addons/base/ir/ir_model.py:1001
#, 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 ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:188
+#: code:addons/base/ir/ir_fields.py:187
#, python-format
msgid "'%s' does not seem to be a number for field '%%(field)s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:208
+#: code:addons/base/ir/ir_fields.py:207
#, python-format
msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:240
+#: code:addons/base/ir/ir_fields.py:239
#, python-format
msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:177
+#: code:addons/base/ir/ir_fields.py:176
#, python-format
msgid "'%s' does not seem to be an integer for field '%%(field)s'"
msgstr ""
@@ -3444,23 +3334,6 @@ msgstr ""
msgid "(reload fonts)"
msgstr ""
-#. module: base
-#: model:ir.module.module,description:base.module_mrp_repair
-msgid ",\n"
-"The aim is to have a complete module to manage all products repairs.\n"
-"====================================================================\n"
-"\n"
-"The following topics should be covered by this module:\n"
-"------------------------------------------------------\n"
-" * Add/remove products in the reparation\n"
-" * Impact for stocks\n"
-" * Invoicing (products and/or services)\n"
-" * Warranty concept\n"
-" * Repair quotation report\n"
-" * Notes for the technician and for the final customer\n"
-""
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.wizard_lang_export
msgid ", or your preferred text editor"
@@ -3606,7 +3479,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:base.view_server_action_form
msgid "<code>\n"
" partner_name = obj.name + '_code'\n"
-" self.pool[\"res.partner\"].create(cr, uid, {\"name\": partner_name}, context=context) \n"
+" env[\"res.partner\"].create({\"name\": partner_name})\n"
" </code>"
msgstr ""
@@ -3740,7 +3613,7 @@ msgid "<u><strong>Views</strong></u>"
msgstr ""
#. module: base
-#: code:addons/models.py:3614
+#: code:addons/models.py:3578
#, python-format
msgid "A document was modified since you last viewed it (%s:%d)"
msgstr ""
@@ -3766,6 +3639,11 @@ msgstr ""
msgid "A module to play with workflows."
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_test_pylint
+msgid "A module to test Odoo with pylint."
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_test_impex
msgid "A module to test import/export."
@@ -3802,7 +3680,7 @@ msgid "A module with dummy methods."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_qweb.py:940
+#: code:addons/base/ir/ir_qweb/fields.py:377
#, python-format
msgid "A unit must be provided to duration widgets"
msgstr ""
@@ -3940,11 +3818,6 @@ msgstr ""
msgid "Accounting Consistency Tests"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_account_tax_adjustments
-msgid "Accounting Tax Adjustments"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_accountant
msgid "Accounting and Finance"
@@ -3980,6 +3853,17 @@ msgstr ""
msgid "Action Bindings/Defaults"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_client_help
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_help
+#: model:ir.model.fields,field_description:base.field_ir_act_server_help
+#: model:ir.model.fields,field_description:base.field_ir_act_url_help
+#: model:ir.model.fields,field_description:base.field_ir_act_window_help
+#: model:ir.model.fields,field_description:base.field_ir_actions_help
+#: model:ir.model.fields,field_description:base.field_ir_actions_help_303
+msgid "Action Description"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_client_name
#: model:ir.model.fields,field_description:base.field_ir_act_server_name
@@ -4010,7 +3894,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_url_type
#: model:ir.model.fields,field_description:base.field_ir_act_window_type
#: model:ir.model.fields,field_description:base.field_ir_actions_type
-#: model:ir.model.fields,field_description:base.field_ir_actions_type_310
+#: model:ir.model.fields,field_description:base.field_ir_actions_type_309
#: model:ir.ui.view,arch_db:base.view_server_action_search
msgid "Action Type"
msgstr ""
@@ -4027,7 +3911,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_url_usage
#: model:ir.model.fields,field_description:base.field_ir_act_window_usage
#: model:ir.model.fields,field_description:base.field_ir_actions_usage
-#: model:ir.model.fields,field_description:base.field_ir_actions_usage_308
+#: model:ir.model.fields,field_description:base.field_ir_actions_usage_307
msgid "Action Usage"
msgstr ""
@@ -4036,17 +3920,6 @@ msgstr ""
msgid "Action bound to this entry - helper field for binding an action, will automatically set the correct reference"
msgstr ""
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_client_help
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_help
-#: model:ir.model.fields,field_description:base.field_ir_act_server_help
-#: model:ir.model.fields,field_description:base.field_ir_act_url_help
-#: model:ir.model.fields,field_description:base.field_ir_act_window_help
-#: model:ir.model.fields,field_description:base.field_ir_actions_help
-#: model:ir.model.fields,field_description:base.field_ir_actions_help_304
-msgid "Action description"
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.ir_cron_view
msgid "Action to Trigger"
@@ -4060,6 +3933,11 @@ msgstr ""
msgid "Actions"
msgstr ""
+#. module: base
+#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
+msgid "Activate"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_cron_active
#: model:ir.model.fields,field_description:base.field_ir_filters_active
@@ -4106,11 +3984,6 @@ msgstr ""
msgid "Add RML Header"
msgstr ""
-#. module: base
-#: model:ir.model.fields,help:base.field_ir_act_window_auto_refresh
-msgid "Add an auto-refresh on the view"
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.view_server_action_form
msgid "Add in the 'More' menu"
@@ -4165,7 +4038,7 @@ msgstr ""
msgid "Adds support for authentication by LDAP server.\n"
"===============================================\n"
"This module allows users to login with their LDAP username and password, and\n"
-"will automatically create OpenERP users for them on the fly.\n"
+"will automatically create Odoo users for them on the fly.\n"
"\n"
"**Note:** This module only work on servers who have Python's ``ldap`` module installed.\n"
"\n"
@@ -4174,7 +4047,7 @@ msgid "Adds support for authentication by LDAP server.\n"
"After installing this module, you need to configure the LDAP parameters in the\n"
"Configuration tab of the Company details. Different companies may have different\n"
"LDAP servers, as long as they have unique usernames (usernames need to be unique\n"
-"in OpenERP, even across multiple companies).\n"
+"in Odoo, even across multiple companies).\n"
"\n"
"Anonymous LDAP binding is also supported (for LDAP servers that allow it), by\n"
"simply keeping the LDAP user and password empty in the LDAP configuration.\n"
@@ -4190,24 +4063,24 @@ msgid "Adds support for authentication by LDAP server.\n"
"\n"
"Security Considerations:\n"
"------------------------\n"
-"Users' LDAP passwords are never stored in the OpenERP database, the LDAP server\n"
+"Users' LDAP passwords are never stored in the Odoo database, the LDAP server\n"
"is queried whenever a user needs to be authenticated. No duplication of the\n"
"password occurs, and passwords are managed in one place only.\n"
"\n"
-"OpenERP does not manage password changes in the LDAP, so any change of password\n"
+"Odoo does not manage password changes in the LDAP, so any change of password\n"
"should be conducted by other means in the LDAP directory directly (for LDAP users).\n"
"\n"
-"It is also possible to have local OpenERP users in the database along with\n"
+"It is also possible to have local Odoo users in the database along with\n"
"LDAP-authenticated users (the Administrator account is one obvious example).\n"
"\n"
"Here is how it works:\n"
"---------------------\n"
-" * The system first attempts to authenticate users against the local OpenERP\n"
+" * The system first attempts to authenticate users against the local Odoo\n"
" database;\n"
" * if this authentication fails (for example because the user has no local\n"
" password), the system then attempts to authenticate against LDAP;\n"
"\n"
-"As LDAP users have blank passwords by default in the local OpenERP database\n"
+"As LDAP users have blank passwords by default in the local Odoo database\n"
"(which means no access), the first step always fails and the LDAP server is\n"
"queried to do the authentication.\n"
"\n"
@@ -4225,7 +4098,7 @@ msgid "Adds support for authentication by LDAP server.\n"
" assigned as local password for each new LDAP user, effectively setting\n"
" a *master password* for these users (until manually changed). You\n"
" usually do not want this. One easy way to setup a template user is to\n"
-" login once with a valid LDAP user, let OpenERP create a blank local\n"
+" login once with a valid LDAP user, let Odoo create a blank local\n"
" user with the same login (and a blank password), then rename this new\n"
" user to a username that does not exist in LDAP, and setup its groups\n"
""
@@ -4242,9 +4115,9 @@ msgid "Administrative divisions of a country. E.g. Fed. State, Departement, Cant
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:619
-#: code:addons/base/ir/ir_model.py:682
-#: code:addons/base/ir/ir_model.py:1201
+#: code:addons/base/ir/ir_model.py:564
+#: code:addons/base/ir/ir_model.py:623
+#: code:addons/base/ir/ir_model.py:1107
#, python-format
msgid "Administrator access is required to uninstall a module"
msgstr ""
@@ -4255,6 +4128,7 @@ msgid "Advanced Events"
msgstr ""
#. module: base
+#: model:ir.ui.view,arch_db:base.act_report_xml_view
#: model:ir.ui.view,arch_db:base.view_model_fields_form
#: model:ir.ui.view,arch_db:base.view_model_form
msgid "Advanced Properties"
@@ -4327,7 +4201,7 @@ msgid "Allows you to create your invoices and track the payments. It is an easie
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:379
+#: code:addons/base/ir/ir_fields.py:378
#, python-format
msgid "Ambiguous specification for field '%(field)s', only provide one of name, external id or database id"
msgstr ""
@@ -4400,7 +4274,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:711
+#: code:addons/base/res/res_users.py:702
#: 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
@@ -4425,7 +4299,7 @@ msgid "Apply"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:603
+#: code:addons/base/module/module.py:556
#: 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
@@ -4599,7 +4473,6 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_attendance
-#: model:res.groups,name:base.group_hr_attendance
msgid "Attendances"
msgstr ""
@@ -4647,12 +4520,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_window_auto_search
-msgid "Auto Search"
-msgstr ""
-
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_auto_refresh
-msgid "Auto-Refresh"
+msgid "Auto search"
msgstr ""
#. module: base
@@ -4712,7 +4580,6 @@ msgstr ""
#: model:ir.model,name:base.model_res_partner_bank
#: model:ir.model.fields,field_description:base.field_res_company_bank_ids
#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
-#: model:ir.ui.menu,name:base.menu_config_bank_accounts
#: model:ir.ui.view,arch_db:base.view_partner_bank_search
#: model:ir.ui.view,arch_db:base.view_partner_bank_tree
msgid "Bank Accounts"
@@ -4804,7 +4671,7 @@ msgid "Base Kanban"
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:233
+#: code:addons/base/res/res_lang.py:227
#, python-format
msgid "Base Language 'en_US' can not be deleted!"
msgstr ""
@@ -4916,12 +4783,6 @@ msgstr ""
msgid "Binary"
msgstr ""
-#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_birthdate
-#: model:ir.model.fields,field_description:base.field_res_users_birthdate
-msgid "Birthdate"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_hw_blackbox_be
msgid "Blackbox Hardware Driver"
@@ -4992,11 +4853,6 @@ msgstr ""
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"
@@ -5087,19 +4943,19 @@ msgid "Cameroon"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:376
+#: code:addons/base/ir/ir_fields.py:375
#, python-format
msgid "Can not create Many-To-One records indirectly, import the field separately"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:583
+#: code:addons/base/module/module.py:539
#, python-format
msgid "Can not upgrade module '%s'. It is not installed."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:543
+#: code:addons/base/ir/ir_model.py:491
#, python-format
msgid "Can only rename one field at a time!"
msgstr ""
@@ -5156,13 +5012,13 @@ msgid "Cannot duplicate configuration!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:545
+#: code:addons/base/ir/ir_model.py:493
#, python-format
msgid "Cannot rename field to %s, because that field already exists!"
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:225
+#: code:addons/base/res/res_lang.py:219
#, python-format
msgid "Cannot unactivate a language that is currently used by users."
msgstr ""
@@ -5236,25 +5092,25 @@ msgid "Change the user password."
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:300
+#: code:addons/base/res/res_partner.py:324
#, 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:531
+#: code:addons/base/ir/ir_model.py:479
#, python-format
msgid "Changing the model of a field is forbidden!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:509
+#: code:addons/base/ir/ir_model.py:457
#, python-format
msgid "Changing the storing system for field \"%s\" is not allowed."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:534
+#: code:addons/base/ir/ir_model.py:482
#, python-format
msgid "Changing the type of a field is not yet supported. Please drop it and create it again!"
msgstr ""
@@ -5269,11 +5125,6 @@ msgstr ""
msgid "Chat With Your Website Visitors"
msgstr ""
-#. module: base
-#: model:ir.module.module,summary:base.module_im_odoo_support
-msgid "Chat with the Odoo collaborators"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_check_printing
msgid "Check Printing Base"
@@ -5413,11 +5264,6 @@ msgstr ""
msgid "City"
msgstr ""
-#. module: base
-#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
-msgid "Click"
-msgstr ""
-
#. module: base
#: model:ir.actions.act_window,help:base.action_attachment
msgid "Click here to attach a new document."
@@ -5627,13 +5473,16 @@ msgid "Company"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_17
-msgid "Company Contact"
+#: model:ir.model.fields,field_description:base.field_res_company_name
+#: model:ir.model.fields,field_description:base.field_res_partner_company_name
+#: model:ir.model.fields,field_description:base.field_res_users_company_name
+msgid "Company Name"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_name
-msgid "Company Name"
+#: model:ir.model.fields,field_description:base.field_res_partner_commercial_company_name
+#: model:ir.model.fields,field_description:base.field_res_users_commercial_company_name
+msgid "Company Name Entity"
msgstr ""
#. module: base
@@ -5671,12 +5520,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_fields_complete_name
-msgid "Complete Name"
-msgstr ""
-
-#. module: base
-#: model:res.partner.category,name:base.res_partner_category_9
-msgid "Components Buyer"
+msgid "Complete name"
msgstr ""
#. module: base
@@ -5723,7 +5567,6 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_event_config
#: model:ir.ui.menu,name:base.menu_marketing_config_association
#: model:ir.ui.menu,name:base.menu_reporting_config
-#: model:ir.ui.menu,name:base.menu_sale_config
#: model:ir.ui.view,arch_db:base.res_config_view_base
#: model:ir.ui.view,arch_db:base.view_company_form
msgid "Configuration"
@@ -5777,14 +5620,14 @@ msgid "Connection Security"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:192
+#: code:addons/base/ir/ir_mail_server.py:181
#, python-format
msgid "Connection Test Failed! Here is what we got instead:\n"
" %s"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:199
+#: code:addons/base/ir/ir_mail_server.py:189
#, python-format
msgid "Connection Test Succeeded! Everything seems properly set up!"
msgstr ""
@@ -5805,11 +5648,6 @@ msgstr ""
msgid "Constraints with the same name are unique per module."
msgstr ""
-#. module: base
-#: model:res.partner.category,name:base.res_partner_category_8
-msgid "Consultancy Services"
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.view_partner_simple_form
#: selection:res.partner,type:0
@@ -5843,21 +5681,18 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_category_form
-#: model:ir.ui.menu,name:base.menu_partner_category_form
#: model:ir.ui.view,arch_db:base.view_partner_category_list
msgid "Contact Tags"
msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_title_contact
-#: model:ir.ui.menu,name:base.menu_partner_title_contact
msgid "Contact Titles"
msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_res_partner_child_ids
#: model:ir.model.fields,field_description:base.field_res_users_child_ids
-#: model:ir.ui.menu,name:base.menu_config_address_book
#: model:ir.ui.view,arch_db:base.view_partner_tree
msgid "Contacts"
msgstr ""
@@ -5867,6 +5702,11 @@ msgstr ""
msgid "Contacts & Addresses"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_contacts
+msgid "Contacts Directory"
+msgstr ""
+
#. module: base
#: sql_constraint:res.partner:0
msgid "Contacts require a name."
@@ -5925,7 +5765,7 @@ msgid "Costa Rica - Accounting"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:562
+#: code:addons/base/res/res_partner.py:587
#, python-format
msgid "Couldn't create contact without email address!"
msgstr ""
@@ -5933,7 +5773,6 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_country
#: model:ir.model.fields,field_description:base.field_res_country_group_country_ids
-#: model:ir.ui.menu,name:base.menu_country_partner
msgid "Countries"
msgstr ""
@@ -5966,7 +5805,6 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_country_group
#: model:ir.model,name:base.model_res_country_group
-#: model:ir.ui.menu,name:base.menu_country_group
#: model:ir.ui.view,arch_db:base.view_country_group_form
#: model:ir.ui.view,arch_db:base.view_country_group_tree
msgid "Country Group"
@@ -6003,9 +5841,6 @@ msgid "Create Access Right"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_logging_create_date
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_create_date
-#: model:ir.model.fields,field_description:base.field_res_partner_create_date
#: model:ir.model.fields,field_description:base.field_res_users_create_date
msgid "Create Date"
msgstr ""
@@ -6031,11 +5866,6 @@ msgstr ""
msgid "Create Menu"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_sale_service
-msgid "Create Tasks from SO"
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.view_model_menu_create
msgid "Create _Menu"
@@ -6067,15 +5897,31 @@ msgid "Create and manage users that will connect to the system. Users can be dea
msgstr ""
#. module: base
-#: model:ir.module.module,summary:base.module_survey
-msgid "Create surveys, collect answers and print statistics"
+#: model:ir.ui.view,arch_db:base.view_partner_form
+msgid "Create company"
msgstr ""
#. module: base
-#: model:ir.module.module,summary:base.module_board
+#: model:ir.model.fields,field_description:base.field_ir_logging_create_date
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_create_date
+msgid "Create date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_survey
+msgid "Create surveys, collect answers and print statistics"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_board
msgid "Create your custom dashboard"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_server_crud_model_id
+msgid "Create/Write Target Model"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_server_crud_model_name
msgid "Create/Write Target Model Name"
@@ -6108,9 +5954,8 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window_create_uid
#: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_uid
#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_301
+#: model:ir.model.fields,field_description:base.field_ir_actions_create_uid_300
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_uid
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_create_uid
#: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_uid
#: model:ir.model.fields,field_description:base.field_ir_cron_create_uid
#: model:ir.model.fields,field_description:base.field_ir_exports_create_uid
@@ -6179,9 +6024,8 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window_create_date
#: model:ir.model.fields,field_description:base.field_ir_act_window_view_create_date
#: model:ir.model.fields,field_description:base.field_ir_actions_create_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_309
+#: model:ir.model.fields,field_description:base.field_ir_actions_create_date_308
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_create_date
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_create_date
#: model:ir.model.fields,field_description:base.field_ir_config_parameter_create_date
#: model:ir.model.fields,field_description:base.field_ir_cron_create_date
#: model:ir.model.fields,field_description:base.field_ir_exports_create_date
@@ -6220,6 +6064,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_res_lang_create_date
#: model:ir.model.fields,field_description:base.field_res_partner_bank_create_date
#: model:ir.model.fields,field_description:base.field_res_partner_category_create_date
+#: model:ir.model.fields,field_description:base.field_res_partner_create_date
#: model:ir.model.fields,field_description:base.field_res_partner_title_create_date
#: model:ir.model.fields,field_description:base.field_res_request_link_create_date
#: model:ir.model.fields,field_description:base.field_res_users_log_create_date
@@ -6278,6 +6123,7 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_currency_form
+#: model:ir.actions.act_window,name:base.action_currency_form_company
#: model:ir.ui.menu,name:base.menu_action_currency_form
#: model:ir.ui.view,arch_db:base.view_currency_search
#: model:ir.ui.view,arch_db:base.view_currency_tree
@@ -6303,6 +6149,7 @@ msgstr ""
#. module: base
#: model:ir.model,name:base.model_res_currency_rate
+#: model:ir.ui.view,arch_db:base.view_currency_rate_form
msgid "Currency Rate"
msgstr ""
@@ -6330,6 +6177,7 @@ msgstr ""
#. module: base
#: selection:ir.actions.act_window,target:0
+#: selection:ir.actions.client,target:0
msgid "Current Window"
msgstr ""
@@ -6364,13 +6212,18 @@ msgstr ""
msgid "Custom Python Parser"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_company_rml_footer
+msgid "Custom Report Footer"
+msgstr ""
+
#. module: base
#: model:ir.ui.menu,name:base.menu_administration_shortcut
msgid "Custom Shortcuts"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:480
+#: code:addons/base/ir/ir_model.py:430
#, python-format
msgid "Custom fields must have a name that starts with 'x_' !"
msgstr ""
@@ -6393,11 +6246,15 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_customer_form
#: model:ir.actions.act_window,name:base.action_partner_form
-#: model:ir.ui.menu,name:base.menu_partner_form
#: model:ir.ui.view,arch_db:base.view_res_partner_filter
msgid "Customers"
msgstr ""
+#. module: base
+#: model:ir.module.module,summary:base.module_contacts
+msgid "Customers, Vendors, Partners,..."
+msgstr ""
+
#. module: base
#: model:ir.actions.act_window,name:base.action_ui_view_custom
#: model:ir.ui.menu,name:base.menu_action_ui_view_custom
@@ -6465,7 +6322,7 @@ msgid "Database Structure"
msgstr ""
#. module: base
-#: code:addons/models.py:3541
+#: code:addons/models.py:3503
#, python-format
msgid "Database fetch misses ids ({}) and has extra ids ({}), may be caused by a type incoherence in a previous request"
msgstr ""
@@ -6624,8 +6481,8 @@ msgid "Delete Access Right"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_actions.py:179
-#: code:addons/base/ir/ir_actions.py:901
+#: code:addons/base/ir/ir_actions.py:216
+#: code:addons/base/ir/ir_actions.py:781
#, python-format
msgid "Deletion of the action record failed."
msgstr ""
@@ -6782,7 +6639,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window_display_name
#: model:ir.model.fields,field_description:base.field_ir_act_window_view_display_name
#: model:ir.model.fields,field_description:base.field_ir_actions_display_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_303
+#: model:ir.model.fields,field_description:base.field_ir_actions_display_name_302
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_display_name
#: model:ir.model.fields,field_description:base.field_ir_attachment_display_name
#: model:ir.model.fields,field_description:base.field_ir_autovacuum_display_name
@@ -6822,8 +6679,6 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative_display_name
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection_display_name
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget_display_name
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget_monetary_display_name
#: model:ir.model.fields,field_description:base.field_ir_rule_display_name
#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_display_name
#: model:ir.model.fields,field_description:base.field_ir_sequence_display_name
@@ -6849,6 +6704,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_res_lang_display_name
#: model:ir.model.fields,field_description:base.field_res_partner_bank_display_name
#: model:ir.model.fields,field_description:base.field_res_partner_category_display_name
+#: model:ir.model.fields,field_description:base.field_res_partner_display_name
#: model:ir.model.fields,field_description:base.field_res_partner_title_display_name
#: model:ir.model.fields,field_description:base.field_res_request_link_display_name
#: model:ir.model.fields,field_description:base.field_res_users_display_name
@@ -6883,11 +6739,6 @@ msgstr ""
msgid "Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained."
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"
@@ -6904,8 +6755,8 @@ msgid "Document Management"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:848
-#: code:addons/base/ir/ir_model.py:851
+#: code:addons/base/ir/ir_model.py:770
+#: code:addons/base/ir/ir_model.py:773
#, python-format
msgid "Document model"
msgstr ""
@@ -6970,13 +6821,13 @@ msgid "Dummy"
msgstr ""
#. module: base
-#: code:addons/base/workflow/workflow.py:24
+#: code:addons/base/workflow/workflow.py:21
#, python-format
msgid "Duplicating workflows is not possible, please create a new workflow"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_qweb.py:938
+#: code:addons/base/ir/ir_qweb/fields.py:374
#, python-format
msgid "Durations can't be negative"
msgstr ""
@@ -7042,13 +6893,13 @@ msgid "El Salvador"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:590
+#: code:addons/base/ir/ir_ui_view.py:565
#, python-format
msgid "Element '%s' cannot be located in parent view"
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:215
+#: code:addons/base/res/res_company.py:216
#: model:ir.model.fields,field_description:base.field_res_bank_email
#: model:ir.model.fields,field_description:base.field_res_company_email
#: model:ir.model.fields,field_description:base.field_res_partner_email
@@ -7078,7 +6929,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 ""
@@ -7098,11 +6948,16 @@ msgid "Employees"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:352
+#: code:addons/base/ir/ir_model.py:300
#, python-format
msgid "Empty dependency in %r"
msgstr ""
+#. module: base
+#: model:res.groups,name:base.group_hr_attendance_use_pin
+msgid "Enable PIN use"
+msgstr ""
+
#. module: base
#: model:ir.ui.view,arch_db:base.view_server_action_form
msgid "Enter Python code here. Help about Python expression is available in the help tab of this document."
@@ -7119,12 +6974,13 @@ msgid "Equipment Manager"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_equipment
+#: model:ir.module.module,shortdesc:base.module_maintenance
msgid "Equipments"
msgstr ""
#. module: base
-#: model:ir.module.module,summary:base.module_hr_equipment
+#: model:ir.module.module,summary:base.module_hr_maintenance
+#: model:ir.module.module,summary:base.module_maintenance
msgid "Equipments, Assets, Internal Hardware, Allocation Tracking"
msgstr ""
@@ -7134,35 +6990,42 @@ msgid "Eritrea"
msgstr ""
#. module: base
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
-#. module: base
-#: code:addons/base/res/res_partner.py:74
+#: code:addons/base/res/res_partner.py:85
#, python-format
msgid "Error ! You can not create recursive tags."
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:353
+#: code:addons/base/res/res_company.py:354
#, python-format
msgid "Error ! You cannot create recursive companies."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:451
+#: code:addons/base/ir/ir_ui_view.py:426
#, python-format
msgid "Error context:\n"
"View `%(view_name)s`"
msgstr ""
#. module: base
-#: code:addons/models.py:1344
+#: code:addons/models.py:1233
#, python-format
msgid "Error details:"
msgstr ""
+#. module: base
+#: code:addons/models.py:1246
+#, python-format
+msgid "Error while validating constraint"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_menu.py:80
+#, python-format
+msgid "Error! You cannot create recursive menus."
+msgstr ""
+
#. module: base
#: model:res.country,name:base.ee
msgid "Estonia"
@@ -7190,7 +7053,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_event
-msgid "Events Organisation"
+msgid "Events Organization"
msgstr ""
#. module: base
@@ -7309,7 +7172,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_url_xml_id
#: model:ir.model.fields,field_description:base.field_ir_act_window_xml_id
#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_302
+#: model:ir.model.fields,field_description:base.field_ir_actions_xml_id_301
#: model:ir.model.fields,field_description:base.field_ir_module_category_xml_id
#: model:ir.model.fields,field_description:base.field_ir_ui_view_xml_id
#: model:ir.ui.view,arch_db:base.view_window_action_form
@@ -7368,7 +7231,7 @@ msgid "Faroe Islands"
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:214
+#: code:addons/base/res/res_company.py:215
#: model:ir.model.fields,field_description:base.field_res_bank_fax
#: model:ir.model.fields,field_description:base.field_res_company_fax
#: model:ir.model.fields,field_description:base.field_res_partner_fax
@@ -7390,7 +7253,6 @@ msgstr ""
#. module: base
#: model:ir.actions.act_window,name:base.action_country_state
-#: model:ir.ui.menu,name:base.menu_country_state_partner
msgid "Fed. States"
msgstr ""
@@ -7454,19 +7316,19 @@ msgid "Field"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:174
+#: code:addons/base/ir/ir_model.py:134
#, python-format
msgid "Field \"Model\" cannot be modified on models."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:178
+#: code:addons/base/ir/ir_model.py:138
#, python-format
msgid "Field \"Transient Model\" cannot be modified on models."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:176
+#: code:addons/base/ir/ir_model.py:136
#, python-format
msgid "Field \"Type\" cannot be modified on models."
msgstr ""
@@ -7503,7 +7365,7 @@ msgid "Field Type"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:921
+#: code:addons/base/ir/ir_ui_view.py:877
#, python-format
msgid "Field `%(field_name)s` does not exist"
msgstr ""
@@ -7560,7 +7422,7 @@ msgid "File Size"
msgstr ""
#. module: base
-#: code:addons/base/module/wizard/base_import_language.py:49
+#: code:addons/base/module/wizard/base_import_language.py:44
#, python-format
msgid "File not imported due to format mismatch or a malformed file. (Valid formats are .csv, .po, .pot)\n"
"\n"
@@ -7656,12 +7518,6 @@ msgstr ""
msgid "Flow Stop"
msgstr ""
-#. module: base
-#: code:addons/base/module/wizard/base_module_upgrade.py:81
-#, python-format
-msgid "Following modules are not installed or unknown: %s"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_res_company_font
msgid "Font"
@@ -7719,13 +7575,13 @@ msgid "For relationship fields, the technical name of the target model"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:475
+#: code:addons/base/ir/ir_model.py:423
#, python-format
msgid "For selection fields, the Selection Options must be given!"
msgstr ""
#. module: base
-#: code:addons/models.py:3674
+#: code:addons/models.py:3638
#, python-format
msgid "For this kind of document, you may only access records you created yourself.\n"
"\n"
@@ -7756,7 +7612,7 @@ msgid "Forum, FAQ, Q&A"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:344
+#: code:addons/base/ir/ir_fields.py:343
#, python-format
msgid "Found multiple matches for field '%%(field)s' (%d matches)"
msgstr ""
@@ -7811,6 +7667,12 @@ msgstr ""
msgid "Full Path"
msgstr ""
+#. module: base
+#: selection:ir.actions.act_window,target:0
+#: selection:ir.actions.client,target:0
+msgid "Full Screen"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_logging_func
#: selection:workflow.activity,kind:0
@@ -7943,21 +7805,11 @@ msgid "Glue module holding mail improvements for website."
msgstr ""
#. module: base
-#: code:addons/base/res/res_config.py:666
+#: code:addons/base/res/res_config.py:661
#, python-format
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_web_analytics
-msgid "Google Analytics"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_google_calendar
msgid "Google Calendar"
@@ -8117,6 +7969,11 @@ msgstr ""
msgid "Guyana"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_maintenance
+msgid "HR - Equipments"
+msgstr ""
+
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_gamification
msgid "HR Gamification"
@@ -8159,7 +8016,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,summary:base.module_hw_scale
-msgid "Hardware Driver for Weighting Scales"
+msgid "Hardware Driver for Weighing Scales"
msgstr ""
#. module: base
@@ -8328,11 +8185,21 @@ msgstr ""
msgid "How to define a computed field"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment_survey
+msgid "Hr Recruitment Interview Forms"
+msgstr ""
+
#. module: base
#: model:ir.module.category,name:base.module_category_human_resources
msgid "Human Resources"
msgstr ""
+#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources_survey
+msgid "Human Resources Survey"
+msgstr ""
+
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_hu
msgid "Hungarian - Accounting"
@@ -8365,9 +8232,9 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_server_id
#: model:ir.model.fields,field_description:base.field_ir_act_url_id
#: model:ir.model.fields,field_description:base.field_ir_act_window_id
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_300
+#: model:ir.model.fields,field_description:base.field_ir_act_window_view_id_299
#: model:ir.model.fields,field_description:base.field_ir_actions_id
-#: model:ir.model.fields,field_description:base.field_ir_actions_id_311
+#: model:ir.model.fields,field_description:base.field_ir_actions_id_310
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_id
#: model:ir.model.fields,field_description:base.field_ir_attachment_id
#: model:ir.model.fields,field_description:base.field_ir_autovacuum_id
@@ -8407,8 +8274,6 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection_id
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text_id
#: model:ir.model.fields,field_description:base.field_ir_qweb_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget_id
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget_monetary_id
#: model:ir.model.fields,field_description:base.field_ir_rule_id
#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range_id
#: model:ir.model.fields,field_description:base.field_ir_sequence_id
@@ -8484,11 +8349,6 @@ msgstr ""
msgid "ISO code"
msgstr ""
-#. module: base
-#: model:res.partner.category,name:base.res_partner_category_7
-msgid "IT Services"
-msgstr ""
-
#. module: base
#: model:res.country,name:base.is
msgid "Iceland"
@@ -8572,7 +8432,7 @@ msgstr ""
msgid "If this view is inherited,\n"
"* if True, the view always extends its parent\n"
"* if False, the view currently does not extend its parent but can be enabled\n"
-" "
+" "
msgstr ""
#. module: base
@@ -8674,10 +8534,17 @@ msgid "Incoming Transitions"
msgstr ""
#. module: base
-#: constraint:ir.actions.server:0
+#: code:addons/base/ir/ir_actions.py:607
+#, python-format
msgid "Incorrect Write Record Expression"
msgstr ""
+#. module: base
+#: code:addons/base/ir/ir_actions.py:714
+#, python-format
+msgid "Incorrect expression"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_fields_index
msgid "Indexed"
@@ -8773,12 +8640,7 @@ msgid "Inline Edit"
msgstr ""
#. module: base
-#: selection:ir.actions.act_window,target:0
-msgid "Inline View"
-msgstr ""
-
-#. module: base
-#: code:addons/base/module/module.py:448
+#: code:addons/base/module/module.py:399
#: model:ir.ui.view,arch_db:base.module_form
#: model:ir.ui.view,arch_db:base.module_view_kanban
#, python-format
@@ -8830,13 +8692,13 @@ msgid "Instant Messaging Bus allow you to send messages to users, in live."
msgstr ""
#. module: base
-#: code:addons/models.py:1549
+#: code:addons/models.py:1448
#, python-format
msgid "Insufficient fields for Calendar View!"
msgstr ""
#. module: base
-#: code:addons/models.py:1559
+#: code:addons/models.py:1458
#, python-format
msgid "Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay"
msgstr ""
@@ -8883,13 +8745,13 @@ msgid "Internal note..."
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_interval_number
-msgid "Interval Number"
+#: model:ir.model.fields,field_description:base.field_ir_cron_interval_type
+msgid "Interval Unit"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_cron_interval_type
-msgid "Interval Unit"
+#: model:ir.model.fields,field_description:base.field_ir_cron_interval_number
+msgid "Interval number"
msgstr ""
#. module: base
@@ -8903,18 +8765,19 @@ msgid "Introspection report on objects"
msgstr ""
#. module: base
-#: code:addons/models.py:4665
+#: code:addons/models.py:4559
#, 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
-#: constraint:ir.cron:0
+#: code:addons/base/ir/ir_cron.py:70
+#, python-format
msgid "Invalid arguments"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:325
+#: code:addons/base/ir/ir_fields.py:324
#, python-format
msgid "Invalid database id '%s' for the field '%%(field)s'"
msgstr ""
@@ -8926,21 +8789,27 @@ msgid "Invalid date/time format directive specified. Please refer to the list of
msgstr ""
#. module: base
-#: code:addons/models.py:757
+#: code:addons/base/ir/ir_actions.py:715
+#, python-format
+msgid "Invalid expression"
+msgstr ""
+
+#. module: base
+#: code:addons/models.py:743
#, python-format
msgid "Invalid function definition %s in object %s !\n"
"You must use the definition: store={object:(fnct, fields, priority, time length)}."
msgstr ""
#. module: base
-#: code:addons/models.py:2148
+#: code:addons/models.py:2128
#, python-format
msgid "Invalid group_by specification: \"%s\".\n"
"A group_by specification must be a list of valid fields."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:318
+#: code:addons/base/res/res_users.py:308
#, python-format
msgid "Invalid groupby"
msgstr ""
@@ -8951,25 +8820,26 @@ msgid "Invalid inheritance mode: if the mode is 'extension', the view must exten
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_actions.py:272
+#: code:addons/base/ir/ir_actions.py:248
+#: code:addons/base/ir/ir_actions.py:250
#, python-format
-msgid "Invalid model name in the action definition."
+msgid "Invalid model name %r in action definition."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:582
+#: code:addons/base/ir/ir_ui_view.py:557
#, python-format
msgid "Invalid position attribute: '%s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_sequence.py:220
+#: code:addons/base/ir/ir_sequence.py:193
#, python-format
msgid "Invalid prefix or suffix for sequence '%s'"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:326
+#: code:addons/base/res/res_users.py:316
#, python-format
msgid "Invalid search criterion"
msgstr ""
@@ -8981,7 +8851,9 @@ msgid "Invalid type"
msgstr ""
#. module: base
-#: constraint:ir.ui.view:0
+#: code:addons/base/ir/ir_ui_view.py:296
+#: code:addons/base/ir/ir_ui_view.py:298
+#, python-format
msgid "Invalid view definition"
msgstr ""
@@ -9137,7 +9009,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,summary:base.module_hr_recruitment
-msgid "Jobs, Recruitment, Applications, Job Interviews, Surveys"
+msgid "Jobs, Recruitment, Applications, Job Interviews"
msgstr ""
#. module: base
@@ -9246,13 +9118,13 @@ msgid "Language Name"
msgstr ""
#. module: base
-#: code:addons/base/module/wizard/base_language_install.py:42
+#: code:addons/base/module/wizard/base_language_install.py:29
#, python-format
msgid "Language Pack"
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:223
+#: code:addons/base/res/res_lang.py:217
#, python-format
msgid "Language code cannot be modified."
msgstr ""
@@ -9301,7 +9173,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window___last_update
#: model:ir.model.fields,field_description:base.field_ir_act_window_view___last_update
#: model:ir.model.fields,field_description:base.field_ir_actions___last_update
-#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_305
+#: model:ir.model.fields,field_description:base.field_ir_actions___last_update_304
#: model:ir.model.fields,field_description:base.field_ir_actions_todo___last_update
#: model:ir.model.fields,field_description:base.field_ir_attachment___last_update
#: model:ir.model.fields,field_description:base.field_ir_autovacuum___last_update
@@ -9341,8 +9213,6 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_relative___last_update
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_selection___last_update
#: model:ir.model.fields,field_description:base.field_ir_qweb_field_text___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget___last_update
-#: model:ir.model.fields,field_description:base.field_ir_qweb_widget_monetary___last_update
#: model:ir.model.fields,field_description:base.field_ir_rule___last_update
#: model:ir.model.fields,field_description:base.field_ir_sequence___last_update
#: model:ir.model.fields,field_description:base.field_ir_sequence_date_range___last_update
@@ -9401,9 +9271,8 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window_write_uid
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_uid
#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_306
+#: model:ir.model.fields,field_description:base.field_ir_actions_write_uid_305
#: model:ir.model.fields,field_description:base.field_ir_attachment_write_uid
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_write_uid
#: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_uid
#: model:ir.model.fields,field_description:base.field_ir_cron_write_uid
#: model:ir.model.fields,field_description:base.field_ir_exports_line_write_uid
@@ -9474,9 +9343,8 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_act_window_write_date
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_write_date
#: model:ir.model.fields,field_description:base.field_ir_actions_write_date
-#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_307
+#: model:ir.model.fields,field_description:base.field_ir_actions_write_date_306
#: model:ir.model.fields,field_description:base.field_ir_attachment_write_date
-#: model:ir.model.fields,field_description:base.field_ir_autovacuum_write_date
#: model:ir.model.fields,field_description:base.field_ir_config_parameter_write_date
#: model:ir.model.fields,field_description:base.field_ir_cron_write_date
#: model:ir.model.fields,field_description:base.field_ir_exports_line_write_date
@@ -9585,11 +9453,6 @@ msgstr ""
msgid "Lead to Issue"
msgstr ""
-#. module: base
-#: model:ir.ui.menu,name:base.menu_crm_config_lead
-msgid "Leads & Opportunities"
-msgstr ""
-
#. module: base
#: model:ir.module.module,summary:base.module_crm
msgid "Leads, Opportunities, Activities"
@@ -9715,7 +9578,6 @@ msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_localization
-#: model:ir.ui.menu,name:base.menu_localisation
#: model:ir.ui.view,arch_db:base.view_users_form
msgid "Localization"
msgstr ""
@@ -9767,11 +9629,6 @@ msgstr ""
msgid "Luxembourg - Accounting"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_mrp
-msgid "MRP"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_mrp_byproduct
msgid "MRP Byproducts"
@@ -9798,18 +9655,13 @@ msgid "Madam"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:483
+#: code:addons/base/ir/ir_mail_server.py:464
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_mail_tip
-msgid "Mail Tips"
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_mail_server.py:479
+#: code:addons/base/ir/ir_mail_server.py:462
#, python-format
msgid "Mail delivery failed via SMTP server '%s'.\n"
"%s: %s"
@@ -9830,6 +9682,12 @@ msgstr ""
msgid "Main Sequence"
msgstr ""
+#. module: base
+#: selection:ir.actions.act_window,target:0
+#: selection:ir.actions.client,target:0
+msgid "Main action of Current Window"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_module_module_maintainer
msgid "Maintainer"
@@ -9870,6 +9728,11 @@ msgstr ""
msgid "Manage bank records you want to be used in the system."
msgstr ""
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_attendance
+msgid "Manage employee attendances"
+msgstr ""
+
#. module: base
#: model:ir.actions.act_window,help:base.action_partner_category_form
msgid "Manage partner tags to better classify them for tracking and analysis purposes.\n"
@@ -9888,41 +9751,36 @@ msgstr ""
#. module: base
#: model:res.groups,name:base.group_hr_manager
-#: model:res.groups,name:base.group_sale_manager
#: model:res.groups,name:base.group_survey_manager
msgid "Manager"
msgstr ""
#. module: base
-#: model:ir.model.fields,help:base.field_ir_actions_todo_type
-msgid "Manual: Launched manually.\n"
-"Automatic: Runs whenever the system is reconfigured.\n"
-"Launch Manually Once: after having been launched manually, it sets automatically to Done."
+#: model:res.groups,name:base.group_hr_attendance
+msgid "Manual Attendances"
msgstr ""
#. module: base
-#: model:res.partner.category,name:base.res_partner_category_14
-msgid "Manufacturer"
+#: model:ir.model.fields,help:base.field_ir_actions_todo_type
+msgid "Manual: Launched manually.\n"
+" Automatic: Runs whenever the system is reconfigured.\n"
+" Launch Manually Once: after having been launched manually, it sets automatically to Done."
msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_manufacturing
+#: model:ir.module.module,shortdesc:base.module_mrp
#: model:ir.ui.menu,name:base.menu_mrp_root
msgid "Manufacturing"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_mrp_operations
-msgid "Manufacturing Operations"
-msgstr ""
-
#. module: base
#: model:ir.module.module,summary:base.module_mrp
msgid "Manufacturing Orders, Bill of Materials, Routings"
msgstr ""
#. module: base
-#: code:addons/models.py:2876
+#: code:addons/models.py:2858
#, python-format
msgid "Many2Many destination model does not exist: `%s`"
msgstr ""
@@ -9933,7 +9791,7 @@ msgid "Many2One"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:487
+#: code:addons/base/ir/ir_model.py:437
#, python-format
msgid "Many2one %s on model %s does not exist!"
msgstr ""
@@ -10137,25 +9995,25 @@ msgid "Miss"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:458
+#: code:addons/base/ir/ir_mail_server.py:440
#, python-format
msgid "Missing SMTP Server"
msgstr ""
#. module: base
-#: code:addons/models.py:3644
+#: code:addons/models.py:3607
#, python-format
msgid "Missing document(s)"
msgstr ""
#. module: base
-#: code:addons/models.py:6319
+#: code:addons/models.py:6195
#, python-format
msgid "Missing required value for the field '%s' (%s)"
msgstr ""
#. module: base
-#: code:addons/models.py:6316
+#: code:addons/models.py:6192
#, python-format
msgid "Missing required value for the field '%s'."
msgstr ""
@@ -10183,26 +10041,30 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_model
+#: model:ir.model.fields,field_description:base.field_ir_act_server_model_name
#: model:ir.model.fields,field_description:base.field_ir_filters_model_id
#: model:ir.model.fields,field_description:base.field_ir_model_constraint_model
#: model:ir.model.fields,field_description:base.field_ir_model_fields_model_id
#: model:ir.model.fields,field_description:base.field_ir_model_model
#: model:ir.model.fields,field_description:base.field_ir_model_relation_model
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_model
+#: model:ir.ui.view,arch_db:base.act_report_xml_search_view
#: model:ir.ui.view,arch_db:base.ir_filters_view_search
#: model:ir.ui.view,arch_db:base.values_view_search_action
#: model:ir.ui.view,arch_db:base.view_model_search
#: model:ir.ui.view,arch_db:base.view_server_action_search
+#: model:ir.ui.view,arch_db:base.view_translation_search
msgid "Model"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:483
+#: code:addons/base/ir/ir_model.py:433
#, python-format
msgid "Model %s does not exist!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:155
+#: code:addons/base/ir/ir_model.py:114
#, python-format
msgid "Model '%s' contains module data and cannot be removed!"
msgstr ""
@@ -10234,7 +10096,6 @@ msgid "Model Description"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_model_name
#: model:ir.model.fields,field_description:base.field_ir_model_data_model
#: model:ir.model.fields,field_description:base.field_ir_values_model
msgid "Model Name"
@@ -10250,6 +10111,11 @@ msgstr ""
msgid "Model for record creation / update. Set this field only to specify a different model than the base model."
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_ui_view_model_ids
+msgid "Model ids"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,help:base.field_ir_act_window_res_model
msgid "Model name of the object to open in the view window"
@@ -10261,8 +10127,8 @@ msgid "Model name on which the method to be called is located, e.g. 'res.partner
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:695
-#: code:addons/base/ir/ir_ui_view.py:873
+#: code:addons/base/ir/ir_ui_view.py:666
+#: code:addons/base/ir/ir_ui_view.py:828
#, python-format
msgid "Model not found: %(model)s"
msgstr ""
@@ -10461,7 +10327,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_name
#: model:ir.model.fields,field_description:base.field_ir_actions_name
-#: model:ir.model.fields,field_description:base.field_ir_actions_name_312
+#: model:ir.model.fields,field_description:base.field_ir_actions_name_311
#: model:ir.model.fields,field_description:base.field_ir_actions_todo_name
#: model:ir.model.fields,field_description:base.field_ir_cron_name
#: model:ir.model.fields,field_description:base.field_ir_logging_name
@@ -10477,7 +10343,6 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_res_groups_name
#: model:ir.model.fields,field_description:base.field_res_lang_name
#: model:ir.model.fields,field_description:base.field_res_partner_bank_bank_name
-#: model:ir.model.fields,field_description:base.field_res_partner_display_name
#: model:ir.model.fields,field_description:base.field_res_partner_name
#: model:ir.model.fields,field_description:base.field_res_request_link_name
#: model:ir.model.fields,field_description:base.field_res_users_name
@@ -10487,6 +10352,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:base.report_irmodulereference
#: model:ir.ui.view,arch_db:base.view_partner_form
#: model:ir.ui.view,arch_db:base.view_partner_simple_form
+#: model:ir.ui.view,arch_db:base.view_partner_tree
msgid "Name"
msgstr ""
@@ -10541,7 +10407,7 @@ msgid "New Caledonia (French)"
msgstr ""
#. module: base
-#: code:addons/base/module/wizard/base_export_language.py:22
+#: code:addons/base/module/wizard/base_export_language.py:18
#, python-format
msgid "New Language (Empty translation template)"
msgstr ""
@@ -10554,6 +10420,7 @@ msgstr ""
#. module: base
#: selection:ir.actions.act_url,target:0
#: selection:ir.actions.act_window,target:0
+#: selection:ir.actions.client,target:0
msgid "New Window"
msgstr ""
@@ -10568,7 +10435,7 @@ msgid "New Zealand - Accounting"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:547
+#: code:addons/base/ir/ir_model.py:495
#, python-format
msgid "New field name must still start with x_ , because it is a custom field!"
msgstr ""
@@ -10629,7 +10496,7 @@ msgid "Niue"
msgstr ""
#. module: base
-#: code:addons/models.py:1630
+#: code:addons/models.py:1556
#, python-format
msgid "No default view of type '%s' could be found !"
msgstr ""
@@ -10640,13 +10507,13 @@ msgid "No gap"
msgstr ""
#. module: base
-#: code:addons/base/module/wizard/base_update_translations.py:22
+#: code:addons/base/module/wizard/base_update_translations.py:33
#, python-format
msgid "No language with code \"%s\" exists"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:357
+#: code:addons/base/ir/ir_fields.py:356
#, python-format
msgid "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
msgstr ""
@@ -10657,13 +10524,13 @@ msgid "Non Updatable"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:361
+#: code:addons/base/ir/ir_model.py:309
#, python-format
msgid "Non-relational field %r in dependency %r"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:318
+#: code:addons/base/ir/ir_model.py:266
#, python-format
msgid "Non-relational field name '%s' in related field '%s'"
msgstr ""
@@ -10698,11 +10565,6 @@ msgstr ""
msgid "Norway - Accounting"
msgstr ""
-#. module: base
-#: selection:ir.module.module,state:0
-msgid "Not Installable"
-msgstr ""
-
#. module: base
#: selection:ir.module.module,state:0
#: selection:ir.module.module.dependency,state:0
@@ -10757,7 +10619,6 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_cron_model
#: model:ir.model.fields,field_description:base.field_ir_model_access_model_id
#: model:ir.model.fields,field_description:base.field_ir_rule_model_id
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_model
#: model:ir.model.fields,field_description:base.field_res_request_link_object
#: model:ir.model.fields,field_description:base.field_wkf_triggers_model
#: selection:ir.translation,type:0
@@ -10790,11 +10651,6 @@ msgstr ""
msgid "Odoo Enterprise Edition License v1.0"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_im_odoo_support
-msgid "Odoo Live Support"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_settings_dashboard
msgid "Odoo Settings Dashboard"
@@ -10825,11 +10681,6 @@ msgstr ""
msgid "Odoo will automatically adds some '0' on the left of the 'Next Number' to get the required padding size."
msgstr ""
-#. module: base
-#: model:res.partner.category,name:base.res_partner_category_12
-msgid "Office Supplies"
-msgstr ""
-
#. module: base
#: model:res.groups,name:base.group_hr_user
msgid "Officer"
@@ -10868,19 +10719,19 @@ msgid "On delete property for many2one fields"
msgstr ""
#. module: base
-#: code:addons/models.py:3644
+#: code:addons/models.py:3607
#, 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:4056
+#: code:addons/models.py:3993
#, 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:347
+#: code:addons/base/res/res_partner.py:367
#, python-format
msgid "One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`"
msgstr ""
@@ -10912,7 +10763,7 @@ msgid "Only administrators can change the settings"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_attachment.py:62
+#: code:addons/base/ir/ir_attachment.py:56
#, python-format
msgid "Only administrators can execute this action."
msgstr ""
@@ -10922,17 +10773,17 @@ msgstr ""
msgid "Only applies if this view inherits from an other one (inherit_id is not False/Null).\n"
"\n"
"* if extension (default), if this view is requested the closest primary view\n"
-" is looked up (via inherit_id), then all views inheriting from it with this\n"
-" view's model are applied\n"
+"is looked up (via inherit_id), then all views inheriting from it with this\n"
+"view's model are applied\n"
"* if primary, the closest primary view is fully resolved (even if it uses a\n"
-" different model than this one), then this view's inheritance specs\n"
-" (<xpath/>) are applied, and the result is used as if it were this view's\n"
-" actual arch.\n"
+"different model than this one), then this view's inheritance specs\n"
+"(<xpath/>) are applied, and the result is used as if it were this view's\n"
+"actual arch.\n"
""
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:848
+#: code:addons/base/ir/ir_model.py:770
#, python-format
msgid "Only users with the following access level are currently allowed to do that"
msgstr ""
@@ -10958,11 +10809,6 @@ msgstr ""
msgid "Open a Window"
msgstr ""
-#. module: base
-#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
-msgid "Opportunities"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_crm
msgid "Opportunity to Quotation"
@@ -10980,7 +10826,7 @@ msgstr ""
#: model:ir.model.fields,help:base.field_ir_act_url_help
#: model:ir.model.fields,help:base.field_ir_act_window_help
#: model:ir.model.fields,help:base.field_ir_actions_help
-#: model:ir.model.fields,help:base.field_ir_actions_help_304
+#: model:ir.model.fields,help:base.field_ir_actions_help_303
msgid "Optional help text for the users with a description of the target view, such as its usage and purpose."
msgstr ""
@@ -11015,8 +10861,8 @@ msgid "Original View"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:725
-#: code:addons/base/res/res_users.py:890
+#: code:addons/base/res/res_users.py:716
+#: code:addons/base/res/res_users.py:876
#, python-format
msgid "Other"
msgstr ""
@@ -11189,11 +11035,6 @@ msgstr ""
msgid "Parent Company"
msgstr ""
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_left
-msgid "Parent Left"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_id
#: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create_menu_id
@@ -11201,8 +11042,8 @@ msgid "Parent Menu"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_right
-msgid "Parent Right"
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_left
+msgid "Parent left"
msgstr ""
#. module: base
@@ -11211,6 +11052,11 @@ msgstr ""
msgid "Parent name"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_ui_menu_parent_right
+msgid "Parent right"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_parser
msgid "Parser Class"
@@ -11220,16 +11066,10 @@ msgstr ""
#: model:ir.model,name:base.model_res_partner
#: 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 ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
-msgid "Partner Assignation & Geolocation"
-msgstr ""
-
#. module: base
#: model:ir.actions.act_window,name:base.action_partner_mass_mail
msgid "Partner Mass Mailing"
@@ -11268,7 +11108,7 @@ msgid "Partners Geolocation"
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:703
+#: code:addons/base/res/res_partner.py:728
#, python-format
msgid "Partners: "
msgstr ""
@@ -11291,6 +11131,7 @@ msgid "Path"
msgstr ""
#. module: base
+#: model:ir.module.category,name:base.module_category_payment_acquirer
#: model:ir.module.module,shortdesc:base.module_payment
msgid "Payment Acquirer"
msgstr ""
@@ -11326,6 +11167,16 @@ msgstr ""
msgid "Payment Acquirer: Paypal Implementation"
msgstr ""
+#. module: base
+#: model:ir.module.module,summary:base.module_payment_payumoney
+msgid "Payment Acquirer: PayuMoney Implementation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_payment_stripe
+msgid "Payment Acquirer: Stripe Implementation"
+msgstr ""
+
#. module: base
#: model:ir.module.module,summary:base.module_payment_transfer
msgid "Payment Acquirer: Transfer Implementation"
@@ -11353,6 +11204,11 @@ msgstr ""
msgid "Payroll Accounting"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_payment_payumoney
+msgid "PayuMoney Payment Acquirer"
+msgstr ""
+
#. module: base
#: model:ir.module.module,summary:base.module_calendar
msgid "Personal & Shared Calendar"
@@ -11379,7 +11235,7 @@ msgid "Philippines"
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:213
+#: code:addons/base/res/res_company.py:214
#: model:ir.model.fields,field_description:base.field_res_bank_phone
#: model:ir.model.fields,field_description:base.field_res_company_phone
#: model:ir.model.fields,field_description:base.field_res_partner_phone
@@ -11420,19 +11276,19 @@ msgid "Plano de contas SNC para Portugal"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:851
+#: code:addons/base/ir/ir_model.py:773
#, python-format
msgid "Please contact your system administrator if you think this is an error."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:458
+#: code:addons/base/ir/ir_mail_server.py:440
#, python-format
msgid "Please define at least one SMTP server, or provide the SMTP parameters explicitly."
msgstr ""
#. module: base
-#: code:addons/base/workflow/workflow.py:83
+#: code:addons/base/workflow/workflow.py:81
#, python-format
msgid "Please make sure no workitems refer to an activity before deleting it!"
msgstr ""
@@ -11448,13 +11304,13 @@ msgid "Please set the Base Model of the action to enable the dynamic expression
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_actions.py:906
+#: code:addons/base/ir/ir_actions.py:787
#, python-format
msgid "Please specify an action to launch!"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:250
+#: code:addons/base/res/res_users.py:245
#, python-format
msgid "Please use the change password wizard (in User Preferences or User menu) to change your own password."
msgstr ""
@@ -11610,11 +11466,6 @@ msgstr ""
msgid "Product Email Template"
msgstr ""
-#. module: base
-#: model:ir.ui.menu,name:base.menu_product
-msgid "Product Variants"
-msgstr ""
-
#. module: base
#: model:ir.module.module,shortdesc:base.module_product_extended
msgid "Product extension to track sales and purchases"
@@ -11672,7 +11523,7 @@ msgid "Properties"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:526
+#: code:addons/base/ir/ir_model.py:474
#, 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 ""
@@ -11682,11 +11533,6 @@ msgstr ""
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_write_expression
msgid "Provide an expression that, applied on the current record, gives the field to update."
@@ -11753,6 +11599,11 @@ msgstr ""
msgid "Purchase Requisitions"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_mrp
+msgid "Purchase and MRP Management"
+msgstr ""
+
#. module: base
#: model:ir.module.category,name:base.module_category_purchase_management
#: model:ir.module.category,name:base.module_category_purchases
@@ -11814,6 +11665,12 @@ msgstr ""
msgid "Quotations, Sales Orders, Invoicing"
msgstr ""
+#. module: base
+#: code:addons/base/ir/ir_ui_view.py:305
+#, python-format
+msgid "Qweb view cannot have 'Groups' define on the record. Use 'groups' atttributes inside the view definition"
+msgstr ""
+
#. module: base
#: model:ir.ui.view,arch_db:base.act_report_xml_view
msgid "RML Configuration"
@@ -11882,12 +11739,6 @@ msgstr ""
msgid "Record"
msgstr ""
-#. module: base
-#: code:addons/models.py:4989
-#, python-format
-msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_server_id_value
#: model:ir.model.fields,field_description:base.field_ir_act_window_res_id
@@ -11910,14 +11761,14 @@ msgid "Record Rules"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_cron.py:271
+#: code:addons/base/ir/ir_cron.py:262
#, 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:411
-#: code:addons/models.py:5116
+#: code:addons/base/ir/ir_actions.py:353
+#: code:addons/models.py:4961
#, python-format
msgid "Record does not exist or has been deleted."
msgstr ""
@@ -11939,18 +11790,19 @@ msgid "Recurring Documents"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:370
+#: code:addons/base/module/module.py:321
#, python-format
msgid "Recursion error in modules dependencies !"
msgstr ""
#. module: base
-#: constraint:ir.actions.server:0
+#: code:addons/base/ir/ir_actions.py:612
+#, python-format
msgid "Recursion found in child server actions"
msgstr ""
#. module: base
-#: code:addons/models.py:4168
+#: code:addons/models.py:4101
#, python-format
msgid "Recursivity Detected."
msgstr ""
@@ -11967,7 +11819,7 @@ msgid "Referenceable Models"
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:218
+#: code:addons/base/res/res_company.py:219
#, python-format
msgid "Reg"
msgstr ""
@@ -11994,20 +11846,19 @@ msgid "Related Server Action"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:330
+#: code:addons/base/ir/ir_model.py:278
#, python-format
msgid "Related field '%s' does not have comodel '%s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:328
+#: code:addons/base/ir/ir_model.py:276
#, python-format
msgid "Related field '%s' does not have type '%s'"
msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_server_wkf_field_id
-#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation_field
msgid "Relation Field"
msgstr ""
@@ -12016,9 +11867,19 @@ msgstr ""
msgid "Relation Name"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation_field
+msgid "Relation field"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_fields_relation_table
-msgid "Relation Table"
+msgid "Relation table"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_server_use_relational_model
+msgid "Relational Target Model"
msgstr ""
#. module: base
@@ -12047,7 +11908,7 @@ msgid "Remove the contextual action related to this server action"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:511
+#: code:addons/base/ir/ir_model.py:459
#, python-format
msgid "Renaming sparse field \"%s\" is not allowed"
msgstr ""
@@ -12090,7 +11951,6 @@ msgid "Report File"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_company_rml_footer
#: model:ir.model.fields,field_description:base.field_res_company_rml_footer_readonly
msgid "Report Footer"
msgstr ""
@@ -12101,7 +11961,6 @@ msgid "Report Model"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_type
#: model:ir.ui.view,arch_db:base.act_report_xml_search_view
msgid "Report Type"
msgstr ""
@@ -12111,6 +11970,11 @@ msgstr ""
msgid "Report Xml"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_report_xml_report_type
+msgid "Report type"
+msgstr ""
+
#. module: base
#: model:ir.ui.view,arch_db:base.act_report_xml_view_tree
msgid "Report xml"
@@ -12150,7 +12014,7 @@ msgid "Resellers"
msgstr ""
#. module: base
-#: code:addons/models.py:1163
+#: code:addons/models.py:1064
#, python-format
msgid "Resolve other errors first"
msgstr ""
@@ -12211,11 +12075,6 @@ msgstr ""
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)"
@@ -12268,17 +12127,19 @@ msgid "Rules"
msgstr ""
#. module: base
-#: constraint:ir.rule:0
+#: code:addons/base/ir/ir_rule.py:65
+#, python-format
msgid "Rules can not be applied on Transient models."
msgstr ""
#. module: base
-#: constraint:ir.rule:0
+#: code:addons/base/ir/ir_rule.py:71
+#, python-format
msgid "Rules can not be applied on the Record Rules model."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_actions.py:883
+#: code:addons/base/ir/ir_actions.py:764
#, python-format
msgid "Run %s"
msgstr ""
@@ -12390,28 +12251,15 @@ msgid "Sale & Purchase Vouchers"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_product_uos
-msgid "Sale - Secondary UoM"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_sale_layout
-msgid "Sale Layout"
-msgstr ""
-
-#. module: base
-#: model:ir.module.module,summary:base.module_sale_layout
-msgid "Sale Layout, page-break, subtotals, separators, report"
+#: model:ir.module.module,shortdesc:base.module_sale_service_rating
+msgid "Sale Service Rating"
msgstr ""
#. module: base
#: model:ir.module.category,name:base.module_category_sales
#: model:ir.module.category,name:base.module_category_sales_management
+#: model:ir.module.module,shortdesc:base.module_sale
#: model:ir.module.module,summary:base.module_website_quote
-#: model:ir.ui.menu,name:base.menu_base_partner
-#: model:ir.ui.menu,name:base.menu_sale_config_sales
-#: model:ir.ui.menu,name:base.menu_sales
-#: model:ir.ui.menu,name:base.menu_sales_config
msgid "Sales"
msgstr ""
@@ -12425,11 +12273,6 @@ msgstr ""
msgid "Sales Expense"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_sale
-msgid "Sales Management"
-msgstr ""
-
#. module: base
#: model:ir.module.module,summary:base.module_sales_team
msgid "Sales Team"
@@ -12539,11 +12382,6 @@ msgstr ""
msgid "Search Partner"
msgstr ""
-#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_search_view
-msgid "Search View"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_window_search_view_id
msgid "Search View Ref."
@@ -12554,6 +12392,11 @@ msgstr ""
msgid "Search modules"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_window_search_view
+msgid "Search view"
+msgstr ""
+
#. module: base
#: model:ir.ui.view,arch_db:base.sequence_view
msgid "Second: %(sec)s"
@@ -12572,17 +12415,7 @@ msgid "Security and Authentication"
msgstr ""
#. module: base
-#: model:res.groups,name:base.group_sale_salesman
-msgid "See Own Leads"
-msgstr ""
-
-#. module: base
-#: model:res.groups,name:base.group_sale_salesman_all_leads
-msgid "See all Leads"
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_fields.py:306
+#: code:addons/base/ir/ir_fields.py:305
#, python-format
msgid "See all possible values"
msgstr ""
@@ -12608,6 +12441,12 @@ msgstr ""
msgid "Selectable"
msgstr ""
+#. module: base
+#: code:addons/base/res/res_partner.py:26
+#, 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 ""
+
#. module: base
#: selection:ir.property,type:0
#: selection:ir.translation,type:0
@@ -12619,6 +12458,12 @@ msgstr ""
msgid "Selection Options"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_partner_self
+#: model:ir.model.fields,field_description:base.field_res_users_self
+msgid "Self"
+msgstr ""
+
#. module: base
#: model:ir.module.module,summary:base.module_website_event_sale
msgid "Sell Your Event's Tickets"
@@ -12657,6 +12502,7 @@ msgstr ""
#: model:ir.model.fields,field_description:base.field_ir_module_module_sequence
#: model:ir.model.fields,field_description:base.field_ir_ui_menu_sequence
#: model:ir.model.fields,field_description:base.field_ir_ui_view_priority
+#: model:ir.model.fields,field_description:base.field_res_company_sequence
#: model:ir.model.fields,field_description:base.field_res_partner_bank_sequence
#: model:ir.model.fields,field_description:base.field_wkf_transition_sequence
#: model:ir.ui.view,arch_db:base.ir_cron_view_tree
@@ -12701,7 +12547,7 @@ msgid "Serialization Field"
msgstr ""
#. module: base
-#: code:addons/models.py:440
+#: code:addons/models.py:428
#, python-format
msgid "Serialization field `%s` not found for sparse field `%s`!"
msgstr ""
@@ -12731,11 +12577,6 @@ msgstr ""
msgid "Server Actions"
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"
@@ -12758,7 +12599,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:521
+#: code:addons/base/res/res_users.py:511
#, python-format
msgid "Setting empty passwords is not allowed for security reasons!"
msgstr ""
@@ -12767,7 +12608,6 @@ msgstr ""
#: model:ir.ui.menu,name:base.menu_administration
#: model:ir.ui.menu,name:base.menu_mrp_config
#: model:ir.ui.menu,name:base.menu_project_general_settings
-#: model:ir.ui.menu,name:base.menu_sale_general_settings
#: model:res.groups,name:base.group_system
msgid "Settings"
msgstr ""
@@ -12842,11 +12682,6 @@ msgstr ""
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 "
@@ -12867,20 +12702,14 @@ msgstr ""
msgid "Sint Maarten (Dutch part)"
msgstr ""
-#. module: base
-#: model:res.partner.title,name:base.res_partner_title_sir
-msgid "Sir"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_fields_size
msgid "Size"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:302
-#, python-format
-msgid "Size of the field can never be less than 0 !"
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field cannot be negative."
msgstr ""
#. module: base
@@ -12937,26 +12766,26 @@ msgid "Sometimes called BIC or Swift."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_attachment.py:323
-#: code:addons/base/ir/ir_model.py:842
+#: code:addons/base/ir/ir_attachment.py:288
+#: code:addons/base/ir/ir_model.py:764
#, python-format
msgid "Sorry, you are not allowed to access this document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:844
+#: code:addons/base/ir/ir_model.py:766
#, python-format
msgid "Sorry, you are not allowed to create this kind of document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:845
+#: code:addons/base/ir/ir_model.py:767
#, python-format
msgid "Sorry, you are not allowed to delete this document."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:843
+#: code:addons/base/ir/ir_model.py:765
#, python-format
msgid "Sorry, you are not allowed to modify this document."
msgstr ""
@@ -12967,7 +12796,7 @@ msgid "Sort"
msgstr ""
#. module: base
-#: code:addons/models.py:4837
+#: code:addons/models.py:4694
#, python-format
msgid "Sorting field %s not found on model %s"
msgstr ""
@@ -13057,11 +12886,6 @@ msgstr ""
msgid "Sponsors, Tracks, Agenda, Event News"
msgstr ""
-#. module: base
-#: model:res.partner.title,shortcut:base.res_partner_title_sir
-msgid "Sr."
-msgstr ""
-
#. module: base
#: model:res.country,name:base.lk
msgid "Sri Lanka"
@@ -13083,6 +12907,7 @@ msgid "Start configuration"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_base_language_export_state
#: model:ir.model.fields,field_description:base.field_res_partner_state_id
#: model:ir.model.fields,field_description:base.field_res_users_state_id
#: model:ir.ui.view,arch_db:base.view_company_form
@@ -13104,6 +12929,12 @@ msgstr ""
msgid "State Name"
msgstr ""
+#. module: base
+#: code:addons/base/res/res_country.py:138
+#, python-format
+msgid "State with id [%s] (%s) seems to have duplicated code: %s"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_res_country_state_ids
msgid "States"
@@ -13128,8 +12959,8 @@ msgid "Step"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_sequence.py:20
-#: code:addons/base/ir/ir_sequence.py:43
+#: code:addons/base/ir/ir_sequence.py:16
+#: code:addons/base/ir/ir_sequence.py:32
#, python-format
msgid "Step must not be zero."
msgstr ""
@@ -13196,6 +13027,12 @@ msgstr ""
msgid "Street2"
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_payment_stripe
+#: model:ir.module.module,shortdesc:base.module_payment_stripe
+msgid "Stripe Payment Acquirer"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_act_server_sub_model_object_field
msgid "Sub-field"
@@ -13280,6 +13117,11 @@ msgstr ""
msgid "Survey CRM"
msgstr ""
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_recruitment_survey
+msgid "Surveys"
+msgstr ""
+
#. module: base
#: model:res.country,name:base.sj
msgid "Svalbard and Jan Mayen Islands"
@@ -13373,7 +13215,7 @@ msgid "TGZ format: this is a compressed archive containing a PO file, directly s
msgstr ""
#. module: base
-#: code:addons/base/res/res_company.py:217
+#: code:addons/base/res/res_company.py:218
#: model:ir.model.fields,field_description:base.field_res_partner_vat
#: model:ir.model.fields,field_description:base.field_res_users_vat
#, python-format
@@ -13391,7 +13233,7 @@ msgid "Tag"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_res_partner_category_id_974
+#: model:ir.model.fields,field_description:base.field_res_partner_category_id_966
#: model:ir.model.fields,field_description:base.field_res_users_category_id
msgid "Tags"
msgstr ""
@@ -13417,8 +13259,6 @@ msgid "Tanzania"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_server_crud_model_id
-#: model:ir.model.fields,field_description:base.field_ir_act_server_use_relational_model
#: model:ir.model.fields,field_description:base.field_ir_act_server_wkf_model_id
msgid "Target Model"
msgstr ""
@@ -13429,6 +13269,7 @@ msgid "Target Model Name"
msgstr ""
#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_client_target
#: model:ir.model.fields,field_description:base.field_ir_act_window_target
msgid "Target Window"
msgstr ""
@@ -13468,6 +13309,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_module_module_name
+#: model:ir.ui.view,arch_db:base.view_model_search
msgid "Technical Name"
msgstr ""
@@ -13478,9 +13320,9 @@ msgid "Technical Settings"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:759
+#: code:addons/base/ir/ir_translation.py:746
#, python-format
-msgid "Technical Translation"
+msgid "Technical Translations"
msgstr ""
#. module: base
@@ -13513,6 +13355,11 @@ msgstr ""
msgid "Tests"
msgstr ""
+#. module: base
+#: model:ir.module.module,description:base.module_test_read_group
+msgid "Tests for read_group"
+msgstr ""
+
#. module: base
#: model:ir.module.module,description:base.module_test_converter
msgid "Tests of field conversions"
@@ -13541,19 +13388,7 @@ msgid "The ISO country code in two chars. \n"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:117
-#, python-format
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_model.py:298
-#, python-format
-msgid "The Selection Options expression is must be in the [('key','Label'), ...] format!"
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_model.py:285
+#: code:addons/base/ir/ir_model.py:249
#, python-format
msgid "The Selection Options expression is not a valid Pythonic expression.Please provide an expression in the [('key','Label'), ...] format."
msgstr ""
@@ -13570,13 +13405,13 @@ msgid "The Separator Format should be like [,n] where 0 < n :starting from Unit
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:708
+#: code:addons/base/module/module.py:665
#, 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:557
+#: code:addons/base/module/module.py:510
#, python-format
msgid "The `base` module cannot be uninstalled"
msgstr ""
@@ -13587,7 +13422,7 @@ msgid "The active field allows you to hide the category without removing it."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:282
+#: code:addons/base/res/res_users.py:277
#, python-format
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
@@ -13602,6 +13437,11 @@ msgstr ""
msgid "The code of the language must be unique !"
msgstr ""
+#. module: base
+#: sql_constraint:res.country.state:0
+msgid "The code of the state must be unique by country !"
+msgstr ""
+
#. module: base
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
@@ -13629,7 +13469,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_attachment_res_model
-msgid "The database object this attachment will be attached to"
+msgid "The database object this attachment will be attached to."
msgstr ""
#. module: base
@@ -13676,6 +13516,12 @@ msgstr ""
msgid "The field on the current object that links to the target object record (must be a many2one, or an integer field with the record ID)"
msgstr ""
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:69
+#, python-format
+msgid "The following modules are not installed or unknown: %s"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,help:base.field_res_country_name
msgid "The full name of the country."
@@ -13702,6 +13548,18 @@ msgstr ""
msgid "The menu action this filter applies to. When left empty the filter applies to all menus for this model."
msgstr ""
+#. module: base
+#: code:addons/base/ir/ir_model.py:82
+#, 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:80
+#, python-format
+msgid "The model name must start with 'x_'."
+msgstr ""
+
#. module: base
#: model:ir.model.fields,help:base.field_ir_act_server_wkf_model_id
msgid "The model that will receive the workflow signal. Note that it should have a workflow associated with it."
@@ -13734,9 +13592,8 @@ msgid "The name of the language must be unique !"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:311
-#, python-format
-msgid "The name of the module must be unique !"
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique!"
msgstr ""
#. module: base
@@ -13793,13 +13650,13 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_attachment_res_id
-msgid "The record id this is attached to"
+msgid "The record id this is attached to."
msgstr ""
#. module: base
-#: code:addons/models.py:3281
-#: code:addons/models.py:3550
-#: code:addons/models.py:3634
+#: code:addons/models.py:3249
+#: code:addons/models.py:3512
+#: code:addons/models.py:3597
#, python-format
msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
@@ -13818,11 +13675,11 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_res_country_state_code
-msgid "The state code in max. three chars."
+msgid "The state code."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:413
+#: code:addons/base/ir/ir_model.py:361
#, python-format
msgid "The table %r if used for other, possibly incompatible fields."
msgstr ""
@@ -13843,7 +13700,17 @@ msgid "The user will be able to manage equipments."
msgstr ""
#. module: base
-#: code:addons/models.py:6331
+#: model:res.groups,comment:base.group_hr_attendance
+msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_attendance_use_pin
+msgid "The user will have to enter his PIN to check in and out manually at the company screen."
+msgstr ""
+
+#. module: base
+#: code:addons/models.py:6207
#, python-format
msgid "The value for the field '%s' already exists."
msgstr ""
@@ -13854,19 +13721,19 @@ msgid "Theme"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_filters.py:79
+#: code:addons/base/ir/ir_filters.py:97
#, python-format
msgid "There is already a shared filter set as default for %(model)s, delete or change it before setting a new default"
msgstr ""
#. module: base
-#: code:addons/models.py:2730
+#: code:addons/models.py:2716
#, python-format
msgid "There is no reference available for %s"
msgstr ""
#. module: base
-#: code:addons/models.py:2861
+#: code:addons/models.py:2841
#, python-format
msgid "There is no reference field '%s' found for '%s'"
msgstr ""
@@ -13882,7 +13749,7 @@ msgid "This Window"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:454
+#: code:addons/base/ir/ir_model.py:401
#, python-format
msgid "This column contains module data and cannot be removed!"
msgstr ""
@@ -13944,8 +13811,8 @@ msgid "Time Format"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_timesheet
-msgid "Time Tracking"
+#: model:ir.module.module,shortdesc:base.module_website_project_timesheet
+msgid "Timesheet in Website Portal"
msgstr ""
#. module: base
@@ -13959,13 +13826,23 @@ msgid "Timesheet on Website Project Issue"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet
msgid "Timesheets"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+msgid "Timesheets / Attendances"
+msgstr ""
+
#. module: base
#: model:ir.module.module,summary:base.module_hr_timesheet_sheet
-msgid "Timesheets, Attendances, Activities"
+msgid "Timesheets, Activities"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_attendance
+msgid "Timesheets/attendances reporting"
msgstr ""
#. module: base
@@ -13980,11 +13857,6 @@ msgstr ""
msgid "Timezone offset"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_web_tip
-msgid "Tips"
-msgstr ""
-
#. module: base
#: model:ir.model.fields,field_description:base.field_res_partner_title
#: model:ir.model.fields,field_description:base.field_res_partner_title_name
@@ -14061,6 +13933,11 @@ msgstr ""
msgid "Touchscreen Interface for Shops"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tour
+msgid "Tours"
+msgstr ""
+
#. module: base
#: model:ir.module.module,summary:base.module_event
msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
@@ -14099,6 +13976,11 @@ msgstr ""
msgid "Transition"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_wkf_instance_transition_ids
+msgid "Transition ids"
+msgstr ""
+
#. module: base
#: model:ir.actions.act_window,name:base.action_workflow_transition_form
#: model:ir.ui.menu,name:base.menu_workflow_transition
@@ -14155,7 +14037,7 @@ msgid "Translation comments"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:648
+#: code:addons/base/ir/ir_translation.py:634
#, python-format
msgid "Translation features are unavailable until you install an extra translation."
msgstr ""
@@ -14166,7 +14048,7 @@ msgid "Translation in Progress"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_translation.py:569
+#: code:addons/base/ir/ir_translation.py:555
#, python-format
msgid "Translation is not valid:\n"
"%s"
@@ -14241,7 +14123,7 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_sequence_implementation
-msgid "Two sequence object implementations are offered: Standard and 'No gap'. The later is slower than the former but forbids any gap in the sequence (while they are possible in the former)."
+msgid "Two sequence object implementations are offered: Standard and 'No gap'. The later is slower than the former but forbids anygap in the sequence (while they are possible in the former)."
msgstr ""
#. module: base
@@ -14330,25 +14212,25 @@ msgid "Ukraine"
msgstr ""
#. module: base
-#: code:addons/models.py:3761
+#: code:addons/models.py:3719
#, 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:360
+#: code:addons/base/module/module.py:311
#, 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:364
+#: code:addons/base/module/module.py:315
#, 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:362
+#: code:addons/base/module/module.py:313
#, python-format
msgid "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
msgstr ""
@@ -14359,22 +14241,18 @@ msgid "Uncategorized"
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:560
+#: code:addons/base/module/module.py:513
#: model:ir.ui.view,arch_db:base.module_form
#, python-format
msgid "Uninstall"
msgstr ""
#. module: base
+#: selection:ir.module.module,state:0
#: selection:ir.module.module.dependency,state:0
msgid "Uninstallable"
msgstr ""
-#. module: base
-#: model:ir.module.module,summary:base.module_product_uos
-msgid "Unit of Sale"
-msgstr ""
-
#. module: base
#: model:res.country,name:base.ae
msgid "United Arab Emirates"
@@ -14401,37 +14279,37 @@ msgid "Unknown"
msgstr ""
#. module: base
-#: code:addons/models.py:1308
+#: code:addons/models.py:1198
#, python-format
msgid "Unknown database identifier '%s'"
msgstr ""
#. module: base
-#: code:addons/models.py:1161
+#: code:addons/models.py:1063
#, python-format
msgid "Unknown error during import:"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:359
+#: code:addons/base/ir/ir_model.py:307
#, python-format
msgid "Unknown field %r in dependency %r"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_model.py:316
+#: code:addons/base/ir/ir_model.py:264
#, python-format
msgid "Unknown field name '%s' in related field '%s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:350
+#: code:addons/base/ir/ir_fields.py:349
#, python-format
msgid "Unknown sub-field '%s'"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:165
+#: code:addons/base/ir/ir_fields.py:164
#, python-format
msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
msgstr ""
@@ -14526,7 +14404,7 @@ msgid "Uruguay - Chart of Accounts"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:167
+#: code:addons/base/ir/ir_fields.py:166
#, python-format
msgid "Use '1' for yes and '0' for no"
msgstr ""
@@ -14557,8 +14435,8 @@ msgid "Use the base model of the action"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:210
-#: code:addons/base/ir/ir_fields.py:242
+#: code:addons/base/ir/ir_fields.py:209
+#: code:addons/base/ir/ir_fields.py:241
#, python-format
msgid "Use the format '%s'"
msgstr ""
@@ -14578,6 +14456,11 @@ msgstr ""
msgid "Used to log into the system"
msgstr ""
+#. module: base
+#: model:ir.model.fields,help:base.field_res_company_sequence
+msgid "Used to order Companies in the company switcher"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,help:base.field_res_partner_type
#: model:ir.model.fields,help:base.field_res_users_type
@@ -14671,20 +14554,15 @@ msgstr ""
#. module: base
#: model:ir.model.fields,field_description:base.field_ir_config_parameter_value
-#: model:ir.model.fields,field_description:base.field_ir_property_value_binary
-#: model:ir.model.fields,field_description:base.field_ir_property_value_datetime
-#: model:ir.model.fields,field_description:base.field_ir_property_value_float
-#: model:ir.model.fields,field_description:base.field_ir_property_value_integer
-#: model:ir.model.fields,field_description:base.field_ir_property_value_reference
-#: model:ir.model.fields,field_description:base.field_ir_property_value_text
#: model:ir.model.fields,field_description:base.field_ir_server_object_lines_value
#: model:ir.model.fields,field_description:base.field_ir_values_value
#: selection:ir.server.object.lines,type:0
+#: model:ir.ui.view,arch_db:base.ir_property_view
msgid "Value"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:278
+#: code:addons/base/ir/ir_fields.py:277
#, python-format
msgid "Value '%s' not found in selection field '%%(field)s'"
msgstr ""
@@ -14694,6 +14572,36 @@ msgstr ""
msgid "Value Mapping"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_binary
+msgid "Value binary"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_datetime
+msgid "Value datetime"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_float
+msgid "Value float"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_integer
+msgid "Value integer"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_reference
+msgid "Value reference"
+msgstr ""
+
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_property_value_text
+msgid "Value text"
+msgstr ""
+
#. module: base
#: model:res.country,name:base.vu
msgid "Vanuatu"
@@ -14709,14 +14617,8 @@ msgstr ""
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.menu,name:base.menu_procurement_management_supplier_name
#: model:ir.ui.view,arch_db:base.view_res_partner_filter
msgid "Vendors"
msgstr ""
@@ -14763,8 +14665,8 @@ msgid "View Architecture"
msgstr ""
#. module: base
-#: model:ir.model.fields,field_description:base.field_ir_act_window_view_mode
-msgid "View Mode"
+#: model:ir.ui.view,arch_db:base.view_translation_search
+msgid "View ID"
msgstr ""
#. module: base
@@ -14795,6 +14697,11 @@ msgstr ""
msgid "View inheritance mode"
msgstr ""
+#. module: base
+#: model:ir.model.fields,field_description:base.field_ir_act_window_view_mode
+msgid "View mode"
+msgstr ""
+
#. module: base
#: model:ir.model.fields,help:base.field_ir_act_window_view_type
msgid "View type: Tree type to use for the tree view, set to 'tree' for a hierarchical tree view, or 'form' for a regular list view"
@@ -14868,19 +14775,14 @@ msgid "Warehouse Management: Waves"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:490
-#: code:addons/base/ir/ir_model.py:338
-#: code:addons/base/ir/ir_model.py:412
-#: code:addons/base/res/res_partner.py:299
+#: code:addons/base/ir/ir_mail_server.py:474
+#: code:addons/base/ir/ir_model.py:286
+#: code:addons/base/ir/ir_model.py:360
+#: code:addons/base/res/res_partner.py:323
#, python-format
msgid "Warning"
msgstr ""
-#. module: base
-#: model:ir.module.module,shortdesc:base.module_warning
-msgid "Warning Messages and Alerts"
-msgstr ""
-
#. module: base
#: code:addons/base/res/res_config.py:444
#, python-format
@@ -14888,7 +14790,7 @@ msgid "Warning!"
msgstr ""
#. module: base
-#: code:addons/models.py:6047
+#: code:addons/models.py:5923
#, python-format
msgid "Warnings"
msgstr ""
@@ -14935,12 +14837,7 @@ msgid "Webkit (deprecated)"
msgstr ""
#. module: base
-#: model:ir.module.module,shortdesc:base.module_report_webkit
-msgid "Webkit Report Engine"
-msgstr ""
-
-#. module: base
-#: code:addons/base/res/res_company.py:216
+#: code:addons/base/res/res_company.py:217
#: model:ir.model.fields,field_description:base.field_ir_module_module_website
#: model:ir.model.fields,field_description:base.field_res_company_website
#: model:ir.model.fields,field_description:base.field_res_partner_website
@@ -15015,6 +14912,11 @@ msgstr ""
msgid "Website Portal for Sales"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_website_project
+msgid "Website Project"
+msgstr ""
+
#. module: base
#: model:ir.module.module,shortdesc:base.module_website_project_issue
msgid "Website Project Issue"
@@ -15059,7 +14961,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hw_scale
-msgid "Weighting Scale Hardware Driver"
+msgid "Weighing Scale Hardware Driver"
msgstr ""
#. module: base
@@ -15118,11 +15020,6 @@ msgstr ""
msgid "Whether values for this field can be translated (enables the translation mechanism for that field)"
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
@@ -15266,7 +15163,7 @@ msgid "You are creating a new user. After saving, the user will receive an invit
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:443
+#: code:addons/base/module/module.py:394
#, python-format
msgid "You are trying to install incompatible themes:\n"
"%s\n"
@@ -15277,11 +15174,11 @@ msgstr ""
#. module: base
#: model:ir.model.fields,help:base.field_ir_attachment_type
-msgid "You can either upload a file from your computer or copy/paste an internet link to your file"
+msgid "You can either upload a file from your computer or copy/paste an internet link to your file."
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:470
+#: code:addons/base/res/res_partner.py:476
#, python-format
msgid "You can not change the company as the partner/user has multiple user linked with different companies."
msgstr ""
@@ -15297,7 +15194,7 @@ msgid "You can not register two fonts with the same name"
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:384
+#: code:addons/base/res/res_users.py:374
#, python-format
msgid "You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)"
msgstr ""
@@ -15318,38 +15215,38 @@ msgid "You can state here the usual format to use for the addresses belonging to
msgstr ""
#. module: base
-#: code:addons/base/res/res_partner.py:282
+#: code:addons/base/res/res_partner.py:306
#, python-format
msgid "You cannot create recursive Partner hierarchies."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:343
+#: code:addons/base/res/res_users.py:333
#, python-format
msgid "You cannot deactivate the admin user."
msgstr ""
#. module: base
-#: code:addons/base/res/res_users.py:345
+#: code:addons/base/res/res_users.py:335
#, python-format
msgid "You cannot deactivate the user you're currently logged in as."
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:238
+#: code:addons/base/res/res_lang.py:232
#, python-format
msgid "You cannot delete the language which is Active!\n"
"Please de-activate the language first."
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:236
+#: code:addons/base/res/res_lang.py:230
#, python-format
msgid "You cannot delete the language which is User's Preferred Language!"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_values.py:429
+#: code:addons/base/ir/ir_values.py:412
#, python-format
msgid "You do not have the permission to perform this operation!!!"
msgstr ""
@@ -15360,22 +15257,22 @@ msgid "You should try other search criteria."
msgstr ""
#. module: base
-#: code:addons/base/module/module.py:380
+#: code:addons/base/module/module.py:331
#, 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:325
+#: code:addons/base/module/module.py:283
#, 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:597
+#: code:addons/base/module/module.py:551
#, python-format
-msgid "You try to upgrade a module that depends on the module: %s.\n"
+msgid "You try to upgrade the module %s that depends on the module: %s.\n"
"But this module is not available in your system."
msgstr ""
@@ -15385,13 +15282,13 @@ msgid "You will be able to define additional access rights by editing the newly
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:216
+#: code:addons/base/ir/ir_mail_server.py:206
#, python-format
msgid "Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should do the trick."
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_mail_server.py:491
+#: code:addons/base/ir/ir_mail_server.py:475
#, python-format
msgid "Your server does not seem to support SSL, you may want to try STARTTLS instead"
msgstr ""
@@ -15442,6 +15339,11 @@ msgstr ""
msgid "_unknown"
msgstr ""
+#. module: base
+#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
+msgid "a new currency before creating a new company."
+msgstr ""
+
#. module: base
#: model:ir.ui.view,arch_db:base.res_partner_kanban_view
msgid "at"
@@ -15493,7 +15395,7 @@ msgid "cr: database cursor"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:315
+#: code:addons/base/ir/ir_fields.py:314
#, python-format
msgid "database id"
msgstr ""
@@ -15568,13 +15470,13 @@ msgid "email@yourcompany.com"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:329
+#: code:addons/base/ir/ir_fields.py:328
#, python-format
msgid "external id"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:144
+#: code:addons/base/ir/ir_fields.py:143
#, python-format
msgid "false"
msgstr ""
@@ -15587,7 +15489,7 @@ msgid "for record in self:\n"
msgstr ""
#. module: base
-#: code:addons/base/res/res_lang.py:260
+#: code:addons/base/res/res_lang.py:242
#, python-format
msgid "format() must be given exactly one %char format specifier"
msgstr ""
@@ -15813,16 +15715,6 @@ msgstr ""
msgid "ir.qweb.field.text"
msgstr ""
-#. module: base
-#: model:ir.model,name:base.model_ir_qweb_widget
-msgid "ir.qweb.widget"
-msgstr ""
-
-#. module: base
-#: model:ir.model,name:base.model_ir_qweb_widget_monetary
-msgid "ir.qweb.widget.monetary"
-msgstr ""
-
#. module: base
#: model:ir.model,name:base.model_ir_rule
msgid "ir.rule"
@@ -15869,19 +15761,19 @@ msgid "log(message, level='info'): a logging function to create ir_logging recor
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_ui_view.py:449
+#: code:addons/base/ir/ir_ui_view.py:423
#, python-format
msgid "n/a"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:339
+#: code:addons/base/ir/ir_fields.py:338
#, python-format
msgid "name"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:144
+#: code:addons/base/ir/ir_fields.py:143
#, python-format
msgid "no"
msgstr ""
@@ -15966,11 +15858,21 @@ msgstr ""
msgid "test of access rights and rules"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_test_read_group
+msgid "test read_group"
+msgstr ""
+
#. module: base
#: model:ir.module.module,shortdesc:base.module_test_assetsbundle
msgid "test-assetsbundle"
msgstr ""
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_test_pylint
+msgid "test-eval"
+msgstr ""
+
#. module: base
#: model:ir.module.module,shortdesc:base.module_test_exceptions
msgid "test-exceptions"
@@ -16026,26 +15928,11 @@ msgstr ""
msgid "the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system."
msgstr ""
-#. module: base
-#: model:res.groups,comment:base.group_sale_salesman_all_leads
-msgid "the user will have access to all records of everyone in the sales application."
-msgstr ""
-
-#. module: base
-#: model:res.groups,comment:base.group_sale_salesman
-msgid "the user will have access to his own data in the sales application."
-msgstr ""
-
#. module: base
#: model:res.groups,comment:base.group_hr_manager
msgid "the user will have an access to the human resources configuration as well as statistic reports."
msgstr ""
-#. module: base
-#: model:res.groups,comment:base.group_sale_manager
-msgid "the user will have an access to the sales configuration as well as statistic reports."
-msgstr ""
-
#. module: base
#: model:ir.ui.view,arch_db:base.view_server_action_form
msgid "time: Python time module"
@@ -16057,12 +15944,7 @@ msgid "title"
msgstr ""
#. module: base
-#: model:ir.ui.view,arch_db:base.action_view_company_form_link_2_currencies
-msgid "to activate a new currency."
-msgstr ""
-
-#. module: base
-#: code:addons/base/ir/ir_fields.py:144
+#: code:addons/base/ir/ir_fields.py:143
#, python-format
msgid "true"
msgstr ""
@@ -16072,13 +15954,6 @@ msgstr ""
msgid "uid: current user id"
msgstr ""
-#. module: base
-#: model:ir.model.fields,field_description:base.field_base_language_export_state
-#: model:ir.model.fields,field_description:base.field_ir_ui_view_model_ids
-#: model:ir.model.fields,field_description:base.field_wkf_instance_transition_ids
-msgid "unknown"
-msgstr ""
-
#. module: base
#: model:ir.model,name:base.model_wizard_ir_model_menu_create
msgid "wizard.ir.model.menu.create"
@@ -16120,7 +15995,7 @@ msgid "workflow: Workflow engine"
msgstr ""
#. module: base
-#: code:addons/base/ir/ir_fields.py:144
+#: code:addons/base/ir/ir_fields.py:143
#, python-format
msgid "yes"
msgstr ""