summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2016-08-18 11:01:16 +0200
committerMartin Trigaux <mat@odoo.com>2016-08-18 11:01:50 +0200
commitc73b2bd0795e3272ddaa78fc6bc24006856db85f (patch)
treecfb9099a95b0a2b677563869e7f7ea895ad43789 /addons
parenta1a84834f9373b851e5589983b98ad93dbe821db (diff)
[I18N] export master source terms
Diffstat (limited to 'addons')
-rw-r--r--addons/account/i18n/account.pot1601
-rw-r--r--addons/account_accountant/i18n/account_accountant.pot35
-rw-r--r--addons/account_analytic_default/i18n/account_analytic_default.pot26
-rw-r--r--addons/account_asset/i18n/account_asset.pot215
-rw-r--r--addons/account_bank_statement_import/i18n/account_bank_statement_import.pot47
-rw-r--r--addons/account_budget/i18n/account_budget.pot332
-rw-r--r--addons/account_cancel/i18n/account_cancel.pot8
-rw-r--r--addons/account_check_printing/i18n/account_check_printing.pot26
-rw-r--r--addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot14
-rw-r--r--addons/account_tax_python/i18n/account_tax_python.pot6
-rw-r--r--addons/account_test/i18n/account_test.pot8
-rw-r--r--addons/account_voucher/i18n/account_voucher.pot126
-rw-r--r--addons/analytic/i18n/analytic.pot151
-rw-r--r--addons/anonymization/i18n/anonymization.pot48
-rw-r--r--addons/association/i18n/association.pot6
-rw-r--r--addons/auth_crypt/i18n/auth_crypt.pot6
-rw-r--r--addons/auth_ldap/i18n/auth_ldap.pot6
-rw-r--r--addons/auth_oauth/i18n/auth_oauth.pot145
-rw-r--r--addons/auth_signup/i18n/auth_signup.pot172
-rw-r--r--addons/barcodes/i18n/barcodes.pot99
-rw-r--r--addons/base_action_rule/i18n/base_action_rule.pot76
-rw-r--r--addons/base_gengo/i18n/base_gengo.pot34
-rw-r--r--addons/base_geolocalize/i18n/base_geolocalize.pot22
-rw-r--r--addons/base_iban/i18n/base_iban.pot16
-rw-r--r--addons/base_import/i18n/base_import.pot845
-rw-r--r--addons/base_import_module/i18n/base_import_module.pot30
-rw-r--r--addons/base_setup/i18n/base_setup.pot115
-rw-r--r--addons/base_vat/i18n/base_vat.pot16
-rw-r--r--addons/board/i18n/board.pot84
-rw-r--r--addons/bus/i18n/bus.pot29
-rw-r--r--addons/calendar/i18n/calendar.pot821
-rw-r--r--addons/contacts/i18n/contacts.pot35
-rw-r--r--addons/crm/i18n/crm.pot977
-rw-r--r--addons/crm_project_issue/i18n/crm_project_issue.pot35
-rw-r--r--addons/decimal_precision/i18n/decimal_precision.pot28
-rw-r--r--addons/delivery/i18n/delivery.pot506
-rw-r--r--addons/document/i18n/document.pot10
-rw-r--r--addons/event/i18n/event.pot814
-rw-r--r--addons/event_sale/i18n/event_sale.pot94
-rw-r--r--addons/fetchmail/i18n/fetchmail.pot22
-rw-r--r--addons/fleet/i18n/fleet.pot506
-rw-r--r--addons/gamification/i18n/gamification.pot309
-rw-r--r--addons/gamification_sale_crm/i18n/gamification_sale_crm.pot13
-rw-r--r--addons/google_account/i18n/google_account.pot20
-rw-r--r--addons/google_calendar/i18n/google_calendar.pot50
-rw-r--r--addons/google_drive/i18n/google_drive.pot44
-rw-r--r--addons/google_spreadsheet/i18n/google_spreadsheet.pot6
-rw-r--r--addons/hr/i18n/hr.pot763
-rw-r--r--addons/hr_attendance/i18n/hr_attendance.pot557
-rw-r--r--addons/hr_contract/i18n/hr_contract.pot120
-rw-r--r--addons/hr_expense/i18n/hr_expense.pot890
-rw-r--r--addons/hr_gamification/i18n/hr_gamification.pot53
-rw-r--r--addons/hr_holidays/i18n/hr_holidays.pot206
-rw-r--r--addons/hr_maintenance/i18n/hr_maintenance.pot74
-rw-r--r--addons/hr_payroll/i18n/hr_payroll.pot76
-rw-r--r--addons/hr_payroll_account/i18n/hr_payroll_account.pot38
-rw-r--r--addons/hr_recruitment/i18n/hr_recruitment.pot391
-rw-r--r--addons/hr_timesheet/i18n/hr_timesheet.pot244
-rw-r--r--addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot235
-rw-r--r--addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot403
-rw-r--r--addons/im_livechat/i18n/im_livechat.pot132
-rw-r--r--addons/link_tracker/i18n/link_tracker.pot44
-rw-r--r--addons/lunch/i18n/lunch.pot134
-rw-r--r--addons/mail/i18n/mail.pot1628
-rw-r--r--addons/maintenance/i18n/maintenance.pot1033
-rw-r--r--addons/marketing_campaign/i18n/marketing_campaign.pot114
-rw-r--r--addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot147
-rw-r--r--addons/mass_mailing/i18n/mass_mailing.pot354
-rw-r--r--addons/membership/i18n/membership.pot50
-rw-r--r--addons/mrp/i18n/mrp.pot2231
-rw-r--r--addons/mrp_byproduct/i18n/mrp_byproduct.pot46
-rw-r--r--addons/mrp_repair/i18n/mrp_repair.pot189
-rw-r--r--addons/note/i18n/note.pot106
-rw-r--r--addons/note_pad/i18n/note_pad.pot6
-rw-r--r--addons/pad/i18n/pad.pot42
-rw-r--r--addons/pad_project/i18n/pad_project.pot6
-rw-r--r--addons/payment/i18n/payment.pot330
-rw-r--r--addons/payment_adyen/i18n/payment_adyen.pot48
-rw-r--r--addons/payment_authorize/i18n/payment_authorize.pot36
-rw-r--r--addons/payment_buckaroo/i18n/payment_buckaroo.pot46
-rw-r--r--addons/payment_ogone/i18n/payment_ogone.pot56
-rw-r--r--addons/payment_paypal/i18n/payment_paypal.pot43
-rw-r--r--addons/payment_payumoney/i18n/payment_payumoney.pot16
-rw-r--r--addons/payment_sips/i18n/payment_sips.pot46
-rw-r--r--addons/payment_stripe/i18n/payment_stripe.pot100
-rw-r--r--addons/payment_transfer/i18n/payment_transfer.pot52
-rw-r--r--addons/point_of_sale/i18n/point_of_sale.pot2089
-rw-r--r--addons/portal/i18n/portal.pot89
-rw-r--r--addons/portal_gamification/i18n/portal_gamification.pot6
-rw-r--r--addons/portal_sale/i18n/portal_sale.pot205
-rw-r--r--addons/portal_stock/i18n/portal_stock.pot6
-rw-r--r--addons/pos_data_drinks/i18n/pos_data_drinks.pot16
-rw-r--r--addons/pos_discount/i18n/pos_discount.pot8
-rw-r--r--addons/pos_mercury/i18n/pos_mercury.pot193
-rw-r--r--addons/pos_reprint/i18n/pos_reprint.pot6
-rw-r--r--addons/pos_restaurant/i18n/pos_restaurant.pot71
-rw-r--r--addons/procurement/i18n/procurement.pot139
-rw-r--r--addons/procurement_jit/i18n/procurement_jit.pot6
-rw-r--r--addons/product/i18n/product.pot1676
-rw-r--r--addons/product_email_template/i18n/product_email_template.pot640
-rw-r--r--addons/product_expiry/i18n/product_expiry.pot36
-rw-r--r--addons/product_extended/i18n/product_extended.pot115
-rw-r--r--addons/product_margin/i18n/product_margin.pot8
-rw-r--r--addons/product_visible_discount/i18n/product_visible_discount.pot14
-rw-r--r--addons/project/i18n/project.pot756
-rw-r--r--addons/project_issue/i18n/project_issue.pot235
-rw-r--r--addons/project_issue_sheet/i18n/project_issue_sheet.pot6
-rw-r--r--addons/purchase/i18n/purchase.pot596
-rw-r--r--addons/purchase_mrp/i18n/purchase_mrp.pot22
-rw-r--r--addons/purchase_requisition/i18n/purchase_requisition.pot134
-rw-r--r--addons/rating/i18n/rating.pot145
-rw-r--r--addons/rating_project/i18n/rating_project.pot262
-rw-r--r--addons/rating_project_issue/i18n/rating_project_issue.pot51
-rw-r--r--addons/report/i18n/report.pot83
-rw-r--r--addons/report_intrastat/i18n/report_intrastat.pot6
-rw-r--r--addons/resource/i18n/resource.pot11
-rw-r--r--addons/sale/i18n/sale.pot862
-rw-r--r--addons/sale_crm/i18n/sale_crm.pot101
-rw-r--r--addons/sale_expense/i18n/sale_expense.pot37
-rw-r--r--addons/sale_margin/i18n/sale_margin.pot6
-rw-r--r--addons/sale_mrp/i18n/sale_mrp.pot19
-rw-r--r--addons/sale_order_dates/i18n/sale_order_dates.pot10
-rw-r--r--addons/sale_service_rating/i18n/sale_service_rating.pot22
-rw-r--r--addons/sale_stock/i18n/sale_stock.pot59
-rw-r--r--addons/sale_timesheet/i18n/sale_timesheet.pot123
-rw-r--r--addons/sales_team/i18n/sales_team.pot269
-rw-r--r--addons/stock/i18n/stock.pot1531
-rw-r--r--addons/stock_account/i18n/stock_account.pot186
-rw-r--r--addons/stock_calendar/i18n/stock_calendar.pot13
-rw-r--r--addons/stock_dropshipping/i18n/stock_dropshipping.pot6
-rw-r--r--addons/stock_landed_costs/i18n/stock_landed_costs.pot136
-rw-r--r--addons/stock_picking_wave/i18n/stock_picking_wave.pot144
-rw-r--r--addons/subscription/i18n/subscription.pot24
-rw-r--r--addons/survey/i18n/survey.pot806
-rw-r--r--addons/survey_crm/i18n/survey_crm.pot6
-rw-r--r--addons/utm/i18n/utm.pot40
-rw-r--r--addons/web/i18n/web.pot1149
-rw-r--r--addons/web_calendar/i18n/web_calendar.pot32
-rw-r--r--addons/web_diagram/i18n/web_diagram.pot30
-rw-r--r--addons/web_editor/i18n/web_editor.pot681
-rw-r--r--addons/web_kanban/i18n/web_kanban.pot66
-rw-r--r--addons/web_kanban_gauge/i18n/web_kanban_gauge.pot12
-rw-r--r--addons/web_planner/i18n/web_planner.pot18
-rw-r--r--addons/web_settings_dashboard/i18n/web_settings_dashboard.pot40
-rw-r--r--addons/web_tour/i18n/web_tour.pot95
-rw-r--r--addons/website/i18n/website.pot1120
-rw-r--r--addons/website_blog/i18n/website_blog.pot685
-rw-r--r--addons/website_crm/i18n/website_crm.pot53
-rw-r--r--addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot1132
-rw-r--r--addons/website_customer/i18n/website_customer.pot32
-rw-r--r--addons/website_event/i18n/website_event.pot226
-rw-r--r--addons/website_event_questions/i18n/website_event_questions.pot58
-rw-r--r--addons/website_event_sale/i18n/website_event_sale.pot24
-rw-r--r--addons/website_event_track/i18n/website_event_track.pot378
-rw-r--r--addons/website_form/i18n/website_form.pot18
-rw-r--r--addons/website_forum/i18n/website_forum.pot632
-rw-r--r--addons/website_forum_doc/i18n/website_forum_doc.pot107
-rw-r--r--addons/website_gengo/i18n/website_gengo.pot6
-rw-r--r--addons/website_google_map/i18n/website_google_map.pot17
-rw-r--r--addons/website_hr/i18n/website_hr.pot21
-rw-r--r--addons/website_hr_recruitment/i18n/website_hr_recruitment.pot55
-rw-r--r--addons/website_issue/i18n/website_issue.pot6
-rw-r--r--addons/website_links/i18n/website_links.pot8
-rw-r--r--addons/website_livechat/i18n/website_livechat.pot21
-rw-r--r--addons/website_mail/i18n/website_mail.pot148
-rw-r--r--addons/website_mail_channel/i18n/website_mail_channel.pot88
-rw-r--r--addons/website_mass_mailing/i18n/website_mass_mailing.pot12
-rw-r--r--addons/website_membership/i18n/website_membership.pot10
-rw-r--r--addons/website_partner/i18n/website_partner.pot46
-rw-r--r--addons/website_payment/i18n/website_payment.pot32
-rw-r--r--addons/website_portal/i18n/website_portal.pot28
-rw-r--r--addons/website_portal_sale/i18n/website_portal_sale.pot109
-rw-r--r--addons/website_project/i18n/website_project.pot169
-rw-r--r--addons/website_project_issue/i18n/website_project_issue.pot91
-rw-r--r--addons/website_project_issue_sheet/i18n/website_project_issue_sheet.pot14
-rw-r--r--addons/website_project_timesheet/i18n/website_project_timesheet.pot37
-rw-r--r--addons/website_quote/i18n/website_quote.pot912
-rw-r--r--addons/website_rating_project_issue/i18n/website_rating_project_issue.pot47
-rw-r--r--addons/website_sale/i18n/website_sale.pot707
-rw-r--r--addons/website_sale_delivery/i18n/website_sale_delivery.pot115
-rw-r--r--addons/website_sale_digital/i18n/website_sale_digital.pot35
-rw-r--r--addons/website_sale_options/i18n/website_sale_options.pot40
-rw-r--r--addons/website_sale_stock/i18n/website_sale_stock.pot6
-rw-r--r--addons/website_slides/i18n/website_slides.pot428
-rw-r--r--addons/website_twitter/i18n/website_twitter.pot54
185 files changed, 19311 insertions, 22288 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 3d57b6db53f..57637028d83 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-17 14:09+0000\n"
-"PO-Revision-Date: 2015-12-17 14:09+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,72 +18,53 @@ msgstr ""
#. module: account
#: model:mail.template,body_html:account.email_template_edi_invoice
msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-" <p>Hello ${object.partner_id.name},</p>\n"
-" <p>A new invoice is available for you: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-" &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p> \n"
-" \n"
-" % if object.paypal_url:\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"/account/static/src/img/btn_paynowcc_lg.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-" \n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
+"% set access_action = object.get_access_action()\n"
+"% set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id)\n"
+"\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>Here is your invoice <strong>${object.number}</strong>\n"
+"% if object.origin:\n"
+"(with reference: ${object.origin} )\n"
+"% endif\n"
+"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
+"from ${object.company_id.name}.\n"
+"</p>\n"
+"\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 ""
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_state
msgid " * The 'Draft' status is used when a user is encoding a new and unconfirmed Invoice.\n"
-" * The 'Pro-forma' status is used the invoice does not have an invoice number.\n"
-" * The 'Open' status is used when user create invoice, an invoice number is generated. Its in open status till user does not pay invoice.\n"
+" * The 'Pro-forma' status is used when the invoice does not have an invoice number.\n"
+" * The 'Open' status is used when user creates invoice, an invoice number is generated. It stays in the open status till the user pays the invoice.\n"
" * The 'Paid' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled.\n"
" * The 'Cancelled' status is used when user cancel invoice."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1500
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1495
#, python-format
msgid " seconds"
msgstr ""
@@ -107,25 +88,30 @@ msgstr ""
#. module: account
#: model:mail.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name|safe} Invoice (Ref ${object.number or 'n/a'})"
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:320
+#: 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:322
#, python-format
msgid "%d transactions were automatically reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:528
+#: code:addons/account/models/account.py:577
#, python-format
msgid "%s (Copy)"
msgstr ""
#. module: account
#: code:addons/account/models/account.py:152
-#: code:addons/account/models/account.py:295
-#: code:addons/account/models/account.py:296
+#: code:addons/account/models/account.py:310
+#: code:addons/account/models/account.py:311
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -141,7 +127,17 @@ msgid ", if accounting or purchase is installed"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:321
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "-> Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_move_line_form
+msgid "-> View partially reconciled entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_bank_statement.py:323
#, python-format
msgid "1 transaction was automatically reconciled."
msgstr ""
@@ -157,11 +153,6 @@ 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:"
msgstr ""
@@ -177,6 +168,80 @@ 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"
msgstr ""
@@ -292,7 +357,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "<span title=\"Balance in Odoo\">Balance in Odoo</span>"
+msgid "<span title=\"Balance in Odoo\">Balance in GL</span>"
msgstr ""
#. module: account
@@ -387,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
@@ -417,6 +482,12 @@ msgid "<strong>Comment:</strong>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
+msgid "<strong>Company:</strong>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "<strong>Contracts &amp; Subscriptions</strong>"
msgstr ""
@@ -445,6 +516,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "<strong>Date from :</strong>"
msgstr ""
@@ -452,6 +524,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "<strong>Date to :</strong>"
msgstr ""
@@ -482,6 +555,11 @@ msgid "<strong>Due Date:</strong>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_journal
+msgid "<strong>Entries Sorted By:</strong>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "<strong>Expenses</strong>"
msgstr ""
@@ -497,6 +575,11 @@ msgid "<strong>Invoice Date:</strong>"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_journal
+msgid "<strong>Journal:</strong>"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.report_generalledger
msgid "<strong>Journals:</strong>"
msgstr ""
@@ -614,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
@@ -626,6 +709,8 @@ msgstr ""
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "<strong>Target Moves:</strong>"
msgstr ""
@@ -647,6 +732,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_invoice_document
+#: model:ir.ui.view,arch_db:account.report_journal
msgid "<strong>Total</strong>"
msgstr ""
@@ -665,21 +751,21 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1206
+#: 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:1209
+#: 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:469
+#: code:addons/account/models/account.py:503
#, python-format
-msgid "A bank account can anly belong to one journal."
+msgid "A bank account can only belong to one journal."
msgstr ""
#. module: account
@@ -713,7 +799,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "A list of your customer and suppler payment terms."
+msgid "A list of your customer and supplier payment terms."
msgstr ""
#. module: account
@@ -724,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:685
+#: code:addons/account/models/account_move.py:736
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:788
-#: code:addons/account/models/account_bank_statement.py:791
+#: code:addons/account/models/account_bank_statement.py:840
+#: code:addons/account/models/account_bank_statement.py:843
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:224
+#: code:addons/account/models/account_bank_statement.py:226
#, python-format
msgid "A statement cannot be canceled when its lines are reconciled."
msgstr ""
@@ -761,9 +847,14 @@ msgid "A typical company may use one journal per payment method (cash,\n"
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:98
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:103
+#: 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/xml/account_reconciliation.xml:140
#: code:addons/account/static/src/xml/account_reconciliation.xml:266
#: model:ir.model,name:account.model_account_account
@@ -773,10 +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"
@@ -808,6 +901,11 @@ msgid "Account Common Account Report"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
msgstr ""
@@ -871,11 +969,21 @@ msgid "Account Number"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_account_report_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_res_partner_property_account_payable_id
msgid "Account Payable"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_category_property_form
msgid "Account Properties"
msgstr ""
@@ -896,12 +1004,10 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_accounting_report_account_report_id
-#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
#: model:ir.ui.view,arch_db:account.view_account_report_tree_hierarchy
msgid "Account Reports Hierarchy"
msgstr ""
@@ -1110,6 +1216,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 ""
@@ -1130,9 +1237,9 @@ msgid "Accounts Mapping"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction
-msgid "Action Needed"
+#: 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
@@ -1183,6 +1290,11 @@ 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
msgid "Advanced Options"
@@ -1212,14 +1324,13 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
#: model:ir.actions.report.xml,name:account.action_report_aged_partner_balance
-#: model:ir.ui.menu,name:account.menu_aged_trial_balance
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
msgid "Aged Partner Balance"
msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
-msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Odoo asks for the name of the company, the Start Date and the size of the interval to be analyzed (in days). Odoo then calculates a table of credit balance by start Date. So if you request an interval of 30 days Odoo generates an analysis of creditors for the past month, past two months, and so on."
+msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. Odoo calculates a table of credit balance by start Date. So if you request an interval of 30 days Odoo generates an analysis of creditors for the past month, past two months, and so on."
msgstr ""
#. module: account
@@ -1241,13 +1352,18 @@ msgstr ""
#: selection:account.aged.trial.balance,target_move:0
#: selection:account.balance.report,target_move:0
#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
#: selection:account.common.partner.report,target_move:0
#: selection:account.common.report,target_move:0
+#: selection:account.print.journal,target_move:0
#: selection:account.report.general.ledger,target_move:0
+#: selection:account.report.partner.ledger,target_move:0
#: selection:accounting.report,target_move:0
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "All Entries"
msgstr ""
@@ -1256,13 +1372,18 @@ msgstr ""
#: selection:account.aged.trial.balance,target_move:0
#: selection:account.balance.report,target_move:0
#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
#: selection:account.common.partner.report,target_move:0
#: selection:account.common.report,target_move:0
+#: selection:account.print.journal,target_move:0
#: selection:account.report.general.ledger,target_move:0
+#: selection:account.report.partner.ledger,target_move:0
#: selection:accounting.report,target_move:0
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "All Posted Entries"
msgstr ""
@@ -1301,12 +1422,17 @@ 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:246
+#: code:addons/account/models/account_bank_statement.py:248
#, 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"
msgstr ""
@@ -1343,7 +1469,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_group_multi_currency
-msgid "Allows you multi currency environment"
+msgid "Allows to work in a multi currency environment"
msgstr ""
#. module: account
@@ -1358,8 +1484,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:138
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:142
+#: code:addons/account/static/src/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:149
#: code:addons/account/static/src/xml/account_reconciliation.xml:265
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount
@@ -1367,13 +1493,13 @@ msgstr ""
#: 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"
@@ -1381,9 +1507,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
@@ -1410,7 +1545,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 ""
@@ -1446,14 +1581,19 @@ msgid "An account type is used to determine how an account is used in\n"
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"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:150
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:156
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:147
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:153
#, python-format
msgid "Analytic Acc."
msgstr ""
@@ -1463,7 +1603,7 @@ 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 ""
@@ -1482,11 +1622,18 @@ 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 ""
@@ -1503,6 +1650,11 @@ 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"
msgstr ""
@@ -1518,6 +1670,11 @@ 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_account_tag_applicability
msgid "Applicability"
msgstr ""
@@ -1561,7 +1718,7 @@ msgstr ""
#: model:ir.model.fields,help:account.field_account_config_settings_module_account_asset
msgid "Asset management: This allows you to manage the assets owned by a company or a person. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.\n"
"\n"
-"-This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"
+"-This installs the module account_asset."
msgstr ""
#. module: account
@@ -1610,7 +1767,7 @@ msgid "Automatic formatting"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:326
+#: code:addons/account/models/account_bank_statement.py:328
#, python-format
msgid "Automatically reconciled items"
msgstr ""
@@ -1627,16 +1784,22 @@ msgid "Awaiting payments"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:156
+#: code:addons/account/models/chart_template.py:183
#, python-format
msgid "BILL"
msgstr ""
#. module: account
+#: selection:res.partner,trust:0
+msgid "Bad Debtor"
+msgstr ""
+
+#. module: account
#: selection:account.payment.term.line,value:0
#: model:ir.model.fields,field_description:account.field_account_move_line_balance
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "Balance"
msgstr ""
@@ -1644,7 +1807,6 @@ msgstr ""
#. module: account
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.ui.menu,name:account.menu_account_report_bs
#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Balance Sheet"
msgstr ""
@@ -1662,7 +1824,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:606
+#: 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
@@ -1725,7 +1887,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1116
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1111
#, python-format
msgid "Bank Reconciliation"
msgstr ""
@@ -1765,11 +1927,6 @@ msgid "Bank Statements"
msgstr ""
#. module: account
-#: selection:account.journal,bank_statements_source:0
-msgid "Bank Synchronization"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.partner_view_buttons
msgid "Bank account(s)"
msgstr ""
@@ -1807,11 +1964,26 @@ msgid "Bank statements are fully reconciled."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_tax_base
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.report_journal
+msgid "Base Amount"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Before continuing, you must install the Chart of Account related to your country (or the generic one if your country is not listed)."
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_journal_belongs_to_company
+msgid "Belong to the user's current company"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
msgid "Bill"
@@ -1840,7 +2012,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Bills &amp; Refunds"
+msgid "Bills"
msgstr ""
#. module: account
@@ -1849,12 +2021,17 @@ msgid "Bills Analysis"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:159
+#: code:addons/account/models/account_journal_dashboard.py:172
#, python-format
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"
msgstr ""
@@ -1923,6 +2100,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
@@ -1988,46 +2166,46 @@ msgid "Cancelled Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:913
+#: code:addons/account/models/account_move.py:1041
#, 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:164
+#: 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:192
+#: 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:446
+#: 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:281
+#: code:addons/account/models/account_move.py:323
#, python-format
msgid "Cannot find any account journal of \"%s\" type for this company, You should create one.\n"
" Please go to Journal Configuration"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:376
+#: code:addons/account/models/account.py:393
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:405
+#: code:addons/account/models/account.py:423
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
@@ -2047,7 +2225,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:606
+#: code:addons/account/models/chart_template.py:650
#, python-format
msgid "Cash"
msgstr ""
@@ -2059,7 +2237,7 @@ msgid "Cash Accounts Prefix"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:209
+#: code:addons/account/models/account_bank_statement.py:211
#: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox
#, python-format
msgid "Cash Control"
@@ -2086,7 +2264,7 @@ msgid "Cash and Banks"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:176
+#: code:addons/account/models/account_bank_statement.py:178
#, python-format
msgid "Cash difference observed during the counting (%s)"
msgstr ""
@@ -2097,13 +2275,13 @@ msgid "CashBox Line"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_cashbox_lines_ids
-msgid "Cashbox Lines"
+#: model:ir.model.fields,field_description:account.field_account_cashbox_line_cashbox_id
+msgid "Cashbox"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_cashbox_line_cashbox_id
-msgid "Cashbox"
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_cashbox_lines_ids
+msgid "Cashbox Lines"
msgstr ""
#. module: account
@@ -2161,7 +2339,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Chart of Accounts has been\n"
-" installed. You should review it and create any additionnal accounts."
+" installed. You should review it and create any additional accounts."
msgstr ""
#. module: account
@@ -2180,6 +2358,11 @@ msgid "Check Closing Balance"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement_is_difference_zero
+msgid "Check if difference is zero."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_account_reconcile
msgid "Check this box if this account allows invoices & payments matching of journal items."
msgstr ""
@@ -2219,7 +2402,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:119
+#: 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"
@@ -2227,7 +2410,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:1860
#, python-format
msgid "Choose counterpart"
msgstr ""
@@ -2243,6 +2426,11 @@ 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."
msgstr ""
@@ -2379,6 +2567,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_company_id
#: model:ir.model.fields,field_description:account.field_account_chart_template_company_id
#: model:ir.model.fields,field_description:account.field_account_common_account_report_company_id
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_company_id
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_company_id
#: model:ir.model.fields,field_description:account.field_account_common_report_company_id
#: model:ir.model.fields,field_description:account.field_account_config_settings_company_id
@@ -2394,8 +2583,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_operation_template_company_id
#: model:ir.model.fields,field_description:account.field_account_payment_company_id
#: model:ir.model.fields,field_description:account.field_account_payment_term_company_id
+#: model:ir.model.fields,field_description:account.field_account_print_journal_company_id
#: model:ir.model.fields,field_description:account.field_account_register_payments_company_id
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_company_id
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_company_id
#: model:ir.model.fields,field_description:account.field_account_tax_company_id
#: model:ir.model.fields,field_description:account.field_account_tax_template_company_id
#: model:ir.model.fields,field_description:account.field_accounting_report_company_id
@@ -2408,6 +2599,18 @@ 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"
msgstr ""
@@ -2440,7 +2643,7 @@ msgid "Complete set of taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:365
+#: code:addons/account/models/account_invoice.py:399
#, python-format
msgid "Compose Email"
msgstr ""
@@ -2462,28 +2665,28 @@ msgid "Configuration"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:412
-#: code:addons/account/models/account_payment.py:414
+#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:452
#, python-format
msgid "Configuration Error !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:312
+#: 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?"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:259
+#: code:addons/account/models/account.py:270
#, python-format
msgid "Configuration error!\n"
"The currency of the journal should be the same than the default credit account."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:261
+#: code:addons/account/models/account.py:272
#, python-format
msgid "Configuration error!\n"
"The currency of the journal should be the same than the default debit account."
@@ -2545,7 +2748,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1504
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1499
#, python-format
msgid "Congrats, you're all done !"
msgstr ""
@@ -2573,12 +2776,13 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_direct_costs
-#: model:ir.ui.view,arch_db:account.view_account_form
msgid "Cost of Revenue"
msgstr ""
#. module: account
+#: code:addons/account/models/account_payment.py:388
#: model:ir.model.fields,field_description:account.field_account_move_line_counterpart
+#, python-format
msgid "Counterpart"
msgstr ""
@@ -2619,7 +2823,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1861
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1857
#, python-format
msgid "Create Write-off"
msgstr ""
@@ -2630,20 +2834,32 @@ msgid "Create a draft refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:227
+#: 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:213
+#: 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:2462
+#: code:addons/account/static/src/xml/account_reconciliation.xml:80
+#, python-format
+msgid "Create model"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2459
#, python-format
msgid "Create writeoff"
msgstr ""
@@ -2668,6 +2884,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_create_uid
#: model:ir.model.fields,field_description:account.field_account_chart_template_create_uid
#: model:ir.model.fields,field_description:account.field_account_common_account_report_create_uid
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_create_uid
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_create_uid
#: model:ir.model.fields,field_description:account.field_account_common_report_create_uid
#: model:ir.model.fields,field_description:account.field_account_config_settings_create_uid
@@ -2678,6 +2895,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_create_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_create_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_create_uid
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_create_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_create_uid
@@ -2696,8 +2914,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_method_create_uid
#: model:ir.model.fields,field_description:account.field_account_payment_term_create_uid
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_create_uid
+#: model:ir.model.fields,field_description:account.field_account_print_journal_create_uid
#: model:ir.model.fields,field_description:account.field_account_register_payments_create_uid
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_create_uid
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_uid
#: model:ir.model.fields,field_description:account.field_account_tax_create_uid
#: model:ir.model.fields,field_description:account.field_account_tax_group_create_uid
#: model:ir.model.fields,field_description:account.field_account_tax_template_create_uid
@@ -2705,6 +2925,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"
@@ -2725,6 +2946,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_create_date
#: model:ir.model.fields,field_description:account.field_account_chart_template_create_date
#: model:ir.model.fields,field_description:account.field_account_common_account_report_create_date
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_create_date
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_create_date
#: model:ir.model.fields,field_description:account.field_account_common_report_create_date
#: model:ir.model.fields,field_description:account.field_account_config_settings_create_date
@@ -2735,6 +2957,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_create_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_create_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_create_date
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_create_date
#: model:ir.model.fields,field_description:account.field_account_invoice_create_date
@@ -2753,8 +2976,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_method_create_date
#: model:ir.model.fields,field_description:account.field_account_payment_term_create_date
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_create_date
+#: model:ir.model.fields,field_description:account.field_account_print_journal_create_date
#: model:ir.model.fields,field_description:account.field_account_register_payments_create_date
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_create_date
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_create_date
#: model:ir.model.fields,field_description:account.field_account_tax_create_date
#: model:ir.model.fields,field_description:account.field_account_tax_group_create_date
#: model:ir.model.fields,field_description:account.field_account_tax_template_create_date
@@ -2762,6 +2987,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"
@@ -2771,16 +2997,28 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move_line_credit
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
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"
msgstr ""
@@ -2802,19 +3040,17 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_abstract_payment_currency_id
+#: model:ir.model.fields,field_description:account.field_account_analytic_line_company_currency_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_currency_id
#: 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
@@ -2824,6 +3060,8 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_res_partner_currency_id
#: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_currency_id
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.view_account_payment_search
#: model:ir.ui.view,arch_db:account.view_move_line_form
msgid "Currency"
@@ -2840,8 +3078,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1180
-#: code:addons/account/models/account_move.py:1188
+#: code:addons/account/models/account_move.py:1342
+#: code:addons/account/models/account_move.py:1352
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -2886,7 +3124,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:155
+#: 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
@@ -2895,7 +3133,7 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:443
+#: code:addons/account/models/account_payment.py:481
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -2908,7 +3146,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:445
+#: code:addons/account/models/account_payment.py:483
#, python-format
msgid "Customer Refund"
msgstr ""
@@ -2938,6 +3176,7 @@ msgstr ""
#. module: account
#. openerp-web
+#: 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
@@ -2948,8 +3187,11 @@ msgstr ""
#: 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
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
@@ -2959,12 +3201,6 @@ msgid "Date"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_message_last_post
-#: model:ir.model.fields,help:account.field_account_invoice_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:56
#, python-format
@@ -2979,6 +3215,11 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,option:0
+msgid "Day(s) after the end of the invoice month (Net EOM)"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,option:0
msgid "Day(s) after the invoice date"
msgstr ""
@@ -2986,6 +3227,8 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_move_line_debit
#: model:ir.ui.view,arch_db:account.report_financial
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
+#: model:ir.ui.view,arch_db:account.report_partnerledger
#: model:ir.ui.view,arch_db:account.report_trialbalance
msgid "Debit"
msgstr ""
@@ -2996,6 +3239,11 @@ 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"
msgstr ""
@@ -3091,6 +3339,11 @@ msgid "Definition"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_res_partner_trust
+msgid "Degree of trust you have in this debtor"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_deprecated
msgid "Deprecated"
msgstr ""
@@ -3155,12 +3408,6 @@ msgid "Difference between the computed ending balance and the specified ending b
msgstr ""
#. module: account
-#: model:account.account.type,name:account.data_account_type_direct_costs
-#: model:ir.ui.view,arch_db:account.view_account_form
-msgid "Direct Costs"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Direct connection to your bank"
msgstr ""
@@ -3203,6 +3450,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_display_name
#: model:ir.model.fields,field_description:account.field_account_chart_template_display_name
#: model:ir.model.fields,field_description:account.field_account_common_account_report_display_name
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_display_name
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_display_name
#: model:ir.model.fields,field_description:account.field_account_common_report_display_name
#: model:ir.model.fields,field_description:account.field_account_config_settings_display_name
@@ -3213,6 +3461,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_display_name
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_display_name
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_display_name
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_display_name
#: model:ir.model.fields,field_description:account.field_account_invoice_display_name
@@ -3232,8 +3481,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_method_display_name
#: model:ir.model.fields,field_description:account.field_account_payment_term_display_name
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_display_name
+#: model:ir.model.fields,field_description:account.field_account_print_journal_display_name
#: model:ir.model.fields,field_description:account.field_account_register_payments_display_name
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_display_name
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_display_name
#: model:ir.model.fields,field_description:account.field_account_tax_display_name
#: model:ir.model.fields,field_description:account.field_account_tax_group_display_name
#: model:ir.model.fields,field_description:account.field_account_tax_template_display_name
@@ -3244,8 +3495,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_financial_display_name
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger_display_name
+#: model:ir.model.fields,field_description:account.field_report_account_report_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"
@@ -3288,10 +3542,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:2449
-#, python-format
msgid "Done"
msgstr ""
@@ -3369,11 +3620,6 @@ msgid "Due Month"
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.action_report_print_overdue
-msgid "Due Payments"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.view_payment_term_line_tree
msgid "Due Type"
msgstr ""
@@ -3384,7 +3630,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:758
+#: 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 ""
@@ -3395,32 +3641,42 @@ msgid "Duplicates"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:135
-#: code:addons/account/models/chart_template.py:148
-#: code:addons/account/models/chart_template.py:158
+#: 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:1508
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1503
#, python-format
msgid "Efficiency at its finest"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:804
+#: code:addons/account/models/account_move.py:889
#, 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"
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_accounting_report_enable_filter
msgid "Enable Comparison"
msgstr ""
@@ -3439,20 +3695,18 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_date_to
#: model:ir.model.fields,field_description:account.field_account_balance_report_date_to
#: model:ir.model.fields,field_description:account.field_account_common_account_report_date_to
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_date_to
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_date_to
#: model:ir.model.fields,field_description:account.field_account_common_report_date_to
+#: model:ir.model.fields,field_description:account.field_account_print_journal_date_to
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_date_to
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_date_to
#: model:ir.model.fields,field_description:account.field_accounting_report_date_to
#: model:ir.model.fields,field_description:account.field_accounting_report_date_to_cmp
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"
msgstr ""
@@ -3473,7 +3727,12 @@ msgid "Entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:778
+#: model:ir.model.fields,field_description:account.field_account_print_journal_sort_selection
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:854
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -3484,7 +3743,7 @@ msgid "Entries to Review"
msgstr ""
#. module: account
-#: code:addons/account/models/account_analytic_line.py:55
+#: code:addons/account/models/account_analytic_line.py:52
#, python-format
msgid "Entries: "
msgstr ""
@@ -3511,7 +3770,6 @@ msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:685
#: code:addons/account/wizard/account_report_common.py:28
#, python-format
msgid "Error!"
@@ -3523,7 +3781,7 @@ msgid "Excel template"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:158
+#: code:addons/account/models/chart_template.py:185
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -3534,8 +3792,13 @@ msgid "Exchange Gain or Loss Journal"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_rate_diff_partial_rec_id
-msgid "Exchange Rate Entry of"
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_exchange_move_id
+msgid "Exchange move id"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_exchange_partial_rec_id
+msgid "Exchange partial rec id"
msgstr ""
#. module: account
@@ -3572,13 +3835,18 @@ msgid "Expenses"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_reference
+msgid "External Reference"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Extra Features"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1515
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1510
#, python-format
msgid "Fast reconciler"
msgstr ""
@@ -3637,11 +3905,6 @@ msgid "Financial Account"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_account_report
-msgid "Financial Report"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_financial_report_style_overwrite
msgid "Financial Report Style"
msgstr ""
@@ -3649,7 +3912,6 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
#: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.ui.menu,name:account.menu_account_reports
msgid "Financial Reports"
msgstr ""
@@ -3755,29 +4017,6 @@ msgid "Fixed amount will count as a debit if it is negative, as a credit if it i
msgstr ""
#. module: account
-#: selection:account.payment.term.line,option:0
-msgid "Day(s) after the end of the invoice month (Net EOM)"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_follower_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_channel_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_partner_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_financial_report_sign
msgid "For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
@@ -3805,12 +4044,22 @@ msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:75
+#: code:addons/account/models/account_invoice.py:77
#, python-format
msgid "Free Reference"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+msgid "From Payable accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
+msgid "From Receivable accounts"
+msgstr ""
+
+#. module: account
#: model:ir.actions.act_window,help:account.action_account_invoice_report_all_supp
msgid "From this report, you can have an overview of the amount invoiced from your vendors. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
@@ -3821,6 +4070,12 @@ msgid "From this report, you can have an overview of the amount invoiced to your
msgstr ""
#. module: account
+#: model:ir.model,name:account.model_account_full_reconcile
+#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_full_reconcile_id
+msgid "Full Reconcile"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_accountant
msgid "Full accounting features: journals, legal statements, chart of accounts, etc."
msgstr ""
@@ -3850,7 +4105,6 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.action_report_general_ledger
-#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -3877,25 +4131,31 @@ msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_module_account_plaid
msgid "Get your bank statements from you bank and import them through plaid.com.\n"
-"-that installs the module account_plaid."
+"-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"
-"This installs the module account_bank_statement_import_ofx."
+"-This installs the module account_bank_statement_import_ofx."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_module_account_bank_statement_import_qif
msgid "Get your bank statements from your bank and import them in Odoo in the .QIF format.\n"
-"This installs the module account_bank_statement_import_qif."
+"-This installs the module account_bank_statement_import_qif."
msgstr ""
#. module: account
#: model:ir.model.fields,help:account.field_account_config_settings_module_account_yodlee
msgid "Get your bank statements from your bank and import them through yodlee.com.\n"
-"-that installs the module account_yodlee."
+"-This installs the module account_yodlee."
msgstr ""
#. module: account
@@ -3926,13 +4186,18 @@ msgid "Go to bank statements"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:447
-#: code:addons/account/models/account_move.py:282
+#: code:addons/account/models/account_invoice.py:467
+#: code:addons/account/models/account_move.py:324
#, python-format
msgid "Go to the configuration panel"
msgstr ""
#. module: account
+#: selection:res.partner,trust:0
+msgid "Good Debtor"
+msgstr ""
+
+#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:204
#: code:addons/account/static/src/xml/account_reconciliation.xml:308
@@ -3942,6 +4207,11 @@ msgid "Good Job!"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_invoice_report_weight
+msgid "Gross Weight"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
#: model:ir.ui.view,arch_db:account.view_account_financial_report_search
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -4014,6 +4284,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_id
#: model:ir.model.fields,field_description:account.field_account_chart_template_id
#: model:ir.model.fields,field_description:account.field_account_common_account_report_id
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_id
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_id
#: model:ir.model.fields,field_description:account.field_account_common_report_id
#: model:ir.model.fields,field_description:account.field_account_config_settings_id
@@ -4024,6 +4295,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template_id
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_id
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_id
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_id
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_id
#: model:ir.model.fields,field_description:account.field_account_invoice_id
@@ -4043,8 +4315,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_method_id
#: model:ir.model.fields,field_description:account.field_account_payment_term_id
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_id
+#: model:ir.model.fields,field_description:account.field_account_print_journal_id
#: model:ir.model.fields,field_description:account.field_account_register_payments_id
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_id
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_id
#: model:ir.model.fields,field_description:account.field_account_tax_group_id
#: model:ir.model.fields,field_description:account.field_account_tax_id
#: model:ir.model.fields,field_description:account.field_account_tax_template_id
@@ -4055,15 +4329,18 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance_id
#: model:ir.model.fields,field_description:account.field_report_account_report_financial_id
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger_id
+#: model:ir.model.fields,field_description:account.field_report_account_report_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:155
+#: code:addons/account/models/chart_template.py:182
#, python-format
msgid "INV"
msgstr ""
@@ -4075,18 +4352,6 @@ msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_message_unread
-#: model:ir.model.fields,help:account.field_account_invoice_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction
-#: model:ir.model.fields,help:account.field_account_invoice_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_account_template_nocreate
msgid "If checked, the new chart of accounts will not contain this by default."
msgstr ""
@@ -4201,6 +4466,11 @@ 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"
msgstr ""
@@ -4221,25 +4491,25 @@ msgid "In Odoo,"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:400
+#: code:addons/account/models/account_bank_statement.py:414
#, 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:198
+#: code:addons/account/models/account_bank_statement.py:200
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:124
+#: code:addons/account/models/account_payment.py:130
#, python-format
msgid "In order to pay multiple invoices at once, they must belong to the same commercial partner."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:128
+#: code:addons/account/models/account_payment.py:134
#, python-format
msgid "In order to pay multiple invoices at once, they must use the same currency."
msgstr ""
@@ -4291,7 +4561,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1787
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1783
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -4339,7 +4609,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 ""
@@ -4356,6 +4625,11 @@ 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..."
msgstr ""
@@ -4372,9 +4646,10 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:807
+#: 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
@@ -4438,6 +4713,11 @@ 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"
msgstr ""
@@ -4448,13 +4728,13 @@ msgid "Invoice paid"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:113
+#: code:addons/account/wizard/account_invoice_refund.py:115
#, python-format
msgid "Invoice refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1291
+#: code:addons/account/models/account_invoice.py:1424
#, python-format
msgid "Invoice sent"
msgstr ""
@@ -4481,6 +4761,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_invoice_ids
#: model:ir.model.fields,field_description:account.field_res_partner_invoice_ids
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model:ir.ui.view,arch_db:account.view_account_payment_form
#: model:ir.ui.view,arch_db:account.view_account_payment_graph
@@ -4492,17 +4773,12 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2095
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2092
#, python-format
msgid "Invoices & Payments Matching"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-msgid "Invoices &amp; Refunds"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all_supp
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -4518,7 +4794,7 @@ msgid "Invoices Statistics"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:159
+#: code:addons/account/models/account_journal_dashboard.py:172
#, python-format
msgid "Invoices owed to you"
msgstr ""
@@ -4534,9 +4810,8 @@ msgid "Invoicing & Payments"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_is_follower
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_is_follower
-msgid "Is Follower"
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_is_difference_zero
+msgid "Is zero"
msgstr ""
#. module: account
@@ -4552,6 +4827,11 @@ msgid "It acts as a default account for debit amount"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_report_partner_ledger_amount_currency
+msgid "It adds the currency column on report if the currency differs from the company currency."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_reconciled
msgid "It indicates that the invoice has been paid and the journal entry of the invoice has been reconciled with one or several journal entries of payment."
msgstr ""
@@ -4562,7 +4842,7 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:811
+#: code:addons/account/models/account_move.py:887
#, python-format
msgid "It is mandatory to specify an account and a journal to create a write-off."
msgstr ""
@@ -4600,6 +4880,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
msgid "JRNL"
msgstr ""
@@ -4610,8 +4891,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2131
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2136
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2128
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2133
#: code:addons/account/static/src/xml/account_reconciliation.xml:141
#: model:ir.model,name:account.model_account_journal
#: model:ir.model.fields,field_description:account.field_account_bank_statement_journal_id
@@ -4621,10 +4902,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
@@ -4638,6 +4921,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.actions.act_window,name:account.action_move_select
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_entry_ids
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -4653,13 +4937,23 @@ 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_invoice_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
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_move_line
#: model:ir.ui.view,arch_db:account.view_move_line_form
#: model:ir.ui.view,arch_db:account.view_move_line_form2
@@ -4668,13 +4962,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:259
-#: code:addons/account/models/account_payment.py:259
+#: code:addons/account/models/account_bank_statement.py:261
+#: code:addons/account/models/account_payment.py:268
#: 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
@@ -4686,7 +4980,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
@@ -4695,6 +4988,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"
@@ -4702,7 +4996,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2094
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2091
#: model:ir.actions.client,name:account.action_manual_reconcile
#, python-format
msgid "Journal Items to Reconcile"
@@ -4728,9 +5022,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_journal_ids
#: model:ir.model.fields,field_description:account.field_account_balance_report_journal_ids
#: model:ir.model.fields,field_description:account.field_account_common_account_report_journal_ids
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_journal_ids
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_journal_ids
#: model:ir.model.fields,field_description:account.field_account_common_report_journal_ids
+#: model:ir.model.fields,field_description:account.field_account_print_journal_journal_ids
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_journal_ids
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_journal_ids
#: model:ir.model.fields,field_description:account.field_accounting_report_journal_ids
#: model:ir.ui.menu,name:account.menu_action_account_journal_form
msgid "Journals"
@@ -4747,6 +5044,11 @@ 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"
msgstr ""
@@ -4778,9 +5080,10 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:112
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:116
+#: code:addons/account/static/src/js/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
msgid "Label"
msgstr ""
@@ -4791,12 +5094,6 @@ msgid "Label on Invoices"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_last_post
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_abstract_payment___last_update
#: model:ir.model.fields,field_description:account.field_account_account___last_update
#: model:ir.model.fields,field_description:account.field_account_account_tag___last_update
@@ -4812,6 +5109,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line___last_update
#: model:ir.model.fields,field_description:account.field_account_chart_template___last_update
#: model:ir.model.fields,field_description:account.field_account_common_account_report___last_update
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report___last_update
#: model:ir.model.fields,field_description:account.field_account_common_partner_report___last_update
#: model:ir.model.fields,field_description:account.field_account_common_report___last_update
#: model:ir.model.fields,field_description:account.field_account_config_settings___last_update
@@ -4822,6 +5120,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax___last_update
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_template___last_update
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template___last_update
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile___last_update
#: model:ir.model.fields,field_description:account.field_account_invoice___last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel___last_update
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm___last_update
@@ -4841,8 +5140,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_method___last_update
#: model:ir.model.fields,field_description:account.field_account_payment_term___last_update
#: model:ir.model.fields,field_description:account.field_account_payment_term_line___last_update
+#: model:ir.model.fields,field_description:account.field_account_print_journal___last_update
#: model:ir.model.fields,field_description:account.field_account_register_payments___last_update
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger___last_update
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger___last_update
#: model:ir.model.fields,field_description:account.field_account_tax___last_update
#: model:ir.model.fields,field_description:account.field_account_tax_group___last_update
#: model:ir.model.fields,field_description:account.field_account_tax_template___last_update
@@ -4853,8 +5154,11 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_report_account_report_agedpartnerbalance___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_financial___last_update
#: model:ir.model.fields,field_description:account.field_report_account_report_generalledger___last_update
+#: model:ir.model.fields,field_description:account.field_report_account_report_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"
@@ -4882,6 +5186,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_write_uid
#: model:ir.model.fields,field_description:account.field_account_chart_template_write_uid
#: model:ir.model.fields,field_description:account.field_account_common_account_report_write_uid
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_write_uid
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_write_uid
#: model:ir.model.fields,field_description:account.field_account_common_report_write_uid
#: model:ir.model.fields,field_description:account.field_account_config_settings_write_uid
@@ -4892,6 +5197,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_write_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_write_uid
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_write_uid
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_write_uid
#: model:ir.model.fields,field_description:account.field_account_invoice_line_write_uid
@@ -4910,8 +5216,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_uid
#: model:ir.model.fields,field_description:account.field_account_payment_term_write_uid
#: model:ir.model.fields,field_description:account.field_account_payment_write_uid
+#: model:ir.model.fields,field_description:account.field_account_print_journal_write_uid
#: model:ir.model.fields,field_description:account.field_account_register_payments_write_uid
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_uid
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_uid
#: model:ir.model.fields,field_description:account.field_account_tax_group_write_uid
#: model:ir.model.fields,field_description:account.field_account_tax_template_write_uid
#: model:ir.model.fields,field_description:account.field_account_tax_write_uid
@@ -4919,6 +5227,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"
@@ -4939,6 +5248,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_write_date
#: model:ir.model.fields,field_description:account.field_account_chart_template_write_date
#: model:ir.model.fields,field_description:account.field_account_common_account_report_write_date
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_write_date
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_write_date
#: model:ir.model.fields,field_description:account.field_account_common_report_write_date
#: model:ir.model.fields,field_description:account.field_account_config_settings_write_date
@@ -4949,6 +5259,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_write_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_write_date
#: model:ir.model.fields,field_description:account.field_account_fiscal_position_write_date
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_cancel_write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_confirm_write_date
#: model:ir.model.fields,field_description:account.field_account_invoice_line_write_date
@@ -4967,8 +5278,10 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_write_date
#: model:ir.model.fields,field_description:account.field_account_payment_term_write_date
#: model:ir.model.fields,field_description:account.field_account_payment_write_date
+#: model:ir.model.fields,field_description:account.field_account_print_journal_write_date
#: model:ir.model.fields,field_description:account.field_account_register_payments_write_date
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_write_date
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_write_date
#: model:ir.model.fields,field_description:account.field_account_tax_group_write_date
#: model:ir.model.fields,field_description:account.field_account_tax_template_write_date
#: model:ir.model.fields,field_description:account.field_account_tax_write_date
@@ -4976,6 +5289,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"
@@ -5013,37 +5327,17 @@ msgid "Legal Name"
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 "Less Cost of Revenue"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_form
-msgid "Less Current Liabilities"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_form
-msgid "Less Expenses"
-msgstr ""
-
-#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_form
-msgid "Less Non-Current Liabilities"
+#: model:ir.ui.view,arch_db:account.view_account_position_form
+msgid "Legal Notes..."
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_form
-msgid "Less Payable Accounts"
+#: model:ir.model.fields,help:account.field_account_fiscal_position_note
+msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:138
+#: code:addons/account/models/account_invoice.py:145
#, python-format
msgid "Less Payment"
msgstr ""
@@ -5103,7 +5397,7 @@ msgid "Logo"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:164
+#: code:addons/account/models/account_bank_statement.py:166
#, python-format
msgid "Loss"
msgstr ""
@@ -5120,7 +5414,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:157
+#: code:addons/account/models/chart_template.py:184
#, python-format
msgid "MISC"
msgstr ""
@@ -5193,6 +5487,12 @@ msgid "Mark invoice as fully paid"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_reconciled_line_ids
+#: model:ir.ui.view,arch_db:account.view_full_reconcile_form
+msgid "Matched Journal Items"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_move_line_matched_credit_ids
msgid "Matched credit ids"
msgstr ""
@@ -5203,6 +5503,17 @@ msgid "Matched debit ids"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_full_reconcile_form
+#: model:ir.ui.view,arch_db:account.view_move_line_form
+msgid "Matching"
+msgstr ""
+
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_move_line_full_reconcile_id
+msgid "Matching Number"
+msgstr ""
+
+#. module: account
#: selection:res.company,fiscalyear_last_month:0
msgid "May"
msgstr ""
@@ -5233,9 +5544,38 @@ msgid "Memo:"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_ids
-msgid "Messages"
+#: 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"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Minus Expenses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Minus Non-Current Liabilities"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_form
+msgid "Minus Payable Accounts"
msgstr ""
#. module: account
@@ -5246,7 +5586,7 @@ msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:157
+#: code:addons/account/models/chart_template.py:184
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -5256,7 +5596,7 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:81
#, python-format
-msgid "Modify presets"
+msgid "Modify models"
msgstr ""
#. module: account
@@ -5282,6 +5622,11 @@ 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"
" to use some of them, you should check their <strong>Active</strong>\n"
@@ -5290,6 +5635,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
msgid "Move"
@@ -5306,12 +5652,17 @@ msgid "Move line ids"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1026
+#: code:addons/account/models/account_move.py:1168
#, 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"
msgstr ""
@@ -5345,6 +5696,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_name
#: model:ir.model.fields,field_description:account.field_account_tax_group_name
#: model:ir.ui.view,arch_db:account.report_financial
+#: model:ir.ui.view,arch_db:account.report_journal
msgid "Name"
msgstr ""
@@ -5356,6 +5708,11 @@ 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
msgid "Net Tax Lines"
@@ -5367,13 +5724,6 @@ 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"
msgstr ""
@@ -5384,19 +5734,12 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1004
+#: code:addons/account/models/account_move.py:1145
#, 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/>"
msgstr ""
@@ -5412,7 +5755,12 @@ msgid "No Follow-up"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:925
+#: 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 ""
@@ -5463,6 +5811,11 @@ msgid "None"
msgstr ""
#. module: account
+#: selection:res.partner,trust:0
+msgid "Normal Debtor"
+msgstr ""
+
+#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Normal Text"
msgstr ""
@@ -5505,6 +5858,7 @@ msgid "November"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_name
#: model:ir.model.fields,field_description:account.field_account_invoice_number
#: model:ir.model.fields,field_description:account.field_account_move_name
msgid "Number"
@@ -5516,12 +5870,6 @@ msgid "Number (Move)"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_number
msgid "Number of Coins/Bills"
msgstr ""
@@ -5537,18 +5885,6 @@ msgid "Number of digits in an account code"
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction_counter
-#: model:ir.model.fields,help:account.field_account_invoice_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,help:account.field_account_invoice_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:192
#, python-format
@@ -5617,6 +5953,11 @@ msgid "Once draft invoices are confirmed, you will not be able\n"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.view_account_config_settings
+msgid "Once this module is installed, you have to configure Tax Cash Basis Journal."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Once you have created your chart of accounts, you will need to update your account balances."
msgstr ""
@@ -5644,20 +5985,20 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:311
+#: code:addons/account/models/account_payment.py:331
#, 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:699
+#: 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:1509
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1504
#, python-format
msgid "Only use the ctrl-enter shortcut to validate reconciliations."
msgstr ""
@@ -5682,15 +6023,10 @@ msgid "Open Payment"
msgstr ""
#. module: account
-#: model:ir.actions.client,name:account.action_client_account_menu
-msgid "Open account dashboard menu"
-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:1898
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2033
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1863
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1895
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2030
#, python-format
msgid "Open balance"
msgstr ""
@@ -5706,6 +6042,13 @@ msgid "Operation Templates"
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_reconcile.py:66
+#: code:addons/account/wizard/account_reconcile.py:125
+#, python-format
+msgid "Operation not allowed. You can only reconcile entries that share the same secondary currency or that don't have one. Edit your journal items or make another selection before proceeding any further."
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_account_template_nocreate
msgid "Optional Create"
msgstr ""
@@ -5725,6 +6068,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 ""
@@ -5774,7 +6118,7 @@ msgid "Outstanding Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:108
+#: code:addons/account/models/account_invoice.py:112
#, python-format
msgid "Outstanding credits"
msgstr ""
@@ -5785,7 +6129,7 @@ msgid "Outstanding credits debits widget"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:111
+#: code:addons/account/models/account_invoice.py:115
#, python-format
msgid "Outstanding debits"
msgstr ""
@@ -5812,11 +6156,6 @@ msgid "Overdue invoices, maturity date passed"
msgstr ""
#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_legal_statement
-msgid "PDF Reports"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "PRO-FORMA"
@@ -5830,7 +6169,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:271
+#: code:addons/account/models/account_payment.py:280
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -5870,7 +6209,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1728
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1724
#: code:addons/account/static/src/xml/account_reconciliation.xml:262
#: model:ir.model,name:account.model_res_partner
#: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_id
@@ -5883,6 +6222,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_payment_partner_id
#: model:ir.model.fields,field_description:account.field_account_register_payments_partner_id
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_journal
#: model:ir.ui.view,arch_db:account.view_account_analytic_line_filter_inherit_account
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
@@ -5899,8 +6239,21 @@ msgid "Partner Company"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_move_line_ref
-msgid "Partner Reference"
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger_menu
+#: model:ir.actions.report.xml,name:account.action_report_partnerledger
+#: model:ir.ui.menu,name:account.menu_partner_ledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_ledger_payable
+msgid "Partner Ledger: Payable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_ledger_receivable
+msgid "Partner Ledger: Receivable"
msgstr ""
#. module: account
@@ -5918,6 +6271,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_result_selection
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_result_selection
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_result_selection
msgid "Partner's"
msgstr ""
@@ -5935,6 +6289,7 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_payable
#: selection:account.account.type,type:0
+#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Payable"
msgstr ""
@@ -5948,6 +6303,7 @@ msgstr ""
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
#: selection:account.common.partner.report,result_selection:0
+#: selection:account.report.partner.ledger,result_selection:0
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.view_account_search
msgid "Payable Accounts"
@@ -5981,11 +6337,22 @@ 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
#, python-format
@@ -5999,6 +6366,11 @@ 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"
msgstr ""
@@ -6029,11 +6401,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 ""
@@ -6064,16 +6433,6 @@ 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"
msgstr ""
@@ -6093,7 +6452,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
@@ -6125,28 +6483,6 @@ 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"
msgstr ""
@@ -6184,7 +6520,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1273
+#: code:addons/account/models/account_invoice.py:1406
#, python-format
msgid "Percentages for Payment Term Line must be between 0 and 100."
msgstr ""
@@ -6222,19 +6558,19 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:662
+#: 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:133
+#: 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:660
+#: code:addons/account/models/account_invoice.py:747
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -6337,11 +6673,6 @@ 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
#: model:ir.ui.view,arch_db:account.invoice_form
@@ -6354,6 +6685,12 @@ msgid "Print Invoice"
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_common_journal_report_amount_currency
+#: model:ir.model.fields,help:account.field_account_print_journal_amount_currency
+msgid "Print Report with the currency column if the currency differs from the company currency."
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.invoice_form
msgid "Pro Forma Invoice"
msgstr ""
@@ -6397,7 +6734,7 @@ msgid "Product Template"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:168
+#: code:addons/account/models/account_bank_statement.py:170
#, python-format
msgid "Profit"
msgstr ""
@@ -6420,7 +6757,6 @@ msgstr ""
#. module: account
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
#: model:ir.actions.act_window,name:account.action_account_report_pl
-#: model:ir.ui.menu,name:account.menu_account_report_pl
msgid "Profit and Loss"
msgstr ""
@@ -6430,19 +6766,19 @@ msgid "Proforma"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:554
+#: code:addons/account/models/account_bank_statement.py:598
#, python-format
msgid "Programmation error : domain_maker_move_line_amount requires comparator '=' or '<'"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:117
+#: code:addons/account/models/account_payment.py:123
#, python-format
msgid "Programmation error: the expected model for this action is 'account.invoice'. The provided one is '%d'."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:115
+#: code:addons/account/models/account_payment.py:121
#, python-format
msgid "Programmation error: wizard action executed without active_model or active_ids in context."
msgstr ""
@@ -6519,6 +6855,7 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.data_account_type_receivable
#: selection:account.account.type,type:0
+#: model:ir.ui.view,arch_db:account.view_account_move_line_filter
#: model:ir.ui.view,arch_db:account.view_account_payment_search
msgid "Receivable"
msgstr ""
@@ -6532,6 +6869,7 @@ msgstr ""
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
#: selection:account.common.partner.report,result_selection:0
+#: selection:account.report.partner.ledger,result_selection:0
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
#: model:ir.ui.view,arch_db:account.view_account_form
#: model:ir.ui.view,arch_db:account.view_account_search
@@ -6541,6 +6879,7 @@ msgstr ""
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
#: selection:account.common.partner.report,result_selection:0
+#: selection:account.report.partner.ledger,result_selection:0
#: model:ir.ui.view,arch_db:account.report_agedpartnerbalance
msgid "Receivable and Payable Accounts"
msgstr ""
@@ -6555,8 +6894,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1849
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2446
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1845
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2443
#: code:addons/account/static/src/xml/account_reconciliation.xml:322
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff
@@ -6577,7 +6916,7 @@ msgid "Reconcile With Write-Off"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_reconcile.py:79
+#: code:addons/account/wizard/account_reconcile.py:94
#, python-format
msgid "Reconcile Writeoff"
msgstr ""
@@ -6597,8 +6936,17 @@ msgid "Reconciled"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_reconciled
+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
-#: model:ir.ui.view,arch_db:account.view_move_line_form
msgid "Reconciliation"
msgstr ""
@@ -6609,6 +6957,11 @@ msgid "Reconciliation Models"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_full_reconcile_partial_reconcile_ids
+msgid "Reconciliation Parts"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
msgid "Reconciliation Transactions"
msgstr ""
@@ -6621,7 +6974,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2159
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2156
#, python-format
msgid "Reconciling "
msgstr ""
@@ -6643,6 +6996,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.report_generalledger
+#: model:ir.ui.view,arch_db:account.report_partnerledger
msgid "Ref"
msgstr ""
@@ -6654,6 +7008,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"
@@ -6686,7 +7041,7 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:809
+#: 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
@@ -6723,6 +7078,7 @@ msgid "Refund base on this type. You can not Modify and Cancel if the invoice is
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Refunds"
msgstr ""
@@ -6812,12 +7168,8 @@ 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 ""
@@ -6850,6 +7202,11 @@ 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"
msgstr ""
@@ -6923,6 +7280,13 @@ msgid "Sale Tax"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal_menu
+#: model:ir.actions.report.xml,name:account.action_report_journal
+#: model:ir.ui.menu,name:account.menu_print_journal
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
#: model:ir.ui.menu,name:account.menu_finance_receivables
@@ -6936,11 +7300,6 @@ msgid "Sales Tax(%)"
msgstr ""
#. module: account
-#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
-msgid "Sales Team"
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_sale_tax_rate
msgid "Sales tax (%)"
msgstr ""
@@ -6954,6 +7313,13 @@ msgid "Salesperson"
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_reconciliation.xml:88
+#, python-format
+msgid "Save and New"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_journal_search
msgid "Search Account Journal"
msgstr ""
@@ -7009,13 +7375,51 @@ 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. Select 'Purchase' for vendor bills journals. Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments. Select 'General' for miscellaneous operations journals. Select 'Opening/Closing Situation' for entries generated for new fiscal years."
+msgid "Select 'Sale' for customer invoices journals.\n"
+"Select 'Purchase' for vendor bills journals.\n"
+"Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments.\n"
+"Select 'General' for miscellaneous operations journals."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1756
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1752
#, python-format
msgid "Select Partner"
msgstr ""
@@ -7045,6 +7449,16 @@ msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pr
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
#: selection:account.register.payments,payment_type:0
@@ -7101,6 +7515,11 @@ 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."
msgstr ""
@@ -7161,6 +7580,13 @@ msgid "Simplify your cash, checks, or credit cards deposits with an integrated b
msgstr ""
#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2446
+#, python-format
+msgid "Skip"
+msgstr ""
+
+#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
msgstr ""
@@ -7173,6 +7599,7 @@ msgstr ""
#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_line_origin
#: model:ir.model.fields,field_description:account.field_account_invoice_origin
+#: model:ir.ui.view,arch_db:account.report_invoice_document
msgid "Source Document"
msgstr ""
@@ -7180,9 +7607,12 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_date_from
#: model:ir.model.fields,field_description:account.field_account_balance_report_date_from
#: model:ir.model.fields,field_description:account.field_account_common_account_report_date_from
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_date_from
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_date_from
#: model:ir.model.fields,field_description:account.field_account_common_report_date_from
+#: model:ir.model.fields,field_description:account.field_account_print_journal_date_from
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_date_from
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_date_from
#: model:ir.model.fields,field_description:account.field_accounting_report_date_from
#: model:ir.model.fields,field_description:account.field_accounting_report_date_from_cmp
msgid "Start Date"
@@ -7210,7 +7640,7 @@ msgid "Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:250
+#: code:addons/account/models/account_bank_statement.py:252
#, python-format
msgid "Statement %s confirmed, journal items were created."
msgstr ""
@@ -7278,6 +7708,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 ""
@@ -7289,7 +7720,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1516
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1511
#, python-format
msgid "Take on average less than 5 seconds to reconcile a transaction."
msgstr ""
@@ -7298,31 +7729,33 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_target_move
#: model:ir.model.fields,field_description:account.field_account_balance_report_target_move
#: model:ir.model.fields,field_description:account.field_account_common_account_report_target_move
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_target_move
#: model:ir.model.fields,field_description:account.field_account_common_partner_report_target_move
#: model:ir.model.fields,field_description:account.field_account_common_report_target_move
+#: model:ir.model.fields,field_description:account.field_account_print_journal_target_move
#: model:ir.model.fields,field_description:account.field_account_report_general_ledger_target_move
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_target_move
#: model:ir.model.fields,field_description:account.field_accounting_report_target_move
msgid "Target Moves"
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:124
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:129
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:121
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:126
#: 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:680
-#: code:addons/account/models/chart_template.py:683
+#: code:addons/account/models/chart_template.py:724
+#: code:addons/account/models/chart_template.py:727
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -7341,6 +7774,17 @@ 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"
+msgstr ""
+
+#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_search
msgid "Tax Application"
msgstr ""
@@ -7357,12 +7801,23 @@ msgid "Tax Computation"
msgstr ""
#. module: account
+#: model:ir.ui.view,arch_db:account.report_journal
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_name
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
msgid "Tax Group"
msgstr ""
@@ -7418,6 +7873,12 @@ 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"
msgstr ""
@@ -7520,11 +7981,6 @@ msgid "Technical field used to hide the payment method if the selected journal h
msgstr ""
#. module: account
-#: model:ir.model.fields,help:account.field_account_move_rate_diff_partial_rec_id
-msgid "Technical field used to keep track of the origin of journal entries created in case of fluctuation of the currency exchange rate. This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,field_description:account.field_account_config_settings_chart_template_id
msgid "Template"
msgstr ""
@@ -7610,7 +8066,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:780
+#: code:addons/account/models/account_move.py:856
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -7632,30 +8088,24 @@ msgid "The amount expressed in the related account currency if not equal to the
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:387
+#: code:addons/account/models/account_move.py:431
#, 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:524
+#: 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 ""
#. module: account
-#: code:addons/account/models/account.py:268
+#: code:addons/account/models/account.py:279
#, python-format
msgid "The bank account of a bank journal must belong to the same company (%s)."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:786
-#, python-format
-msgid "The bank statement line was already reconciled."
-msgstr ""
-
-#. module: account
#: model:ir.model.fields,help:account.field_account_move_line_statement_id
msgid "The bank statement used for bank reconciliation"
msgstr ""
@@ -7697,7 +8147,7 @@ msgid "The discussions with your customer are automatically displayed at\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:182
+#: code:addons/account/models/account_bank_statement.py:184
#, python-format
msgid "The ending balance is incorrect !\n"
"The expected balance (%s) is different from the computed one. (%s)"
@@ -7714,7 +8164,7 @@ msgid "The fiscal position will determine taxes and accounts used for the partne
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:272
+#: code:addons/account/models/account.py:283
#, python-format
msgid "The holder of a journal's bank account must be the company (%s)."
msgstr ""
@@ -7725,7 +8175,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:412
+#: code:addons/account/models/account_payment.py:450
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -7779,7 +8229,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:782
+#: code:addons/account/models/account_move.py:858
#, python-format
msgid "The partner has to be the same on all lines for receivable and payable accounts!"
msgstr ""
@@ -7790,7 +8240,7 @@ msgid "The partner reference of this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:314
+#: code:addons/account/models/account_payment.py:334
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -7806,13 +8256,13 @@ msgid "The residual amount on a journal item expressed in the company currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:372
+#: code:addons/account/models/account_move.py:416
#, 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:1162
+#: 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 ""
@@ -7824,13 +8274,13 @@ 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:414
+#: code:addons/account/models/account_payment.py:452
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:170
+#: code:addons/account/models/account_bank_statement.py:172
#, python-format
msgid "There is no account defined on the journal %s for %s involved in a cash difference."
msgstr ""
@@ -7851,7 +8301,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1492
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1487
#, python-format
msgid "There you go, it's all done !"
msgstr ""
@@ -7867,6 +8317,12 @@ 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
msgid "This Week"
@@ -7926,6 +8382,12 @@ msgid "This allows you to group received checks before you deposit them to the b
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"
" the sales and purchase rates or use the usual m2o fields. This last choice assumes that\n"
@@ -7986,13 +8448,13 @@ msgid "This is the accounting dashboard. If you have not yet\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:304
+#: code:addons/account/models/account.py:319
#, python-format
msgid "This journal already contains items, therefore you cannot modify its company."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:307
+#: code:addons/account/models/account.py:322
#, python-format
msgid "This journal already contains items, therefore you cannot modify its short name."
msgstr ""
@@ -8071,7 +8533,7 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:20
#, python-format
-msgid "Tip : Hit ctrl-enter to reconcile all the balanced items in the sheet."
+msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet."
msgstr ""
#. module: account
@@ -8100,7 +8562,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:776
+#: code:addons/account/models/account_move.py:852
#, python-format
msgid "To reconcile the entries company should be the same for all entries!"
msgstr ""
@@ -8114,8 +8576,8 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:145
#: 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
@@ -8188,6 +8650,16 @@ 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."
msgstr ""
@@ -8222,19 +8694,19 @@ msgid "Transfer To"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:209
+#: code:addons/account/models/account_payment.py:218
#, python-format
msgid "Transfer account not defined on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:385
+#: code:addons/account/models/account_payment.py:423
#, python-format
msgid "Transfer from %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:467
+#: code:addons/account/models/account_payment.py:506
#, python-format
msgid "Transfer to %s"
msgstr ""
@@ -8247,7 +8719,6 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_balance_menu
#: model:ir.actions.report.xml,name:account.action_report_trial_balance
-#: model:ir.ui.menu,name:account.menu_general_Balance_report
msgid "Trial Balance"
msgstr ""
@@ -8257,7 +8728,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
@@ -8272,7 +8742,7 @@ msgid "Type"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:738
+#: code:addons/account/models/chart_template.py:782
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
@@ -8291,6 +8761,18 @@ msgid "Unit of Measure"
msgstr ""
#. module: account
+#: 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."
msgstr ""
@@ -8318,18 +8800,6 @@ msgid "Unposted Journal Items"
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread_counter
-#: model:ir.model.fields,field_description:account.field_account_invoice_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_payment.xml:81
#: model:ir.ui.view,arch_db:account.account_unreconcile_view
@@ -8364,11 +8834,15 @@ 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"
msgstr ""
@@ -8430,6 +8904,11 @@ msgid "Used in reports to know if we should consider journal items from the begi
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement_reference
+msgid "Used to hold the reference of the external mean that created this statement (name of imported file, reference of online synchronization...)"
+msgstr ""
+
+#. module: account
#: model:ir.model.fields,help:account.field_account_journal_sequence
msgid "Used to order Journals in the dashboard view"
msgstr ""
@@ -8445,6 +8924,7 @@ msgid "Used to register a profit when the ending balance of a cash register diff
msgstr ""
#. module: account
+#: model:ir.model.fields,help:account.field_account_analytic_line_company_currency_id
#: model:ir.model.fields,help:account.field_account_bank_statement_line_journal_currency_id
#: model:ir.model.fields,help:account.field_account_move_line_company_currency_id
#: model:ir.model.fields,help:account.field_account_partial_reconcile_company_currency_id
@@ -8459,7 +8939,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1866
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1862
#: 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
@@ -8504,7 +8984,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:808
+#: 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
@@ -8512,7 +8992,7 @@ msgid "Vendor Bill"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:156
+#: 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
@@ -8526,7 +9006,7 @@ msgid "Vendor Flow"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:488
#, python-format
msgid "Vendor Payment"
msgstr ""
@@ -8545,8 +9025,8 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:810
-#: code:addons/account/models/account_payment.py:448
+#: code:addons/account/models/account_invoice.py:898
+#: code:addons/account/models/account_payment.py:486
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
msgid "Vendor Refund"
@@ -8576,8 +9056,30 @@ msgid "View supported banks"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1096
-#: code:addons/account/models/account_invoice.py:1161
+#: model:ir.model.fields,field_description:account.field_account_invoice_report_volume
+msgid "Volume"
+msgstr ""
+
+#. module: account
+#: 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 ""
@@ -8604,18 +9106,6 @@ msgid "We hope this tool helped you implement our accounting application."
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_website_message_ids
-#: model:ir.model.fields,field_description:account.field_account_invoice_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: account
-#: model:ir.model.fields,help:account.field_account_bank_statement_website_message_ids
-#: model:ir.model.fields,help:account.field_account_invoice_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
msgid "Welcome"
msgstr ""
@@ -8633,12 +9123,19 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1503
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1498
#, python-format
msgid "Whew, that was fast !"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_common_journal_report_amount_currency
+#: model:ir.model.fields,field_description:account.field_account_print_journal_amount_currency
+#: model:ir.model.fields,field_description:account.field_account_report_partner_ledger_amount_currency
+msgid "With Currency"
+msgstr ""
+
+#. module: account
#: selection:account.balance.report,display_account:0
#: selection:account.common.account.report,display_account:0
#: selection:account.report.general.ledger,display_account:0
@@ -8666,7 +9163,12 @@ msgid "With tax"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:808
+#: model:ir.model,name:account.model_tax_adjustments_wizard
+msgid "Wizard for Tax Adjustments"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:893
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#, python-format
msgid "Write-Off"
@@ -8698,7 +9200,7 @@ msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:774
+#: code:addons/account/models/account_move.py:850
#, python-format
msgid "You are trying to reconcile some entries that are already reconciled!"
msgstr ""
@@ -8715,7 +9217,7 @@ msgid "You can control the invoice from your vendor according to\n"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config.py:229
+#: 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 ""
@@ -8727,13 +9229,13 @@ 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:297
+#: code:addons/account/models/account_payment.py:317
#, python-format
msgid "You can not delete a payment that is already posted"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:122
+#: code:addons/account/models/account_payment.py:128
#, python-format
msgid "You can only register payments for open invoices"
msgstr ""
@@ -8744,19 +9246,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:177
+#: 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."
+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:175
+#: 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:789
+#: 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 ""
@@ -8768,25 +9270,25 @@ msgid "You cannot change the owner company of an account that already contains j
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:997
+#: code:addons/account/models/account_move.py:1134
#, python-format
msgid "You cannot change the tax, you should remove and recreate lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:379
+#: code:addons/account/models/account_move.py:423
#, 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:406
+#: 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:404
+#: 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 ""
@@ -8798,21 +9300,21 @@ msgid "You cannot do that on an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1028
+#: code:addons/account/models/account_move.py:1170
#, 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:1030
+#: code:addons/account/models/account_move.py:1172
#, python-format
msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n"
"%s."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:329
+#: code:addons/account/models/account.py:334
#, python-format
msgid "You cannot empty the account number once set.\n"
"If you would like to delete the account number, you can do it from the Bank Accounts list."
@@ -8825,20 +9327,20 @@ msgid "You cannot have a receivable/payable account that is not reconciliable. (
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:126
+#: code:addons/account/models/account_payment.py:132
#, python-format
msgid "You cannot mix customer invoices and vendor bills in a single payment."
msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1788
+#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1784
#, python-format
msgid "You cannot mix items from receivable and payable accounts."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:143
+#: 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."
@@ -8857,14 +9359,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:881
-#: code:addons/account/models/account_move.py:999
+#: code:addons/account/models/account_move.py:1010
+#: code:addons/account/models/account_move.py:1136
#, python-format
msgid "You cannot use deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:937
+#: code:addons/account/models/account_move.py:1065
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
@@ -8882,7 +9384,7 @@ msgid "You must define a Start Date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1097
+#: code:addons/account/models/account_invoice.py:1209
#, python-format
msgid "You must first select a partner!"
msgstr ""
@@ -8900,19 +9402,19 @@ msgid "You must set a start date."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1160
+#: code:addons/account/models/account_move.py:1326
#, 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:1162
+#: code:addons/account/models/account_move.py:1328
#, 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:1164
+#: code:addons/account/models/account_move.py:1330
#, 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 ""
@@ -9061,13 +9563,13 @@ 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
@@ -9093,6 +9595,7 @@ 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 ""
@@ -9143,17 +9646,27 @@ msgid "report.account.report_generalledger"
msgstr ""
#. module: account
+#: 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_overdue
msgid "report.account.report_overdue"
msgstr ""
#. module: account
+#: 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_report_trialbalance
msgid "report.account.report_trialbalance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:202
+#: code:addons/account/models/account_move.py:218
#, python-format
msgid "reversal of: "
msgstr ""
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index f80a46dfe0a..6be2774aa07 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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 &amp; Loss statement or view the Balance Sheet.</i>"
+msgstr ""
+
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index dd842c99e93..70084cd84aa 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -96,16 +96,6 @@ msgid "End Date"
msgstr ""
#. module: account_analytic_default
-#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
-msgid "Entries"
-msgstr ""
-
-#. module: account_analytic_default
-#: model:ir.model.fields,field_description:account_analytic_default.field_product_product_expense_policy
-msgid "Expense Invoice Policy"
-msgstr ""
-
-#. module: account_analytic_default
#: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_sequence
msgid "Gives the sequence order when displaying a list of analytic distribution"
msgstr ""
@@ -121,11 +111,6 @@ msgid "ID"
msgstr ""
#. module: account_analytic_default
-#: model:ir.model.fields,help:account_analytic_default.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: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
@@ -199,11 +184,6 @@ msgid "Start Date"
msgstr ""
#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_stock_picking
-msgid "Transfer"
-msgstr ""
-
-#. module: account_analytic_default
#: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_user_id
#: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_form_search
msgid "User"
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 91291ac5aa7..63df0d2313f 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-15 09:26+0000\n"
-"PO-Revision-Date: 2016-01-15 09:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,18 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:350
+#: code:addons/account_asset/models/account_asset.py:375
#, python-format
msgid " (copy)"
msgstr ""
#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:509
+#, 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"
msgstr ""
@@ -47,8 +53,18 @@ msgid "Account Entry"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_needaction
-msgid "Action Needed"
+#: 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
@@ -58,7 +74,12 @@ msgid "Active"
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 "Additional Options"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:566
#, python-format
msgid "Amount"
msgstr ""
@@ -80,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
@@ -90,7 +110,6 @@ 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_category_form
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
msgid "Asset Account"
msgstr ""
@@ -149,7 +168,7 @@ msgid "Asset category"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:238
+#: code:addons/account_asset/models/account_asset.py:262
#, python-format
msgid "Asset created"
msgstr ""
@@ -160,7 +179,7 @@ msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:271
+#: code:addons/account_asset/models/account_asset.py:295
#, python-format
msgid "Asset sold or disposed. Accounting entry awaiting for validation."
msgstr ""
@@ -189,6 +208,11 @@ 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"
msgstr ""
@@ -214,6 +238,11 @@ 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
msgid "Cancel"
@@ -237,6 +266,11 @@ msgid "Check this if you want to automatically confirm the assets of this catego
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
msgid "Choose the method to use to compute the amount of depreciation lines.\n"
@@ -298,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 ""
@@ -333,7 +367,7 @@ msgid "Cumulative Depreciation"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:486
+#: code:addons/account_asset/models/account_asset.py:566
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id
#, python-format
msgid "Currency"
@@ -376,11 +410,6 @@ msgid "Date of depreciation"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
msgid "Deferred Revenue Account"
msgstr ""
@@ -414,9 +443,8 @@ msgid "Depreciation"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_depreciation_id
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
-msgid "Depreciation Account"
+msgid "Depreciation Asset Account"
msgstr ""
#. module: account_asset
@@ -431,13 +459,18 @@ msgid "Depreciation Date"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_id
-msgid "Depreciation Entry"
+#: 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.ui.view,arch_db:account_asset.view_account_asset_category_form
-msgid "Depreciation Asset Account"
+#: 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"
msgstr ""
#. module: account_asset
@@ -472,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:489
+#: code:addons/account_asset/models/account_asset.py:569
#, python-format
msgid "Depreciation line posted."
msgstr ""
@@ -494,19 +527,19 @@ msgid "Display Name"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:274
+#: code:addons/account_asset/models/account_asset.py:298
#, python-format
msgid "Disposal Move"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:277
+#: code:addons/account_asset/models/account_asset.py:301
#, python-format
msgid "Disposal Moves"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:468
+#: code:addons/account_asset/models/account_asset.py:548
#, python-format
msgid "Document closed."
msgstr ""
@@ -532,36 +565,11 @@ 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.ui.view,arch_db:account_asset.view_asset_asset_report_search
msgid "Extended Filters..."
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
msgid "From this report, you can have an overview on all depreciations. The\n"
" search bar can also be used to personalize your assets depreciation reporting."
@@ -604,6 +612,11 @@ 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
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_id
@@ -614,21 +627,6 @@ msgid "ID"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: account_asset
-#: model:ir.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"
msgstr ""
@@ -651,11 +649,6 @@ msgid "Invoice Line"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: account_asset
#: model:ir.model.fields,help:account_asset.field_account_asset_asset_salvage_value
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
@@ -671,18 +664,13 @@ msgid "Journal"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:376
+#: code:addons/account_asset/models/account_asset.py:409
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
#, python-format
msgid "Journal Entries"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: account_asset
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset___last_update
#: model:ir.model.fields,field_description:account_asset.field_account_asset_category___last_update
#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line___last_update
@@ -717,8 +705,8 @@ msgid "Linear"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_ids
-msgid "Messages"
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_check
+msgid "Linked"
msgstr ""
#. module: account_asset
@@ -759,11 +747,6 @@ msgid "Note"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: account_asset
#: selection:account.asset.asset,method_time:0
#: selection:account.asset.category,method_time:0
#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_method_number
@@ -783,17 +766,12 @@ msgid "Number of Months in a Period"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_unread_counter
-msgid "Number of unread messages"
+#: 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/account_asset.py:488
+#: code:addons/account_asset/models/account_asset.py:568
#: 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
@@ -818,14 +796,9 @@ 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
@@ -854,7 +827,7 @@ msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:316
+#: code:addons/account_asset/models/account_asset.py:341
#, python-format
msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
msgstr ""
@@ -880,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 ""
@@ -981,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 ""
@@ -994,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 ""
@@ -1005,16 +984,6 @@ msgid "Unposted Amount"
msgstr ""
#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: account_asset
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_purchase_tree
msgid "Vendor"
@@ -1034,31 +1003,25 @@ msgid "Year"
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset_invoice.py:53
-#, python-format
-msgid "You already have assets with the reference %s.\nPlease delete these assets before creating new ones for this invoice."
-msgstr ""
-
-#. module: account_asset
-#: code:addons/account_asset/account_asset.py:100
+#: code:addons/account_asset/models/account_asset.py:106
#, python-format
msgid "You cannot delete a document is in %s state."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:102
+#: code:addons/account_asset/models/account_asset.py:109
#, python-format
msgid "You cannot delete a document that contains posted entries."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:497
+#: code:addons/account_asset/models/account_asset.py:577
#, python-format
msgid "You cannot delete posted depreciation lines."
msgstr ""
#. module: account_asset
-#: code:addons/account_asset/account_asset.py:499
+#: code:addons/account_asset/models/account_asset.py:579
#, python-format
msgid "You cannot delete posted installment lines."
msgstr ""
diff --git a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
index 906bbba552c..7b225892e39 100644
--- a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
+++ b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:226
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:236
#, python-format
msgid "%d transactions had already been imported and were ignored."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:226
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:236
#, python-format
msgid "1 transaction had already been imported and was ignored."
msgstr ""
@@ -53,7 +53,7 @@ msgid "Allow Cancelling Entries"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:228
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:238
#, python-format
msgid "Already imported items"
msgstr ""
@@ -69,7 +69,7 @@ msgid "At least one outbound"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:75
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:76
#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_bank_id
#, python-format
msgid "Bank"
@@ -101,13 +101,18 @@ msgid "Bank Statement Line"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_belongs_to_company
+msgid "Belong to the user's current company"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
msgid "Cancel"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:160
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:165
#, python-format
msgid "Cannot find in which journal import this statement. Please manually select a journal."
msgstr ""
@@ -138,7 +143,7 @@ msgid "Company related to this journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:105
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:106
#, python-format
msgid "Could not make sense of the given file.\n"
"Did you install the module to support this type of file ?"
@@ -203,6 +208,11 @@ msgid "Entry Sequence"
msgstr ""
#. module: account_bank_statement_import
+#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_filename
+msgid "Filename"
+msgstr ""
+
+#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_data_file
msgid "Get you bank statements in electronic format from your bank and select them here."
msgstr ""
@@ -269,7 +279,7 @@ msgid "Journal"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:66
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:67
#: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view
#, python-format
msgid "Journal Creation"
@@ -334,7 +344,7 @@ msgid "Means of payment for sending money. Odoo modules offer various payments h
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:132
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:136
#, python-format
msgid "No currency found matching '%s'."
msgstr ""
@@ -361,7 +371,10 @@ msgstr ""
#. module: account_bank_statement_import
#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type
-msgid "Select 'Sale' for customer invoices journals. Select 'Purchase' for vendor bills journals. Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments. Select 'General' for miscellaneous operations journals. Select 'Opening/Closing Situation' for entries generated for new fiscal years."
+msgid "Select 'Sale' for customer invoices journals.\n"
+"Select 'Purchase' for vendor bills journals.\n"
+"Select 'Cash' or 'Bank' for journals that are used in customer or vendor payments.\n"
+"Select 'General' for miscellaneous operations journals."
msgstr ""
#. module: account_bank_statement_import
@@ -395,13 +408,13 @@ msgid "The account of the statement you are importing is not yet recorded in Odo
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:143
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:151
#, python-format
msgid "The account of this statement (%s) is not the same as the journal (%s)."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:156
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:161
#, python-format
msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s) !"
msgstr ""
@@ -427,13 +440,13 @@ msgid "This field contains the information related to the numbering of the refun
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:110
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:111
#, python-format
msgid "This file doesn't contain any statement."
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:118
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:119
#, python-format
msgid "This file doesn't contain any transaction."
msgstr ""
@@ -464,7 +477,7 @@ msgid "Whether this journal should be displayed on the dashboard or not"
msgstr ""
#. module: account_bank_statement_import
-#: code:addons/account_bank_statement_import/account_bank_statement_import.py:218
+#: code:addons/account_bank_statement_import/account_bank_statement_import.py:228
#, python-format
msgid "You have already imported that file."
msgstr ""
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index cb6837def30..7bf2aec9045 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,51 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "<strong>Analysis from:</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-msgid "<strong>Analysis from</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-msgid "<strong>Analytic Account</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "<strong>Budget:</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "<strong>Currency:</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-msgid "<strong>Currency</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-msgid "<strong>Printed at:</strong>"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "<strong>Total:</strong>"
-msgstr ""
-
-#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
msgid "A budget is a forecast of your company's income and/or expenses\n"
" expected for a period in the future. A budget is defined on some\n"
@@ -69,22 +24,6 @@ msgid "A budget is a forecast of your company's income and/or expenses\n"
msgstr ""
#. module: account_budget
-#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
-msgid "Account Budget crossovered report"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
-msgid "Account Budget crossovered summary report"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_account_budget_analytic
-#: model:ir.model,name:account_budget.model_account_budget_report
-msgid "Account Budget report for analytic account"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_account_ids
#: model:ir.ui.view,arch_db:account_budget.view_budget_post_form
msgid "Accounts"
@@ -96,34 +35,21 @@ msgid "Achievement"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model,name:account_budget.model_account_analytic_account
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_analytic_account_id
msgid "Analytic Account"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-msgid "Analytic Budget"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Approve"
msgstr ""
#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.action_report_budget
#: model:ir.model,name:account_budget.model_crossovered_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_crossovered_budget_id
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_tree
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_search
msgid "Budget"
msgstr ""
@@ -174,9 +100,6 @@ msgstr ""
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
-#: model:ir.actions.report.xml,name:account_budget.action_report_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.action_report_crossovered_budget
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
msgid "Budgets"
@@ -192,14 +115,6 @@ msgid "By keeping track of where your money goes, you may be less\n"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.account_budget_analytic_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_summary_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_report_view
-msgid "Cancel"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Cancel Budget"
msgstr ""
@@ -232,50 +147,23 @@ msgid "Confirmed"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_create_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_create_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_create_uid
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_create_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_create_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_create_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_create_uid
msgid "Created by"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_create_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_create_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_create_date
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_create_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_create_date
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_create_date
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_create_date
msgid "Created on"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "Description"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_display_name
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_display_name
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_display_name
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_display_name
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_display_name
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_display_name
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_display_name
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_analyticaccountbudget_display_name
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_budget_display_name
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_crossoveredbudget_display_name
msgid "Display Name"
msgstr ""
@@ -303,141 +191,44 @@ msgid "End Date"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_date_to
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_date_to
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_date_to
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_date_to
-msgid "End of period"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_id
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_id
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_id
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_id
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_id
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_id
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_analyticaccountbudget_id
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_budget_id
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_crossoveredbudget_id
msgid "ID"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic___last_update
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report___last_update
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report___last_update
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post___last_update
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report___last_update
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget___last_update
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines___last_update
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_analyticaccountbudget___last_update
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_budget___last_update
-#: model:ir.model.fields,field_description:account_budget.field_report_account_budget_report_crossoveredbudget___last_update
msgid "Last Modified on"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_write_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_write_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_write_uid
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_write_uid
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_write_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_write_uid
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_write_uid
msgid "Last Updated by"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_write_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_write_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_write_date
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_write_date
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_write_date
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_write_date
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_write_date
msgid "Last Updated on"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_account_budget_post_name
msgid "Name"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_paid_date
msgid "Paid Date"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "Perc(%)"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Period"
msgstr ""
@@ -445,51 +236,17 @@ msgstr ""
#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_planned_amount
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
-#: model:ir.ui.view,arch_db:account_budget.report_budget
msgid "Planned Amount"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "Planned Amt"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_practical_amount
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
-#: model:ir.ui.view,arch_db:account_budget.report_budget
#: model:ir.ui.view,arch_db:account_budget.view_account_analytic_account_form_inherit_budget
msgid "Practical Amount"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "Practical Amt"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.account_budget_analytic_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_summary_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_report_view
-msgid "Print"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
-#: model:ir.ui.view,arch_db:account_budget.account_budget_report_view
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
-msgid "Print Summary"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
msgid "Reset to Draft"
msgstr ""
@@ -500,34 +257,18 @@ msgid "Responsible"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.account_budget_analytic_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_summary_report_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_report_view
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_date_from
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_date_from
msgid "Start Date"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_date_from
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_report_date_from
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_crossvered_summary_report_date_from
-#: model:ir.model.fields,field_description:account_budget.field_account_budget_report_date_from
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_state
msgid "Status"
msgstr ""
#. module: account_budget
-#: code:addons/account_budget/account_budget.py:104
+#: code:addons/account_budget/models/account_budget.py:89
#, python-format
msgid "The Budget '%s' has no accounts!"
msgstr ""
@@ -535,33 +276,15 @@ msgstr ""
#. module: account_budget
#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_theoritical_amount
#: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form
-#: model:ir.ui.view,arch_db:account_budget.report_budget
msgid "Theoretical Amount"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "Theoretical Amt"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.view_account_analytic_account_form_inherit_budget
msgid "Theoritical Amount"
msgstr ""
#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.account_budget_analytic_view
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_report_view
-msgid "This wizard is used to print budget"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.account_budget_crossvered_summary_report_view
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-
-#. module: account_budget
#: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_search
msgid "To Approve"
msgstr ""
@@ -572,54 +295,7 @@ msgid "To Approve Budgets"
msgstr ""
#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Validated"
msgstr ""
-#. module: account_budget
-#: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model.fields,help:account_budget.field_crossovered_budget_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-msgid "at"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_report_account_budget_report_analyticaccountbudget
-msgid "report.account_budget.report_analyticaccountbudget"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_report_account_budget_report_budget
-msgid "report.account_budget.report_budget"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.model,name:account_budget.model_report_account_budget_report_crossoveredbudget
-msgid "report.account_budget.report_crossoveredbudget"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget
-#: model:ir.ui.view,arch_db:account_budget.report_budget
-#: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget
-msgid "to"
-msgstr ""
-
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index a76586ca020..79ea14ec0e5 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "Cancel Invoice"
msgstr ""
#. module: account_cancel
-#: code:addons/account_cancel/models/account_bank_statement.py:22
+#: code:addons/account_cancel/models/account_bank_statement.py:28
#, python-format
msgid "Please set the bank statement to New before canceling."
msgstr ""
diff --git a/addons/account_check_printing/i18n/account_check_printing.pot b/addons/account_check_printing/i18n/account_check_printing.pot
index 7e9ba2b88a6..05bb666dd0f 100644
--- a/addons/account_check_printing/i18n/account_check_printing.pot
+++ b/addons/account_check_printing/i18n/account_check_printing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:27+0000\n"
-"PO-Revision-Date: 2015-09-14 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,20 +16,20 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_check_printing
-#: code:addons/account_check_printing/account_journal.py:55
+#: code:addons/account_check_printing/models/account_journal.py:57
#, python-format
msgid " : Check Number Sequence"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:35
-#: code:addons/account_check_printing/account_payment.py:72
+#: code:addons/account_check_printing/models/account_payment.py:37
+#: code:addons/account_check_printing/models/account_payment.py:74
#, python-format
msgid " and %s/100"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:81
+#: code:addons/account_check_printing/models/account_payment.py:83
#, python-format
msgid "A check memo cannot exceed 60 characters."
msgstr ""
@@ -89,7 +89,7 @@ msgid "Checks numbering sequence."
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_journal_dashboard.py:23
+#: code:addons/account_check_printing/models/account_journal.py:96
#, python-format
msgid "Checks to Print"
msgstr ""
@@ -120,7 +120,7 @@ msgid "ID"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:101
+#: code:addons/account_check_printing/models/account_payment.py:103
#, python-format
msgid "In order to print multiple checks at once, they must belong to the same bank journal."
msgstr ""
@@ -169,7 +169,7 @@ msgid "Payments"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:98
+#: code:addons/account_check_printing/models/account_payment.py:100
#, python-format
msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled"
msgstr ""
@@ -195,7 +195,7 @@ msgid "Print Checks"
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:114
+#: code:addons/account_check_printing/models/account_payment.py:116
#: model:ir.model,name:account_check_printing.model_print_prenumbered_checks
#: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view
#, python-format
@@ -218,7 +218,7 @@ msgid "Technical feature used to know whether check printing was enabled as paym
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_journal.py:25
+#: code:addons/account_check_printing/models/account_journal.py:26
#, python-format
msgid "The last check number was %s. In order to avoid a check being rejected by the bank, you can only use a greater number."
msgstr ""
@@ -229,7 +229,7 @@ msgid "The selected journal is configured to print check numbers. If your pre-pr
msgstr ""
#. module: account_check_printing
-#: code:addons/account_check_printing/account_payment.py:135
+#: code:addons/account_check_printing/models/account_payment.py:137
#, python-format
msgid "There is no check layout configured.\n"
"Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct."
diff --git a/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot b/addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
index 27248c2b122..6a5eb0c5a4f 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:39+0000\n"
-"PO-Revision-Date: 2015-09-07 14:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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
@@ -37,7 +37,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 +63,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:55
#, 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_tax_python/i18n/account_tax_python.pot b/addons/account_tax_python/i18n/account_tax_python.pot
index 0872cded1af..cec3b831353 100644
--- a/addons/account_tax_python/i18n/account_tax_python.pot
+++ b/addons/account_tax_python/i18n/account_tax_python.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_test/i18n/account_test.pot b/addons/account_test/i18n/account_test.pot
index 9bbdefe2794..d06c55926e1 100644
--- a/addons/account_test/i18n/account_test.pot
+++ b/addons/account_test/i18n/account_test.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,7 @@ msgid "Tests"
msgstr ""
#. module: account_test
-#: code:addons/account_test/report/account_test_report.py:49
+#: code:addons/account_test/report/report_account_test.py:51
#, python-format
msgid "The test was passed successfully"
msgstr ""
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index fb2f00fc919..7ca4ed1425e 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:10+0000\n"
-"PO-Revision-Date: 2015-09-18 08:10+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,13 +35,13 @@ msgid "Account Date"
msgstr ""
#. module: account_voucher
-#: model:ir.model,name:account_voucher.model_account_voucher
-msgid "Accounting Voucher"
+#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_account_date
+msgid "Accounting Date"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_needaction
-msgid "Action Needed"
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
msgstr ""
#. module: account_voucher
@@ -61,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 ""
@@ -91,7 +93,7 @@ msgid "Cancelled"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:144
+#: code:addons/account_voucher/models/account_voucher.py:165
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
msgstr ""
@@ -113,6 +115,12 @@ msgid "Company"
msgstr ""
#. module: account_voucher
+#: model:ir.model.fields,help:account_voucher.field_account_voucher_company_id
+#: model:ir.model.fields,help:account_voucher.field_account_voucher_line_company_id
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_create_uid
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line_create_uid
msgid "Created by"
@@ -138,18 +146,11 @@ 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 ""
#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line_name
msgid "Description"
msgstr ""
@@ -181,26 +182,11 @@ 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 ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher_line_sequence
msgid "Gives the sequence of this line when displaying the voucher."
msgstr ""
@@ -219,16 +205,6 @@ msgid "ID"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher_tax_correction
msgid "In case we have a rounding problem in the tax, use this field to correct it"
msgstr ""
@@ -240,11 +216,6 @@ msgid "Internal Notes"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_journal_id
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter
#: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale
@@ -264,11 +235,6 @@ msgid "Journal Items"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher___last_update
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line___last_update
msgid "Last Modified on"
@@ -287,16 +253,6 @@ msgid "Last Updated on"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_narration
msgid "Notes"
msgstr ""
@@ -307,31 +263,11 @@ msgid "Number"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,help:account_voucher.field_account_voucher_line_tax_ids
msgid "Only for tax excluded from price"
msgstr ""
#. module: account_voucher
-#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
-msgid "Open Invoicing Menu"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_paid
msgid "Paid"
msgstr ""
@@ -363,13 +299,13 @@ msgid "Payment Reference"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:180
+#: 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:183
+#: code:addons/account_voucher/models/account_voucher.py:204
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
@@ -539,16 +475,6 @@ msgid "Unit Price"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form
#: model:ir.ui.view,arch_db:account_voucher.view_sale_receipt_form
msgid "Validate"
@@ -567,7 +493,7 @@ msgid "Vendor Voucher"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:28
+#: 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
@@ -604,16 +530,6 @@ msgid "Vouchers Entries"
msgstr ""
#. module: account_voucher
-#: model:ir.model.fields,field_description:account_voucher.field_account_voucher_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.model.fields,help:account_voucher.field_account_voucher_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
msgid "When the purchase receipt is confirmed, you can record the\n"
" vendor payment related to this purchase receipt."
@@ -626,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:345
+#: 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 ad5aebfb9a8..5e2506ecc05 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-09-29 10:25+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,23 +16,13 @@ msgstr ""
"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
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction
-msgid "Action Needed"
+#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_active
+msgid "Active"
msgstr ""
#. module: analytic
@@ -52,11 +42,6 @@ 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"
msgstr ""
@@ -68,6 +53,13 @@ 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
#: model:ir.ui.view,arch_db:analytic.view_account_analytic_line_pivot
@@ -101,8 +93,8 @@ msgid "Analytic Tags"
msgstr ""
#. module: analytic
-#: selection:account.analytic.account,account_type:0
-msgid "Analytic View"
+#: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_search
+msgid "Archived"
msgstr ""
#. module: analytic
@@ -116,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
@@ -161,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"
@@ -169,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"
@@ -196,11 +185,6 @@ msgid "Date"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_debit
msgid "Debit"
msgstr ""
@@ -212,33 +196,12 @@ 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_account_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_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
msgid "Group By..."
@@ -246,20 +209,14 @@ 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_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction
-msgid "If checked, new messages require your attention."
+#: 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
@@ -271,18 +228,7 @@ msgid "In Odoo, sale orders and projects are implemented using\n"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_last_post
-msgid "Last Message Date"
-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"
@@ -290,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"
@@ -298,23 +243,12 @@ 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"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: analytic
#: model:ir.actions.act_window,help:analytic.account_analytic_line_action
msgid "No activity yet on this account."
msgstr ""
@@ -325,26 +259,6 @@ msgid "No activity yet."
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter
-msgid "Number of unread messages"
-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"
msgstr ""
@@ -375,11 +289,6 @@ 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_tag_ids
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_tag_ids
msgid "Tags"
@@ -396,31 +305,11 @@ 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"
msgstr ""
#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_account_type
-msgid "Type of Account"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: analytic
-#: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: analytic
#: model:ir.model.fields,field_description:analytic.field_account_analytic_line_user_id
msgid "User"
msgstr ""
diff --git a/addons/anonymization/i18n/anonymization.pot b/addons/anonymization/i18n/anonymization.pot
index 1b025de18e0..ea0456432c7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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:431
+#: 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:283
+#: 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:427
+#: 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:372
-#: code:addons/anonymization/anonymization.py:431
+#: 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:519
+#: 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 ""
@@ -230,6 +230,12 @@ 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"
msgstr ""
@@ -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:74
+#: 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:341
+#: 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:374
-#: code:addons/anonymization/anonymization.py:512
+#: 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:372
+#: 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:72
+#: 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:510
+#: 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:48
+#: 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/association/i18n/association.pot b/addons/association/i18n/association.pot
index f80a46dfe0a..fbb07ea155b 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -3,10 +3,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_crypt/i18n/auth_crypt.pot b/addons/auth_crypt/i18n/auth_crypt.pot
index ceca78e59bd..eb0d956f4af 100644
--- a/addons/auth_crypt/i18n/auth_crypt.pot
+++ b/addons/auth_crypt/i18n/auth_crypt.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot
index 5248904f5a4..4cdd7ef843b 100644
--- a/addons/auth_ldap/i18n/auth_ldap.pot
+++ b/addons/auth_ldap/i18n/auth_ldap.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot
index 1753f88d12e..3122de51837 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,17 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: auth_oauth
-#: model:ir.ui.view,arch_db:auth_oauth.view_general_configuration
-msgid "<br/>\n"
-" - Ceate 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:99
#, python-format
msgid "Access Denied"
@@ -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 ""
@@ -53,6 +43,11 @@ 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"
msgstr ""
@@ -73,6 +68,23 @@ 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
msgid "Client ID"
@@ -84,6 +96,11 @@ 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
msgid "Contracts"
@@ -101,7 +118,7 @@ msgstr ""
#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_res_users_currency_id
-msgid "Currency id"
+msgid "Currency"
msgstr ""
#. module: auth_oauth
@@ -115,18 +132,29 @@ msgid "Data URL"
msgstr ""
#. module: auth_oauth
+#: model:ir.model.fields,field_description:auth_oauth.field_res_users_trust
+msgid "Degree of trust you have in this debtor"
+msgstr ""
+
+#. module: auth_oauth
#: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider_display_name
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"
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
@@ -140,6 +168,11 @@ 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"
msgstr ""
@@ -176,6 +209,11 @@ 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"
msgstr ""
@@ -216,6 +254,19 @@ 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"
msgstr ""
@@ -231,11 +282,41 @@ 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
+#: 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."
@@ -252,6 +333,17 @@ msgid "The partner has at least one unreconciled debit and credit since last tim
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"
msgstr ""
@@ -273,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
@@ -331,7 +428,7 @@ 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 ""
@@ -346,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 f31ec11d68b..bb79f2c942c 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-06 07:13+0000\n"
-"PO-Revision-Date: 2016-01-06 07:13+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,42 +16,66 @@ msgstr ""
"Plural-Forms: \n"
#. module: auth_signup
-#: model:mail.template,body_html:auth_signup.set_password_email
+#: model:mail.template,body_html:auth_signup.reset_password_email
msgid "\n"
-" \n"
-" <p>\n"
-" ${object.name},\n"
-" </p>\n"
-" <p>\n"
-" You have been invited to connect to \"${object.company_id.name}\" in order to get access to your documents in Odoo.\n"
-" </p>\n"
-" <p>\n"
-" To accept the invitation, click on the following link:\n"
-" </p>\n"
-" <ul>\n"
-" <li><a href=\"${object.signup_url}\">Accept invitation to \"${object.company_id.name}\"</a></li>\n"
-" </ul>\n"
-" <p>\n"
-" Thanks,\n"
-" </p>\n"
-" <pre>\n"
-"--\n"
-"${object.company_id.name or ''}\n"
-"${object.company_id.email or ''}\n"
-"${object.company_id.phone or ''}\n"
-" </pre>\n"
-" \n"
-" "
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <p>Dear ${object.name},</p>\n"
+" <p>A password reset was requested for the Odoo account linked to this email.</p>\n"
+" <p>You may change your password by following this link which will remain valid during 24 hours:</p>\n"
+" <div style=\"text-align: center; margin-top: 16px;\">\n"
+" <a href=\"${object.signup_url}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Change password</a>\n"
+" </div>\n"
+" <p>If you do not expect this, you can safely ignore this email.</p>\n"
+" <p>Best regards,</p>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777\">\n"
+" ${user.signature | safe}\n"
+" <p style=\"font-size: 11px; margin-top: 10px;\">\n"
+" <strong>Sent by ${user.company_id.name} using <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\">Odoo</a></strong>\n"
+" </p>\n"
+"</div>"
msgstr ""
#. module: auth_signup
-#: model:mail.template,body_html:auth_signup.reset_password_email
+#: model:mail.template,body_html:auth_signup.set_password_email
msgid "\n"
-"<p>A password reset was requested for the Odoo account linked to this email.</p>\n"
-"\n"
-"<p>You may change your password by following <a href=\"${object.signup_url}\">this link</a>, which will remain valid during 24 hours.</p>\n"
-"\n"
-"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+"<p>Dear ${object.name},</p>\n"
+" <p>\n"
+" You have been invited to connect to \"${object.company_id.name}\" in order to get access to your documents in Odoo.\n"
+" </p>\n"
+" <p>\n"
+" To accept the invitation, click on the following link:\n"
+" </p>\n"
+" <div style=\"text-align: center; margin-top: 16px;\">\n"
+" <a href=\"${object.signup_url}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Accept invitation to \"${object.company_id.name}\"</a>\n"
+" </div>\n"
+" <p>Best regards,</p>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777\">\n"
+" ${user.signature | safe}\n"
+" <p style=\"font-size: 11px; margin-top: 10px;\">\n"
+" <strong>Sent by ${user.company_id.name} using <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\">Odoo</a></strong>\n"
+" </p>\n"
+"</div>"
msgstr ""
#. module: auth_signup
@@ -75,19 +99,19 @@ msgid "Allow external users to sign up"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:64
+#: code:addons/auth_signup/controllers/main.py:61
#, python-format
msgid "An email has been sent with credentials to reset your password"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:40
+#: code:addons/auth_signup/controllers/main.py:38
#, python-format
msgid "Another user is already registered using this email address."
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:115
+#: code:addons/auth_signup/controllers/main.py:111
#, python-format
msgid "Authentication Failed."
msgstr ""
@@ -99,7 +123,7 @@ msgid "Back to Login"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/res_users.py:277
+#: code:addons/auth_signup/models/res_users.py:135
#, python-format
msgid "Cannot send email: user %s has no email address."
msgstr ""
@@ -116,17 +140,17 @@ msgstr ""
#. module: auth_signup
#: selection:res.users,state:0
-msgid "Connected"
+msgid "Confirmed"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:43
+#: code:addons/auth_signup/controllers/main.py:41
#, python-format
msgid "Could not create a new account."
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/controllers/main.py:66
+#: code:addons/auth_signup/controllers/main.py:63
#, python-format
msgid "Could not reset your password"
msgstr ""
@@ -173,7 +197,7 @@ msgid "Reset Password"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/res_users.py:253
+#: code:addons/auth_signup/models/res_users.py:108
#, python-format
msgid "Reset password: invalid username or email"
msgstr ""
@@ -195,18 +219,6 @@ msgid "Sign up"
msgstr ""
#. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_expiration
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_expiration
-msgid "Signup Expiration"
-msgstr ""
-
-#. module: auth_signup
-#: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_token
-#: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_token
-msgid "Signup Token"
-msgstr ""
-
-#. module: auth_signup
#: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_type
#: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_type
msgid "Signup Token Type"
@@ -225,6 +237,18 @@ msgid "Signup URL"
msgstr ""
#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_expiration
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_expiration
+msgid "Signup expiration"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_token
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_token
+msgid "Signup token"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.model.fields,field_description:auth_signup.field_res_users_state
msgid "Status"
msgstr ""
@@ -235,6 +259,11 @@ msgid "Template user for new users created through signup"
msgstr ""
#. module: auth_signup
+#: model:ir.model.fields,help:auth_signup.field_res_users_website_url
+msgid "The full URL to access the document through the website."
+msgstr ""
+
+#. module: auth_signup
#: model:ir.model.fields,help:auth_signup.field_base_config_settings_auth_signup_reset_password
msgid "This allows users to trigger a password reset from the Login page."
msgstr ""
@@ -245,6 +274,41 @@ msgid "Users"
msgstr ""
#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_published
+msgid "Visible in Website"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_description
+msgid "Website Partner Full Description"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_short_description
+msgid "Website Partner Short Description"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_url
+msgid "Website URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_description
+msgid "Website meta description"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_keywords
+msgid "Website meta keywords"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model.fields,field_description:auth_signup.field_res_users_website_meta_title
+msgid "Website meta title"
+msgstr ""
+
+#. module: auth_signup
#: model:ir.ui.view,arch_db:auth_signup.fields
#: model:ir.ui.view,arch_db:auth_signup.reset_password
msgid "Your Email"
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index 1d2c7ad4a2b..2c97f58c675 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:27+0000\n"
-"PO-Revision-Date: 2015-09-14 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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 ""
@@ -108,11 +110,21 @@ 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
msgid "Created by"
@@ -125,6 +137,16 @@ 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
#: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin_display_name
@@ -132,25 +154,35 @@ 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"
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:122
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
#, python-format
msgid "Error : Document not editable"
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:60
#, python-format
msgid "Error : No last scanned barcode"
msgstr ""
@@ -182,6 +214,16 @@ 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"
msgstr ""
@@ -192,6 +234,11 @@ 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"
" encoded into the barcode. They are indicated by <code>{NNN}</code> where the N's\n"
@@ -202,6 +249,11 @@ msgid "Patterns can also define how numerical values, such as weight or price, c
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"
msgstr ""
@@ -218,7 +270,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:77
#, python-format
msgid "Set quantity"
msgstr ""
@@ -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 ""
@@ -258,14 +310,14 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:122
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
#, python-format
msgid "To modify this document, please first start edition."
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:60
#, python-format
msgid "To set the quantity please scan a barcode first."
msgstr ""
@@ -281,6 +333,11 @@ msgid "UPC Codes can be converted to EAN by prefixing them with a zero. This set
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"
msgstr ""
@@ -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 ""
@@ -307,6 +365,11 @@ 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"
msgstr ""
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index 114a4ea4fe2..7984ea9b352 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-09 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,11 @@ msgid "Action Rule"
msgstr ""
#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule_line_test
+msgid "Action Rule Line Test"
+msgstr ""
+
+#. module: base_action_rule
#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
msgid "Action Rule Test"
msgstr ""
@@ -109,18 +114,16 @@ 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
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_create_uid
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"
msgstr ""
@@ -136,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
@@ -152,6 +157,7 @@ msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_display_name
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_display_name
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_display_name
msgid "Display Name"
msgstr ""
@@ -193,6 +199,7 @@ msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_id
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_id
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_id
msgid "ID"
msgstr ""
@@ -231,27 +238,40 @@ msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule___last_update
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test___last_update
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test___last_update
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
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_write_uid
msgid "Last Updated by"
msgstr ""
#. module: base_action_rule
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_write_date
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_write_date
#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_write_date
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"
msgstr ""
@@ -267,6 +287,11 @@ msgid "Months"
msgstr ""
#. module: base_action_rule
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_name
+msgid "Name"
+msgstr ""
+
+#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "New"
msgstr ""
@@ -363,21 +388,6 @@ 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"
msgstr ""
@@ -397,13 +407,19 @@ msgid "Use automated actions to automatically trigger actions for\n"
msgstr ""
#. module: base_action_rule
+#: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_line_test_user_id
+msgid "User id"
+msgstr ""
+
+#. module: base_action_rule
#: model:ir.model.fields,help:base_action_rule.field_base_action_rule_trg_date_calendar_id
msgid "When calculating a day-based timed condition, it is possible to use a calendar to compute the date based on working days."
msgstr ""
#. 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
diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot
index 26d5c926ed1..86a3aaf194c 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,6 +51,11 @@ msgid "Check this box if you're using the sandbox mode of Gengo, mainly used for
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"
msgstr ""
@@ -112,6 +117,11 @@ msgstr ""
#. module: base_gengo
#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
+msgid "Gengo Public or Private keys are wrong or missing."
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.ui.view,arch_db:base_gengo.base_gengo_translation_wizard_from
msgid "Gengo Request Form"
msgstr ""
@@ -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 ""
@@ -257,11 +272,6 @@ 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"
msgstr ""
diff --git a/addons/base_geolocalize/i18n/base_geolocalize.pot b/addons/base_geolocalize/i18n/base_geolocalize.pot
index de05a233699..6be98270e5f 100644
--- a/addons/base_geolocalize/i18n/base_geolocalize.pot
+++ b/addons/base_geolocalize/i18n/base_geolocalize.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,9 +31,9 @@ msgid "<span> ; Long: </span>"
msgstr ""
#. module: base_geolocalize
-#: code:addons/base_geolocalize/models/res_partner.py:23
+#: code:addons/base_geolocalize/models/res_partner.py:17
#, python-format
-msgid "Cannot contact geolocation servers. Please make sure that your internet connection is up and running (%s)."
+msgid "Cannot contact geolocation servers. Please make sure that your Internet connection is up and running (%s)."
msgstr ""
#. module: base_geolocalize
@@ -42,23 +42,23 @@ msgid "Geo Latitude"
msgstr ""
#. module: base_geolocalize
-#: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_date_localization
-msgid "Geo Localization Date"
+#: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_longitude
+msgid "Geo Longitude"
msgstr ""
#. module: base_geolocalize
#: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form
-msgid "Geo Localize"
+msgid "Geolocate"
msgstr ""
#. module: base_geolocalize
#: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form
-msgid "Geo Location"
+msgid "Geolocation"
msgstr ""
#. module: base_geolocalize
-#: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_longitude
-msgid "Geo Longitude"
+#: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_date_localization
+msgid "Geolocation Date"
msgstr ""
#. module: base_geolocalize
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index 5d2cb8f5d74..6f2b6aa43d9 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,32 +21,32 @@ msgid "Bank Accounts"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:57
+#: code:addons/base_iban/models/res_partner_bank.py:57
#, python-format
msgid "Cannot compute the BBAN because the account number is not an IBAN."
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:26
+#: code:addons/base_iban/models/res_partner_bank.py:26
#, python-format
msgid "No IBAN !"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:34
+#: code:addons/base_iban/models/res_partner_bank.py:34
#, python-format
msgid "The IBAN does not seem to be correct. You should have entered something like this %s\n"
"Where B = National bank code, S = Branch code, C = Account No, k = Check digit"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:30
+#: code:addons/base_iban/models/res_partner_bank.py:30
#, python-format
msgid "The IBAN is invalid, it should begin with the country code"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:40
+#: code:addons/base_iban/models/res_partner_bank.py:40
#, python-format
msgid "This IBAN does not pass the validation check, please verify it."
msgstr ""
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index de9dc117fbe..a86338cc8ea 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.0e\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-18 13:40+0000\n"
-"PO-Revision-Date: 2015-12-18 13:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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:466
+#: 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:281
+#: 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
@@ -232,17 +95,24 @@ 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:147
-#: code:addons/base_import/models.py:153
+#. 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:315
+#: 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:204
-#, 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:443
+#: 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:112
-#: code:addons/base_import/models.py:146
-#: 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
@@ -331,133 +191,46 @@ 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)"
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:490
+#: 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:477
+#: 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,115 +260,34 @@ 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
#: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly___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:363
+#: 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:364
+#: 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:173
+#: 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:174
+#: 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:376
+#: 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:460
+#: 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:462
+#: 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 0c35cb20470..3264c03b894 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,12 @@ 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"
msgstr ""
@@ -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 ""
@@ -121,6 +127,18 @@ 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"
msgstr ""
@@ -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 dd29a3eadca..ba1929a57e1 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-09-29 10:25+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,11 @@ msgid "Allow documents sharing"
msgstr ""
#. module: base_setup
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_currency
+msgid "Allow multi currencies"
+msgstr ""
+
+#. module: base_setup
#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_google_calendar
msgid "Allow the users to synchronize their calendar with Google Calendar"
msgstr ""
@@ -36,8 +41,12 @@ msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
msgstr ""
#. module: base_setup
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_currency
+msgid "Allows to work in a multi currency environment"
+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 ""
@@ -53,22 +62,10 @@ 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"
msgstr ""
@@ -80,36 +77,20 @@ 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"
-msgstr ""
-
-#. module: base_setup
#: model:ir.ui.view,arch_db:base_setup.view_general_configuration
msgid "Email"
msgstr ""
@@ -141,19 +122,7 @@ 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 ""
@@ -169,22 +138,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 ""
@@ -194,33 +157,23 @@ msgid "Manage Inter Company"
msgstr ""
#. module: base_setup
-#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_light_multi_company
+#: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_multi_company
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"
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 "Multi Currencies"
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
@@ -251,16 +204,6 @@ 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."
msgstr ""
@@ -277,13 +220,8 @@ msgid "This installs the module inter_company_rules.\n"
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
@@ -296,16 +234,11 @@ msgid "When you send a document to a customer\n"
msgstr ""
#. module: base_setup
-#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_light_multi_company
+#: model:ir.model.fields,help:base_setup.field_base_config_settings_group_multi_company
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."
msgstr ""
@@ -315,13 +248,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/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 155835143eb..5cd3ae55c5c 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,25 +26,19 @@ msgid "If checked, Partners VAT numbers will be fully validated against EU's VIE
msgstr ""
#. module: base_vat
-#: code:addons/base_vat/base_vat.py:111
-#, python-format
-msgid "Importing VAT Number [%s] is not valid !"
-msgstr ""
-
-#. module: base_vat
#: model:ir.model,name:base_vat.model_res_partner
msgid "Partner"
msgstr ""
#. module: base_vat
-#: code:addons/base_vat/base_vat.py:128
+#: code:addons/base_vat/models/res_partner.py:131
#, python-format
msgid "The VAT number [%s] for partner [%s] does not seem to be valid. \n"
"Note: the expected format is %s"
msgstr ""
#. module: base_vat
-#: code:addons/base_vat/base_vat.py:127
+#: code:addons/base_vat/models/res_partner.py:130
#, python-format
msgid "The VAT number [%s] for partner [%s] either failed the VIES VAT validation check or did not respect the expected format %s."
msgstr ""
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 77b65f7bbaf..a0256fac462 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:24
+#: code:addons/board/static/src/xml/board.xml:25
#, python-format
msgid "&nbsp;"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:406
+#: code:addons/board/static/src/js/dashboard.js:409
#, python-format
msgid "'%s' added to dashboard"
msgstr ""
@@ -50,7 +50,7 @@ msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:139
+#: code:addons/board/static/src/js/dashboard.js:141
#, python-format
msgid "Are you sure you want to remove this item ?"
msgstr ""
@@ -61,122 +61,66 @@ msgid "Board"
msgstr ""
#. module: board
-#: model:ir.model,name:board.model_board_create
-msgid "Board Creation"
-msgstr ""
-
-#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_name
-msgid "Board Name"
-msgstr ""
-
-#. module: board
-#: model:ir.ui.view,arch_db:board.view_board_create
-msgid "Cancel"
-msgstr ""
-
-#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:6
+#: code:addons/board/static/src/xml/board.xml:7
#, python-format
msgid "Change Layout"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:4
+#: code:addons/board/static/src/xml/board.xml:5
#, python-format
msgid "Change Layout.."
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/xml/board.xml:36
+#: code:addons/board/static/src/xml/board.xml:37
#, python-format
msgid "Choose dashboard layout"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:408
+#: code:addons/board/static/src/js/dashboard.js:411
#, python-format
msgid "Could not add filter to dashboard"
msgstr ""
#. module: board
-#: model:ir.ui.view,arch_db:board.view_board_create
-msgid "Create"
-msgstr ""
-
-#. module: board
-#: model:ir.actions.act_window,name:board.action_board_create
-#: model:ir.ui.menu,name:board.menu_board_create
-msgid "Create Board"
-msgstr ""
-
-#. module: board
-#: model:ir.ui.view,arch_db:board.view_board_create
-msgid "Create New Dashboard"
-msgstr ""
-
-#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: board
#: model:ir.model.fields,field_description:board.field_board_board_display_name
-#: model:ir.model.fields,field_description:board.field_board_create_display_name
msgid "Display Name"
msgstr ""
#. module: board
#. openerp-web
-#: code:addons/board/static/src/js/dashboard.js:94
+#: code:addons/board/static/src/js/dashboard.js:96
#, python-format
msgid "Edit Layout"
msgstr ""
#. module: board
#: model:ir.model.fields,field_description:board.field_board_board_id
-#: model:ir.model.fields,field_description:board.field_board_create_id
msgid "ID"
msgstr ""
#. module: board
#: model:ir.model.fields,field_description:board.field_board_board___last_update
-#: model:ir.model.fields,field_description:board.field_board_create___last_update
msgid "Last Modified on"
msgstr ""
#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: board
+#. openerp-web
+#: code:addons/board/static/src/js/dashboard.js:32
#: model:ir.actions.act_window,name:board.open_board_my_dash_action
#: model:ir.ui.menu,name:board.menu_board_my_dash
#: model:ir.ui.view,arch_db:board.board_my_dash_view
+#, python-format
msgid "My Dashboard"
msgstr ""
#. module: board
-#: model:ir.model.fields,field_description:board.field_board_create_menu_parent_id
-msgid "Parent Menu"
-msgstr ""
-
-#. module: board
#: model:ir.actions.act_window,help:board.open_board_my_dash_action
msgid "To add your first report into this dashboard, go to any\n"
" menu, switch to list or graph view, and click <i>'Add to\n"
diff --git a/addons/bus/i18n/bus.pot b/addons/bus/i18n/bus.pot
index 513bf639336..94658009c35 100644
--- a/addons/bus/i18n/bus.pot
+++ b/addons/bus/i18n/bus.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,22 +37,31 @@ msgstr ""
#. module: bus
#: model:ir.model.fields,field_description:bus.field_bus_bus_create_uid
-#: model:ir.model.fields,field_description:bus.field_bus_presence_create_uid
msgid "Created by"
msgstr ""
#. module: bus
-#: model:ir.model.fields,field_description:bus.field_bus_presence_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: bus
#: model:ir.model.fields,field_description:bus.field_bus_bus_display_name
#: model:ir.model.fields,field_description:bus.field_bus_presence_display_name
msgid "Display Name"
msgstr ""
#. module: bus
+#: model:ir.model.fields,field_description:bus.field_res_users_partner_latitude
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: bus
+#: model:ir.model.fields,field_description:bus.field_res_users_partner_longitude
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: bus
+#: model:ir.model.fields,field_description:bus.field_res_users_date_localization
+msgid "Geolocation Date"
+msgstr ""
+
+#. module: bus
#: model:ir.model.fields,field_description:bus.field_bus_bus_id
#: model:ir.model.fields,field_description:bus.field_bus_presence_id
msgid "ID"
@@ -83,13 +92,11 @@ msgstr ""
#. module: bus
#: model:ir.model.fields,field_description:bus.field_bus_bus_write_uid
-#: model:ir.model.fields,field_description:bus.field_bus_presence_write_uid
msgid "Last Updated by"
msgstr ""
#. module: bus
#: model:ir.model.fields,field_description:bus.field_bus_bus_write_date
-#: model:ir.model.fields,field_description:bus.field_bus_presence_write_date
msgid "Last Updated on"
msgstr ""
diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot
index 0df6f9193e8..d86b8b5d0d8 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-20 13:58+0000\n"
-"PO-Revision-Date: 2016-01-20 13:58+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,391 +16,305 @@ msgstr ""
"Plural-Forms: \n"
#. module: calendar
-#: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
+#: model:mail.template,body_html:calendar.calendar_template_meeting_changedate
msgid "\n"
-" <style>\n"
-" span.oe_mail_footer_access {\n"
-" display:block; \n"
-" text-align:center;\n"
-" color:grey; \n"
-" }\n"
-" </style>\n"
-" <div style=\"border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;\">\n"
-" <div style=\"height:auto;text-align: center;font-size : 30px;color: #8A89BA;\">\n"
-" <strong>${object.event_id.name}</strong> \n"
-" </div>\n"
-" <div style=\"height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px\">\n"
-" <strong style=\"margin-left:12px\">Dear ${object.cn}</strong> ,<br/>\n"
-" <p style=\"margin-left:12px\">That is a reminder for the event below : </p>\n"
-" </div>\n"
-" <div style=\"height: auto;margin-left:12px;margin-top:30px;\">\n"
-" <table>\n"
-" <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;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;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"
-" </td>\n"
-" <td>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin-top: 15px; margin-left: 10px;font-size: 16px;\">\n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Where\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style = \"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px\" >\n"
-" : ${object.event_id.location}\n"
-" <span style= \"color:#A9A9A9; \">(<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </span>\n"
-" </div>\n"
-" % endif\n"
-" </td> \n"
-" </tr> \n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" What\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:text-top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${object.event_id.description}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"height:auto; width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Duration\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td colspan=\"3\" style=\"vertical-align:text-top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr> \n"
-" <tr style=\" height: 30px;\">\n"
-" <td style=\"height: 25px;width: 120px; background : # CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" <div>\n"
-" Attendees\n"
-" </div>\n"
-" </td>\n"
-" <td colspan=\"3\">\n"
-" : \n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" % endfor\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div> \n"
+"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
+" <p>\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">View</a>\n"
+" </p>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
+" <div>\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
" </div>\n"
-" \n"
-" "
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
+" <p style=\"font-size: 20px; text-align: center;\"><strong>${object.event_id.name} date updated</strong></p>\n"
+" <p>\n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
+" The date of the meeting has been upated. The meeting ${object.event_id.name} created by ${object.event_id.user_id.partner_id.name} is now scheduled for ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.\n"
+" </p>\n"
+" <table style=\"margin-top: 20px;\"><tr>\n"
+" <td>\n"
+" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #a24689;\">\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('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"
+" <p>Details of the event</p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>"
msgstr ""
#. module: calendar
#: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
msgid "\n"
-" <style> \n"
-" span.oe_mail_footer_access {\n"
-" display:block; \n"
-" text-align:center;\n"
-" color:grey; \n"
-" }\n"
-" </style>\n"
-" <div style=\"border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;\">\n"
-" <div style=\"height:auto;text-align: center;font-size : 30px;color: #8A89BA;\">\n"
-" <strong>${object.event_id.name}</strong>\n"
-" </div>\n"
-" <div style=\"height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px\">\n"
-" <strong style=\"margin-left:12px\">Dear ${object.cn}</strong> ,<br/><p style=\"margin-left:12px\">${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"
-" </div>\n"
-" <div style=\"height: auto;margin-left:12px;margin-top:30px;\">\n"
-" <table>\n"
-" <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;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;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"
-" </td>\n"
-" <td>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin-top: 15px; margin-left: 10px;font-size: 16px;\">\n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Where\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style = \"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px\" >\n"
-" : ${object.event_id.location}\n"
-" <span style= \"color:#A9A9A9; \">(<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </span>\n"
-" </div>\n"
-" % endif\n"
-" </td> \n"
-" </tr> \n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" What\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:text-top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${object.event_id.description}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"height:auto; width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Duration\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td colspan=\"3\" style=\"vertical-align:text-top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr> \n"
-" <tr style=\" height: 30px;\">\n"
-" <td style=\"height: 25px;width: 120px; background : # CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" <div>\n"
-" Attendees\n"
-" </div>\n"
-" </td>\n"
-" <td colspan=\"3\">\n"
-" : \n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" % endfor\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;\">\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">Accept</a>\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">Decline</a>\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">View</a>\n"
-" </div> \n"
+"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
+" <p>\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">View</a>\n"
+" </p>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
+" <div>\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
" </div>\n"
-" \n"
-" "
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
+" <p style=\"font-size: 20px; text-align: center;\">Invitation to <strong>${object.event_id.name}</strong></p>\n"
+" <p>\n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
+" ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.</p>\n"
+" <table style=\"margin-top: 20px;\"><tr>\n"
+" <td>\n"
+" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #a24689;\">\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('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"
+" <p>Details of the event</p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>"
msgstr ""
#. module: calendar
-#: model:mail.template,body_html:calendar.calendar_template_meeting_changedate
-msgid " \n"
-" <style>\n"
-" span.oe_mail_footer_access {\n"
-" display:block; \n"
-" text-align:center;\n"
-" color:grey; \n"
-" }\n"
-" </style>\n"
-" <div style=\"border-radius: 2px; max-width: 1200px; height: auto;margin-left: auto;margin-right: auto;background-color:#f9f9f9;\">\n"
-" <div style=\"height:auto;text-align: center;font-size : 30px;color: #8A89BA;\">\n"
-" <strong>${object.event_id.name}</strong>\n"
-" </div>\n"
-" <div style=\"height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px\">\n"
-" <strong style=\"margin-left:12px\">Dear ${object.cn}</strong> ,<br/>\n"
-" <p style=\"margin-left:12px\">The date of the meeting has been changed...<br/>\n"
-" The meeting 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)}.</p>\n"
-" </div>\n"
-" <div style=\"height: auto;margin-left:12px;margin-top:30px;\">\n"
-" <table>\n"
-" <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;border-color:#ffffff;background:#8a89ba;padding-top: 4px;\">${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;\">\n"
-" ${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n"
-" </div>\n"
-" <div style='font-size:12px;text-align:center;font-weight:bold;color:#ffffff;background-color:#8a89ba'>${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}</div>\n"
-" <div style=\"border-collapse:separate;color:#8a89ba;text-align:center;width: 128px;font-size:12px;border-bottom-right-radius:3px;font-weight:bold;border:1px solid;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"
-" </td>\n"
-" <td>\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin-top: 15px; margin-left: 10px;font-size: 16px;\">\n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Where\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.location:\n"
-" <div style = \"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px\" >\n"
-" : ${object.event_id.location}\n"
-" <span style= \"color:#A9A9A9; \">(<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
-" </span>\n"
-" </div>\n"
-" % endif\n"
-" </td> \n"
-" </tr> \n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" What\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td style=\"vertical-align:text-top;\">\n"
-" % if object.event_id.description :\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${object.event_id.description}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr>\n"
-" \n"
-" <tr>\n"
-" <td style=\"vertical-align:top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"height:auto; width: 120px; background : #CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" Duration\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" <td colspan=\"3\" style=\"vertical-align:text-top;\">\n"
-" % if not object.event_id.allday and object.event_id.duration:\n"
-" <div style=\"font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}\n"
-" </div>\n"
-" % endif\n"
-" </td>\n"
-" </tr> \n"
-" <tr style=\" height: 30px;\">\n"
-" <td style=\"height: 25px;width: 120px; background : # CCCCCC; font-family: Lucida Grande', Ubuntu, Arial, Verdana, sans-serif;\">\n"
-" <div>\n"
-" Attendees\n"
-" </div>\n"
-" </td>\n"
-" <td colspan=\"3\">\n"
-" : \n"
-" % for attendee in object.event_id.attendee_ids:\n"
-" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${'color' in ctx and ctx['color'][attendee.state] or 'white'};\"></div>\n"
-" % if attendee.cn != object.cn:\n"
-" <span style=\"margin-left:5px\">${attendee.cn}</span>\n"
-" % else:\n"
-" <span style=\"margin-left:5px\">You</span>\n"
-" % endif\n"
-" % endfor\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </td>\n"
-" </tr>\n"
-" </table> \n"
-" </div>\n"
-" <div style=\"height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;\">\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">Accept</a>\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">Decline</a>\n"
-" <a style=\"padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;\" href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\">View</a>\n"
-" </div> \n"
+#: model:mail.template,body_html:calendar.calendar_template_meeting_reminder
+msgid "\n"
+"% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}\n"
+"<div summary=\"o_mail_template\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:10px 10px 10px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" <td valign=\"center\" align=\"right\" width=\"340\" style=\"padding:10px 10px 10px 5px; font-size: 12px;\">\n"
+" <p>\n"
+" <a href=\"/calendar/meeting/accept?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Accept</a>\n"
+" <a href=\"/calendar/meeting/decline?db=${'dbname' in ctx and ctx['dbname'] or '' }&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">Decline</a>\n"
+" <a href=\"/calendar/meeting/view?db=${'dbname' in ctx and ctx['dbname'] or ''}&token=${object.access_token}&action=${'action_id' in ctx and ctx['action_id'] or ''}&id=${object.event_id.id}\" style=\"padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\">View</a>\n"
+" </p>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding:10px 10px 10px 5px;\">\n"
+" <div>\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
" </div>\n"
-" \n"
-" "
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:10px 10px 10px 5px;font-size: 14px;\">\n"
+" <p style=\"font-size: 20px; text-align: center;\">Reminder for <strong>${object.event_id.name}</strong></p>\n"
+" <p>\n"
+" <strong>Dear ${object.common_name}</strong>,<br />\n"
+" This is a reminder for the below event :\n"
+" </p>\n"
+" <table style=\"margin-top: 20px;\"><tr>\n"
+" <td>\n"
+" <div style=\"border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;background:#a24689;padding-top: 4px;\">\n"
+" ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n"
+" </div>\n"
+" <div style=\"font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #F8F8F8;width: 130px;border:1px solid #a24689;\">\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('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"
+" <p>Details of the event</p>\n"
+" <ul>\n"
+" % if object.event_id.location:\n"
+" <li>Location: ${object.event_id.location}\n"
+" (<a href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n"
+" </li>\n"
+" % endif\n"
+" % if object.event_id.description :\n"
+" <li>Description: ${object.event_id.description}</li>\n"
+" % endif\n"
+" % if not object.event_id.allday and object.event_id.duration\n"
+" <li>Duration: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}</li>\n"
+" % endif\n"
+" <li>Attendees\n"
+" <ul>\n"
+" % for attendee in object.event_id.attendee_ids:\n"
+" <li>\n"
+" <div style=\"display:inline-block; border-radius: 50%; width:10px; height:10px;background:${colors[attendee.state] or 'white'};\"></div>\n"
+" % if attendee.common_name != object.common_name:\n"
+" <span style=\"margin-left:5px\">${attendee.common_name}</span>\n"
+" % else:\n"
+" <span style=\"margin-left:5px\">You</span>\n"
+" % endif\n"
+" </li>\n"
+" % endfor\n"
+" </ul></li>\n"
+" </ul>\n"
+" </td>\n"
+" </tr></table>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>"
msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:34
+#: code:addons/calendar/static/src/js/base_calendar.js:95
#, python-format
msgid " [Me]"
msgstr ""
#. module: calendar
-#: model:mail.template,subject:calendar.calendar_template_meeting_invitation
-msgid "${object.event_id.name}"
+#: model:mail.template,subject:calendar.calendar_template_meeting_reminder
+msgid "${object.event_id.name} - Reminder"
msgstr ""
#. module: calendar
-#: model:mail.template,subject:calendar.calendar_template_meeting_changedate
-msgid "${object.event_id.name} - Date has been updated"
+#: model:mail.template,subject:calendar.calendar_template_meeting_invitation
+msgid "${object.event_id.name} invitation"
msgstr ""
#. module: calendar
-#: model:mail.template,subject:calendar.calendar_template_meeting_reminder
-msgid "${object.event_id.name} - Reminder"
+#: model:mail.template,subject:calendar.calendar_template_meeting_changedate
+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 ""
@@ -412,12 +326,6 @@ msgid "<span> hours</span>"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1613
-#, python-format
-msgid "A email has been send to specify that the date has been changed !"
-msgstr ""
-
-#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Accept"
msgstr ""
@@ -429,18 +337,14 @@ msgid "Accepted"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: calendar
+#: model:ir.model.fields,field_description:calendar.field_calendar_contacts_active
#: model:ir.model.fields,field_description:calendar.field_calendar_event_active
msgid "Active"
msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:120
+#: code:addons/calendar/static/src/js/base_calendar.js:75
#, python-format
msgid "Add Favorite Calendar"
msgstr ""
@@ -451,7 +355,7 @@ msgid "All Day"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:770
+#: code:addons/calendar/models/calendar.py:634
#, python-format
msgid "AllDay , %s"
msgstr ""
@@ -462,18 +366,6 @@ msgid "Amount"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1090
-#, python-format
-msgid "An invitation email has been sent to attendee %s"
-msgstr ""
-
-#. module: calendar
-#: code:addons/calendar/calendar.py:1424
-#, python-format
-msgid "An invitation email has been sent to attendee(s)"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_is_attendee
msgid "Attendee"
msgstr ""
@@ -489,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"
@@ -502,7 +394,7 @@ msgid "Availability"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1715
+#: code:addons/calendar/models/calendar.py:1474
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#, python-format
@@ -529,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 ""
@@ -551,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 ""
@@ -585,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 ""
@@ -595,11 +486,6 @@ msgid "Date of month"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Day of Month"
msgstr ""
@@ -650,9 +536,9 @@ msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:153
+#: 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
@@ -674,9 +560,13 @@ msgid "Email"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1386
-#, python-format
-msgid "Email addresses not found"
+#: model:ir.model,name:calendar.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: calendar
+#: model:ir.model,name:calendar.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
msgstr ""
#. module: calendar
@@ -711,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:820
+#, python-format
+msgid "Ending date cannot be set before starting date."
+msgstr ""
+
+#. module: calendar
+#: code:addons/calendar/models/calendar.py:818
+#, python-format
+msgid "Ending datetime cannot be set before starting datetime."
msgstr ""
#. module: calendar
@@ -731,20 +628,20 @@ msgid "Event alarm"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1252
+#: code:addons/calendar/models/calendar.py:1057
#, python-format
msgid "Event recurrence interval cannot be negative."
msgstr ""
#. module: calendar
#. openerp-web
-#: code:addons/calendar/static/src/js/base_calendar.js:44
+#: 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 ""
@@ -759,27 +656,12 @@ msgid "First"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:143
+#: code:addons/calendar/models/calendar.py:859
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.event,byday:0
msgid "Fourth"
msgstr ""
@@ -811,7 +693,7 @@ msgid "Group By"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1659
+#: code:addons/calendar/models/calendar.py:1422
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -837,16 +719,6 @@ msgid "ID"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,help:calendar.field_calendar_event_active
msgid "If the active field is set to false, it will allow you to hide the event alarm information without removing it."
msgstr ""
@@ -867,6 +739,11 @@ 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"
msgstr ""
@@ -877,21 +754,11 @@ msgid "Invite wizard"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.event,byday:0
msgid "Last"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_alarm___last_update
#: model:ir.model.fields,field_description:calendar.field_calendar_alarm_manager___last_update
#: model:ir.model.fields,field_description:calendar.field_calendar_attendee___last_update
@@ -931,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 ""
@@ -992,11 +860,6 @@ msgid "Message"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.alarm,interval:0
msgid "Minute(s)"
msgstr ""
@@ -1044,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 ""
@@ -1056,26 +917,11 @@ msgid "Notification"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.event,end_type:0
msgid "Number of repetitions"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: calendar
#. openerp-web
#: code:addons/calendar/static/src/xml/base_calendar.xml:17
#, python-format
@@ -1083,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 ""
@@ -1108,18 +954,23 @@ 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:1265
+#: code:addons/calendar/models/calendar.py:1070
#, 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 ""
@@ -1330,12 +1181,6 @@ msgid "The calendar is shared between employees and fully integrated with\n"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1382
-#, python-format
-msgid "The following contacts have no email address :"
-msgstr ""
-
-#. module: calendar
#: selection:calendar.event,byday:0
msgid "Third"
msgstr ""
@@ -1388,17 +1233,11 @@ msgid "Unit"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_unread
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_search
msgid "Unread Messages"
msgstr ""
#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: calendar
#: model:ir.ui.view,arch_db:calendar.view_calendar_event_form
msgid "Until"
msgstr ""
@@ -1409,21 +1248,6 @@ msgid "Update only this instance"
msgstr ""
#. module: calendar
-#: model:mail.message.subtype,description:calendar.subtype_invitation
-msgid "Warning, a mandatory field has been modified since the creation of this event"
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,field_description:calendar.field_calendar_event_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: calendar
-#: model:ir.model.fields,help:calendar.field_calendar_event_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: calendar
#: model:ir.model.fields,field_description:calendar.field_calendar_event_we
msgid "Wed"
msgstr ""
@@ -1444,50 +1268,22 @@ 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"
msgstr ""
@@ -1503,7 +1299,7 @@ msgid "e.g. Business Lunch"
msgstr ""
#. module: calendar
-#: code:addons/calendar/calendar.py:1250
+#: code:addons/calendar/models/calendar.py:1055
#, python-format
msgid "interval cannot be negative."
msgstr ""
@@ -1513,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/contacts/i18n/contacts.pot b/addons/contacts/i18n/contacts.pot
new file mode 100644
index 00000000000..e6f3a61a688
--- /dev/null
+++ b/addons/contacts/i18n/contacts.pot
@@ -0,0 +1,35 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contacts
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid "Click to add a contact in your contacts directory."
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid "Odoo helps you easily track all activities related to\n"
+" a customer: discussions, history of business opportunities,\n"
+" documents, etc."
+msgstr ""
+
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index f500682dec9..bc729dfa7d7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:17+0000\n"
-"PO-Revision-Date: 2015-10-09 09:17+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,122 @@ msgstr ""
"Plural-Forms: \n"
#. module: crm
+#: model:mail.template,body_html:crm.mail_template_data_module_install_crm
+msgid "\n"
+" % set last_created_team = user.env['crm.team'].search([], order=\"create_date desc\")[0]\n"
+"\n"
+" <div style=\"margin: 10px auto;\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:2px;width:30%;\">\n"
+" <img src=\"web/static/src/img/logo.png\"/>\n"
+" </td>\n"
+" <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
+" <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #a24689;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:15px 10px;font-size:20px\">\n"
+" <p style=\"color:#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"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-size:13px;font-weight:bold; \">What’s next?</span></p>\n"
+" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Try creating a lead by sending an email to </span>\n"
+" <a href=\"mailto:${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_team.alias_id.name_get()[0][1] if last_created_team.alias_id.alias_domain else user.company_id.email}</span>\n"
+" </a>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>Track your opportunities in your sale funnel by simply dragging and dropping the cards from one column to another</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul> <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Discover the </span>\n"
+" <span><a href=\"/web#view_type=list&model=crm.lead&action=crm.crm_lead_all_leads\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">CRM planner</span></a></span>\n"
+" <span> to activate extra features</span>\n"
+" <span style=\"color:#a24689;margin:0;font-weight:bold\">(${user.env['web.planner'].get_planner_progress('planner_crm')}% done)</span>\n"
+" </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>Automatically assign your leads to your salesmen with the lead scoring, </span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Keep in touch with your potential client with efficient email campaigns,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Gain high quality insight from surveys,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Get smart reporting and accurate dashboards,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>And much more...</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul>\n"
+" <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Need Help?</span>\n"
+" <span style=\"font-style:italic;\">You’re not alone</span>\n"
+" </p>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>We would be delighted to assist you along the way. Contact us 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"
+" 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\">\n"
+" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
+" </p>\n"
+" <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
+" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
+" </div>\n"
+" </div>"
+msgstr ""
+
+#. module: crm
+#: model:mail.template,body_html:crm.email_template_opportunity_reminder_mail
+msgid "\n"
+"<p>Hello ${object.user_id and object.user_id.name or ''},</p>\n"
+"<p>The opportunity <strong>${object.name}</strong> did not have any activity since at least 5 days.</p>\n"
+"%if object.description:\n"
+"<p>Here is the description about the opportunity : </p><p><i>${object.description}</i>\n"
+"%endif\n"
+"</p><p>Thank you!</p>\n"
+""
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_meeting_count
#: model:ir.model.fields,field_description:crm.field_res_partner_meeting_count
#: model:ir.model.fields,field_description:crm.field_res_users_meeting_count
@@ -43,19 +159,41 @@ 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 &amp; 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\"/>&amp;nbsp;"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "<i class=\"fa fa-question-circle\"> view examples</i>"
msgstr ""
#. module: crm
-#: model:ir.actions.server,body_html:crm.action_email_reminder_lead
-#: model:mail.template,body_html:crm.email_template_opportunity_reminder_mail
-msgid "<p>This opportunity did not have any activity since at least 5 days. Here are some details:</p>\n"
-"<ul>\n"
-"<li>Name: ${object.name}</li>\n"
-"<li>ID: ${object.id}</li>\n"
-"<li>Description: ${object.description}</li>\n"
-"</ul>"
+#. 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
@@ -274,16 +412,6 @@ msgid "<span class=\"panel-title\"><span data-icon=\"&#57463;\"/><strong> Exerci
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"
" We have special options for unlimited number of customizations!\n"
@@ -388,6 +516,11 @@ msgid "<strong>Recommended actions:</strong>"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form_schedule
+msgid "<strong>Recommended activities:</strong>"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "<strong>Review the top 5 opportunities</strong><br/>\n"
" Once the big picture is clear, focus on the best opportunities. Start from stages on the right (negotiation, proposal, etc) and review the biggest opportunities one by one with the team."
@@ -514,11 +647,6 @@ msgid "Accept Emails From"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_activity_view_search
msgid "Action Search"
msgstr ""
@@ -534,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
@@ -542,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 ""
@@ -565,11 +698,23 @@ msgid "Activities Done Target"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_next_activity_id
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_subtype_id
msgid "Activity"
msgstr ""
#. module: crm
+#: code:addons/crm/wizard/crm_activity_log.py:80
+#, python-format
+msgid "Activity Done"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_lead_kanban_state
+msgid "Activity State"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Add Features"
msgstr ""
@@ -618,16 +763,17 @@ msgid "Aligning your sales organization on a systematic\n"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:306
+#: 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:917
+#: 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
@@ -653,7 +799,6 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "Archived"
msgstr ""
@@ -669,16 +814,20 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.merge_opportunity_form
-#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner_mass
msgid "Assign opportunities to"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
+#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner_mass
msgid "Assign these opportunities to"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
+msgid "Assign this opportunity to"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_opening_date
msgid "Assignation Date"
msgstr ""
@@ -701,11 +850,6 @@ 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"
msgstr ""
@@ -746,11 +890,6 @@ msgid "Boost your online sales with sleek product pages."
msgstr ""
#. module: crm
-#: selection:crm.stage,type:0
-msgid "Both"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_message_bounce
msgid "Bounce"
msgstr ""
@@ -782,19 +921,6 @@ 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_lead_campaign_id
#: 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
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -803,7 +929,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
#: model:ir.ui.view,arch_db:crm.crm_lead_lost_view_form
#: model:ir.ui.view,arch_db:crm.merge_opportunity_form
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
@@ -838,8 +964,6 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_lost_reason_view_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 "Channel"
msgstr ""
@@ -855,8 +979,10 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_city
+#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_city
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
msgid "City"
msgstr ""
@@ -866,7 +992,21 @@ msgid "Classify and analyze your lead/opportunity categories like: Training, Ser
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:922
+#. 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 ""
@@ -892,13 +1032,8 @@ msgid "Click to define a new sales tag."
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
-msgid "Click to set a new stage in your lead/opportunity pipeline."
-msgstr ""
-
-#. module: crm
-#: model:web.tip,description:crm.crm_tip_2
-msgid "Click to view the opportunities related to this customer."
+#: model:ir.actions.act_window,help:crm.crm_stage_action
+msgid "Click to set a new stage in your opportunity pipeline."
msgstr ""
#. module: crm
@@ -913,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 ""
@@ -954,6 +1089,13 @@ 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"
msgstr ""
@@ -1053,11 +1195,21 @@ 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"
msgstr ""
@@ -1069,11 +1221,18 @@ msgstr ""
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2projectissue.wizard,action:0
#: selection:crm.partner.binding,action:0
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."
msgstr ""
@@ -1102,9 +1261,16 @@ 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
#: model:ir.model.fields,field_description:crm.field_crm_activity_create_uid
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_create_uid
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_create_uid
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_create_uid
#: model:ir.model.fields,field_description:crm.field_crm_lead_create_uid
@@ -1121,6 +1287,7 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_create_date
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_create_date
#: model:ir.model.fields,field_description:crm.field_crm_activity_create_date
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_create_date
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_create_date
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_create_date
#: model:ir.model.fields,field_description:crm.field_crm_lead_lost_create_date
@@ -1133,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 ""
@@ -1161,9 +1327,11 @@ msgid "Current Line"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:996
+#: 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
@@ -1175,7 +1343,7 @@ msgid "Customer"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:998
+#: code:addons/crm/models/crm_lead.py:1103
#, python-format
msgid "Customer Email"
msgstr ""
@@ -1186,19 +1354,20 @@ msgid "Customer Name"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_planner
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner_mass
msgid "Customers"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_report_date
-msgid "Date"
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "Customizations"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_last_post
-msgid "Date of the last message posted on the record."
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_date
+msgid "Date"
msgstr ""
#. module: crm
@@ -1213,7 +1382,7 @@ msgstr ""
#. module: crm
#: model:ir.actions.act_window,name:crm.action_partner_deduplicate
-msgid "Deduplicate Contact"
+msgid "Deduplicate Contacts"
msgstr ""
#. module: crm
@@ -1288,9 +1457,15 @@ 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
#: model:ir.model.fields,field_description:crm.field_crm_activity_display_name
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_display_name
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_display_name
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_display_name
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_display_name
@@ -1313,6 +1488,7 @@ msgstr ""
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.lead2projectissue.wizard,action:0
#: selection:crm.partner.binding,action:0
msgid "Do not link to a customer"
msgstr ""
@@ -1333,21 +1509,11 @@ msgid "Don't use stages to qualify opportunities, use tags instead"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
-msgid "Done"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
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"
msgstr ""
@@ -1458,22 +1624,22 @@ msgid "Existing Tools"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_date_deadline
#: 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_leads_filter
-#: 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_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
@@ -1522,55 +1688,12 @@ msgid "Folded in Pipeline"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Follow-up"
-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_data_call
-#: model:mail.message.subtype,description:crm.crm_activity_data_call_mail_message_subtype
-msgid "Follow-up call"
-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.model.fields,field_description:crm.field_crm_lead_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
-msgid "Followup"
-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 ""
@@ -1587,17 +1710,12 @@ msgid "Force assignation"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:558
+#: code:addons/crm/models/crm_lead.py:554
#, python-format
msgid "From %s : %s"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_function
-msgid "Function"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Gain high quality insight from surveys, a great way to engage with prospects"
msgstr ""
@@ -1678,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
@@ -1701,6 +1819,7 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_id
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_id
#: model:ir.model.fields,field_description:crm.field_crm_activity_id
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_id
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_id
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_id
@@ -1726,16 +1845,6 @@ msgid "Ids"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_crm_lead_opt_out
msgid "If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."
msgstr ""
@@ -1747,7 +1856,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "If you followed the preceeding steps, you already setup\n"
+msgid "If you followed the preceding steps, you already setup\n"
" the foundations to a strong process leading to\n"
" continuous improvements of your sales teams."
msgstr ""
@@ -1789,23 +1898,11 @@ msgid "Include archived"
msgstr ""
#. module: crm
-#: code:addons/crm/sales_team.py:15
-#, python-format
-msgid "Incoming"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Incoming Emails"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Incoming email create leads automatically when a new prospect contacts you.\n"
-" That's the easiest way to integrate Odoo with third party apps."
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_sale_config_settings_module_crm_voip
msgid "Integration with Asterisk"
msgstr ""
@@ -1832,8 +1929,8 @@ msgid "Is Company"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_is_follower
-msgid "Is Follower"
+#: model:ir.model.fields,field_description:crm.field_crm_lead_function
+msgid "Job Position"
msgstr ""
#. module: crm
@@ -1852,19 +1949,10 @@ msgid "Last Action"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_last_activity_id
-msgid "Last Activity"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard___last_update
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line___last_update
#: model:ir.model.fields,field_description:crm.field_crm_activity___last_update
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log___last_update
#: model:ir.model.fields,field_description:crm.field_crm_activity_report___last_update
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner___last_update
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass___last_update
@@ -1888,6 +1976,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_write_uid
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_write_uid
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_write_uid
#: model:ir.model.fields,field_description:crm.field_crm_activity_write_uid
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_write_uid
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_write_uid
@@ -1904,6 +1993,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_write_date
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_write_date
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_write_date
#: model:ir.model.fields,field_description:crm.field_crm_activity_write_date
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_write_date
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_write_date
@@ -1917,14 +2007,14 @@ msgid "Last Updated on"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:834
+#: 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
-#: selection:crm.stage,type:0
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_lead_id
+#: model:ir.model.fields,field_description:crm.field_crm_activity_report_lead_id
#: model:ir.model.fields,field_description:crm.field_crm_lead_lost_lead_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
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_leads
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#, python-format
@@ -1981,12 +2071,11 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_leads
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
#: model:ir.ui.view,arch_db:crm.sales_team_form_view_in_crm
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
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 ""
@@ -2031,11 +2120,6 @@ 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"
msgstr ""
@@ -2061,6 +2145,13 @@ 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"
msgstr ""
@@ -2071,12 +2162,8 @@ msgid "Lines"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_stage_team_ids
-msgid "Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."
-msgstr ""
-
-#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2projectissue.wizard,action:0
#: selection:crm.partner.binding,action:0
msgid "Link to an existing customer"
msgstr ""
@@ -2092,8 +2179,33 @@ msgid "List of possible pain points by segment/profile"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
+msgid "Log & Schedule Next"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+msgid "Log Activity"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
+msgid "Log Only"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
+msgid "Log a note..."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_activity_log_action
+#: model:ir.model,name:crm.model_crm_activity_log
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form
+msgid "Log an Activity"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -2124,29 +2236,21 @@ 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.actions.server,name:crm.action_mark_as_lost
-msgid "Mark As Lost"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Mark Lost"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Mark Won"
msgstr ""
#. module: crm
+#: model:ir.actions.server,name:crm.action_mark_as_lost
+msgid "Mark as lost"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
msgid "Marketing"
msgstr ""
@@ -2162,7 +2266,6 @@ msgid "Maximum of Group of Contacts"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_medium_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_medium_id
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -2170,7 +2273,7 @@ msgid "Medium"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1056
+#: code:addons/crm/models/crm_lead.py:899
#, python-format
msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)"
msgstr ""
@@ -2247,31 +2350,31 @@ msgid "Merge with existing opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:543
+#: code:addons/crm/models/crm_lead.py:502
#, python-format
msgid "Merged lead"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:537
+#: code:addons/crm/models/crm_lead.py:536
#, python-format
msgid "Merged leads"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:539
+#: code:addons/crm/models/crm_lead.py:536
#, python-format
msgid "Merged opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:543
+#: code:addons/crm/models/crm_lead.py:502
#, python-format
msgid "Merged opportunity"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:328
+#: code:addons/crm/wizard/base_partner_merge.py:331
#, python-format
msgid "Merged with the following partners:"
msgstr ""
@@ -2292,16 +2395,6 @@ msgid "Message subtype gives a more precise type on the message, especially for
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_crm_activity_internal
msgid "Messages with internal subtypes will be visible only by employees, aka members of base_user group"
msgstr ""
@@ -2337,6 +2430,11 @@ 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"
msgstr ""
@@ -2348,12 +2446,17 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
msgid "My Opportunities"
msgstr ""
#. module: crm
+#: model:ir.actions.server,name:crm.action_your_pipeline
+#: model:ir.ui.menu,name:crm.menu_crm_opportunities
+msgid "My Pipeline"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_group_by_name
#: model:ir.model.fields,field_description:crm.field_crm_lead_tag_name
#: model:ir.model.fields,field_description:crm.field_crm_lost_reason_name
@@ -2361,15 +2464,6 @@ msgid "Name"
msgstr ""
#. module: crm
-#: code:addons/crm/sales_team.py:39
-#: model:crm.stage,name:crm.crm_stage_2_3
-#: model:crm.stage,name:crm.stage_lead4
-#, python-format
-msgid "Negotiation"
-msgstr ""
-
-#. module: crm
-#: model:crm.stage,name:crm.crm_stage_2_1
#: model:crm.stage,name:crm.stage_lead1
msgid "New"
msgstr ""
@@ -2403,40 +2497,49 @@ msgid "Next Activity"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_activity_1_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead_next_activity_1
-msgid "Next Activity 1"
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_date_action
+#: model:ir.model.fields,field_description:crm.field_crm_lead_date_action
+msgid "Next Activity Date"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_activity_2_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead_next_activity_2
-msgid "Next Activity 2"
+#: model:ir.model.fields,field_description:crm.field_crm_lead_title_action
+msgid "Next Activity Summary"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_activity_3_id
-#: model:ir.model.fields,field_description:crm.field_crm_lead_next_activity_3
-msgid "Next Activity 3"
+#: code:addons/crm/wizard/crm_activity_log.py:61
+#, python-format
+msgid "Next activity"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_date_action
-msgid "Next Activity Date"
+#: selection:crm.lead,kanban_state:0
+msgid "Next activity is planned"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_title_action
-msgid "Next Activity Summary"
+#: selection:crm.lead,kanban_state:0
+msgid "Next activity late"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1011
+#: code:addons/crm/models/crm_lead.py:1123
#, python-format
msgid "No Subject"
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form_schedule
+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
msgid "No salesperson"
@@ -2449,6 +2552,16 @@ msgid "Normal"
msgstr ""
#. module: crm
+#: model:crm.lost.reason,name:crm.lost_reason_3
+msgid "Not enough stock"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_note
+msgid "Note"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,help:crm.field_res_users_payment_next_action
msgid "Note regarding the next action."
msgstr ""
@@ -2464,11 +2577,6 @@ msgid "Notes"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,help:crm.field_crm_opportunity_report_delay_close
msgid "Number of Days to close the case"
msgstr ""
@@ -2494,16 +2602,6 @@ msgid "Number of days before executing the action, allowing you to plan the date
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Odoo Default"
msgstr ""
@@ -2516,15 +2614,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
@@ -2546,14 +2639,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
@@ -2562,17 +2650,12 @@ 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:318
+#: 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 ""
#. module: crm
-#: model:ir.actions.client,name:crm.action_client_crm_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_form_view_salesteams_opportunity
#: model:ir.actions.act_window,name:crm.crm_lead_opportunities
#: model:ir.actions.act_window,name:crm.relate_partner_opportunities
@@ -2587,7 +2670,6 @@ msgstr ""
#: model:ir.ui.view,arch_db:crm.crm_case_pivot_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
-#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1
msgid "Opportunities"
@@ -2625,16 +2707,14 @@ msgid "Opportunities that are assigned to me"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:813
+#: 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
-#: selection:crm.stage,type:0
#: model:ir.model.fields,field_description:crm.field_calendar_event_opportunity_id
#: model:ir.model.fields,field_description:crm.field_crm_lead_name
#: model:ir.model.fields,field_description:crm.field_res_partner_opportunity_count
#: 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
@@ -2655,6 +2735,11 @@ 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
msgid "Opportunity Won"
@@ -2737,7 +2822,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"
@@ -2775,6 +2859,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.crm_opportunity_report_menu
+#: model:ir.ui.view,arch_db:crm.crm_planner
#: model:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
msgid "Pipeline"
msgstr ""
@@ -2818,7 +2903,7 @@ msgid "Planner"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:628
+#: 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 ""
@@ -2828,11 +2913,26 @@ msgstr ""
msgid "Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
-"- followers: only followers of the related document\n"
+"- followers: only followers of the related document or members of following channels\n"
""
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_preceding_activity_ids
+msgid "Preceding Activities"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_last_activity_id
+msgid "Previous Activity"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "Prices"
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "Prices can be computed using advanced formulas.<br/>\n"
" Example: 15% discount when buying more than 3 t-shirts."
@@ -2849,6 +2949,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"
@@ -2860,20 +2961,23 @@ msgid "Probability (%)"
msgstr ""
#. module: crm
-#: code:addons/crm/sales_team.py:31
-#, python-format
-msgid "Proposal"
+#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_expected_revenue
+msgid "Probable Turnover"
msgstr ""
#. module: crm
-#: model:crm.stage,name:crm.stage_lead3
-msgid "Proposition"
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "Products"
msgstr ""
#. module: crm
-#: model:crm.stage,name:crm.crm_stage_2_2
-#: model:crm.stage,name:crm.stage_lead2
-msgid "Qualification"
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "Proposal"
+msgstr ""
+
+#. module: crm
+#: model:crm.stage,name:crm.stage_lead3
+msgid "Proposition"
msgstr ""
#. module: crm
@@ -2882,8 +2986,7 @@ msgid "Qualification form (you can use the survey app for this)"
msgstr ""
#. module: crm
-#: code:addons/crm/sales_team.py:23
-#, python-format
+#: model:crm.stage,name:crm.stage_lead2
msgid "Qualified"
msgstr ""
@@ -2893,11 +2996,28 @@ msgid "Rating"
msgstr ""
#. module: crm
+#. 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
#: model:ir.model,name:crm.model_crm_lost_reason
msgid "Reason for loosing leads"
msgstr ""
#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_recommended_activity_id
+msgid "Recommended Activities"
+msgstr ""
+
+#. module: crm
+#: model:ir.model.fields,field_description:crm.field_crm_activity_recommended_activity_ids
+msgid "Recommended Next Activities"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_team_alias_force_thread_id
msgid "Record Thread ID"
msgstr ""
@@ -2910,6 +3030,7 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_action
#: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_action
+#: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_action
#: model:ir.model.fields,field_description:crm.field_crm_partner_binding_action
msgid "Related Customer"
msgstr ""
@@ -2920,14 +3041,8 @@ msgid "Relation field"
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 on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name}"
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_lead
-msgid "Reminder to User"
+msgid "Reminder: Lead ${object.name} from ${object.partner_id != False and object.partner_id.name or object.contact_name}"
msgstr ""
#. module: crm
@@ -2942,18 +3057,18 @@ msgid "Requirements"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_activity_report_user_id
-msgid "Responsible"
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "Retailers"
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Retailers"
+msgid "Revenue by Salesperson"
msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Revenue by Salesperson"
+msgid "Sale Flow"
msgstr ""
#. module: crm
@@ -2972,19 +3087,12 @@ msgid "Sales Settings"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_lead_tag_action
-#: model:ir.ui.view,arch_db:crm.crm_lead_tag_form
-#: model:ir.ui.view,arch_db:crm.crm_lead_tag_tree
-msgid "Sales Tags"
-msgstr ""
-
-#. module: crm
#: model:ir.model,name:crm.model_crm_team
+#: model:ir.model.fields,field_description:crm.field_crm_activity_log_team_id
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_team_id
#: 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
@@ -3006,11 +3114,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
@@ -3023,6 +3131,21 @@ msgid "Save filters or add any report to your dashboard with the Favorites menu.
msgstr ""
#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form_schedule
+msgid "Schedule Activity"
+msgstr ""
+
+#. module: crm
+#: model:ir.ui.view,arch_db:crm.crm_activity_log_view_form_schedule
+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"
msgstr ""
@@ -3044,11 +3167,6 @@ msgid "Select Leads/Opportunities"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.sales_team_form_view_in_crm
-msgid "Select Stages for this Sales Team"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
msgid "Select the list of fields used to search for\n"
" duplicated records. If you select several fields,\n"
@@ -3070,12 +3188,6 @@ 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"
msgstr ""
@@ -3087,11 +3199,6 @@ 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"
msgstr ""
@@ -3126,7 +3233,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-msgid "Show all opportunities for which the next action date is today or before"
+msgid "Show all opportunities for which the next action date is before today"
msgstr ""
#. module: crm
@@ -3162,7 +3269,6 @@ msgid "Some examples of lost reasons: \"We don't have people/skill\", \"Price to
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_source_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_source_id
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -3170,13 +3276,17 @@ msgid "Source"
msgstr ""
#. module: crm
+#: model:ir.model.fields,help:crm.field_crm_stage_team_id
+msgid "Specific team that uses this stage. Other teams will not ne able to see or use this stage."
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_stage_id
#: model:ir.model.fields,field_description:crm.field_crm_lead_stage_id
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_stage_id
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_stage_form
-#: 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 ""
@@ -3208,19 +3318,16 @@ msgid "Stage of case"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
-#: model:ir.actions.act_window,name:crm.crm_stage_act
-#: model:ir.model.fields,field_description:crm.field_crm_team_stage_ids
+#: model:ir.actions.act_window,name:crm.crm_stage_action
#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
#: model:ir.ui.view,arch_db:crm.crm_stage_tree
-#: model:ir.ui.view,arch_db:crm.sales_team_form_view_in_crm
msgid "Stages"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
-msgid "Stages will allow salespersons to easily track how a specific\n"
-" lead or opportunity is positioned in the sales cycle."
+#: model:ir.actions.act_window,help:crm.crm_stage_action
+msgid "Stages allow salespersons to easily track how a specific opportunity\n"
+" is positioned in the sales cycle."
msgstr ""
#. module: crm
@@ -3264,8 +3371,9 @@ msgid "Subscription Management"
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."
+#: 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
@@ -3288,7 +3396,6 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_lead_tag_ids
-#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
msgid "Tags"
msgstr ""
@@ -3299,13 +3406,13 @@ msgid "Task"
msgstr ""
#. module: crm
-#: model:ir.filters,name:crm.ir_filters_crm_opportunity_report_next_action
-msgid "Team Activities"
+#: model:ir.model.fields,field_description:crm.field_crm_stage_team_id
+msgid "Team"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_stage_team_ids
-msgid "Teams"
+#: model:ir.filters,name:crm.ir_filters_crm_opportunity_report_next_action
+msgid "Team Activities"
msgstr ""
#. module: crm
@@ -3382,6 +3489,19 @@ msgid "The whole process may take a few hours. But it's worth doing\n"
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"
+" 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."
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.base_partner_merge_automatic_wizard_form
msgid "There is no more contacts to merge for this request..."
msgstr ""
@@ -3403,31 +3523,15 @@ msgid "This email address has been preconfigured as the default\n"
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_stage_type
-msgid "This field is used to distinguish stages related to Leads from stages related to Opportunities, or to specify stages available for both types."
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_campaign_id
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report_campaign_id
-msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "This is the default configuration, there is nothing to setup."
msgstr ""
#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_medium_id
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_source_id
-#: model:ir.model.fields,help:crm.field_crm_opportunity_report_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
+#. 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
@@ -3443,11 +3547,11 @@ msgstr ""
#. module: crm
#: model:ir.model.fields,help:crm.field_crm_stage_fold
-msgid "This stage is folded in the kanban view whenthere are no records in that stage to display."
+msgid "This stage is folded in the kanban view when there are no records in that stage to display."
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1210
+#: code:addons/crm/models/crm_lead.py:1026
#, python-format
msgid "This target does not exist."
msgstr ""
@@ -3475,6 +3579,11 @@ msgid "Today Activities"
msgstr ""
#. module: crm
+#: model:crm.lost.reason,name:crm.lost_reason_1
+msgid "Too expensive"
+msgstr ""
+
+#. module: crm
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_total_revenue
msgid "Total Revenue"
msgstr ""
@@ -3488,7 +3597,6 @@ msgstr ""
#: model:ir.model.fields,field_description:crm.field_crm_activity_report_lead_type
#: model:ir.model.fields,field_description:crm.field_crm_lead_type
#: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_type
-#: model:ir.model.fields,field_description:crm.field_crm_stage_type
msgid "Type"
msgstr ""
@@ -3516,7 +3624,6 @@ msgid "Unless you are starting a new business, you probably have a list of custo
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_unread
#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
#: model:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -3524,11 +3631,6 @@ msgid "Unread Messages"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: crm
#: model:ir.model.fields,field_description:crm.field_res_users_unreconciled_aml_ids
msgid "Unreconciled aml ids"
msgstr ""
@@ -3555,6 +3657,7 @@ 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"
@@ -3562,14 +3665,6 @@ msgid "Use leads if you need a qualification step before creating an\n"
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"
msgstr ""
@@ -3594,11 +3689,23 @@ msgid "Use subscription for recurring billing.\n"
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."
msgstr ""
@@ -3645,6 +3752,11 @@ 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"
" reach our"
@@ -3689,18 +3801,13 @@ msgid "We designed Odoo to help you grow your business. Odoo CRM\n"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "We hope this process helped you bring your sales vision to life."
+#: model:crm.lost.reason,name:crm.lost_reason_2
+msgid "We don't have people/skills"
msgstr ""
#. module: crm
-#: model:ir.model.fields,field_description:crm.field_crm_lead_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: crm
-#: model:ir.model.fields,help:crm.field_crm_lead_website_message_ids
-msgid "Website communication history"
+#: model:ir.ui.view,arch_db:crm.crm_planner
+msgid "We hope this process helped you bring your sales vision to life."
msgstr ""
#. module: crm
@@ -3720,7 +3827,7 @@ msgstr ""
#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "What are the main KPIs you need to track for your the sales actities?"
+msgid "What are the main KPIs you need to track for your the sales activities?"
msgstr ""
#. module: crm
@@ -3746,15 +3853,12 @@ msgid "Wizard"
msgstr ""
#. module: crm
-#: code:addons/crm/sales_team.py:47
-#: model:crm.stage,name:crm.crm_stage_2_4
-#: model:crm.stage,name:crm.stage_lead5
+#: model:crm.stage,name:crm.stage_lead4
#: model:ir.ui.view,arch_db:crm.crm_activity_report_view_search
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_leads
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
#: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
#: model:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
-#, python-format
msgid "Won"
msgstr ""
@@ -3780,12 +3884,6 @@ msgid "You can also combine several rules into a sequence.<br/>\n"
msgstr ""
#. module: crm
-#: code:addons/crm/base_partner_merge.py:309
-#, python-format
-msgid "You cannot merge a contact with one of his parent."
-msgstr ""
-
-#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "You can change the pricing method at anytime. We\n"
" recommend you to select the easiest option that\n"
@@ -3793,6 +3891,12 @@ msgid "You can change the pricing method at anytime. We\n"
msgstr ""
#. module: crm
+#: code:addons/crm/wizard/base_partner_merge.py:306
+#, python-format
+msgid "You cannot merge a contact with one of his parent."
+msgstr ""
+
+#. module: crm
#: model:ir.ui.view,arch_db:crm.crm_planner
msgid "You don't need to review lost opportunities at every sales meeting, but it's good\n"
" practice to do it at least once a month. Ask your team to set tags on opportunities to\n"
@@ -3801,7 +3905,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:447
+#: code:addons/crm/wizard/base_partner_merge.py:398
#, python-format
msgid "You have to specify a filter for your selection"
msgstr ""
@@ -3830,18 +3934,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."
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Customers"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Customizations"
+" opportunities, convert them into quotations, attach related\n"
+" documents, track all discussions, and much more."
msgstr ""
#. module: crm
@@ -3860,26 +3954,13 @@ msgid "Your LinkedIn or social media pages"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,name:crm.crm_lead_opportunities_tree_view
-#: model:ir.actions.server,name:crm.action_your_pipeline
-#: model:ir.ui.menu,name:crm.menu_crm_opportunities
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Pipeline"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Prices"
+#: model:mail.template,subject:crm.mail_template_data_module_install_crm
+msgid "Your Odoo CRM application is running smoothly."
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Products"
-msgstr ""
-
-#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_planner
-msgid "Your Proposal"
+#: model:ir.actions.act_window,name:crm.crm_lead_opportunities_tree_view
+msgid "Your Pipeline"
msgstr ""
#. module: crm
@@ -3934,22 +4015,24 @@ msgid "browse the documentation"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
-msgid "e.g. Discuss proposal"
+#: 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
#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
-msgid "e.g. Product Pricing"
+msgid "e.g. Discuss proposal"
msgstr ""
#. module: crm
-#: model:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
-msgid "oe_kanban_text_red"
+#: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
+msgid "e.g. Product Pricing"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:913
+#: code:addons/crm/models/crm_lead.py:887
#, python-format
msgid "opportunities"
msgstr ""
@@ -4022,7 +4105,7 @@ msgid "to setup your own domain\n"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:1050
+#: code:addons/crm/models/crm_lead.py:893
#, python-format
msgid "unknown"
msgstr ""
diff --git a/addons/crm_project_issue/i18n/crm_project_issue.pot b/addons/crm_project_issue/i18n/crm_project_issue.pot
index cadd6d105e2..ad08a23b27f 100644
--- a/addons/crm_project_issue/i18n/crm_project_issue.pot
+++ b/addons/crm_project_issue/i18n/crm_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -39,11 +39,6 @@ msgid "Create Issue"
msgstr ""
#. module: crm_project_issue
-#: selection:crm.lead2projectissue.wizard,action:0
-msgid "Create a new customer"
-msgstr ""
-
-#. module: crm_project_issue
#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_create_uid
msgid "Created by"
msgstr ""
@@ -54,26 +49,11 @@ msgid "Created on"
msgstr ""
#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_partner_id
-msgid "Customer"
-msgstr ""
-
-#. module: crm_project_issue
#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_display_name
msgid "Display Name"
msgstr ""
#. module: crm_project_issue
-#: selection:crm.lead2projectissue.wizard,action:0
-msgid "Do not link to a customer"
-msgstr ""
-
-#. module: crm_project_issue
-#: model:ir.model,name:crm_project_issue.model_crm_lead2projectissue_wizard
-msgid "Handle partner binding or generation in CRM wizards."
-msgstr ""
-
-#. module: crm_project_issue
#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_id
msgid "ID"
msgstr ""
@@ -99,17 +79,12 @@ msgid "Lead"
msgstr ""
#. module: crm_project_issue
-#: selection:crm.lead2projectissue.wizard,action:0
-msgid "Link to an existing customer"
-msgstr ""
-
-#. module: crm_project_issue
#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_project_id
msgid "Project"
msgstr ""
#. module: crm_project_issue
-#: model:ir.model.fields,field_description:crm_project_issue.field_crm_lead2projectissue_wizard_action
-msgid "Related Customer"
+#: model:ir.model,name:crm_project_issue.model_crm_lead2projectissue_wizard
+msgid "crm.lead2projectissue.wizard"
msgstr ""
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index 4c4827f4567..4ba8fff11bf 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,6 +51,21 @@ 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
msgid "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 1160acc2328..1a389fdaaaf 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,11 @@ 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"
msgstr ""
@@ -51,8 +56,16 @@ 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
+#: model:ir.ui.view,arch_db:delivery.view_quant_package_form_save
+msgid "<span>kg</span>"
msgstr ""
#. module: delivery
@@ -68,12 +81,6 @@ 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"
msgstr ""
@@ -89,11 +96,25 @@ msgid "A precise description of the Product, used only for internal information
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"
msgstr ""
@@ -109,6 +130,11 @@ msgid "Amount of the order to benefit from a free shipping, expressed in the com
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
+msgid "Archived"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_asset_category_id
msgid "Asset Type"
msgstr ""
@@ -175,6 +201,11 @@ 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"
msgstr ""
@@ -191,36 +222,27 @@ msgid "Can be Sold"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_can_be_expensed
-msgid "Can be expensed"
+#: model:ir.model.fields,help:delivery.field_stock_quant_package_shipping_weight
+msgid "Can be changed during the 'put in pack' to adjust the weight of the shipping."
msgstr ""
#. module: delivery
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form_shipping
msgid "Cancel"
msgstr ""
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_carrier_id
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_package_carrier_type
#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_id
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_form
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_tree
msgid "Carrier"
msgstr ""
#. module: delivery
-#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
-msgid "Carrier Information"
-msgstr ""
-
-#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_ref
-msgid "Carrier Tracking Ref"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_route_from_categ_ids
msgid "Category Routes"
msgstr ""
@@ -236,11 +258,6 @@ msgid "Click to define a new delivery method."
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"
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_color
msgid "Color Index"
msgstr ""
@@ -271,6 +288,11 @@ 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."
msgstr ""
@@ -286,6 +308,11 @@ 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
msgid "Created by"
@@ -317,13 +344,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
@@ -364,6 +391,16 @@ msgid "Delivery"
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
+msgid "Delivery Carrier"
+msgstr ""
+
+#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
+msgid "Delivery Information"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id
#: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id
msgid "Delivery Method"
@@ -417,6 +454,11 @@ msgid "Determine the display order"
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_quant_package_form_save
+msgid "Discard"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_display_name
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_display_name
msgid "Display Name"
@@ -430,13 +472,18 @@ msgid "Each carrier (e.g. UPS) can have several delivery methods (e.g.\n"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_prod_environment
+msgid "Environment"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_sale_order_delivery_price
msgid "Estimated Delivery Price"
msgstr ""
#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_event_ok
-msgid "Event Subscription"
+msgid "Event Registration"
msgstr ""
#. module: delivery
@@ -480,13 +527,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
@@ -535,6 +582,16 @@ 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."
msgstr ""
@@ -545,8 +602,24 @@ msgid "Gives the sequence order when calculating delivery carrier."
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_weight
-msgid "Gross Weight"
+#: model:ir.ui.view,arch_db:delivery.view_delivery_carrier_search
+msgid "Group By"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_hs_code
+#: model:ir.model.fields,field_description:delivery.field_product_template_hs_code
+msgid "HS Code"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_height
+msgid "Height"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:product.packaging:0
+msgid "Height must be positive"
msgstr ""
#. module: delivery
@@ -581,11 +654,6 @@ 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."
msgstr ""
@@ -611,6 +679,16 @@ 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"
msgstr ""
@@ -662,11 +740,6 @@ 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"
msgstr ""
@@ -695,6 +768,16 @@ msgid "Last Updated on"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_length
+msgid "Length"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:product.packaging:0
+msgid "Length must be positive"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_location_id
msgid "Location"
msgstr ""
@@ -705,11 +788,28 @@ msgid "Logistical Units"
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
+msgid "Manage Package Type"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_track_service
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sale order validation and track the work hours."
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_produce_delay
msgid "Manufacturing Lead Time"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_margin
+msgid "Margin"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_date_from
msgid "Margin Date From"
msgstr ""
@@ -720,11 +820,31 @@ msgid "Margin Date To"
msgstr ""
#. module: delivery
+#: sql_constraint:delivery.carrier:0
+msgid "Margin cannot be lower than -100%"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_max_weight
+msgid "Max Weight"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:product.packaging:0
+msgid "Max Weight must be positive"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_max_value
msgid "Maximum Value"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,help:delivery.field_product_packaging_max_weight
+msgid "Maximum weight shippable in this packaging"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_image_medium
msgid "Medium-sized image"
msgstr ""
@@ -745,13 +865,18 @@ msgid "Membership Start Date"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_message_ids
-msgid "Messages"
+#: 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,help:delivery.field_delivery_carrier_message_ids
-msgid "Messages and communication history"
+#: 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"
msgstr ""
#. module: delivery
@@ -767,13 +892,18 @@ msgid "Name"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:62
+#: selection:product.packaging,package_carrier_type:0
+msgid "No carrier integration"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/sale_order.py:63
#, python-format
msgid "No carrier matching."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:70
+#: code:addons/delivery/models/sale_order.py:72
#, python-format
msgid "No carrier set for this order."
msgstr ""
@@ -789,12 +919,6 @@ 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"
msgstr ""
@@ -815,21 +939,60 @@ msgid "Number of unread messages"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_purchase_method
+msgid "On ordered quantities: control bills based on ordered quantities.\n"
+"On received quantities: control bills based on received quantity."
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_price_rule_operator
msgid "Operator"
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 (time or deliveries)."
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_outgoing_qty
msgid "Outgoing"
msgstr ""
#. module: delivery
+#: model:ir.ui.view,arch_db:delivery.view_quant_package_form_save
+msgid "Package"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_shipper_package_code
+msgid "Package Code"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:35
+#: code:addons/delivery/models/stock_picking.py:128
+#, python-format
+msgid "Package Details"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_stock_picking_package_ids
msgid "Packages"
msgstr ""
#. module: delivery
+#: model:ir.model,name:delivery.model_product_packaging
+msgid "Packaging"
+msgstr ""
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_pack_operation
+msgid "Packing Operation"
+msgstr ""
+
+#. module: delivery
#: model:ir.model,name:delivery.model_res_partner
msgid "Partner"
msgstr ""
@@ -847,12 +1010,6 @@ 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
-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"
msgstr ""
@@ -874,6 +1031,11 @@ 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"
msgstr ""
@@ -946,6 +1108,18 @@ 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"
msgstr ""
@@ -956,6 +1130,11 @@ 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"
msgstr ""
@@ -963,6 +1142,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
+#: model:ir.model.fields,field_description:delivery.field_sale_order_line_product_qty
msgid "Quantity"
msgstr ""
@@ -988,6 +1168,11 @@ msgid "Quantity of products that are planned to leave.\n"
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"
msgstr ""
@@ -998,6 +1183,21 @@ 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"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_route_ids
msgid "Routes"
msgstr ""
@@ -1033,26 +1233,33 @@ 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 ""
#. module: delivery
-#: model:ir.model.fields,help:delivery.field_delivery_carrier_categ_id
-msgid "Select category for the current product"
+#: model:ir.ui.view,arch_db:delivery.view_quant_package_form_save
+msgid "Save"
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."
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_categ_id
+msgid "Select category for the current product"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/delivery_carrier.py:250
+#: 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
+#: 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
#: model:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
msgid "Send to Shipper"
msgstr ""
@@ -1069,15 +1276,14 @@ msgid "Set price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:88
-#, python-format
-msgid "Shipment sent to carrier %s for expedition with tracking number %s"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_prod_environment
+msgid "Set to True if your credentials are certified for production."
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/stock_picking.py:106
+#: code:addons/delivery/models/stock_picking.py:147
#, python-format
-msgid "Your delivery method has no redirect on courier provider's website to track this order."
+msgid "Shipment sent to carrier %s for expedition with tracking number %s<br/>Cost: %.2f %s"
msgstr ""
#. module: delivery
@@ -1086,8 +1292,8 @@ msgid "Shipping Cost"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_shipping_enabled
-msgid "Shipping enabled"
+#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_shipping_weight
+msgid "Shipping Weight"
msgstr ""
#. module: delivery
@@ -1096,11 +1302,6 @@ 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
msgid "Specify if the product can be selected in a sales order line."
@@ -1114,18 +1315,19 @@ 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
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state_ids
-msgid "States"
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_hs_code
+#: model:ir.model.fields,help:delivery.field_product_template_hs_code
+msgid "Standardized code for international shipping and goods declaration"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state
-msgid "Status"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_state_ids
+msgid "States"
msgstr ""
#. module: delivery
@@ -1144,6 +1346,16 @@ 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"
msgstr ""
@@ -1174,14 +1386,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
@@ -1190,17 +1402,12 @@ msgid "The average delay in days between the confirmation of the customer order
msgstr ""
#. module: delivery
-#: code:addons/delivery/models/sale_order.py:53
+#: code:addons/delivery/models/sale_order.py:54
#, python-format
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."
-msgstr ""
-
-#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_volume
msgid "The volume in m3."
msgstr ""
@@ -1248,6 +1455,11 @@ msgid "This is the sum of the extra price of all attributes"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,help:delivery.field_delivery_carrier_margin
+msgid "This percentage will be added to the shipping price."
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_property_stock_production
msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."
msgstr ""
@@ -1294,13 +1506,13 @@ msgid "Tracking"
msgstr ""
#. module: delivery
-#: model:ir.model,name:delivery.model_stock_picking
-msgid "Transfer"
+#: model:ir.model.fields,field_description:delivery.field_stock_picking_carrier_tracking_ref
+msgid "Tracking Reference"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_partner_id
-msgid "Transporter Company"
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Transfer"
msgstr ""
#. module: delivery
@@ -1314,18 +1526,7 @@ 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 ""
@@ -1336,16 +1537,6 @@ 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"
msgstr ""
@@ -1361,6 +1552,11 @@ 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"
msgstr ""
@@ -1371,18 +1567,13 @@ msgid "Variable Factor"
msgstr ""
#. module: delivery
-#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_extra
-msgid "Variant Extra Price"
-msgstr ""
-
-#. module: delivery
#: 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_seller_ids
-msgid "Vendor"
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_price_extra
+msgid "Variant Price Extra"
msgstr ""
#. module: delivery
@@ -1391,6 +1582,11 @@ msgid "Vendor Taxes"
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_seller_ids
+msgid "Vendors"
+msgstr ""
+
+#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_volume
@@ -1411,6 +1607,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.price.rule,variable:0
#: selection:delivery.price.rule,variable_factor:0
+#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_weight
#: model:ir.model.fields,field_description:delivery.field_stock_move_weight
#: model:ir.model.fields,field_description:delivery.field_stock_picking_weight
#: model:ir.model.fields,field_description:delivery.field_stock_quant_package_weight
@@ -1425,6 +1622,16 @@ 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"
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,help:delivery.field_delivery_carrier_alert_time
msgid "When a new a Serial Number is issued, this is the number of days before an alert should be notified."
msgstr ""
@@ -1460,6 +1667,29 @@ msgid "When validating an invoice, an email will be sent to the customer based o
msgstr ""
#. module: delivery
+#: model:ir.model.fields,field_description:delivery.field_product_packaging_width
+msgid "Width"
+msgstr ""
+
+#. module: delivery
+#: sql_constraint:product.packaging:0
+msgid "Width must be positive"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:187
+#, python-format
+msgid "You are shipping different packaging types in the same shipment.\n"
+"Packaging Types: %s"
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/models/stock_picking.py:163
+#, python-format
+msgid "Your delivery method has no redirect on courier provider's website to track this order."
+msgstr ""
+
+#. module: delivery
#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_zip_from
msgid "Zip From"
msgstr ""
@@ -1474,11 +1704,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/document/i18n/document.pot b/addons/document/i18n/document.pot
index b55507db9c0..e3f02ca43d0 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: document
#. openerp-web
-#: code:addons/document/static/src/js/document.js:25
+#: code:addons/document/static/src/js/document.js:26
#, python-format
msgid "%s (%s)"
msgstr ""
#. module: document
#. openerp-web
-#: code:addons/document/static/src/js/document.js:13
+#: code:addons/document/static/src/js/document.js:14
#, python-format
msgid "Attachment(s)"
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 5f17c44d9ed..d83638540d7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-01 06:27+0000\n"
-"PO-Revision-Date: 2015-10-01 06:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,39 +16,57 @@ msgstr ""
"Plural-Forms: \n"
#. module: event
-#: model:ir.model.fields,field_description:event.field_report_event_registration_cancel_state
-msgid " # No of Cancelled Registrations"
+#: model:mail.template,body_html:event.event_registration_mail_template_badge
+msgid "\n"
+"<p>Dear ${object.name},</p>\n"
+"<p>Thank you for your inquiry.</p>\n"
+"<p>Here is your badge for the event ${object.event_id.name}.</p>\n"
+"<p>If you have any questions, please let us know.</p>\n"
+"<p>Best regards,</p>"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_report_event_registration_confirm_state
-msgid " # No of Confirmed Registrations"
+#: 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 registration 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>"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_report_event_registration_draft_state
-msgid " # No of Draft Registrations"
+#: model:mail.template,body_html:event.event_reminder
+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>If you have any questions, please let us know.</p>\n"
+"<p>Best regards,</p>"
msgstr ""
#. module: event
-#: model:ir.ui.view,arch_db:event.view_event_kanban
-msgid "(stats)"
+#: model:ir.model.fields,field_description:event.field_report_event_registration_cancel_state
+msgid " # No of Cancelled Registrations"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_0
-msgid "3 Intensive Days"
+#: model:ir.model.fields,field_description:event.field_report_event_registration_confirm_state
+msgid " # No of Confirmed Registrations"
msgstr ""
#. module: event
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "5 Intensive Days"
+#: model:ir.model.fields,field_description:event.field_report_event_registration_draft_state
+msgid " # No of Draft Registrations"
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>"
+#: model:ir.ui.view,arch_db:event.view_event_kanban
+msgid "(stats)"
msgstr ""
#. module: event
@@ -58,80 +76,12 @@ msgid "<i class=\"fa fa-clock-o\"/>\n"
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
msgid "<i>to</i>"
msgstr ""
#. module: event
-#: model:mail.template,body_html:event.event_reminder
-msgid "<p>Hello ${object.name},</p>\n"
-"<p>This is a reminder for ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located} to ${object.event_id.date_end_located}.\n"
-"For any further information please contact our event department.</p>\n"
-"<p>Thank you for your participation!</p>\n"
-"<p>Best regards</p>"
-msgstr ""
-
-#. module: event
-#: model:mail.template,body_html:event.event_registration_mail_template_badge
-msgid "<p>Hello ${object.name},</p>\n"
-"<p>We confirm that your subscription to the event ${object.event_id.name} has been recorded.\n"
-"Please, Find your <b>Event Badge</b> attached with this mail.</p>\n"
-"<p>Thank you for your participation!</p>\n"
-"<p>Best regards</p>"
-msgstr ""
-
-#. module: event
-#: model:mail.template,body_html:event.event_subscription
-msgid "<p>Hello ${object.name},</p>\n"
-"<p>We confirm that your subscription to the event ${object.event_id.name} has been recorded.\n"
-"You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>\n"
-"<p>Thank you for your participation!</p>\n"
-"<p>Best regards</p>"
-msgstr ""
-
-#. module: event
-#: model:mail.template,body_html:event.event_thanks
-msgid "<p>Hello ${object.name},</p>\n"
-"<p>We would like to thank you for your presence at our event ${object.event_id.name}.\n"
-"<br/><br/>\n"
-" % if object.event_id.organizer_id and object.event_id.organizer_id.is_company:\n"
-" <strong>The ${object.event_id.organizer_id.name} Team</strong>\n"
-" % elif object.event_id.organizer_id:\n"
-" <strong>${object.event_id.organizer_id.name}</strong>\n"
-" % endif\n"
-"</p>"
-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 "<small>John Doe, CEO</small>"
-msgstr ""
-
-#. module: event
#: model:ir.ui.view,arch_db:event.view_event_form
msgid "<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" class=\"oe_read_only\">\n"
" to \n"
@@ -139,77 +89,13 @@ msgid "<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\"
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_message_needaction
-#: model:ir.model.fields,field_description:event.field_event_registration_message_needaction
-msgid "Action Needed"
-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
@@ -224,7 +110,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
@@ -248,13 +134,6 @@ 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
#: selection:report.event.registration,registration_state:0
@@ -304,6 +183,11 @@ 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"
msgstr ""
@@ -314,20 +198,18 @@ msgid "Badge Front"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_badge_innerright
-msgid "Badge Inner Right"
+#: model:ir.model.fields,field_description:event.field_event_event_badge_innerleft
+msgid "Badge Inner Left"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_badge_innerleft
-msgid "Badge Innner Left"
+#: model:ir.model.fields,field_description:event.field_event_event_badge_innerright
+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
@@ -336,39 +218,6 @@ 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
msgid "Cancel"
@@ -399,17 +248,12 @@ 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:204
+#: code:addons/event/models/event.py:207
#, python-format
msgid "Closing Date cannot be set before Beginning Date."
msgstr ""
@@ -423,22 +267,12 @@ msgid "Company"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:397
+#: code:addons/event/models/event.py:403
#, 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"
msgstr ""
@@ -499,30 +333,11 @@ 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 "Controlers 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
#: model:ir.model.fields,field_description:event.field_event_event_create_uid
@@ -550,45 +365,18 @@ msgid "Creation Date"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:378
+#: code:addons/event/models/event.py:380
#, python-format
msgid "Customer"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:376
+#: code:addons/event/models/event.py:382
#, python-format
msgid "Customer Email"
msgstr ""
#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_last_post
-#: model:ir.model.fields,help:event.field_event_registration_message_last_post
-msgid "Date of the last message posted on the record."
-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)"
msgstr ""
@@ -614,13 +402,6 @@ 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
#: model:ir.model.fields,field_description:event.field_event_event_display_name
@@ -638,13 +419,6 @@ 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
msgid "Done"
@@ -657,11 +431,6 @@ 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"
msgstr ""
@@ -712,6 +481,16 @@ 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
msgid "Event Confirmation"
@@ -790,7 +569,6 @@ 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
@@ -798,6 +576,11 @@ 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
#: model:ir.ui.view,arch_db:event.view_report_event_registration_search
@@ -827,11 +610,6 @@ 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"
msgstr ""
@@ -847,11 +625,6 @@ 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"
msgstr ""
@@ -872,29 +645,6 @@ msgid "Finish Event"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_follower_ids
-#: model:ir.model.fields,field_description:event.field_event_registration_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_channel_ids
-#: model:ir.model.fields,field_description:event.field_event_registration_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_partner_ids
-#: model:ir.model.fields,field_description:event.field_event_registration_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: event
-#: model: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."
msgstr ""
@@ -905,23 +655,6 @@ msgid "For each event you can define a minimum reserved seats (number of attende
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
#: model:ir.ui.view,arch_db:event.view_report_event_registration_search
@@ -929,37 +662,11 @@ 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:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "I did not expect such a great learning experience. I feel like I can develop anything now."
-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
#: model:ir.model.fields,field_description:event.field_event_event_id
@@ -972,18 +679,6 @@ msgid "ID"
msgstr ""
#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_unread
-#: model:ir.model.fields,help:event.field_event_registration_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_needaction
-#: model:ir.model.fields,help:event.field_event_registration_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,help:event.field_event_event_state
msgid "If event is created, the status is 'Draft'. If event is confirmed for the particular dates the status is set to 'Confirmed'. If the event is over, the status is set to 'Done'. If event is cancelled the status is set to 'Cancelled'."
msgstr ""
@@ -994,10 +689,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
@@ -1016,50 +709,11 @@ 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,field_description:event.field_event_event_message_is_follower
-#: model:ir.model.fields,field_description:event.field_event_registration_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,help:event.field_event_type_default_registration_max
msgid "It will select this default maximum value when you choose this event"
msgstr ""
@@ -1075,12 +729,6 @@ msgid "Kanban Color Index"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_last_post
-#: model:ir.model.fields,field_description:event.field_event_registration_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_event_config_settings___last_update
#: model:ir.model.fields,field_description:event.field_event_confirm___last_update
#: model:ir.model.fields,field_description:event.field_event_event___last_update
@@ -1125,18 +773,6 @@ 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"
msgstr ""
@@ -1147,7 +783,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 ""
@@ -1173,7 +809,7 @@ msgstr ""
#. module: event
#: selection:event.config.settings,auto_confirmation:0
-msgid "Manually confirm every subscription"
+msgid "Manually confirm every registration"
msgstr ""
#. module: event
@@ -1183,7 +819,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 ""
@@ -1193,30 +828,11 @@ msgid "Maximum Attendees Number"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_ids
-#: model:ir.model.fields,field_description:event.field_event_registration_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_ids
-#: model:ir.model.fields,help:event.field_event_registration_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_seats_min
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)"
msgstr ""
@@ -1238,7 +854,7 @@ 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
@@ -1247,26 +863,20 @@ msgid "No mini website per event"
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:198
+#: code:addons/event/models/event.py:201
#, python-format
msgid "No more available seats."
msgstr ""
#. module: event
-#: code:addons/event/models/event.py:298
+#: code:addons/event/models/event.py:301
#, 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"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_needaction_counter
-#: model:ir.model.fields,field_description:event.field_event_registration_message_needaction_counter
-msgid "Number of Actions"
+msgid "No validation step on registration"
msgstr ""
#. module: event
@@ -1290,49 +900,13 @@ msgid "Number of Registrations"
msgstr ""
#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_needaction_counter
-#: model:ir.model.fields,help:event.field_event_registration_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,help:event.field_event_event_message_unread_counter
-#: model:ir.model.fields,help:event.field_event_registration_message_unread_counter
-msgid "Number of unread messages"
-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.actions.client,name:event.action_client_event_menu
-msgid "Open Event Menu"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_event_event_organizer_id
msgid "Organizer"
msgstr ""
@@ -1348,20 +922,6 @@ 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"
msgstr ""
@@ -1372,35 +932,6 @@ 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 &amp; 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:event.event,description:event.event_0
-#: model:event.event,description:event.event_1
-#: model:event.event,description:event.event_3
-msgid "Read Great Contents"
-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"
msgstr ""
@@ -1459,6 +990,11 @@ 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"
msgstr ""
@@ -1489,25 +1025,11 @@ 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"
msgstr ""
@@ -1519,8 +1041,13 @@ msgid "Responsible"
msgstr ""
#. module: event
+#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_barcode
+msgid "Scan badges to confirm attendances"
+msgstr ""
+
+#. module: event
#: model:res.groups,name:event.group_email_scheduling
-msgid "Schedule Emails on Event Subscription"
+msgid "Schedule Emails on Event Registration"
msgstr ""
#. module: event
@@ -1539,11 +1066,6 @@ 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"
msgstr ""
@@ -1569,11 +1091,6 @@ 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"
msgstr ""
@@ -1607,33 +1124,11 @@ msgid "Subscribe"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_questions
-msgid "Subscription Survey"
-msgstr ""
-
-#. module: event
-#: model:event.event,name:event.event_3
-msgid "Technical Training"
-msgstr ""
-
-#. module: event
-#: model:mail.template,subject:event.event_thanks
-msgid "Thanks for attending ${object.event_id.name}"
-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."
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 "This course help me build my first application within a month. Definetly worth its price."
-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"
msgstr ""
@@ -1649,30 +1144,11 @@ 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"
msgstr ""
#. module: event
-#: model:event.type,name:event.event_type_4
-msgid "Training"
-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"
-msgstr ""
-
-#. module: event
#: selection:event.event,state:0
#: selection:event.registration,state:0
#: model:ir.ui.view,arch_db:event.view_event_search
@@ -1685,25 +1161,6 @@ 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"
msgstr ""
@@ -1714,22 +1171,14 @@ msgid "Unlimited"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_unread
-#: model:ir.model.fields,field_description:event.field_event_registration_message_unread
#: model:ir.ui.view,arch_db:event.view_event_search
#: model:ir.ui.view,arch_db:event.view_registration_search
msgid "Unread Messages"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_message_unread_counter
-#: model:ir.model.fields,field_description:event.field_event_registration_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: event
#: model:ir.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
@@ -1748,78 +1197,35 @@ 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 &amp; Operators"
-msgstr ""
-
-#. module: event
-#: model:event.event,description:event.event_2
-msgid "Warehouse management, Manufacturing (MRP) &amp; 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?"
msgstr ""
#. module: event
-#: model:ir.model.fields,field_description:event.field_event_event_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: event
-#: model:ir.model.fields,help:event.field_event_event_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: event
#: selection:event.mail,interval_unit:0
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 do people say about this course?"
-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:230
+#: code:addons/event/models/event.py:233
#, 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:355
+#: code:addons/event/models/event.py:358
#, 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"
+msgid "You will be able to configure emails, and to schedule them to be automatically sent to the attendees on registration and/or attendance"
msgstr ""
#. module: event
@@ -1829,7 +1235,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
@@ -1838,13 +1244,6 @@ 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"
msgstr ""
@@ -1860,34 +1259,7 @@ 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 8800cdacb43..2c840316e5c 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,14 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: event_sale
-#: code:addons/event_sale/models/event.py:170
-#, python-format
-msgid " with ticket %s"
+#: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
+msgid "Apply"
msgstr ""
#. module: event_sale
-#: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form
-msgid "Apply"
+#: model:ir.model.fields,field_description:event_sale.field_product_product_asset_category_id
+msgid "Asset Type"
msgstr ""
#. module: event_sale
@@ -57,12 +56,6 @@ msgid "Choose an event ticket and it will automatically create a registration fo
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
#: model:ir.model.fields,field_description:event_sale.field_registration_editor_line_create_uid
@@ -77,6 +70,11 @@ msgid "Created on"
msgstr ""
#. module: event_sale
+#: model:ir.model.fields,field_description:event_sale.field_product_product_deferred_revenue_category_id
+msgid "Deferred Revenue Type"
+msgstr ""
+
+#. module: event_sale
#: model:ir.model.fields,help:event_sale.field_event_event_ticket_seats_max
msgid "Define the number of available tickets. If you have too much registrations you will not be able to sell tickets anymore. Set 0 to ignore this rule set as unlimited."
msgstr ""
@@ -84,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 ""
@@ -113,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
@@ -140,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
@@ -200,24 +204,18 @@ 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"
msgstr ""
@@ -254,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 ""
@@ -315,32 +315,6 @@ 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
msgid "Ticket Type"
@@ -362,18 +336,6 @@ 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"
msgstr ""
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 18090ce6ba8..beb8f9877f6 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgid "Confirmed"
msgstr ""
#. module: fetchmail
-#: code:addons/fetchmail/fetchmail.py:150
+#: code:addons/fetchmail/models/fetchmail.py:137
#, python-format
msgid "Connection test failed: %s"
msgstr ""
@@ -73,13 +73,11 @@ msgid "Create a New Record"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_create_uid
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_create_uid
msgid "Created by"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_create_date
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_create_date
msgid "Created on"
msgstr ""
@@ -90,7 +88,6 @@ msgid "Defines the order of processing, lower values mean higher priority"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_display_name
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_display_name
msgid "Display Name"
msgstr ""
@@ -106,7 +103,6 @@ msgid "Hostname or IP of the mail server"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_id
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_id
msgid "ID"
msgstr ""
@@ -159,19 +155,16 @@ msgid "Last Fetch Date"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings___last_update
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server___last_update
msgid "Last Modified on"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_write_uid
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_write_uid
msgid "Last Updated by"
msgstr ""
#. module: fetchmail
-#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_config_settings_write_date
#: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server_write_date
msgid "Last Updated on"
msgstr ""
@@ -329,7 +322,7 @@ msgstr ""
#. module: fetchmail
#: model:ir.model.fields,help:fetchmail.field_fetchmail_server_original
-msgid "Whether a full original copy of each email should be kept for referenceand attached to each processed message. This will usually double the size of your message database."
+msgid "Whether a full original copy of each email should be kept for reference and attached to each processed message. This will usually double the size of your message database."
msgstr ""
#. module: fetchmail
@@ -337,8 +330,3 @@ msgstr ""
msgid "Whether attachments should be downloaded. If not enabled, incoming emails will be stripped of any attachments before being processed"
msgstr ""
-#. module: fetchmail
-#: model:ir.model,name:fetchmail.model_fetchmail_config_settings
-msgid "fetchmail.config.settings"
-msgstr ""
-
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index c875325c57d..aaad92f2a2a 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:27+0000\n"
-"PO-Revision-Date: 2015-09-29 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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:373
+#: 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:649
+#: 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,24 +68,25 @@ msgid "Acquisition Date"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_needaction
-msgid "Action Needed"
+#: 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_contract_form
-#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_tree
-msgid "Activation Cost"
+#: 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_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 "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 ""
@@ -95,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 ""
@@ -112,6 +113,12 @@ 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"
msgstr ""
@@ -185,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
@@ -233,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 ""
@@ -308,11 +320,6 @@ 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
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_contract_id
@@ -323,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 ""
@@ -343,11 +350,6 @@ 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
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_contract_id
@@ -356,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 ""
@@ -366,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 ""
@@ -379,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 ""
@@ -391,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 ""
@@ -411,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 ""
@@ -426,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
@@ -467,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
@@ -483,7 +483,7 @@ msgid "Created on"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_2863
+#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_2877
msgid "Current state of the vehicle"
msgstr ""
@@ -502,11 +502,6 @@ msgid "Date"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_date
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_date
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_date
@@ -540,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
@@ -576,24 +570,24 @@ msgid "Driver of the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:390
+#: 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 ""
@@ -608,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 ""
@@ -624,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 ""
@@ -650,21 +644,6 @@ msgid "Fleet"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_cost_type
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_cost_type
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_cost_type
@@ -679,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 ""
@@ -696,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 ""
@@ -727,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 ""
@@ -737,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 ""
@@ -791,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."
@@ -820,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_2812
+#: 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
@@ -836,16 +814,6 @@ msgid "ID"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_29
msgid "Ignition Coil Replacement"
msgstr ""
@@ -860,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 ""
@@ -899,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 ""
@@ -910,22 +878,11 @@ msgid "Invoice Reference"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: fleet
#: selection:fleet.vehicle,odometer_unit:0
msgid "Kilometers"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_last_post
-msgid "Last Message Date"
-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
@@ -946,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
@@ -962,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
@@ -983,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:397
-#, 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
@@ -1035,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 ""
@@ -1045,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."
@@ -1057,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 ""
@@ -1072,40 +1027,32 @@ 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 ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: fleet
#: selection:fleet.vehicle,odometer_unit:0
msgid "Miles"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2845
-#: 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 ""
@@ -1121,23 +1068,23 @@ msgid "Model of a vehicle"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2845
+#: 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:386
+#: 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 ""
@@ -1170,10 +1117,10 @@ msgid "No"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:385
-#: code:addons/fleet/fleet.py:389
-#: code:addons/fleet/fleet.py:393
-#: code:addons/fleet/fleet.py:396
+#: 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 ""
@@ -1181,54 +1128,39 @@ 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 ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_doors
msgid "Number of doors of the vehicle"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_seats
msgid "Number of seats of the vehicle"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,help:fleet.field_fleet_vehicle_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_odometer_id
#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer_id
#: 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 ""
@@ -1247,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 ""
@@ -1275,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 ""
@@ -1317,11 +1249,6 @@ msgid "Omnium"
msgstr ""
#. module: fleet
-#: model:ir.actions.client,name:fleet.action_fleet_menu
-msgid "Open Fleet Menu"
-msgstr ""
-
-#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_service_16
msgid "Options"
msgstr ""
@@ -1346,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 ""
@@ -1384,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
@@ -1423,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:720
+#: 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 ""
@@ -1497,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 ""
@@ -1549,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 ""
@@ -1559,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 ""
@@ -1579,8 +1508,8 @@ msgid "Starter Replacement"
msgstr ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_2863
-#: 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 ""
@@ -1590,14 +1519,14 @@ msgid "State name already exists"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:394
+#: 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 ""
@@ -1623,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 ""
@@ -1634,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 ""
@@ -1651,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 ""
@@ -1676,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 ""
@@ -1751,32 +1682,27 @@ 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_2878
+#: 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 ""
#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: fleet
-#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_sequence
msgid "Used to order the note stages"
msgstr ""
#. module: fleet
-#: model:res.groups,name:fleet.group_fleet_user
+#: model:res.groups,name:fleet.fleet_group_user
msgid "User"
msgstr ""
@@ -1791,45 +1717,52 @@ 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
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_vehicle_id
@@ -1838,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 ""
@@ -1898,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 ""
@@ -1933,27 +1867,27 @@ 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 ""
#. module: fleet
#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_notes
-msgid "Write here all supplementary informations relative to this contract"
+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 ""
@@ -1963,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 ""
@@ -2017,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 dda2100a57f..41de46c4d5b 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-30 12:39+0000\n"
-"PO-Revision-Date: 2015-09-30 12:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,9 +33,9 @@ msgstr ""
#. module: gamification
#: model:mail.template,body_html:gamification.email_template_goal_reminder
msgid "\n"
-" <header>\n"
+" <p>\n"
" <strong>Reminder ${object.name}</strong>\n"
-" </header>\n"
+" </p>\n"
" \n"
" <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
" "
@@ -44,9 +44,9 @@ msgstr ""
#. module: gamification
#: model:mail.template,body_html:gamification.simple_report_template
msgid "\n"
-"<header>\n"
+"<p>\n"
" <strong>${object.name}</strong>\n"
-"</header>\n"
+"</p>\n"
"<p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
"\n"
"% if object.visibility_mode == 'personal':\n"
@@ -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
@@ -169,22 +189,11 @@ 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"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_needaction
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_active
msgid "Active"
msgstr ""
@@ -217,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
@@ -298,7 +307,7 @@ msgid "Can not grant"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:442
+#: code:addons/gamification/models/goal.py:410
#, python-format
msgid "Can not modify the configuration of a started goal"
msgstr ""
@@ -322,23 +331,16 @@ 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"
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 ""
@@ -416,22 +418,13 @@ 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"
msgstr ""
@@ -500,28 +493,18 @@ msgid "Date Field"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_last_post
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_challenge_category
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_2090
-msgid "Definition Condition"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_2099
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3039
msgid "Definition Description"
msgstr ""
@@ -548,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 ""
@@ -565,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 ""
@@ -606,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
@@ -640,24 +618,6 @@ msgid "Filter Domain"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_follower_ids
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_channel_ids
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_partner_ids
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_reward_first_id
msgid "For 1st user"
msgstr ""
@@ -674,7 +634,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_reward_id
-msgid "For Every Succeding User"
+msgid "For Every Succeeding User"
msgstr ""
#. module: gamification
@@ -736,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_2101
+#: 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"
@@ -765,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 ""
@@ -786,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 ""
@@ -855,6 +816,11 @@ 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
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard_id
@@ -873,19 +839,7 @@ msgstr ""
#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_badge_remaining_sending
-msgid "If a maxium is set"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_unread
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_needaction
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_needaction
-msgid "If checked, new messages require your attention."
+msgid "If a maximum is set"
msgstr ""
#. module: gamification
@@ -929,39 +883,12 @@ msgid "Individual Goals"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_model_inherited_model_ids
-msgid "Inherited models"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:319
-#, 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_message_is_follower
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_last_post
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge___last_update
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user___last_update
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_user_wizard___last_update
@@ -1043,18 +970,6 @@ msgid "Mail Group Following"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_ids
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_ids
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_model_id
#: model:ir.ui.view,arch_db:gamification.goal_definition_search_view
msgid "Model"
@@ -1142,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 ""
@@ -1163,24 +1078,6 @@ msgid "Notification Messages"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_needaction_counter
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,help:gamification.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,help:gamification.field_gamification_challenge_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: gamification
#: model:ir.model.fields,field_description:gamification.field_gamification_badge_stat_count_distinct
msgid "Number of users"
msgstr ""
@@ -1211,11 +1108,6 @@ 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"
msgstr ""
@@ -1281,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
@@ -1331,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 ""
@@ -1433,21 +1324,29 @@ 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"
msgstr ""
@@ -1489,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_2095
+#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3035
msgid "Suffix"
msgstr ""
@@ -1514,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 ""
@@ -1540,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:131
+#: code:addons/gamification/models/goal.py:90
#, python-format
msgid "The domain for the definition %s seems incorrect, please check it.\n"
"\n"
@@ -1583,6 +1484,22 @@ msgid "The maximum number of time this badge can be sent per month per person."
msgstr ""
#. module: gamification
+#: code:addons/gamification/models/goal.py:107
+#, python-format
+msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
+"\n"
+"%s not found"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:104
+#, python-format
+msgid "The model configuration for the definition %s seems incorrect, please check it.\n"
+"\n"
+"%s not stored"
+msgstr ""
+
+#. module: gamification
#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_model_id
msgid "The model object for the field to evaluate"
msgstr ""
@@ -1623,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 ""
@@ -1655,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
@@ -1669,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 ""
@@ -1710,24 +1624,12 @@ msgid "Unit"
msgstr ""
#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_unread
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model.fields,field_description:gamification.field_gamification_badge_message_unread_counter
-#: model:ir.model.fields,field_description:gamification.field_gamification_challenge_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: gamification
#: model:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
msgid "Update"
msgstr ""
#. module: gamification
-#: code:addons/gamification/models/goal.py:476
+#: code:addons/gamification/models/goal.py:445
#, python-format
msgid "Update %s"
msgstr ""
@@ -1746,12 +1648,16 @@ 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
msgid "Weekly"
@@ -1784,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 ""
@@ -1812,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 ""
@@ -1851,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
@@ -1880,11 +1786,6 @@ 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."
msgstr ""
diff --git a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
index 744efdee748..e7d86173186 100644
--- a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
+++ b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,11 +36,13 @@ msgid "Monthly Sales Targets"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_marketing1
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_new_leads
msgid "New Leads"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_marketing3
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_new_opportunities
msgid "New Opportunities"
msgstr ""
@@ -56,6 +58,7 @@ msgid "Paid Sales Orders"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_marketing2
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_lead_delay_open
msgid "Time to Qualify a Lead"
msgstr ""
@@ -66,6 +69,7 @@ msgid "Total Customer Refunds"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_sale1
#: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_invoices
msgid "Total Invoiced"
msgstr ""
@@ -76,6 +80,7 @@ msgid "Total Paid Sales Orders"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,definition_suffix:gamification_sale_crm.line_crm_marketing2
#: model:gamification.goal.definition,suffix:gamification_sale_crm.definition_crm_lead_delay_close
#: model:gamification.goal.definition,suffix:gamification_sale_crm.definition_crm_lead_delay_open
msgid "days"
@@ -87,11 +92,13 @@ msgid "invoices"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,definition_suffix:gamification_sale_crm.line_crm_marketing1
#: model:gamification.goal.definition,suffix:gamification_sale_crm.definition_crm_nbr_new_leads
msgid "leads"
msgstr ""
#. module: gamification_sale_crm
+#: model:gamification.challenge.line,definition_suffix:gamification_sale_crm.line_crm_marketing3
#: model:gamification.goal.definition,suffix:gamification_sale_crm.definition_crm_nbr_new_opportunities
msgid "opportunities"
msgstr ""
diff --git a/addons/google_account/i18n/google_account.pot b/addons/google_account/i18n/google_account.pot
index 459efa8553a..16936f9c65a 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 13:41+0000\n"
-"PO-Revision-Date: 2016-01-13 13:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot
index 3453a641add..825f20235cc 100644
--- a/addons/google_calendar/i18n/google_calendar.pot
+++ b/addons/google_calendar/i18n/google_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,28 +40,28 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:77
+#: code:addons/google_calendar/static/src/js/google_calendar.js:79
#, python-format
msgid "Accounts"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:67
+#: code:addons/google_calendar/static/src/js/google_calendar.js:69
#, python-format
msgid "All events have been disconnected from your previous account. You can now restart the synchronization"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:49
+#: code:addons/google_calendar/static/src/js/google_calendar.js:51
#, python-format
msgid "An administrator needs to configure Google Synchronization before you can use it!"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:71
+#: code:addons/google_calendar/static/src/js/google_calendar.js:73
#, python-format
msgid "An error occured while disconnecting events from your previous account. Please retry or contact your administrator."
msgstr ""
@@ -106,8 +106,8 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:46
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:50
+#: code:addons/google_calendar/static/src/js/google_calendar.js:48
+#: code:addons/google_calendar/static/src/js/google_calendar.js:52
#, python-format
msgid "Configuration"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:58
+#: code:addons/google_calendar/static/src/js/google_calendar.js:60
#, python-format
msgid "Do you want to do this now?"
msgstr ""
@@ -136,14 +136,14 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:72
+#: code:addons/google_calendar/static/src/js/google_calendar.js:74
#, python-format
msgid "Event disconnection error"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:68
+#: code:addons/google_calendar/static/src/js/google_calendar.js:70
#, python-format
msgid "Event disconnection success"
msgstr ""
@@ -169,13 +169,21 @@ msgid "Google ID should be unique!"
msgstr ""
#. module: google_calendar
+#: code:addons/google_calendar/models/google_calendar.py:673
+#, python-format
+msgid "Google is lost... the next synchro will be a full synchro. \n"
+"\n"
+" %s"
+msgstr ""
+
+#. module: google_calendar
#: model:ir.model.fields,field_description:google_calendar.field_google_calendar_id
msgid "ID"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:57
+#: code:addons/google_calendar/static/src/js/google_calendar.js:59
#, python-format
msgid "In order to do this, you first need to disconnect all existing events from the old account."
msgstr ""
@@ -227,7 +235,7 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:38
+#: code:addons/google_calendar/static/src/js/google_calendar.js:40
#, python-format
msgid "Redirection"
msgstr ""
@@ -249,21 +257,21 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:87
+#: code:addons/google_calendar/static/src/js/google_calendar.js:90
#, python-format
msgid "Sync with <b>Google</b>"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:42
+#: code:addons/google_calendar/static/src/js/google_calendar.js:44
#, python-format
msgid "The Google Synchronization needs to be configured before you can use it, do you want to do it now?"
msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:56
+#: code:addons/google_calendar/static/src/js/google_calendar.js:58
#, python-format
msgid "The account you are trying to synchronize (%s) is not the same as the last one used (%s)!"
msgstr ""
@@ -295,12 +303,18 @@ msgstr ""
#. module: google_calendar
#. openerp-web
-#: code:addons/google_calendar/static/src/js/calendar_sync.js:34
+#: code:addons/google_calendar/static/src/js/google_calendar.js:36
#, python-format
msgid "You will be redirected to Google to authorize access to your calendar!"
msgstr ""
#. module: google_calendar
+#: code:addons/google_calendar/models/google_calendar.py:296
+#, python-format
+msgid "Your token is invalid or has been revoked !"
+msgstr ""
+
+#. module: google_calendar
#: model:ir.model,name:google_calendar.model_base_config_settings
msgid "base.config.settings"
msgstr ""
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
index 46229306e4a..a8840532825 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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,17 +67,12 @@ 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"
msgstr ""
@@ -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/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
index 5989beba6e3..302443b2b59 100644
--- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index dfdcb92a3d8..46743e15b7c 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-15 10:41+0000\n"
-"PO-Revision-Date: 2016-01-15 10:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,49 +16,12 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr
-#: code:addons/hr/hr.py:119
+#: 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"
" <span class=\"o_following\">Following</span>"
@@ -80,45 +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_message_needaction
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_needaction
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: hr
+#: model:ir.model.fields,field_description:hr.field_hr_department_active
#: model:ir.model.fields,field_description:hr.field_hr_employee_active
msgid "Active"
msgstr ""
#. module: hr
-#: model: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 ""
@@ -129,40 +60,11 @@ 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"
msgstr ""
@@ -178,11 +80,6 @@ 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
msgid "Click to add a new employee."
@@ -194,27 +91,11 @@ 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
msgid "Coach"
@@ -252,28 +133,11 @@ 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
#: model:ir.model.fields,field_description:hr.field_hr_employee_create_uid
@@ -300,30 +164,11 @@ msgid "Date of Birth"
msgstr ""
#. module: hr
-#: model:ir.model.fields,help:hr.field_hr_department_message_last_post
-#: model:ir.model.fields,help:hr.field_hr_employee_message_last_post
-#: model:ir.model.fields,help:hr.field_hr_job_message_last_post
-msgid "Date of the last message posted on the record."
-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.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
@@ -421,15 +266,13 @@ msgid "Employees Tags"
msgstr ""
#. module: hr
-#: code:addons/hr/hr.py:299
-#: 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:269
-#: constraint:hr.employee:0
+#: code:addons/hr/models/hr.py:167
#, python-format
msgid "Error! You cannot create recursive hierarchy of Employee(s)."
msgstr ""
@@ -445,11 +288,6 @@ 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"
msgstr ""
@@ -460,114 +298,27 @@ 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.model.fields,field_description:hr.field_hr_department_message_follower_ids
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_follower_ids
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_follower_ids
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "Followers"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_channel_ids
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_channel_ids
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_partner_ids
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_partner_ids
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_employee_gender
msgid "Gender"
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
msgid "Group By"
msgstr ""
#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "HR Department"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_form
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"
msgstr ""
@@ -578,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
@@ -601,32 +352,11 @@ msgid "Identification No"
msgstr ""
#. module: hr
-#: model:ir.model.fields,help:hr.field_hr_department_message_unread
-#: model:ir.model.fields,help:hr.field_hr_employee_message_unread
-#: model:ir.model.fields,help:hr.field_hr_job_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr
-#: model:ir.model.fields,help:hr.field_hr_department_message_needaction
-#: model:ir.model.fields,help:hr.field_hr_employee_message_needaction
-#: model:ir.model.fields,help:hr.field_hr_job_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,help:hr.field_hr_employee_active
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"
msgstr ""
@@ -637,27 +367,6 @@ 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.model.fields,field_description:hr.field_hr_department_message_is_follower
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_is_follower
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: hr
#: model:ir.ui.view,arch_db:hr.view_employee_filter
#: model:ir.ui.view,arch_db:hr.view_hr_job_form
#: model:ir.ui.view,arch_db:hr.view_hr_job_tree
@@ -671,21 +380,11 @@ 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
#: model:ir.ui.menu,name:hr.menu_hr_job_position_config
@@ -702,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 ""
@@ -712,13 +412,6 @@ msgid "Jobs"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_last_post
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_last_post
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department___last_update
#: model:ir.model.fields,field_description:hr.field_hr_employee___last_update
#: model:ir.model.fields,field_description:hr.field_hr_employee_category___last_update
@@ -727,11 +420,6 @@ msgid "Last Modified on"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_res_users_last_website_so_id
-msgid "Last Online Sale Order"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,field_description:hr.field_hr_department_write_uid
#: model:ir.model.fields,field_description:hr.field_hr_employee_category_write_uid
#: model:ir.model.fields,field_description:hr.field_hr_employee_write_uid
@@ -743,6 +431,7 @@ msgstr ""
#: model:ir.model.fields,field_description:hr.field_hr_department_write_date
#: model:ir.model.fields,field_description:hr.field_hr_employee_category_write_date
#: model:ir.model.fields,field_description:hr.field_hr_employee_write_date
+#: model:ir.model.fields,field_description:hr.field_hr_job_write_date
msgid "Last Updated on"
msgstr ""
@@ -757,21 +446,6 @@ 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"
msgstr ""
@@ -794,23 +468,11 @@ 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"
msgstr ""
@@ -826,9 +488,6 @@ msgid "Members"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_ids
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_ids
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_ids
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
msgid "Messages"
msgstr ""
@@ -839,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 ""
@@ -862,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
@@ -883,13 +523,6 @@ msgid "Notes"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job_no_of_employee
msgid "Number of employees currently occupying this job position."
msgstr ""
@@ -900,25 +533,11 @@ msgid "Number of hired employees for this job position during recruitment phase.
msgstr ""
#. module: hr
-#: model:ir.model.fields,help:hr.field_hr_department_message_needaction_counter
-#: model:ir.model.fields,help:hr.field_hr_employee_message_needaction_counter
-#: model:ir.model.fields,help:hr.field_hr_job_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: hr
#: model:ir.model.fields,help:hr.field_hr_job_no_of_recruitment
msgid "Number of new employees you expect to recruit."
msgstr ""
#. module: hr
-#: model:ir.model.fields,help:hr.field_hr_department_message_unread_counter
-#: model:ir.model.fields,help:hr.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,help:hr.field_hr_job_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: hr
#: model:ir.actions.act_window,help:hr.open_module_tree_department
msgid "Odoo's department structure is used to manage all documents\n"
" related to employees by departments: expenses, timesheets,\n"
@@ -926,11 +545,6 @@ msgid "Odoo's department structure is used to manage all documents\n"
msgstr ""
#. module: hr
-#: model:ir.actions.client,name:hr.action_client_hr_menu
-msgid "Open HR Menu"
-msgstr ""
-
-#. module: hr
#: selection:hr.employee,gender:0
msgid "Other"
msgstr ""
@@ -941,24 +555,13 @@ 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"
msgstr ""
#. module: hr
-#: model:hr.job,website_description:hr.job_developer
-msgid "Passion for the Internet and its culture"
+#: model:ir.model,name:hr.model_res_partner
+msgid "Partner"
msgstr ""
#. module: hr
@@ -977,49 +580,16 @@ 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"
msgstr ""
@@ -1055,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
@@ -1081,13 +645,6 @@ 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."
msgstr ""
@@ -1103,17 +660,6 @@ 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"
msgstr ""
@@ -1156,11 +702,6 @@ msgid "Subordinates"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_res_users_subscription_count
-msgid "Subscriptions"
-msgstr ""
-
-#. module: hr
#: sql_constraint:hr.employee.category:0
msgid "Tag name already exists !"
msgstr ""
@@ -1171,16 +712,6 @@ 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!"
msgstr ""
@@ -1201,19 +732,6 @@ 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.model.fields,field_description:hr.field_hr_department_message_unread
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_unread
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_unread
#: model:ir.ui.view,arch_db:hr.hr_kanban_view_employees
#: model:ir.ui.view,arch_db:hr.view_department_filter
#: model:ir.ui.view,arch_db:hr.view_employee_filter
@@ -1222,15 +740,8 @@ msgid "Unread Messages"
msgstr ""
#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_department_message_unread_counter
-#: model:ir.model.fields,field_description:hr.field_hr_employee_message_unread_counter
-#: model:ir.model.fields,field_description:hr.field_hr_job_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: hr
-#: model:ir.model.fields,field_description:hr.field_hr_job_write_date
-msgid "Update Date"
+#: model:ir.model.fields,help:hr.field_hr_employee_login
+msgid "Used to log into the system"
msgstr ""
#. module: hr
@@ -1244,58 +755,11 @@ 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
msgid "With just a quick glance on the Odoo employee screen, you\n"
@@ -1304,17 +768,6 @@ msgid "With just a quick glance on the Odoo employee screen, you\n"
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"
msgstr ""
@@ -1345,62 +798,6 @@ 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"
" the recruitment process to evaluate the applicants for this job\n"
@@ -1408,113 +805,6 @@ msgid "You can attach a survey to a job position. It will be used in\n"
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, such as the 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, such as the 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&amp;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"
msgstr ""
@@ -1524,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 3a02dcb3653..e2dd80d9163 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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
+#. openerp-web
+#: code:addons/hr_attendance/static/src/xml/attendance.xml:97
+#, python-format
+msgid "Checked out at"
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:27
+#, python-format
+msgid "Click to check in"
+msgstr ""
+
+#. module: hr_attendance
+#. 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.report_attendanceerrors
-msgid "Date Recorded"
+#. 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.view,arch_db:hr_attendance.report_attendanceerrors
-msgid "Date Signed"
+#: 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.ui.view,arch_db:hr_attendance.edit_attendance_reason
-msgid "Define attendance reason"
+#: 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
+#: 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
+#: 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
-#: constraint:hr.attendance:0
-msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+#. 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
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
+#. 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
+#. 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_employee_last_sign
-msgid "Last Sign"
+#: 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,62 +523,78 @@ 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.menu,name:hr_attendance.menu_hr_time_tracking
-msgid "Time Tracking"
+#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
+msgid "Today"
msgstr ""
#. module: hr_attendance
-#: model:ir.ui.menu,name:hr_attendance.timesheet_menu_root
-msgid "Timesheets"
+#. 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
-#: model:ir.ui.view,arch_db:hr_attendance.view_hr_attendance_filter
-msgid "Today"
+#. 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
@@ -388,14 +603,46 @@ 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 632c699be39..8e876cb9199 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model,name:hr_contract.model_base_action_rule
msgid "Action Rules"
msgstr ""
@@ -41,13 +36,13 @@ msgid "Basic Salary of the employee"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle
-msgid "Company Vehicle"
+#: 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,name:hr_contract.model_hr_contract
-msgid "Contract"
+#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle
+msgid "Company Vehicle"
msgstr ""
#. module: hr_contract
@@ -58,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_5307
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_5703
#: 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
@@ -85,6 +80,12 @@ 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"
msgstr ""
@@ -126,11 +127,6 @@ msgid "Current Employee"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_department_id
msgid "Department"
msgstr ""
@@ -154,13 +150,13 @@ msgid "Employee"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
-msgid "End Date"
+#: model:ir.model,name:hr_contract.model_hr_contract
+msgid "Employee Contract"
msgstr ""
#. module: hr_contract
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
+#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end
+msgid "End Date"
msgstr ""
#. module: hr_contract
@@ -170,21 +166,6 @@ msgid "Expired"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,help:hr_contract.field_hr_contract_type_sequence
msgid "Gives the sequence when displaying a list of Contract."
msgstr ""
@@ -216,13 +197,8 @@ msgid "ID"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_needaction
-msgid "If checked, new messages require your attention."
+#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search
+msgid "Important Messages"
msgstr ""
#. module: hr_contract
@@ -236,11 +212,6 @@ msgid "Information"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_manager
msgid "Is a Manager"
msgstr ""
@@ -256,11 +227,6 @@ msgid "Job Title"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract___last_update
#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type___last_update
msgid "Last Modified on"
@@ -294,16 +260,6 @@ msgid "Medical Examination Date"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: hr_contract
#: selection:hr.contract,state:0
msgid "New"
msgstr ""
@@ -315,26 +271,11 @@ msgid "Notes"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.model.fields,field_description:hr_contract.field_hr_employee_children
msgid "Number of Children"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.filters,name:hr_contract.contract_open
msgid "Open Contracts"
msgstr ""
@@ -408,17 +349,6 @@ msgid "Trial Start Date"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_message_unread
-#: 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_hr_contract_message_unread_counter
-msgid "Unread Messages Counter"
-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"
msgstr ""
@@ -444,16 +374,6 @@ msgid "Wage"
msgstr ""
#. module: hr_contract
-#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: hr_contract
-#: model:ir.model.fields,help:hr_contract.field_hr_contract_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: hr_contract
#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form
msgid "Work Permit"
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 891dcc3e98e..98185e60f40 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-21 09:18+0000\n"
-"PO-Revision-Date: 2015-09-21 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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
+#: 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.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
+#. 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
+#: 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
+#: 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
+#: 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_sheet
msgid "<strong>Total</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>Validated By:</strong>"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_needaction
-msgid "Action Needed"
+#: 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:product.product,name:hr_expense.air_ticket
-#: model:product.template,name:hr_expense.air_ticket_product_template
-msgid "Air Flight"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_account_id
+msgid "Account"
+msgstr ""
+
+#. module: hr_expense
+#: 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,118 +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:291
+#, 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.fields,help:hr_expense.field_hr_expense_message_last_post
-msgid "Date of the last message posted on the record."
+#: 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_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_sheet_department_id
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
msgid "Department"
msgstr ""
@@ -179,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 ""
@@ -202,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 ""
@@ -219,17 +381,66 @@ 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"
msgstr ""
@@ -251,121 +462,138 @@ 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"
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:206
+#: code:addons/hr_expense/models/hr_expense.py:398
#, python-format
msgid "Expenses must belong to the same Employee."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:209
+#: code:addons/hr_expense/models/hr_expense.py:509
#, python-format
msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "Expenses of Your Team Member"
+#: code:addons/hr_expense/models/hr_expense.py:402
+#, python-format
+msgid "Expenses must have been paid by the same entity (Company or employee)"
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_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.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 to Invoice"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_follower_ids
-msgid "Followers"
+#: 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.model.fields,field_description:hr_expense.field_hr_expense_message_channel_ids
-msgid "Followers (Channels)"
+#: 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 ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_partner_ids
-msgid "Followers (Partners)"
+#: model:ir.actions.act_window,help:hr_expense.action_approved_expense
+msgid "From here the accountant will be able to approve as well as refuse the expenses which are verified by the HR Manager."
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
-msgid "Former Employees"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner
+msgid "From: Your Email"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.act_window,help:hr_expense.action_approved_expense
-msgid "From here the accountant will be able to approve as well as refuse the expenses which are verified by the HR Manager."
+#: model:ir.ui.view,arch_db:hr_expense.product_product_expense_form_view
+msgid "General Information"
msgstr ""
#. module: hr_expense
-#: model:ir.actions.server,name:hr_expense.hr_expense_entry_action_server
-msgid "Generate Single Accounting Entry"
+#: 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.model,name:hr_expense.model_hr_department
-msgid "HR Department"
+#: 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.actions.report.xml,name:hr_expense.action_report_hr_expense
-msgid "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
@@ -374,29 +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_9311
msgid "ID"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_is_follower
-msgid "Is Follower"
-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 ""
@@ -406,59 +621,87 @@ msgid "Journal Item"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_last_post
-msgid "Last Message Date"
-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.model.fields,field_description:hr_expense.field_hr_expense_message_ids
-msgid "Messages"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_alias_expense_open
+msgid "Mail Gateway"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_message_ids
-msgid "Messages and communication history"
+#. 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.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_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
@@ -468,86 +711,141 @@ 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:260
+#: code:addons/hr_expense/models/hr_expense.py:239
#, 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:231
+#: code:addons/hr_expense/models/hr_expense.py:207
#, 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:227
+#: code:addons/hr_expense/models/hr_expense.py:203
#, 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.hr_expense_form_view
-msgid "Notes..."
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
+msgid "Not Refused"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_needaction_counter
-msgid "Number of Actions"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+msgid "Notes..."
msgstr ""
#. module: hr_expense
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_attachment_number
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_attachment_number
msgid "Number of Attachments"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_message_needaction_counter
-msgid "Number of messages which requires an action"
+#: 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.model.fields,help:hr_expense.field_hr_expense_message_unread_counter
-msgid "Number of unread messages"
+#: 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_request_approve_expense
-#: model:ir.actions.act_window,help:hr_expense.expense_all
+#: 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
-#: model:ir.actions.client,name:hr_expense.action_client_expense_menu
-msgid "Open Expense Menu"
+#: 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,state:0
+#: 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:264
+#: 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:243
#, 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 ""
@@ -558,12 +856,17 @@ 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 ""
@@ -583,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 ""
@@ -595,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: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
+#: 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: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.action_request_to_post_expense_sheet
+msgid "Reports to Post"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:73
+#: 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:94
#, 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
@@ -626,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 ""
@@ -653,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,field_description:hr_expense.field_hr_expense_tax_ids
-msgid "Taxes"
+#: 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.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
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_journal_id
+#: code:addons/hr_expense/models/hr_expense.py:485
+#, python-format
+msgid "The expense has been validated by %s"
+msgstr ""
+
+#. module: hr_expense
+#: 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
@@ -700,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 ""
@@ -717,75 +1168,126 @@ msgid "Unit of Measure"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_unread
-msgid "Unread Messages"
+#: model:ir.actions.act_window,name:hr_expense.action_approved_expense
+msgid "Unreported Expenses"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_register_payment_view_form
+msgid "Validate"
msgstr ""
#. module: hr_expense
-#: model:ir.ui.view,arch_db:hr_expense.report_expense
-msgid "UoM"
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_responsible_id
+msgid "Validation By"
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.view_expenses_tree
+msgid "View Attached Documents"
msgstr ""
#. module: hr_expense
-#: selection:hr.expense,state:0
-msgid "Waiting Payment"
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "View Attachments"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_website_message_ids
-msgid "Website Messages"
+#: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view
+msgid "View Report"
msgstr ""
#. module: hr_expense
-#: model:ir.model.fields,help:hr_expense.field_hr_expense_website_message_ids
-msgid "Website communication history"
+#. openerp-web
+#: code:addons/hr_expense/static/src/js/tour.js:11
+#, python-format
+msgid "Want to manage your employee expenses and receipts? <i>Start here</i>."
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.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:107
+#: code:addons/hr_expense/models/hr_expense.py:506
#, python-format
-msgid "You can only delete draft or refused expenses!"
+msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:203
-#, python-format
-msgid "You can only generate accounting entry for approved expense(s)."
+#: 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
-#: code:addons/hr_expense/models/hr_expense.py:113
+#: 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:110
#, 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
-#: code:addons/hr_expense/models/hr_expense.py:124
+#: 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:480
+#: code:addons/hr_expense/models/hr_expense.py:492
#, 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
@@ -793,3 +1295,19 @@ msgstr ""
msgid "or"
msgstr ""
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:292
+#, 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 d120670825e..25c8a0c0f53 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,11 @@ msgid "A goal is defined by a user and a goal type.\n"
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"
" The challenge can use a period (weekly, monthly...) for automatic creation of goals.\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 ""
@@ -39,6 +45,11 @@ msgid "Badges are rewards of good work. Give them to people you believe deserve
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"
msgstr ""
@@ -71,6 +82,11 @@ 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
#: model:ir.model.fields,field_description:hr_gamification.field_gamification_badge_user_wizard_employee_id
@@ -98,6 +114,11 @@ 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
msgid "Goals History"
@@ -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 de22029304f..22b28611d67 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:10+0000\n"
-"PO-Revision-Date: 2015-09-18 08:10+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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\"&gt;"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:234
-#: code:addons/hr_holidays/hr_holidays.py:356
+#: 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
@@ -109,13 +108,13 @@ msgid "Absent Today"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_needaction
-msgid "Action Needed"
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_active
+msgid "Active"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_active
-msgid "Active"
+#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
+msgid "Active Leaves and Allocations"
msgstr ""
#. module: hr_holidays
@@ -175,7 +174,7 @@ msgid "Allocation Requests to Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:559
+#: code:addons/hr_holidays/models/hr.py:129
#, python-format
msgid "Allocation for %s"
msgstr ""
@@ -238,10 +237,10 @@ 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"
+" 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
@@ -314,6 +313,23 @@ msgid "Choose 'Leave Request' if someone wants to take an off-day. \n"
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."
msgstr ""
@@ -377,11 +393,6 @@ 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"
msgstr ""
@@ -393,7 +404,7 @@ msgstr ""
#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-msgid "Current Year Leaves"
+msgid "Current Year"
msgstr ""
#. module: hr_holidays
@@ -402,11 +413,6 @@ msgid "Dashboard"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_department_id
msgid "Department"
msgstr ""
@@ -487,21 +493,6 @@ msgid "First Approval"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_dept_date_from
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_date_from
msgid "From"
@@ -528,11 +519,6 @@ msgid "HR Comments"
msgstr ""
#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_department
-msgid "HR Department"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
msgid "HR Leaves Summary Report By Department"
msgstr ""
@@ -563,16 +549,6 @@ msgid "ID"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_active
msgid "If the active field is set to false, it will allow you to hide the leave type without removing it."
msgstr ""
@@ -583,21 +559,11 @@ msgid "If you select this check box, the system allows the employees to take mor
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Ivory"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays___last_update
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_remaining_leaves_user___last_update
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status___last_update
@@ -791,17 +757,17 @@ msgstr ""
#. module: hr_holidays
#: model:mail.message.subtype,name:hr_holidays.mt_department_holidays_confirmed
-msgid "Leaves/Allocations: first approval"
+msgid "Leaves/Allocations Confirmed"
msgstr ""
#. module: hr_holidays
#: model:mail.message.subtype,name:hr_holidays.mt_department_holidays_first_validated
-msgid "Leaves/Allocations: second approval"
+msgid "Leaves/Allocations First Approval"
msgstr ""
#. module: hr_holidays
#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
-msgid "Legal Leaves 2015"
+msgid "Legal Leaves 2016"
msgstr ""
#. module: hr_holidays
@@ -880,16 +846,6 @@ msgid "Meeting Type"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.ui.view,arch_db:hr_holidays.edit_holiday_new
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
msgid "Mode"
@@ -906,13 +862,7 @@ msgid "My Department Leaves"
msgstr ""
#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-msgid "My Leave Requests"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_my_leaves
-#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "My Leaves"
msgstr ""
@@ -932,11 +882,6 @@ msgid "New"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_number_of_days
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday_employee
@@ -950,16 +895,6 @@ msgid "Number of Leaves"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_status_categ_id
msgid "Once a leave is validated, Odoo will create a corresponding meeting of this type in the calendar."
msgstr ""
@@ -973,11 +908,6 @@ msgid "Once you have recorded your leave request, it will be sent\n"
msgstr ""
#. module: hr_holidays
-#: model:ir.actions.client,name:hr_holidays.action_client_hr_holidays_menu
-msgid "Open HR Menu"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_parent_id
msgid "Parent"
msgstr ""
@@ -1011,6 +941,11 @@ 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
#: model:ir.ui.view,arch_db:hr_holidays.view_holiday_allocation_tree_customize
@@ -1138,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:554
+#: 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
@@ -1150,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 ""
@@ -1183,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
@@ -1248,17 +1181,11 @@ msgid "Unpaid"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_unread
#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
msgid "Unread Messages"
msgstr ""
#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_remaining_leaves_user_user_id
#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_user_id
msgid "User"
@@ -1295,69 +1222,49 @@ msgid "Waiting Second Validation"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:554
-#: code:addons/hr_holidays/hr_holidays.py:561
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
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 ""
#. module: hr_holidays
-#: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
-msgid "Year"
-msgstr ""
-
-#. module: hr_holidays
#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
msgid "You can assign remaining Legal Leaves for each employee, Odoo\n"
" will automatically create and validate allocation requests."
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:561
+#: 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:352
-#: code:addons/hr_holidays/hr_holidays.py:364
+#: 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 ""
@@ -1387,3 +1294,4 @@ msgstr ""
#: model:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
msgid "to"
msgstr ""
+
diff --git a/addons/hr_maintenance/i18n/hr_maintenance.pot b/addons/hr_maintenance/i18n/hr_maintenance.pot
new file mode 100644
index 00000000000..2166db6c8b9
--- /dev/null
+++ b/addons/hr_maintenance/i18n/hr_maintenance.pot
@@ -0,0 +1,74 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * hr_maintenance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_equipment_department_id
+msgid "Assigned to Department"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_equipment_employee_id
+msgid "Assigned to Employee"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_request_view_form_inherit_hr
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_request_view_search_inherit_hr
+msgid "Created By"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request_department_id
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_form_inherit_hr
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_tree_inherit_hr
+#: selection:maintenance.equipment,equipment_assign_to:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request_employee_id
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_form_inherit_hr
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_equipment_view_tree_inherit_hr
+#: selection:maintenance.equipment,equipment_assign_to:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model,name:hr_maintenance.model_maintenance_equipment
+msgid "Equipment"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model,name:hr_maintenance.model_maintenance_request
+msgid "Maintenance Requests"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.ui.view,arch_db:hr_maintenance.maintenance_request_view_search_inherit_hr
+msgid "My Requests"
+msgstr ""
+
+#. module: hr_maintenance
+#: selection:maintenance.equipment,equipment_assign_to:0
+msgid "Other"
+msgstr ""
+
+#. module: hr_maintenance
+#: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_equipment_equipment_assign_to
+msgid "Used By"
+msgstr ""
+
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index c49506c1e51..ade22ec537f 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-01 06:26+0000\n"
-"PO-Revision-Date: 2015-10-01 06:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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_9081
+#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_9495
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter
msgid "Category"
msgstr ""
@@ -323,7 +326,6 @@ msgid "Confirm"
msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_contract_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_input_contract_id
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_contract_id
@@ -461,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 ""
@@ -510,6 +511,11 @@ msgid "Employee"
msgstr ""
#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_employee_grade_form
#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_structure_list_view
msgid "Employee Function"
@@ -530,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 ""
@@ -597,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 ""
@@ -643,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
@@ -666,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 ""
@@ -756,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 ""
@@ -862,12 +867,12 @@ 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 ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_run
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_payslip_run_id
#: model:ir.ui.view,arch_db:hr_payroll.hr_payslip_run_filter
msgid "Payslip Batches"
@@ -916,6 +921,11 @@ msgid "Payslip Name"
msgstr ""
#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Run"
+msgstr ""
+
+#. module: hr_payroll
#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
#: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_worked_days_line_ids
msgid "Payslip Worked Days"
@@ -1042,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 ""
@@ -1119,7 +1123,8 @@ msgid "Salary Rules"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:638
+#: 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 ""
@@ -1310,49 +1315,49 @@ msgid "Worked Days & Inputs"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:838
+#: 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:844
+#: 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:867
+#: 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:831
+#: 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:861
+#: 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 ""
@@ -1373,11 +1378,6 @@ 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"
msgstr ""
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index d5b54cc53a3..dc970791b54 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,24 +27,21 @@ msgid "Accounting Entry"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:147
-#: code:addons/hr_payroll_account/hr_payroll_account.py:163
+#: code:addons/hr_payroll_account/models/hr_payroll_account.py:113
+#: code:addons/hr_payroll_account/models/hr_payroll_account.py:129
#, python-format
msgid "Adjustment Entry"
msgstr ""
#. module: hr_payroll_account
#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_contract_analytic_account_id
+#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_payslip_line_analytic_account_id
#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_salary_rule_analytic_account_id
msgid "Analytic Account"
msgstr ""
#. module: hr_payroll_account
-#: model:ir.model,name:hr_payroll_account.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: hr_payroll_account
+#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_payslip_line_account_credit
#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_salary_rule_account_credit
msgid "Credit Account"
msgstr ""
@@ -55,11 +52,17 @@ msgid "Date Account"
msgstr ""
#. module: hr_payroll_account
+#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_payslip_line_account_debit
#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_salary_rule_account_debit
msgid "Debit Account"
msgstr ""
#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contract
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
msgid "Generate payslips for all selected employees"
msgstr ""
@@ -75,17 +78,17 @@ msgid "Pay Slip"
msgstr ""
#. module: hr_payroll_account
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
-msgid "Payslip Batches"
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
msgstr ""
#. module: hr_payroll_account
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
-msgid "Payslip Line"
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
+msgid "Payslip Run"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:98
+#: code:addons/hr_payroll_account/models/hr_payroll_account.py:64
#, python-format
msgid "Payslip of %s"
msgstr ""
@@ -98,18 +101,19 @@ msgid "Salary Journal"
msgstr ""
#. module: hr_payroll_account
+#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_payslip_line_account_tax_id
#: model:ir.model.fields,field_description:hr_payroll_account.field_hr_salary_rule_account_tax_id
msgid "Tax"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:145
+#: code:addons/hr_payroll_account/models/hr_payroll_account.py:111
#, python-format
msgid "The Expense Journal \"%s\" has not properly configured the Credit Account!"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:161
+#: code:addons/hr_payroll_account/models/hr_payroll_account.py:127
#, python-format
msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!"
msgstr ""
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index ae519b9720a..752b2ccf085 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,18 +16,37 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.hr_welcome_new_employee
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_refuse
msgid "\n"
-" <p>\n"
-" %if object.department_id:\n"
-" I’m very pleased to announce that <strong> ${object.name} </strong> will be joining us as a ${object.job_id.name}\n"
-" in ${object.department_id.name}.\n"
-" %else:\n"
-" I’m very pleased to announce that <strong> ${object.name} </strong> will be joining us as a ${object.job_id.name}.\n"
-" %endif\n"
-" </p>\n"
-" <p>Please welcome him/her and help him/her finding his/her marks.</p>\n"
-" "
+"<p>Dear ${object.partner_name or 'applicant'},</p>\n"
+"<p>Thank you for your enquiry.<br />\n"
+"Unfortunately, your profile does not match with our needs</p>\n"
+"<p>If you have any questions, please let us know.</p>\n"
+"<p>Best regards,</p>"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_interest
+msgid "\n"
+"<p>Dear ${object.partner_name or 'applicant'},</p>\n"
+"<p>Thank you for your enquiry.<br />\n"
+"Your resume got our interest. I will contact you as soon as possible to plan\n"
+"next steps of the recruitment process.</p>\n"
+"<p>If you have any questions, please let us know.</p>\n"
+"<p>Best regards,</p>"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.template,body_html:hr_recruitment.email_template_data_applicant_employee
+msgid "\n"
+"<p>Dear all,</p>\n"
+"<p>I’m very pleased to announce that <strong> ${object.name} </strong> will be\n"
+"joining us as a ${object.job_id.name}\n"
+"%if object.department_id:\n"
+" in ${object.department_id.name}.\n"
+"%endif\n"
+".</p>\n"
+"<p>Please welcome him/her and help him/her finding his/her marks.</p>"
msgstr ""
#. module: hr_recruitment
@@ -86,30 +105,6 @@ msgid "<b>Departement:</b>"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.applicant_interest
-msgid "<p>Dear ${object.partner_name or 'applicant'},</p>\n"
-" <p>Congrats! Your resume's got our interest!\n"
-" I will call you as soon as possible to make a 10 minutes phone interview and plan a first meeting.</p>\n"
-" <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030\n"
-" If I do not answer, please let me a message with some schedules to call you back.</p>\n"
-" <p>Kind regards,</p>\n"
-" <br/>\n"
-" ${object.user_id.signature | safe}"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:mail.template,body_html:hr_recruitment.applicant_refuse
-msgid "<p>Dear ${object.partner_name or 'applicant'},</p>\n"
-" <p>We thank you for your interest in our company and for your application.\n"
-" Unfortunately, your profile does not match with our needs or our recruitment\n"
-" campaign has reached its term.</p>\n"
-" <p>If you want more details, feel free to contact us by phone.</p>\n"
-" <p>Kind regards,</p>\n"
-" <br/>\n"
-" ${object.user_id and object.user_id.signature | safe or ''}"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
msgid "<span class=\"o_stat_text\">Meetings</span>"
msgstr ""
@@ -152,12 +147,8 @@ msgid "A Python dictionary that will be evaluated to provide default values when
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_active
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_active
msgid "Active"
msgstr ""
@@ -167,6 +158,13 @@ msgid "Activities"
msgstr ""
#. module: hr_recruitment
+#. 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 &gt; Qualified &gt; First Interview &gt; Recruited</i>"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_job_address_id
msgid "Address where employees are working"
msgstr ""
@@ -243,7 +241,7 @@ msgid "Applicant's Name"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:85
+#: code:addons/hr_recruitment/models/hr_recruitment.py:92
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_tree_view_job
#: model:ir.ui.view,arch_db:hr_recruitment.hr_applicant_calendar_view
#, python-format
@@ -275,12 +273,12 @@ msgid "Application Summary"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.applicant_interest
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_interest
msgid "Application approved"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.applicant_refuse
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_refuse
msgid "Application refused"
msgstr ""
@@ -380,11 +378,6 @@ msgid "By Recruiter"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_campaign_id
-msgid "Campaign"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_configuration
msgid "Cancel"
msgstr ""
@@ -409,7 +402,7 @@ 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
@@ -424,12 +417,18 @@ 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
msgid "Closed"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category_color
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_color
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_color
msgid "Color Index"
@@ -458,31 +457,31 @@ msgid "Configure Recruitment"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:382
+#: code:addons/hr_recruitment/models/hr_recruitment.py:389
#: 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:384
+#: code:addons/hr_recruitment/models/hr_recruitment.py:391
#, 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
@@ -496,20 +495,19 @@ msgid "Create Employee"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_source_tree
-msgid "Create alias"
+#: 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.actions.act_window,help:hr_recruitment.action_hr_job_sources
-msgid "Create email and url for each distinct source. <br>\n"
-" When the applicant will arrive, you will know from wich source the Job position is coming."
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_source_tree
+msgid "Create alias"
msgstr ""
#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_sources
-msgid "Create here some alias...\n"
-" That will allow you to track from where the applicant is coming from..."
+msgid "Create some aliases that will allow you to track where applicants come from."
msgstr ""
#. module: hr_recruitment
@@ -543,11 +541,6 @@ msgid "Creation Week"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_day_close
msgid "Days to Close"
msgstr ""
@@ -563,6 +556,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 ""
@@ -575,12 +569,6 @@ msgid "Define here your stages of the recruitment process, for example:\n"
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
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_degree_name
@@ -620,6 +608,12 @@ msgid "Department Manager"
msgstr ""
#. module: hr_recruitment
+#: 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:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_description
msgid "Description"
msgstr ""
@@ -630,6 +624,11 @@ msgid "Desk space"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
+msgid "Discard"
+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"
@@ -698,6 +697,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 ""
@@ -782,31 +782,11 @@ 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:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: hr_recruitment
#: model:survey.label,value:hr_recruitment.rrow_2_1_8
msgid "Freebies such as tea, coffee and stationery"
msgstr ""
@@ -864,13 +844,13 @@ msgid "Group By"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_department
-msgid "HR Department"
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
+msgid "Hired Employees"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
-msgid "Hired Employees"
+#: model:ir.model,name:hr_recruitment.model_hr_department
+msgid "Hr Department"
msgstr ""
#. module: hr_recruitment
@@ -890,16 +870,6 @@ msgid "ID of the parent record holding the alias (example: project holding the t
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: hr_recruitment
#: model: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
@@ -908,7 +878,7 @@ msgstr ""
#: 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, precise:"
+msgid "If other, please specify:"
msgstr ""
#. module: hr_recruitment
@@ -932,21 +902,12 @@ 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
msgid "Interview Form"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
msgid "Job"
@@ -958,6 +919,11 @@ 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"
msgstr ""
@@ -989,9 +955,8 @@ msgid "Job Positions"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_job_stage_ids
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_job_ids
-msgid "Job Stages"
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_stage_job_id
+msgid "Job Specific"
msgstr ""
#. module: hr_recruitment
@@ -1015,11 +980,6 @@ msgid "Knowledge"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant___last_update
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_category___last_update
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_config_settings___last_update
@@ -1063,14 +1023,15 @@ msgid "Last Updated on"
msgstr ""
#. module: hr_recruitment
-#: model:survey.label,value:hr_recruitment.recruitment_1_2_1
-msgid "Male"
+#. 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
-#: 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...)"
+#: model:survey.label,value:hr_recruitment.recruitment_1_2_1
+msgid "Male"
msgstr ""
#. module: hr_recruitment
@@ -1079,22 +1040,11 @@ msgid "Master Degree"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_medium_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_medium_id
msgid "Medium"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_partner_mobile
msgid "Mobile"
msgstr ""
@@ -1125,9 +1075,7 @@ msgid "Name"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_job.py:27
#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
-#, python-format
msgid "New"
msgstr ""
@@ -1153,7 +1101,7 @@ msgid "New Applications"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:428
+#: code:addons/hr_recruitment/models/hr_recruitment.py:439
#, python-format
msgid "New Employee %s Hired"
msgstr ""
@@ -1199,12 +1147,17 @@ msgid "No Interview Form"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/models/hr_recruitment.py:395
+#: code:addons/hr_recruitment/models/hr_recruitment.py:407
#, python-format
msgid "No Subject"
msgstr ""
#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
+msgid "No document yet."
+msgstr ""
+
+#. module: hr_recruitment
#: model:survey.label,value:hr_recruitment.rrow_2_1_10
msgid "No out of hours working"
msgstr ""
@@ -1221,11 +1174,6 @@ msgid "Not important"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_attachment_number
msgid "Number of Attachments"
msgstr ""
@@ -1236,16 +1184,6 @@ msgid "Number of Days to close the project issue"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_applications
msgid "Odoo helps you track applicants in the recruitment\n"
" process and follow up all operations: meetings, interviews, etc."
@@ -1268,8 +1206,21 @@ msgid "Office location"
msgstr ""
#. module: hr_recruitment
-#: model:ir.actions.client,name:hr_recruitment.action_client_hr_recruitment_menu
-msgid "Open HR Menu"
+#: 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:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+msgid "Ongoing"
msgstr ""
#. module: hr_recruitment
@@ -1317,7 +1268,7 @@ msgstr ""
msgid "Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
-"- followers: only followers of the related document\n"
+"- followers: only followers of the related document or members of following channels\n"
""
msgstr ""
@@ -1409,11 +1360,21 @@ msgid "Refuse"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.view_hr_recruitment_report_search
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
#: model:survey.label,value:hr_recruitment.rrow_2_1_12
msgid "Regular meetings"
msgstr ""
#. module: hr_recruitment
+#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
+msgid "Reopen Application"
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.ui.menu,name:hr_recruitment.report_hr_recruitment
msgid "Reports"
msgstr ""
@@ -1425,11 +1386,6 @@ msgid "Requirements"
msgstr ""
#. module: hr_recruitment
-#: model:ir.ui.view,arch_db:hr_recruitment.crm_case_form_view_job
-msgid "Reset Application"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_response_id
msgid "Response"
msgstr ""
@@ -1498,16 +1454,6 @@ 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
msgid "Sequence"
@@ -1525,7 +1471,6 @@ msgid "Somewhat important"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_source_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_source_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_source_source_id
msgid "Source"
@@ -1554,6 +1499,11 @@ msgid "Specific Email Address"
msgstr ""
#. module: hr_recruitment
+#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_stage_job_id
+msgid "Specific job that uses this stage. Other jobs will not use this stage."
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_stage_id
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_recruitment_report_stage_id
#: model:ir.ui.view,arch_db:hr_recruitment.hr_recruitment_stage_form
@@ -1630,7 +1580,10 @@ 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 ""
@@ -1672,6 +1625,11 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.action_hr_job_sources
+msgid "These aliases can be emails or urls for every source. When the applicant arrives here through one of these you'll know where he came from."
+msgstr ""
+
+#. module: hr_recruitment
#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_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"
msgstr ""
@@ -1692,23 +1650,24 @@ 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_applicant_campaign_id
-msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_medium_id
#: 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"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_source_id
#: model:ir.model.fields,help:hr_recruitment.field_hr_recruitment_report_source_id
msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
msgstr ""
#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_applicant_resumes
+msgid "This menu helps you search through resumes and motivation\n"
+" letters. Odoo automatically indexes .PDF, .DOC, DOCX, .TXT\n"
+" files so that you can search keywords from the content of these\n"
+" files."
+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
@@ -1726,13 +1685,19 @@ msgid "This stage is folded in the kanban view when there are no records in that
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
msgid "Unassigned"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_unread
#: model:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
#: model:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
#: model:ir.ui.view,arch_db:hr_recruitment.view_job_filter_recruitment
@@ -1740,11 +1705,6 @@ msgid "Unread Messages"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: hr_recruitment
#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_write_date
msgid "Update Date"
msgstr ""
@@ -1755,6 +1715,13 @@ 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"
msgstr ""
@@ -1776,23 +1743,20 @@ msgid "Very important"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_email_cc
-msgid "Watchers Emails"
-msgstr ""
-
-#. module: hr_recruitment
-#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_website_message_ids
-msgid "Website Messages"
+#. 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
-#: model:ir.model.fields,help:hr_recruitment.field_hr_applicant_website_message_ids
-msgid "Website communication history"
+#: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant_email_cc
+msgid "Watchers Emails"
msgstr ""
#. module: hr_recruitment
-#: model:mail.template,subject:hr_recruitment.hr_welcome_new_employee
-msgid "Welcoming ${object.name} "
+#: model:mail.template,subject:hr_recruitment.email_template_data_applicant_employee
+msgid "Welcome ${object.name} "
msgstr ""
#. module: hr_recruitment
@@ -1813,7 +1777,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:432
+#: code:addons/hr_recruitment/models/hr_recruitment.py:443
#, python-format
msgid "You must define an Applied Job and a Contact Name for this applicant."
msgstr ""
@@ -1824,12 +1788,17 @@ 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:300
+#: code:addons/hr_recruitment/models/hr_recruitment.py:298
#, python-format
msgid "job applicants"
msgstr ""
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 870dd78b2cc..112e68f78be 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:26+0000\n"
-"PO-Revision-Date: 2015-09-14 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,20 +16,25 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
-msgid "Accounting"
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "<span>Timesheet Entries</span>"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+#: 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.model,name:hr_timesheet.model_account_analytic_account
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_account_id
-msgid "Analytic Account"
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_activity_analysis
+msgid "Activity Analysis"
msgstr ""
#. module: hr_timesheet
@@ -38,43 +43,55 @@ msgid "Analytic Line"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Analytic account"
+#: 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 ""
#. module: hr_timesheet
-#: model:ir.model.fields,help:hr_timesheet.field_account_analytic_account_use_timesheets
-msgid "Check this field if this project manages timesheets"
+#: constraint:project.task:0
+msgid "Circular references are not permitted between tasks and sub-tasks"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: 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,name:hr_timesheet.model_res_company
-msgid "Companies"
+#: 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."
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"
+#: model:ir.model.fields,help:hr_timesheet.field_project_task_total_hours
+msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_config
-msgid "Configuration"
+#: 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,62 +101,87 @@ msgid "Define your Analytic Structure"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_display_name
-msgid "Display Name"
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_delay_hours
+msgid "Delay Hours"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_department_id
+msgid "Department"
+msgstr ""
+
+#. module: hr_timesheet
+#: 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
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Duration"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Extended Filters..."
+#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_effective
+msgid "Effective Hours"
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"
+#: 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"
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_parent_id
+msgid "Parent Task"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
-msgid "Information"
+#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_planned
+msgid "Planned Hours"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_line_is_timesheet
-msgid "Is a Timesheet"
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+msgid "Product"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report___last_update
-msgid "Last Modified on"
+#: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_progress
+msgid "Progress"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "Month"
+#: 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.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+msgid "Project"
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_form
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
-msgid "Product"
+#: 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
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_kanban_inherited_progress
+msgid "Remaining hours"
msgstr ""
#. module: hr_timesheet
@@ -148,40 +190,77 @@ msgid "Reports"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "This Month"
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Responsible"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_report_quantity
-msgid "Time"
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited
+msgid "Spent Hours"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_project_subtask_project_id
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_subtask_project_id
+msgid "Sub-task Project"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model,name:hr_timesheet.model_hr_timesheet_report
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_report_all
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_subtask_count
+msgid "Sub-task count"
+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 ""
+
+#. module: hr_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_children_hours
+msgid "Sub-tasks Hours"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model.fields,help:hr_timesheet.field_project_task_children_hours
+msgid "Sum of the planned hours of all sub-tasks (when a sub-task is closed or its spent hours exceed its planned hours, spent hours are counted instead)"
+msgstr ""
+
+#. module: hr_timesheet
+#: 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.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
-msgid "Timesheet"
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Task"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_accounts_form
-msgid "Timesheet Accounts"
+#: model:ir.model,name:hr_timesheet.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet
+msgid "Time"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
+#: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
+msgid "Timesheet"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_form
#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "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
@@ -195,20 +274,30 @@ msgid "Timesheet by Month"
msgstr ""
#. module: hr_timesheet
-#: model:ir.model.fields,field_description:hr_timesheet.field_account_analytic_account_use_timesheets
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_timesheet_ids
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
+#: 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
+#: model:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
+#: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
msgid "Timesheets"
msgstr ""
#. module: hr_timesheet
-#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
-msgid "Total time"
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_total_hours
+msgid "Total"
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"
+#: 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 ""
+
+#. module: hr_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree
+msgid "Total time"
msgstr ""
#. module: hr_timesheet
@@ -217,10 +306,16 @@ msgid "Users"
msgstr ""
#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.model.fields,field_description:hr_timesheet.field_project_task_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 in the\n"
-" analytic accounting/contract and can be re-invoiced to\n"
+" day. Every time spent on a project will become a cost and can be re-invoiced to\n"
" customers if required."
msgstr ""
@@ -229,8 +324,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.ui.view,arch_db:hr_timesheet.view_hr_timesheet_report_search
-msgid "month"
-msgstr ""
-
diff --git a/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
new file mode 100644
index 00000000000..c39c1f8c989
--- /dev/null
+++ b/addons/hr_timesheet_attendance/i18n/hr_timesheet_attendance.pot
@@ -0,0 +1,235 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * hr_timesheet_attendance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
+msgid "<span class=\"o_stat_text\">Timesheet</span>"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model,name:hr_timesheet_attendance.model_hr_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_2_hr_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_attendance_count
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_attendances_ids
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model,name:hr_timesheet_attendance.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_date
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_name
+msgid "Date"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_difference
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_difference
+msgid "Difference"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
+msgid "Differences"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_display_name
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.actions.act_window,name:hr_timesheet_attendance.action_hr_timesheet_attendance_report
+msgid "HR Timesheet/Attendance Report"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_id
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_id
+msgid "ID"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report___last_update
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_period_ids
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
+msgid "Period"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:76
+#, python-format
+msgid "Please verify that the total difference of the sheet is lower than %.2f."
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_attendance_sheet_id
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_attendance_sheet_id_computed
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_sheet_id
+msgid "Sheet"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:85
+#, python-format
+msgid "The timesheet cannot be validated as it contains an attendance record with no Check Out)."
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
+msgid "This Month"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
+msgid "This Week"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_sheet_sheet
+msgid "Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.menu,name:hr_timesheet_attendance.menu_hr_timesheet_attendance_report
+msgid "Timesheet / Attendance"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Activities"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.actions.act_window,name:hr_timesheet_attendance.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_sheet_form
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_attendance
+msgid "Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
+msgid "Total Attendances"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
+msgid "Total Difference"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_day_total_timesheet
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_sheet_sheet_total_timesheet
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.hr_timesheet_day_tree
+msgid "Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_attendance
+msgid "Total attendance"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_difference
+msgid "Total difference"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_total_timesheet
+msgid "Total timesheet"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model.fields,field_description:hr_timesheet_attendance.field_hr_timesheet_attendance_report_user_id
+msgid "User id"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:98
+#, python-format
+msgid "You can not enter an attendance date outside the current timesheet dates."
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:96
+#, 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_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_timesheet_sheet.py:53
+#, python-format
+msgid "You cannot delete a timesheet that has attendance entries."
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:113
+#, python-format
+msgid "You cannot enter an attendance date outside the current timesheet dates."
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: code:addons/hr_timesheet_attendance/models/hr_attendance.py:119
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.model,name:hr_timesheet_attendance.model_hr_timesheet_attendance_report
+msgid "hr.timesheet.attendance.report"
+msgstr ""
+
+#. module: hr_timesheet_attendance
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_pivot
+#: model:ir.ui.view,arch_db:hr_timesheet_attendance.view_hr_timesheet_attendance_report_search
+msgid "timesheet attendance"
+msgstr ""
+
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index d5c955f3761..67572441e36 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 10:41+0000\n"
-"PO-Revision-Date: 2016-01-13 10:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,44 +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"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_needaction
-msgid "Action Needed"
+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
@@ -91,25 +56,6 @@ 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
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_current_open
-msgid "Cancel"
-msgstr ""
-
-#. module: hr_timesheet_sheet
#. openerp-web
#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:51
#, python-format
@@ -127,12 +73,6 @@ 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"
msgstr ""
@@ -150,42 +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"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_last_post
-msgid "Date of the last message posted on the record."
+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
-#: selection:res.company,timesheet_range:0
-msgid "Day"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: 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 ""
@@ -195,37 +111,13 @@ 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
msgid "Employee"
@@ -242,29 +134,8 @@ msgid "Employees"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:77
-#, 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"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_partner_ids
-msgid "Followers (Partners)"
+#: 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
@@ -273,76 +144,38 @@ msgid "Group By"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model,name:hr_timesheet_sheet.model_hr_department
-msgid "HR Department"
+#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
+msgid "Hours"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.hr_timesheet_sheet_form
-msgid "Hours"
+#: 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 ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "In Draft"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:54
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
+#: 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
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:68
-#, python-format
-msgid "In order to create a timesheet for this employee, you must link the employee to a product."
-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_sheet_sheet_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_current_open
-msgid "It will open your current timesheet"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_last_post
-msgid "Last Message Date"
-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 ""
@@ -359,25 +192,23 @@ msgid "Last Updated on"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_ids
-msgid "Messages"
+#: selection:res.company,timesheet_range:0
+msgid "Month"
msgstr ""
#. module: hr_timesheet_sheet
-#: selection:res.company,timesheet_range:0
-msgid "Month"
+#: 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.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
-#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_current_open
-msgid "My Timesheet"
+#: 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.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
-msgid "My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet."
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timesheet_sheet
+msgid "My Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
@@ -387,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 ""
@@ -403,61 +233,22 @@ msgid "Note"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state:0
-#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_current_open
msgid "Open"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.actions.client,name:hr_timesheet_sheet.action_client_hr_timesheet_sheet_menu
-msgid "Open HR Menu"
-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:108
-#, 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"
msgstr ""
@@ -468,6 +259,11 @@ 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"
msgstr ""
@@ -484,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 ""
@@ -518,20 +301,12 @@ msgid "Summary"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:45
-#, 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 ""
@@ -547,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
@@ -563,11 +338,6 @@ 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"
msgstr ""
@@ -588,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 ""
@@ -600,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 ""
@@ -620,6 +389,7 @@ msgid "Timesheets to Approve"
msgstr ""
#. module: hr_timesheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_to_approve
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "To Approve"
msgstr ""
@@ -635,44 +405,16 @@ 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.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_unread
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "Unread Messages"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: hr_timesheet_sheet
#: model:ir.ui.view,arch_db:hr_timesheet_sheet.view_hr_timesheet_sheet_filter
msgid "Unvalidated Timesheets"
msgstr ""
@@ -689,88 +431,30 @@ msgid "Waiting Approval"
msgstr ""
#. module: hr_timesheet_sheet
-#: model:ir.model.fields,field_description:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: hr_timesheet_sheet
-#: model:ir.model.fields,help:hr_timesheet_sheet.field_hr_timesheet_sheet_sheet_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
msgid "Week"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:221
+#: 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:454
-#, 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:452
-#, 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:231
-#, 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:229
+#: 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:49
+#: 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:473
-#, 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:72
-#, 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:494
-#, 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:353
+#: code:addons/hr_timesheet_sheet/models/account_analytic_line.py:60
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet."
msgstr ""
@@ -801,6 +485,11 @@ 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"
msgstr ""
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index bdcb126875c..5de4d54a3e3 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-26 12:06+0000\n"
-"PO-Revision-Date: 2016-05-26 12:06+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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
@@ -105,6 +105,20 @@ 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
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_livechat_channel_id
@@ -143,12 +157,17 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:28
+#: code:addons/im_livechat/static/src/js/im_livechat.js:29
#, python-format
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."
msgstr ""
@@ -160,6 +179,11 @@ 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
msgid "Conversation"
@@ -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
@@ -300,13 +324,17 @@ 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"
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"
@@ -319,7 +347,7 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:29
+#: code:addons/im_livechat/static/src/js/im_livechat.js:30
#, python-format
msgid "How may I help you?"
msgstr ""
@@ -374,6 +402,11 @@ 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
msgid "Last Updated by"
@@ -397,13 +430,18 @@ 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"
msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:8
+#: code:addons/im_livechat/static/src/xml/im_livechat_backend.xml:9
#, python-format
msgid "Livechat"
msgstr ""
@@ -416,12 +454,7 @@ msgstr ""
#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.im_livechat_report_channel_action
#: model:ir.actions.act_window,help:im_livechat.im_livechat_report_operator_action
-msgid "Livechat Support Channel Statistics allows you to easily check and analyse your company livechat session performance. Extract informations 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"
+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
@@ -470,18 +503,13 @@ msgid "Missed sessions"
msgstr ""
#. module: im_livechat
-#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_search
-msgid "My sessions"
-msgstr ""
-
-#. module: im_livechat
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_channel_name
msgid "Name"
msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:76
+#: code:addons/im_livechat/static/src/js/im_livechat.js:117
#, python-format
msgid "None of our collaborators seems to be available, please try again later."
msgstr ""
@@ -510,11 +538,7 @@ msgid "OK"
msgstr ""
#. module: im_livechat
-#: model:ir.actions.client,name:im_livechat.ir_action_client_open_livechat_menu
-msgid "Open Livechat Channel Menu"
-msgstr ""
-
-#. module: im_livechat
+#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_partner_id
#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_operator_partner_id
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_channel_view_search
#: model:ir.ui.view,arch_db:im_livechat.im_livechat_report_operator_view_search
@@ -540,8 +564,8 @@ msgid "Operators\n"
msgstr ""
#. module: im_livechat
-#: model:ir.model.fields,field_description:im_livechat.field_im_livechat_report_channel_partner_id
-msgid "Opertor"
+#: 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
@@ -561,20 +585,19 @@ msgstr ""
#. module: im_livechat
#: model:ir.model,name:im_livechat.model_rating_rating
-#: model:ir.model.fields,field_description:im_livechat.field_mail_channel_rating_ids
msgid "Rating"
msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/static/src/js/im_livechat.js:308
+#: code:addons/im_livechat/static/src/js/im_livechat.js:309
#, python-format
msgid "Rating: :rating_%d"
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
@@ -629,6 +652,11 @@ 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."
msgstr ""
@@ -651,11 +679,6 @@ 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"
msgstr ""
@@ -666,6 +689,11 @@ 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."
msgstr ""
@@ -722,8 +750,8 @@ msgstr ""
#. module: im_livechat
#. openerp-web
-#: code:addons/im_livechat/controllers/main.py:30
-#: code:addons/im_livechat/static/src/js/im_livechat.js:27
+#: code:addons/im_livechat/controllers/main.py:37
+#: code:addons/im_livechat/static/src/js/im_livechat.js:28
#, python-format
msgid "Visitor"
msgstr ""
@@ -734,21 +762,11 @@ 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"
msgstr ""
@@ -756,11 +774,16 @@ msgstr ""
#. module: im_livechat
#: model:ir.actions.act_window,help:im_livechat.im_livechat_channel_action
msgid "You can create channels for each website on which you want\n"
-" to integrate the website live chat widget, allowing you website\n"
+" to integrate the website live chat widget, allowing your website\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?"
msgstr ""
@@ -771,6 +794,11 @@ 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:"
msgstr ""
diff --git a/addons/link_tracker/i18n/link_tracker.pot b/addons/link_tracker/i18n/link_tracker.pot
index cf179e862fa..c811db866c6 100644
--- a/addons/link_tracker/i18n/link_tracker.pot
+++ b/addons/link_tracker/i18n/link_tracker.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: link_tracker
-#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_campaign_id
-msgid "Campaign"
-msgstr ""
-
-#. module: link_tracker
#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_link_click_ids
#: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_form
msgid "Clicks"
@@ -128,11 +123,6 @@ msgid "Link Tracker"
msgstr ""
#. module: link_tracker
-#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_medium_id
-msgid "Medium"
-msgstr ""
-
-#. module: link_tracker
#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_count
msgid "Number of Clicks"
msgstr ""
@@ -158,11 +148,6 @@ msgid "Short URL code"
msgstr ""
#. module: link_tracker
-#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_source_id
-msgid "Source"
-msgstr ""
-
-#. module: link_tracker
#: model:ir.actions.act_window,name:link_tracker.action_view_click_statistics
msgid "Statistics of Clicks"
msgstr ""
@@ -173,21 +158,6 @@ msgid "Target URL"
msgstr ""
#. module: link_tracker
-#: model:ir.model.fields,help:link_tracker.field_link_tracker_campaign_id
-msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
-msgstr ""
-
-#. module: link_tracker
-#: model:ir.model.fields,help:link_tracker.field_link_tracker_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
-msgstr ""
-
-#. module: link_tracker
-#: model:ir.model.fields,help:link_tracker.field_link_tracker_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
-msgstr ""
-
-#. module: link_tracker
#: model:ir.ui.view,arch_db:link_tracker.view_link_tracker_filter
msgid "Title and URL"
msgstr ""
@@ -198,12 +168,6 @@ msgid "Tracked Link"
msgstr ""
#. module: link_tracker
-#: model:ir.actions.act_window,name:link_tracker.action_link_tracker_click
-#: model:ir.ui.menu,name:link_tracker.menu_url_shortener_links
-msgid "Tracked Links"
-msgstr ""
-
-#. module: link_tracker
#: model:ir.model.fields,field_description:link_tracker.field_link_tracker_short_url
msgid "Tracked URL"
msgstr ""
@@ -214,7 +178,7 @@ msgid "Visit Page"
msgstr ""
#. module: link_tracker
-#: code:addons/link_tracker/models/link_tracker.py:138
+#: code:addons/link_tracker/models/link_tracker.py:141
#, python-format
msgid "Visit Webpage"
msgstr ""
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 217325e1680..f90d40afc53 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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
@@ -39,15 +47,14 @@ msgid "A cashmove can either be an expense or a payment.<br>\n"
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."
+#: model:ir.actions.act_window,help:lunch.lunch_product_action
+msgid "A product is defined by its name, category, price and vendor."
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."
+#: model:ir.model.fields,field_description:lunch.field_lunch_alert_active
+#: model:ir.model.fields,field_description:lunch.field_lunch_product_active
+msgid "Active"
msgstr ""
#. module: lunch
@@ -58,7 +65,7 @@ msgid "Add"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:251
+#: code:addons/lunch/models/lunch.py:263
#, python-format
msgid "Alert"
msgstr ""
@@ -87,6 +94,17 @@ msgid "And"
msgstr ""
#. module: lunch
+#: model:ir.actions.server,name:lunch.action_server_lunch_archive_product
+msgid "Archive/Unarchive"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.view,arch_db:lunch.lunch_alert_view_search
+#: model:ir.ui.view,arch_db:lunch.lunch_product_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: lunch
#: model:ir.model.fields,field_description:lunch.field_lunch_order_balance_visible
msgid "Balance visible"
msgstr ""
@@ -102,6 +120,11 @@ 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"
msgstr ""
@@ -134,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"
@@ -168,11 +190,6 @@ 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."
msgstr ""
@@ -371,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_1805
+#: 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 ""
@@ -431,13 +448,13 @@ msgid "Lunch Alert"
msgstr ""
#. module: lunch
-#: code:addons/lunch/models/lunch.py:223
+#: 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
@@ -478,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 ""
@@ -488,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"
@@ -501,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 ""
@@ -517,6 +533,24 @@ 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
#: model:ir.ui.view,arch_db:lunch.lunch_order_line_view_tree
@@ -580,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 ""
@@ -608,6 +643,11 @@ 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"
msgstr ""
@@ -642,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"
@@ -723,12 +762,17 @@ 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
#, python-format
@@ -778,11 +822,6 @@ 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
#: model:ir.model.fields,field_description:lunch.field_lunch_product_supplier
@@ -816,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 ""
@@ -855,11 +894,6 @@ 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"
msgstr ""
@@ -879,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 876db94389d..74c3e0ef2c6 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-22 13:00+0000\n"
-"PO-Revision-Date: 2016-07-22 13:00+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,194 +18,214 @@ 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"
-"<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=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n"
-" % if ctx.get('button_access'):\n"
-" <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; 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\">${ctx['button_access']['title']}</a>\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"
-" <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; 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\">${ctx['button_follow']['title']}</a>\n"
-" \n"
-" % elif ctx.get('button_unfollow'):\n"
-" <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; 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\">${ctx['button_unfollow']['title']}</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 not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n"
-" <p style=\"padding: 5px 10px; font-size: 12px;\">\n"
-" About <strong>${ctx['model_name']}\n"
-" % if ctx.get('record_name'):\n"
-" : ${ctx['record_name']}\n"
-" % endif\n"
-" </strong>\n"
-" </p>\n"
-" % endif\n"
-" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n"
-" <p>\n"
-" % if ctx.get('actions'):\n"
-" % for action in ctx['actions']:\n"
-" <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n"
-" %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n"
-" |\n"
-" % endif\n"
-" % endfor\n"
-" % else:\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"
-" % endif\n"
-" </p>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody></table>\n"
-"</div>\n"
-"<div 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:5px 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:15px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\n"
-"<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:5px 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]} -&gt; ${tracking[2]}</li>\n"
-" % endfor\n"
-" </ul>\n"
-" % endif\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"
+"% endif\n"
+"${object.body | safe}\n"
+"% if ctx.get('tracking'):\n"
+" <ul>\n"
+" % for tracking in ctx['tracking']\n"
+" <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
+" % endfor\n"
+" </ul>\n"
+"% endif\n"
+"\n"
"% if ctx.get('signature'):\n"
-"<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n"
-" ${ctx['signature'] | safe}\n"
-" </td>\n"
-" </tr></tbody>\n"
-" </table>\n"
-"</div>\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
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:83
+#: 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:230
+#: code:addons/mail/models/mail_template.py:226
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:238
+#: code:addons/mail/models/mail_thread.py:240
#, python-format
msgid "%s created"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:81
+#: code:addons/mail/models/res_users.py:80
#, python-format
msgid "%s has joined the %s network."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:96
+#: code:addons/mail/static/src/xml/thread.xml:94
#, python-format
msgid "(from"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:48
+#: code:addons/mail/static/src/xml/chatter.xml:38
#, 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
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:147
+#: code:addons/mail/static/src/xml/thread.xml:178
#, python-format
msgid "-------- Show older messages --------"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:513
+#: 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:489
+#: 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:151
+#: 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"
" <strong>Email mass mailing</strong> on\n"
@@ -248,6 +268,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
@@ -264,10 +285,65 @@ msgid "Access Groups"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction
+#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction
+#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_needaction
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction
msgid "Action Needed"
msgstr ""
@@ -283,33 +359,27 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_active_domain
msgid "Active domain"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/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/chatter.xml:144
+#: 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/chatter.xml:141
+#: 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"
@@ -323,8 +393,8 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:26
-#: code:addons/mail/static/src/xml/client_action.xml:44
+#: 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 ""
@@ -356,6 +426,7 @@ msgid "Advanced Settings"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_id
#: model:ir.ui.view,arch_db:mail.view_mail_alias_form
@@ -370,6 +441,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_contact
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_contact
#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
msgid "Alias Contact Security"
@@ -382,6 +454,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_name
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_name
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_name
#: model:ir.model.fields,field_description:mail.field_res_users_alias_name
msgid "Alias Name"
@@ -389,6 +462,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_domain
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_domain
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_domain
#: model:ir.model.fields,field_description:mail.field_res_users_alias_domain
msgid "Alias domain"
@@ -396,6 +470,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_model_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_model_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_model_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_model_id
msgid "Aliased Model"
@@ -409,7 +484,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
+#: code:addons/mail/static/src/xml/systray.xml:20
#, python-format
msgid "All"
msgstr ""
@@ -421,7 +496,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:190
+#: code:addons/mail/static/src/js/chat_manager.js:192
#, python-format
msgid "Anonymous"
msgstr ""
@@ -430,6 +505,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
#: model:ir.model.fields,help:mail.field_mail_mail_no_auto_thread
#: model:ir.model.fields,help:mail.field_mail_message_no_auto_thread
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_no_auto_thread
msgid "Answers do not go in the original document discussion thread. This has an impact on the generated message-id."
msgstr ""
@@ -441,7 +517,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:120
+#: code:addons/mail/static/src/js/followers.js:117
#, python-format
msgid "Apply"
msgstr ""
@@ -465,7 +541,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_attachment_ids
#: model:ir.model.fields,help:mail.field_mail_mail_attachment_ids
#: model:ir.model.fields,help:mail.field_mail_message_attachment_ids
-msgid "Attachments are linked to a document through model / res_id and to the messagethrough this field."
+msgid "Attachments are linked to a document through model / res_id and to the message through this field."
msgstr ""
#. module: mail
@@ -477,6 +553,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_id
#: model:ir.model.fields,field_description:mail.field_mail_mail_author_id
#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_id
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Author"
msgstr ""
@@ -490,6 +567,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_author_id
#: model:ir.model.fields,help:mail.field_mail_mail_author_id
#: model:ir.model.fields,help:mail.field_mail_message_author_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_id
msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
msgstr ""
@@ -497,6 +575,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar
#: model:ir.model.fields,field_description:mail.field_mail_mail_author_avatar
#: model:ir.model.fields,field_description:mail.field_mail_message_author_avatar
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_author_avatar
msgid "Author's avatar"
msgstr ""
@@ -523,25 +602,13 @@ msgid "Auto subscription"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_compose_message_body
-#: model:ir.model.fields,help:mail.field_mail_mail_body
-#: model:ir.model.fields,help:mail.field_mail_message_body
-msgid "Automatically sanitized HTML contents"
-msgstr ""
-
-#. module: mail
-#: model:ir.model.fields,field_description:mail.field_res_users_chatter_needaction_auto
-msgid "Automatically set needaction as Read"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search
msgid "Available for mass mailing"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:162
+#: code:addons/mail/static/src/xml/followers.xml:87
#, python-format
msgid "Be careful with channels following internal notifications"
msgstr ""
@@ -556,8 +623,14 @@ msgid "Body"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_res_partner_message_bounce
+#: model:ir.model.fields,field_description:mail.field_res_users_message_bounce
+msgid "Bounce"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:128
+#: code:addons/mail/static/src/js/followers.js:125
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -632,14 +705,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:23
-#: code:addons/mail/static/src/xml/client_action.xml:89
+#: 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
#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_partner_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_channel_ids
#: model:ir.ui.menu,name:mail.mail_channel_menu_settings
#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
#, python-format
@@ -654,7 +729,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:13
+#: code:addons/mail/static/src/xml/systray.xml:21
#: model:ir.actions.client,name:mail.mail_channel_action_client_chat
#, python-format
msgid "Chat"
@@ -674,6 +749,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_child_ids
msgid "Child Messages"
msgstr ""
@@ -688,23 +764,18 @@ msgid "Choose an example"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:308
+#: 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:324
+#: 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."
msgstr ""
@@ -747,6 +818,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.view_mail_search
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
+#: selection:survey.mail.compose.message,message_type:0
msgid "Comment"
msgstr ""
@@ -757,14 +829,8 @@ msgid "Compose Email"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
-#, python-format
-msgid "Compose a new message"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_composition_mode
msgid "Composition mode"
msgstr ""
@@ -776,12 +842,6 @@ 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
msgid "Content"
@@ -791,6 +851,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_body
#: model:ir.model.fields,field_description:mail.field_mail_mail_body
#: model:ir.model.fields,field_description:mail.field_mail_message_body
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_body
msgid "Contents"
msgstr ""
@@ -801,7 +862,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_minimized
-msgid "Conversation is minimied"
+msgid "Conversation is minimized"
msgstr ""
#. module: mail
@@ -812,15 +873,27 @@ msgid "Conversations"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_res_partner_message_bounce
+#: model:ir.model.fields,help:mail.field_res_users_message_bounce
+msgid "Counter of the number of bounced emails for this contact"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:250
+#: code:addons/mail/static/src/js/client_action.js:316
#, python-format
msgid "Create %s"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+msgid "Create Date"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_create_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias_create_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_create_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_create_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_uid
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_uid
@@ -837,7 +910,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_create_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_create_date
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_create_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_date
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
@@ -859,11 +932,12 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
#: model:ir.model.fields,help:mail.field_mail_mail_starred
#: model:ir.model.fields,help:mail.field_mail_message_starred
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_starred
msgid "Current user has a starred notification linked to this message"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:16
+#: code:addons/mail/models/res_partner.py:19
#, python-format
msgid "Customers"
msgstr ""
@@ -872,14 +946,70 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_date
#: model:ir.model.fields,field_description:mail.field_mail_mail_date
#: model:ir.model.fields,field_description:mail.field_mail_message_date
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_date
msgid "Date"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_account_analytic_account_message_last_post
+#: model:ir.model.fields,help:mail.field_account_asset_asset_message_last_post
+#: model:ir.model.fields,help:mail.field_account_bank_statement_message_last_post
+#: model:ir.model.fields,help:mail.field_account_invoice_message_last_post
+#: model:ir.model.fields,help:mail.field_account_voucher_message_last_post
+#: model:ir.model.fields,help:mail.field_blog_blog_message_last_post
+#: model:ir.model.fields,help:mail.field_blog_post_message_last_post
+#: model:ir.model.fields,help:mail.field_calendar_event_message_last_post
+#: model:ir.model.fields,help:mail.field_crm_lead_message_last_post
+#: model:ir.model.fields,help:mail.field_crm_team_message_last_post
+#: model:ir.model.fields,help:mail.field_crossovered_budget_message_last_post
+#: model:ir.model.fields,help:mail.field_event_event_message_last_post
+#: model:ir.model.fields,help:mail.field_event_registration_message_last_post
+#: model:ir.model.fields,help:mail.field_event_track_message_last_post
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_last_post
+#: model:ir.model.fields,help:mail.field_forum_forum_message_last_post
+#: model:ir.model.fields,help:mail.field_forum_post_message_last_post
+#: model:ir.model.fields,help:mail.field_forum_tag_message_last_post
+#: model:ir.model.fields,help:mail.field_gamification_badge_message_last_post
+#: model:ir.model.fields,help:mail.field_gamification_challenge_message_last_post
+#: model:ir.model.fields,help:mail.field_hr_applicant_message_last_post
+#: 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_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_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
+#: model:ir.model.fields,help:mail.field_product_template_message_last_post
+#: model:ir.model.fields,help:mail.field_project_issue_message_last_post
+#: model:ir.model.fields,help:mail.field_project_project_message_last_post
+#: model:ir.model.fields,help:mail.field_project_task_message_last_post
+#: model:ir.model.fields,help:mail.field_purchase_order_message_last_post
+#: model:ir.model.fields,help:mail.field_purchase_requisition_message_last_post
#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
#: model:ir.model.fields,help:mail.field_res_users_message_last_post
+#: model:ir.model.fields,help:mail.field_sale_order_message_last_post
+#: model:ir.model.fields,help:mail.field_slide_channel_message_last_post
+#: model:ir.model.fields,help:mail.field_slide_slide_message_last_post
+#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_last_post
+#: model:ir.model.fields,help:mail.field_stock_picking_message_last_post
+#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_last_post
+#: model:ir.model.fields,help:mail.field_stock_production_lot_message_last_post
+#: model:ir.model.fields,help:mail.field_survey_survey_message_last_post
msgid "Date of the last message posted on the record."
msgstr ""
@@ -896,6 +1026,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_defaults
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_defaults
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,field_description:mail.field_res_users_alias_defaults
msgid "Default Values"
@@ -916,8 +1047,26 @@ msgid "Default recipients of the record:\n"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete
+msgid "Delete Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_auto_delete_message
+msgid "Delete Message Copy"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete
+msgid "Delete sent emails (mass mailing only)"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:111
+#: code:addons/mail/static/src/xml/thread.xml:167
#, python-format
msgid "Delete this attachment"
msgstr ""
@@ -942,7 +1091,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 ""
@@ -965,6 +1114,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_display_name
#: model:ir.model.fields,field_description:mail.field_mail_alias_display_name
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_display_name
#: model:ir.model.fields,field_description:mail.field_mail_channel_display_name
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_display_name
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_display_name
@@ -987,6 +1137,12 @@ msgid "Display an option on related documents to open a composition wizard with
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_compose_message_auto_delete_message
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_auto_delete_message
+msgid "Do not keep a copy of the email in the document communication history (mass mailing only)"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
msgstr ""
@@ -998,14 +1154,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:117
+#: code:addons/mail/static/src/js/followers.js:114
#, python-format
msgid "Edit Subscription of "
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:129
+#: code:addons/mail/static/src/xml/followers.xml:50
#, python-format
msgid "Edit subscription"
msgstr ""
@@ -1015,6 +1171,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
+#: selection:survey.mail.compose.message,message_type:0
msgid "Email"
msgstr ""
@@ -1078,6 +1235,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_email_from
#: model:ir.model.fields,help:mail.field_mail_mail_email_from
#: model:ir.model.fields,help:mail.field_mail_message_email_from
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_email_from
msgid "Email address of the sender. This field is set when no matching partner is found and replaces the author_id field in the chatter."
msgstr ""
@@ -1105,13 +1263,13 @@ msgid "Emails"
msgstr ""
#. module: mail
-#: code:addons/mail/models/update.py:91
+#: 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:240
+#: code:addons/mail/models/mail_mail.py:239
#, python-format
msgid "Error without exception. Probably due do sending an email without computed recipients."
msgstr ""
@@ -1153,7 +1311,7 @@ msgid "Failed"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:352
+#: code:addons/mail/models/mail_template.py:363
#, python-format
msgid "Failed to render template %r using values %r"
msgstr ""
@@ -1173,6 +1331,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred_partner_ids
msgid "Favorited By"
msgstr ""
@@ -1210,36 +1369,201 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:605
-#: code:addons/mail/static/src/xml/chatter.xml:99
+#: code:addons/mail/models/mail_thread.py:666
+#: code:addons/mail/static/src/xml/followers.xml:21
#, python-format
msgid "Follow"
msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_event_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_event_track_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_project_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_project_task_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_partner_message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_follower_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_follower_ids
#: model:ir.ui.menu,name:mail.menu_email_followers
#: model:ir.ui.view,arch_db:mail.view_followers_tree
msgid "Followers"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_event_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_event_track_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_project_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_project_task_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_channel_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_channel_ids
msgid "Followers (Channels)"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_event_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_event_track_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_project_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_project_task_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_partner_ids
msgid "Followers (Partners)"
msgstr ""
@@ -1255,7 +1579,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:103
+#: code:addons/mail/static/src/xml/followers.xml:25
#, python-format
msgid "Following"
msgstr ""
@@ -1267,6 +1591,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail_email_from
#: model:ir.model.fields,field_description:mail.field_mail_message_email_from
#: model:ir.model.fields,field_description:mail.field_mail_template_email_from
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_email_from
msgid "From"
msgstr ""
@@ -1276,7 +1601,7 @@ msgid "Gateway"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:48
+#: code:addons/mail/models/res_users.py:50
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -1321,6 +1646,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_id
#: model:ir.model.fields,field_description:mail.field_mail_alias_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_id
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_id
@@ -1339,6 +1665,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_thread_id
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_thread_id
#: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_thread_id
#: model:ir.model.fields,help:mail.field_res_users_alias_parent_thread_id
msgid "ID of the parent record holding the alias (example: project holding the task creation alias)"
@@ -1352,24 +1679,134 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:108
+#: code:addons/mail/static/src/xml/client_action.xml:112
#, python-format
msgid "Idle"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread
+#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread
+#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread
+#: model:ir.model.fields,help:mail.field_account_invoice_message_unread
+#: model:ir.model.fields,help:mail.field_account_voucher_message_unread
+#: model:ir.model.fields,help:mail.field_blog_blog_message_unread
+#: model:ir.model.fields,help:mail.field_blog_post_message_unread
+#: model:ir.model.fields,help:mail.field_calendar_event_message_unread
+#: model:ir.model.fields,help:mail.field_crm_lead_message_unread
+#: model:ir.model.fields,help:mail.field_crm_team_message_unread
+#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread
+#: model:ir.model.fields,help:mail.field_event_event_message_unread
+#: model:ir.model.fields,help:mail.field_event_registration_message_unread
+#: model:ir.model.fields,help:mail.field_event_track_message_unread
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread
+#: model:ir.model.fields,help:mail.field_forum_forum_message_unread
+#: model:ir.model.fields,help:mail.field_forum_post_message_unread
+#: model:ir.model.fields,help:mail.field_forum_tag_message_unread
+#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread
+#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread
+#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread
+#: model:ir.model.fields,help:mail.field_hr_contract_message_unread
+#: model:ir.model.fields,help:mail.field_hr_department_message_unread
+#: model:ir.model.fields,help:mail.field_hr_employee_message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_message_unread
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread
+#: model:ir.model.fields,help:mail.field_hr_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_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
+#: model:ir.model.fields,help:mail.field_product_template_message_unread
+#: model:ir.model.fields,help:mail.field_project_issue_message_unread
+#: model:ir.model.fields,help:mail.field_project_project_message_unread
+#: model:ir.model.fields,help:mail.field_project_task_message_unread
+#: model:ir.model.fields,help:mail.field_purchase_order_message_unread
+#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread
#: model:ir.model.fields,help:mail.field_res_partner_message_unread
#: model:ir.model.fields,help:mail.field_res_users_message_unread
+#: model:ir.model.fields,help:mail.field_sale_order_message_unread
+#: model:ir.model.fields,help:mail.field_slide_channel_message_unread
+#: model:ir.model.fields,help:mail.field_slide_slide_message_unread
+#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_message_unread
+#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_unread
+#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread
+#: model:ir.model.fields,help:mail.field_survey_survey_message_unread
msgid "If checked new messages require your attention."
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction
+#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction
+#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction
+#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction
+#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction
+#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction
+#: model:ir.model.fields,help:mail.field_blog_post_message_needaction
+#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction
+#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction
+#: model:ir.model.fields,help:mail.field_crm_team_message_needaction
+#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction
+#: model:ir.model.fields,help:mail.field_event_event_message_needaction
+#: model:ir.model.fields,help:mail.field_event_registration_message_needaction
+#: model:ir.model.fields,help:mail.field_event_track_message_needaction
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction
+#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction
+#: model:ir.model.fields,help:mail.field_forum_post_message_needaction
+#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction
+#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_department_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction
+#: model:ir.model.fields,help:mail.field_hr_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_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
+#: model:ir.model.fields,help:mail.field_product_template_message_needaction
+#: model:ir.model.fields,help:mail.field_project_issue_message_needaction
+#: model:ir.model.fields,help:mail.field_project_project_message_needaction
+#: model:ir.model.fields,help:mail.field_project_task_message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction
+#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction
#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
#: model:ir.model.fields,help:mail.field_res_users_message_needaction
+#: model:ir.model.fields,help:mail.field_sale_order_message_needaction
+#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction
+#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction
+#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction
+#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_needaction
+#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction
+#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction
msgid "If checked, new messages require your attention."
msgstr ""
@@ -1391,6 +1828,17 @@ msgid "If opt-out is checked, this contact has refused to receive emails for mas
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_mail_mail_scheduled_date
+msgid "If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible."
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,help:mail.field_email_template_preview_scheduled_date
+#: model:ir.model.fields,help:mail.field_mail_template_scheduled_date
+msgid "If set, the queue manager will send the email after the date. If not set, the email will be send as soon as possible. Jinja2 placeholders may be used."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_base_config_settings_alias_domain
msgid "If you have setup a catch-all email domain redirected to the Odoo server, enter the domain name here."
msgstr ""
@@ -1403,7 +1851,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: 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
@@ -1414,6 +1862,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_parent_id
#: model:ir.model.fields,help:mail.field_mail_mail_parent_id
#: model:ir.model.fields,help:mail.field_mail_message_parent_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_parent_id
msgid "Initial thread message."
msgstr ""
@@ -1429,50 +1878,50 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1607
+#: 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:514
+#: 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:75
+#: 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 ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:144
+#: code:addons/mail/static/src/js/followers.js:143
#, python-format
msgid "Invite Follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:30
-#: 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:626
+#: code:addons/mail/static/src/js/client_action.js:648
#, python-format
msgid "Invite people to #%s"
msgstr ""
@@ -1488,10 +1937,65 @@ msgid "Invited people only"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_event_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_event_track_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_project_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_project_task_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_is_follower
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_is_follower
msgid "Is Follower"
msgstr ""
@@ -1501,6 +2005,11 @@ msgid "Is Notification"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_is_subscribed
+msgid "Is Subscribed"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
msgid "Is a member"
msgstr ""
@@ -1512,7 +2021,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
-msgid "Join Group"
+msgid "Join"
msgstr ""
#. module: mail
@@ -1527,16 +2036,72 @@ msgid "Language"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_last_post
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_last_post
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_last_post
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_last_post
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_last_post
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_last_post
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_last_post
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_last_post
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_last_post
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_last_post
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_last_post
+#: model:ir.model.fields,field_description:mail.field_event_event_message_last_post
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_last_post
+#: model:ir.model.fields,field_description:mail.field_event_track_message_last_post
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_last_post
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_last_post
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_last_post
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_last_post
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_last_post
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_last_post
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_last_post
+#: 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_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_last_post
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_last_post
+#: model:ir.model.fields,field_description:mail.field_project_project_message_last_post
+#: model:ir.model.fields,field_description:mail.field_project_task_message_last_post
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_last_post
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_last_post
#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_last_post
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_last_post
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_last_post
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_last_post
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_last_post
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_last_post
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_last_post
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_last_post
msgid "Last Message Date"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview___last_update
#: model:ir.model.fields,field_description:mail.field_mail_alias___last_update
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin___last_update
#: model:ir.model.fields,field_description:mail.field_mail_channel___last_update
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner___last_update
#: model:ir.model.fields,field_description:mail.field_mail_compose_message___last_update
@@ -1566,6 +2131,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_write_uid
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_write_uid
#: model:ir.model.fields,field_description:mail.field_mail_alias_write_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_write_uid
#: model:ir.model.fields,field_description:mail.field_mail_channel_write_uid
@@ -1582,6 +2148,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_write_date
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_write_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_write_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_write_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_write_date
@@ -1597,8 +2164,14 @@ msgid "Last Updated on"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+msgid "Leave"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:97
+#: 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 ""
@@ -1614,6 +2187,12 @@ 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"
msgstr ""
@@ -1630,26 +2209,27 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:443
+#: 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:75
+#: code:addons/mail/static/src/xml/chatter.xml:60
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_is_log
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_is_log
msgid "Log an Internal Note"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:75
+#: code:addons/mail/static/src/xml/chatter.xml:60
#, python-format
msgid "Log an internal note"
msgstr ""
@@ -1668,7 +2248,7 @@ msgid "Mail Channel Form"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_mail.py:306
+#: code:addons/mail/models/mail_mail.py:305
#, python-format
msgid "Mail Delivery Failed"
msgstr ""
@@ -1690,21 +2270,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:125
+#: 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:125
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
msgid "Mark all read"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:105
+#: code:addons/mail/static/src/xml/thread.xml:106
#, python-format
msgid "Mark as Read"
msgstr ""
@@ -1712,7 +2292,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/thread.xml:68
-#: code:addons/mail/static/src/xml/thread.xml:102
+#: code:addons/mail/static/src/xml/thread.xml:100
#, python-format
msgid "Mark as Todo"
msgstr ""
@@ -1754,6 +2334,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_record_name
#: model:ir.model.fields,field_description:mail.field_mail_mail_record_name
#: model:ir.model.fields,field_description:mail.field_mail_message_record_name
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_record_name
msgid "Message Record Name"
msgstr ""
@@ -1774,7 +2355,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 ""
@@ -1798,6 +2379,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_message_type
#: model:ir.model.fields,help:mail.field_mail_mail_message_type
#: model:ir.model.fields,help:mail.field_mail_message_message_type
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_type
msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
msgstr ""
@@ -1805,6 +2387,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_message_id
#: model:ir.model.fields,help:mail.field_mail_mail_message_id
#: model:ir.model.fields,help:mail.field_mail_message_message_id
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_message_id
msgid "Message unique identifier"
msgstr ""
@@ -1812,15 +2395,71 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_id
#: model:ir.model.fields,field_description:mail.field_mail_mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_message_message_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_id
msgid "Message-Id"
msgstr ""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_ids
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_ids
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_ids
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_ids
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_ids
+#: model:ir.model.fields,field_description:mail.field_event_event_message_ids
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_ids
+#: model:ir.model.fields,field_description:mail.field_event_track_message_ids
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_ids
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_ids
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_ids
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_ids
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_ids
+#: model:ir.model.fields,field_description:mail.field_project_project_message_ids
+#: model:ir.model.fields,field_description:mail.field_project_task_message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_ids
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_ids
#: model:ir.model.fields,field_description:mail.field_res_partner_message_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_ids
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_ids
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_ids
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
msgid "Messages"
@@ -1832,6 +2471,13 @@ 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"
msgstr ""
@@ -1876,6 +2522,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_record_name
#: model:ir.model.fields,help:mail.field_mail_mail_record_name
#: model:ir.model.fields,help:mail.field_mail_message_record_name
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_record_name
msgid "Name get of the related document."
msgstr ""
@@ -1890,9 +2537,11 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction
#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
#: model:ir.model.fields,help:mail.field_mail_mail_needaction
#: model:ir.model.fields,help:mail.field_mail_message_needaction
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_needaction
#: model:ir.ui.view,arch_db:mail.view_message_search
msgid "Need Action"
msgstr ""
@@ -1934,18 +2583,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:54
-#: code:addons/mail/static/src/js/window_manager.js:124
-#: code:addons/mail/static/src/xml/chatter.xml:67
-#: code:addons/mail/static/src/xml/client_action.xml:127
-#: code:addons/mail/static/src/xml/systray.xml:16
+#: 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:57
+#: code:addons/mail/static/src/xml/systray.xml:24
#, python-format
msgid "New message"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:140
+#: code:addons/mail/static/src/xml/thread.xml:131
#, python-format
msgid "New messages"
msgstr ""
@@ -1959,14 +2607,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:81
+#: code:addons/mail/static/src/js/client_action.js:79
#, python-format
msgid "New people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:216
+#: code:addons/mail/static/src/js/followers.js:218
#, python-format
msgid "No follower"
msgstr ""
@@ -1996,6 +2644,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_no_auto_thread
msgid "No threading for answers"
msgstr ""
@@ -2006,7 +2655,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:48
+#: code:addons/mail/static/src/xml/thread.xml:72
#, python-format
msgid "Note by"
msgstr ""
@@ -2018,46 +2667,206 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message_notify
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_notify
msgid "Notify followers of the document (mass post only)"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_event_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_event_track_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_project_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_project_task_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_needaction_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_needaction_counter
msgid "Number of Actions"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_account_analytic_account_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_invoice_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_calendar_event_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_lead_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crm_team_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_event_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_registration_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_event_track_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_forum_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_post_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_forum_tag_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_contract_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_department_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_employee_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_hr_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_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
+#: model:ir.model.fields,help:mail.field_product_template_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_issue_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_project_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_project_task_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_order_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition_message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_sale_order_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_channel_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_slide_slide_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot_message_needaction_counter
+#: model:ir.model.fields,help:mail.field_survey_survey_message_needaction_counter
msgid "Number of messages which requires an action"
msgstr ""
#. module: mail
+#: model:ir.model.fields,help:mail.field_account_analytic_account_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_asset_asset_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_bank_statement_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_invoice_message_unread_counter
+#: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter
+#: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter
+#: model:ir.model.fields,help:mail.field_calendar_event_message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_lead_message_unread_counter
+#: model:ir.model.fields,help:mail.field_crm_team_message_unread_counter
+#: model:ir.model.fields,help:mail.field_crossovered_budget_message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_event_message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_registration_message_unread_counter
+#: model:ir.model.fields,help:mail.field_event_track_message_unread_counter
+#: model:ir.model.fields,help:mail.field_fleet_vehicle_message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_forum_message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_post_message_unread_counter
+#: model:ir.model.fields,help:mail.field_forum_tag_message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_badge_message_unread_counter
+#: model:ir.model.fields,help:mail.field_gamification_challenge_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_applicant_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_contract_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_department_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_employee_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_expense_sheet_message_unread_counter
+#: model:ir.model.fields,help:mail.field_hr_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_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
+#: model:ir.model.fields,help:mail.field_product_template_message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_issue_message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_project_message_unread_counter
+#: model:ir.model.fields,help:mail.field_project_task_message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_order_message_unread_counter
+#: model:ir.model.fields,help:mail.field_purchase_requisition_message_unread_counter
#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
+#: model:ir.model.fields,help:mail.field_sale_order_message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_channel_message_unread_counter
+#: model:ir.model.fields,help:mail.field_slide_slide_message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_landed_cost_message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_picking_wave_message_unread_counter
+#: model:ir.model.fields,help:mail.field_stock_production_lot_message_unread_counter
+#: model:ir.model.fields,help:mail.field_survey_survey_message_unread_counter
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
#, python-format
@@ -2066,7 +2875,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:113
#, python-format
msgid "Offline"
msgstr ""
@@ -2103,14 +2912,21 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:218
+#: 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
#, python-format
msgid "One follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:107
+#: code:addons/mail/static/src/xml/client_action.xml:111
#, python-format
msgid "Online"
msgstr ""
@@ -2132,14 +2948,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:128
+#: 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 ""
@@ -2152,6 +2968,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_force_thread_id
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_force_thread_id
#: model:ir.model.fields,help:mail.field_mail_channel_alias_force_thread_id
#: model:ir.model.fields,help:mail.field_res_users_alias_force_thread_id
msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
@@ -2202,6 +3019,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_server_id
#: model:ir.model.fields,field_description:mail.field_mail_message_mail_server_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_mail_server_id
msgid "Outgoing mail server"
msgstr ""
@@ -2212,6 +3030,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_user_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_user_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_user_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_user_id
msgid "Owner"
@@ -2226,11 +3045,13 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_parent_id
#: model:ir.model.fields,field_description:mail.field_mail_mail_parent_id
#: model:ir.model.fields,field_description:mail.field_mail_message_parent_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_parent_id
msgid "Parent Message"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_model_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_model_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_model_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_model_id
msgid "Parent Model"
@@ -2238,6 +3059,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_parent_thread_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_parent_thread_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_parent_thread_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_parent_thread_id
msgid "Parent Record Thread ID"
@@ -2245,6 +3067,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_parent_model_id
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_parent_model_id
#: model:ir.model.fields,help:mail.field_mail_channel_alias_parent_model_id
#: model:ir.model.fields,help:mail.field_res_users_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))"
@@ -2261,7 +3084,7 @@ msgid "Partner"
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_partner.py:35
+#: code:addons/mail/models/res_partner.py:39
#, python-format
msgid "Partner Profile"
msgstr ""
@@ -2275,6 +3098,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_needaction_partner_ids
msgid "Partners with Need Action"
msgstr ""
@@ -2298,7 +3122,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:618
+#: code:addons/mail/static/src/js/chatter.js:186
#, python-format
msgid "Please complete partner's informations"
msgstr ""
@@ -2317,13 +3141,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:252
+#: code:addons/mail/static/src/js/composer.js:640
#, python-format
msgid "Please, wait while the file is uploading."
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_contact
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_contact
#: model:ir.model.fields,help:mail.field_mail_channel_alias_contact
#: model:ir.model.fields,help:mail.field_res_users_alias_contact
msgid "Policy to post a message on the document using the mailgateway.\n"
@@ -2370,13 +3195,20 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:44
+#: code:addons/mail/static/src/xml/client_action.xml:53
#, python-format
msgid "Private Channels"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:176
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:138
+#, python-format
+msgid "Public Channels"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:180
#, python-format
msgid "Re:"
msgstr ""
@@ -2404,6 +3236,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_force_thread_id
+#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin_alias_force_thread_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_force_thread_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_force_thread_id
msgid "Record Thread ID"
@@ -2420,6 +3253,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail_res_id
#: model:ir.model.fields,field_description:mail.field_mail_message_res_id
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_res_id
msgid "Related Document ID"
msgstr ""
@@ -2431,6 +3265,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_message_model
#: model:ir.model.fields,field_description:mail.field_mail_template_model
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_res_model
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_model
msgid "Related Document Model"
msgstr ""
@@ -2456,14 +3291,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:131
+#: code:addons/mail/static/src/xml/followers.xml:52
#, python-format
msgid "Remove this follower"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:105
+#: code:addons/mail/static/src/xml/thread.xml:103
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "Reply"
@@ -2473,6 +3308,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_reply_to
#: model:ir.model.fields,help:mail.field_mail_mail_reply_to
#: model:ir.model.fields,help:mail.field_mail_message_reply_to
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_reply_to
msgid "Reply email address. Setting the reply_to bypasses the automatic thread creation."
msgstr ""
@@ -2482,6 +3318,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail_reply_to
#: model:ir.model.fields,field_description:mail.field_mail_message_reply_to
#: model:ir.model.fields,field_description:mail.field_mail_template_reply_to
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_reply_to
msgid "Reply-To"
msgstr ""
@@ -2508,13 +3345,6 @@ msgid "Rich-text/HTML message"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_body_html
-#: model:ir.model.fields,help:mail.field_ir_act_server_body_html
-#: model:ir.model.fields,help:mail.field_mail_template_body_html
-msgid "Rich-text/HTML version of the message (placeholders may be used here)"
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.view_email_template_search
msgid "SMTP Server"
msgstr ""
@@ -2536,12 +3366,24 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_window.js:23
+#: code:addons/mail/static/src/js/chat_window.js:35
#, python-format
msgid "Say something"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_email_template_preview_scheduled_date
+#: model:ir.model.fields,field_description:mail.field_mail_template_scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_mail_scheduled_date
+#: model:ir.ui.view,arch_db:mail.email_template_form
+msgid "Scheduled Send Date"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Search Alias"
msgstr ""
@@ -2565,7 +3407,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:9
+#: 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"
@@ -2577,7 +3419,7 @@ msgid "Send Email"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:237
+#: code:addons/mail/models/mail_template.py:247
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -2590,19 +3432,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:67
+#: code:addons/mail/static/src/xml/chatter.xml:57
#, python-format
msgid "Send a message"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:135
-#, python-format
-msgid "Send mail"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
msgid "Send messages by email"
msgstr ""
@@ -2616,7 +3451,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:94
+#: code:addons/mail/static/src/xml/client_action.xml:97
#, python-format
msgid "Sends messages by email"
msgstr ""
@@ -2634,7 +3469,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:128
+#: code:addons/mail/static/src/xml/client_action.xml:138
#, python-format
msgid "Settings"
msgstr ""
@@ -2656,6 +3491,12 @@ 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
msgid "Sidebar Button"
@@ -2683,6 +3524,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_author_avatar
#: model:ir.model.fields,help:mail.field_mail_mail_author_avatar
#: model:ir.model.fields,help:mail.field_mail_message_author_avatar
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_author_avatar
msgid "Small-sized image of this contact. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
msgstr ""
@@ -2703,11 +3545,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:432
-#: code:addons/mail/static/src/xml/client_action.xml:18
+#: 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
#: model:ir.model.fields,field_description:mail.field_mail_message_starred
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_starred
#, python-format
msgid "Starred"
msgstr ""
@@ -2740,6 +3583,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
#: model:ir.model.fields,field_description:mail.field_mail_message_subject
#: model:ir.model.fields,field_description:mail.field_mail_template_subject
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subject
#, python-format
msgid "Subject"
msgstr ""
@@ -2759,7 +3603,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:68
+#: code:addons/mail/static/src/xml/thread.xml:115
#, python-format
msgid "Subject:"
msgstr ""
@@ -2773,7 +3617,8 @@ 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_2108
+#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2117
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_subtype_id
#: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
msgid "Subtype"
msgstr ""
@@ -2787,6 +3632,7 @@ msgstr ""
#. module: mail
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
+#: selection:survey.mail.compose.message,message_type:0
msgid "System notification"
msgstr ""
@@ -2811,17 +3657,12 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_substitution
-msgid "The excaped html code replacing the shortcut"
-msgstr ""
-
-#. module: mail
-#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
-#: model:ir.model.fields,help:mail.field_mail_template_model_id
-msgid "The kind of document with with this template can be used"
+msgid "The escaped html code replacing the shortcut"
msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_model_id
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_model_id
#: model:ir.model.fields,help:mail.field_mail_channel_alias_model_id
#: model:ir.model.fields,help:mail.field_res_users_alias_model_id
msgid "The model (Odoo Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)"
@@ -2829,6 +3670,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_name
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_name
#: model:ir.model.fields,help:mail.field_mail_channel_alias_name
#: model:ir.model.fields,help:mail.field_res_users_alias_name
msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
@@ -2836,14 +3678,15 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_user_id
+#: model:ir.model.fields,help:mail.field_mail_alias_mixin_alias_user_id
#: model:ir.model.fields,help:mail.field_mail_channel_alias_user_id
#: model:ir.model.fields,help:mail.field_res_users_alias_user_id
msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:642
-#: code:addons/mail/models/mail_message.py:731
+#: 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"
@@ -2852,7 +3695,13 @@ 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
+#: model:ir.model.fields,help:mail.field_email_template_preview_model_id
+#: model:ir.model.fields,help:mail.field_mail_template_model_id
+msgid "The type of document this template can be used with"
msgstr ""
#. module: mail
@@ -2862,6 +3711,11 @@ msgid "The values displayed hereunder are informative. When sending the email, t
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."
msgstr ""
@@ -2898,28 +3752,28 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chat_window.xml:24
+#: code:addons/mail/static/src/xml/extended_chat_window.xml:7
#, python-format
msgid "To:"
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 ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:117
+#: code:addons/mail/static/src/js/thread.js:230
#, python-format
msgid "Today"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:122
+#: code:addons/mail/static/src/xml/client_action.xml:133
#, python-format
msgid "Toggle Channels"
msgstr ""
@@ -2933,7 +3787,8 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message_tracking_value_ids
#: model:ir.model.fields,help:mail.field_mail_mail_tracking_value_ids
#: model:ir.model.fields,help:mail.field_mail_message_tracking_value_ids
-msgid "Tracked values are stored in a separate model. This field allow to reconstructthe tracking and to generate statistics on the model."
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_tracking_value_ids
+msgid "Tracked values are stored in a separate model. This field allow to reconstruct the tracking and to generate statistics on the model."
msgstr ""
#. module: mail
@@ -2957,6 +3812,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_tracking_value_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_tracking_value_ids
msgid "Tracking values"
msgstr ""
@@ -2964,6 +3820,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
#: model:ir.model.fields,field_description:mail.field_mail_mail_message_type
#: model:ir.model.fields,field_description:mail.field_mail_message_message_type
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_message_type
msgid "Type"
msgstr ""
@@ -2973,23 +3830,22 @@ msgid "UUID"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_message.py:42
+#: 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:98
+#: 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:638
-#: code:addons/mail/static/src/xml/chatter.xml:96
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+#: code:addons/mail/models/mail_thread.py:667
+#: code:addons/mail/static/src/xml/followers.xml:23
#, python-format
msgid "Unfollow"
msgstr ""
@@ -3000,19 +3856,128 @@ msgid "Unfortunately this email alias is already used, please choose a unique on
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread
+#: model:ir.model.fields,field_description:mail.field_event_event_message_unread
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread
+#: model:ir.model.fields,field_description:mail.field_event_track_message_unread
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_unread
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_unread
+#: model:ir.model.fields,field_description:mail.field_project_project_message_unread
+#: model:ir.model.fields,field_description:mail.field_project_task_message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread
#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_unread
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread
msgid "Unread Messages"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_account_analytic_account_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_asset_asset_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_bank_statement_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_invoice_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_calendar_event_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_lead_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crm_team_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_crossovered_budget_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_event_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_registration_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_event_track_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_fleet_vehicle_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_forum_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_post_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_forum_tag_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_badge_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_gamification_challenge_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_applicant_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_contract_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_department_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_employee_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_expense_sheet_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_hr_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_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
+#: model:ir.model.fields,field_description:mail.field_product_template_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_issue_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_project_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_project_task_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_order_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_purchase_requisition_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_sale_order_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_channel_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_slide_slide_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_landed_cost_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_picking_wave_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_stock_production_lot_message_unread_counter
+#: model:ir.model.fields,field_description:mail.field_survey_survey_message_unread_counter
msgid "Unread Messages Counter"
msgstr ""
@@ -3023,60 +3988,55 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:126
+#: 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:126
+#: 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:127
+#: 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:127
+#: 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:425
-#, python-format
-msgid "Unsubscribed"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:178
+#: code:addons/mail/static/src/xml/thread.xml:169
#, python-format
msgid "Uploading"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:583
+#: code:addons/mail/static/src/js/composer.js:640
#, python-format
msgid "Uploading error"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_use_active_domain
msgid "Use active domain"
msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id
+#: model:ir.model.fields,field_description:mail.field_survey_mail_compose_message_template_id
msgid "Use template"
msgstr ""
@@ -3098,15 +4058,21 @@ msgid "Users"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:593
-#: code:addons/mail/models/mail_thread.py:595
+#: 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/chatter.js:365
+#: code:addons/mail/static/src/js/followers.js:328
#, 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 ?"
@@ -3126,6 +4092,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
+#: model:ir.model.fields,help:mail.field_survey_mail_compose_message_is_log
msgid "Whether the message is an internal note (comment mode only)"
msgstr ""
@@ -3136,26 +4103,44 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:7
+#: code:addons/mail/static/src/xml/composer.xml:18
#, python-format
msgid "Write something..."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:122
+#: code:addons/mail/static/src/js/thread.js:232
#, python-format
msgid "Yesterday"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:80
+#: code:addons/mail/static/src/js/client_action.js:78
#, python-format
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
#, python-format
@@ -3163,27 +4148,27 @@ msgid "You can mark any message as 'starred', and it shows up in this channel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/res_users.py:47
+#: code:addons/mail/models/res_users.py:49
#, python-format
msgid "You cannot create a new user from here.\n"
" To create new user please go to configuration panel."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_channel.py:125
+#: 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:315
+#: 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:478
+#: code:addons/mail/static/src/js/chat_manager.js:601
#, python-format
msgid "You have been invited to: "
msgstr ""
@@ -3196,7 +4181,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:401
+#: 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 ""
@@ -3207,7 +4199,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 ""
@@ -3218,17 +4210,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:312
+#: code:addons/mail/models/mail_thread.py:319
#, python-format
msgid "document"
msgstr ""
@@ -3242,17 +4234,27 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:220
+#: code:addons/mail/static/src/js/followers.js:222
#, python-format
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"
msgstr ""
@@ -3263,32 +4265,42 @@ msgid "ir.autovacuum"
msgstr ""
#. module: mail
+#: model:ir.model,name:mail.model_mail_alias_mixin
+msgid "mail.alias.mixin"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "members"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:97
+#: 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"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:142
+#: code:addons/mail/static/src/js/thread.js:20
#, python-format
msgid "now"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:93
+#: code:addons/mail/static/src/xml/thread.xml:91
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3300,23 +4312,27 @@ msgid "publisher_warranty.contract"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "rd"
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:16
+#, python-format
+msgid "read less"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
-msgid "record:"
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:15
+#, python-format
+msgid "read more"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "sales"
+#: model:ir.ui.view,arch_db:mail.email_template_preview_form
+msgid "record:"
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/maintenance/i18n/maintenance.pot b/addons/maintenance/i18n/maintenance.pot
new file mode 100644
index 00000000000..41f9073d994
--- /dev/null
+++ b/addons/maintenance/i18n/maintenance.pot
@@ -0,0 +1,1033 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * maintenance
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+msgid "<b>Category:</b>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "<b>Model Number:</b>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+msgid "<b>Request to:</b>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "<b>Serial Number:</b>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "<span class=\"label label-warning pull-right\">Canceled</span>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "<span>Reports</span>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "<span>View</span>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_defaults
+msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_active
+msgid "Active"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "All"
+msgstr ""
+
+#. module: maintenance
+#: sql_constraint:maintenance.equipment:0
+msgid "Another asset already exists with this serial number!"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_archive
+msgid "Archive"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model,name:maintenance.model_maintenance_equipment_category
+msgid "Asset Category"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_tree
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_tree
+msgid "Assign To User"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Assigned"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_assign_date
+msgid "Assigned Date"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Available"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+#: selection:maintenance.request,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_category_id
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Category"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_name
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
+msgid "Category Name"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_action_from_category_form
+msgid "Click to add a new Engine."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_category_action
+msgid "Click to add a new equipment category."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_action
+msgid "Click to add a new equipment."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_request_action
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_request_action_link
+msgid "Click to add a new maintenance request."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_stage_action
+#: model:ir.actions.act_window,help:maintenance.maintenance_dashboard_action
+msgid "Click to add a stage in the maintenance request."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.maintenance_team_action_settings
+msgid "Click to add a team in the maintenance request."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_close_date
+msgid "Close Date"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_color
+msgid "Color"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_color
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_color
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_color
+msgid "Color Index"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_note
+msgid "Comments"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.equipment.category,name:maintenance.equipment_computer
+msgid "Computers"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_maintenance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,maintenance_type:0
+msgid "Corrective"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_cost
+msgid "Cost"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Created By"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_create_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_create_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_create_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_owner_user_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_create_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_create_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_create_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_create_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_create_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_open_count
+msgid "Current Maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_m_dashboard
+msgid "Dashboard"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_next_action_date
+msgid "Date of the next preventive maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_period
+msgid "Days between each preventive maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Delete"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_description
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Description"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_display_name
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_display_name
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_display_name
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_display_name
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "Done"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_duration
+msgid "Duration"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_request_duration
+msgid "Duration in minutes and seconds."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Edit..."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_id
+msgid "Email alias for this equipment category. New emails will automatically create new maintenance request for this equipment category."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model,name:maintenance.model_maintenance_equipment
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_equipment_count
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_equipment_id
+msgid "Equipment"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,description:maintenance.mt_mat_assign
+#: model:mail.message.subtype,name:maintenance.mt_cat_mat_assign
+#: model:mail.message.subtype,name:maintenance.mt_mat_assign
+msgid "Equipment Assigned"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_category_action
+#: model:ir.ui.menu,name:maintenance.menu_maintenance_cat
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
+msgid "Equipment Categories"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id_3386
+msgid "Equipment Category"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_name
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Equipment Name"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_equipment_ids
+msgid "Equipment ids"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_action
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_action_from_category_form
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_equipment_ids
+#: model:ir.ui.menu,name:maintenance.menu_equipment_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Equipments"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_fold
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_fold
+msgid "Folded in Maintenance Pipe"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_request_action
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_request_action_link
+msgid "Follow the process of the request and communicate with the collaborator."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Group by..."
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,priority:0
+msgid "High"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_id
+msgid "ID"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_parent_thread_id
+msgid "ID of the parent record holding the alias (example: project holding the task creation alias)"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+#: selection:maintenance.request,kanban_state:0
+#: model:maintenance.stage,name:maintenance.stage_1
+msgid "In Progress"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Internal Note ......."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_kanban_state
+msgid "Kanban State"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment___last_update
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category___last_update
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request___last_update
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage___last_update
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_write_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_write_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_write_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_write_uid
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_write_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_write_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_write_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_write_date
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_location
+msgid "Location"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_m_reports_losses
+msgid "Losses Analysis"
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_maintenance_count
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_count
+#: model:ir.ui.menu,name:maintenance.menu_m_request
+#: model:ir.ui.menu,name:maintenance.menu_maintenance_title
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_m_request_calendar
+msgid "Maintenance Calendar"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Maintenance Duration"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_maintenance_duration
+msgid "Maintenance Duration in minutes and seconds."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Maintenance Request"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,name:maintenance.mt_cat_req_created
+msgid "Maintenance Request Created"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_stage_view_tree
+msgid "Maintenance Request Stage"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_stage_view_search
+msgid "Maintenance Request Stages"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,description:maintenance.mt_req_created
+msgid "Maintenance Request created"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_cal
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_from_equipment
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_request_action_link
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_todo_request_action_from_dashboard
+#: model:ir.model,name:maintenance.model_maintenance_request
+#: model:ir.ui.menu,name:maintenance.menu_m_request_form
+msgid "Maintenance Requests"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model,name:maintenance.model_maintenance_stage
+msgid "Maintenance Stage"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_maintenance_stage_configuration
+msgid "Maintenance Stages"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Maintenance Subject"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_team_id
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_form
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_view_tree
+msgid "Maintenance Team"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.maintenance_dashboard_action
+#: model:ir.model,name:maintenance.model_maintenance_team
+#: model:ir.ui.menu,name:maintenance.menu_maintenance_teams
+msgid "Maintenance Teams"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_maintenance_type
+msgid "Maintenance Type"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_duration
+msgid "Maintenance duration"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_maintenance_ids
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_maintenance_ids
+msgid "Maintenance ids"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_model
+msgid "Model"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "More <i class=\"fa fa-caret-down\"/>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "My Equipments"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "My Requests"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_name
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_name
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_tree
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Name"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.stage,name:maintenance.stage_0
+msgid "New Request"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Next Preventive Maintenance"
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_note
+msgid "Note"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_force_thread_id
+msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_m_reports_oee
+msgid "Overall Equipment Effectiveness (OEE)"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_user_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_owner_user_id
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_technician_user_id
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_tree
+msgid "Owner"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_parent_thread_id
+msgid "Parent Record Thread ID"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_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))"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_contact
+msgid "Policy to post a message on the document using the mailgateway.\n"
+"- everyone: everyone can post\n"
+"- partners: only authenticated partners\n"
+"- followers: only followers of the related document or members of following channels\n"
+""
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,maintenance_type:0
+msgid "Preventive"
+msgstr ""
+
+#. module: maintenance
+#: code:addons/maintenance/models/maintenance.py:210
+#, python-format
+msgid "Preventive Maintenance - %s"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Preventive Maintenance Frequency"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.equipment.category,name:maintenance.equipment_printer
+msgid "Printers"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_priority
+msgid "Priority"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Product Information"
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Reopen Request"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.stage,name:maintenance.stage_3
+msgid "Repaired"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.menu,name:maintenance.menu_m_reports
+msgid "Reporting"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Request"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,name:maintenance.mt_req_created
+msgid "Request Created"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_request_date
+msgid "Request Date"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_done
+msgid "Request Done"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_request_ids
+msgid "Request ids"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Requested By"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category_technician_user_id
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Responsible"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "Scheduled"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_schedule_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.stage,name:maintenance.stage_4
+msgid "Scrap"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_scrap_date
+msgid "Scrap Date"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_category_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Search"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_stage_sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_serial_no
+msgid "Serial Number"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_request_archive
+msgid "Set archive to true to hide the maintenance request without deleting it."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "Settings"
+msgstr ""
+
+#. module: maintenance
+#: model:maintenance.equipment.category,name:maintenance.equipment_software
+msgid "Software"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_stage_id
+msgid "Stage"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.hr_equipment_stage_action
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Stages"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,name:maintenance.mt_req_status
+msgid "Status Changed"
+msgstr ""
+
+#. module: maintenance
+#: model:mail.message.subtype,description:maintenance.mt_req_status
+msgid "Status changed"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_partner_id
+msgid "Subcontracting Partner"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "Subject"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_name
+msgid "Subjects"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_request_maintenance_team_id
+msgid "Team"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,name:maintenance.maintenance_team_action_settings
+msgid "Teams"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_technician_user_id
+msgid "Technician"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Technicians"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_model_id
+msgid "The model (Odoo Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_name
+msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category_alias_user_id
+msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_action
+msgid "This application helps you to track equipments used by employees.\n"
+" Create some laptop, printer or phone and link each equipment to\n"
+" an employee or departement. You will manage allocations, issues\n"
+" and maintenance of equipment."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.actions.act_window,help:maintenance.hr_equipment_action_from_category_form
+msgid "This application helps you to track equipments used by employees.\n"
+" Create some laptop, printer or phone and link each equipment to an employee or departement.\n"
+" You will manage allocations, issues and maintenance of equipment."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "To Do"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "To do"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count
+msgid "Todo request count"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_block
+msgid "Todo request count block"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_date
+msgid "Todo request count date"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_count_high_priority
+msgid "Todo request count high priority"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_team_todo_request_ids
+msgid "Todo request ids"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
+msgid "Top Priorities"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
+msgid "Unassigned"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Under Maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Unread Messages"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "Unscheduled Maintenance"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "Used in location"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_partner_id
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
+msgid "Vendor"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_partner_ref
+msgid "Vendor Reference"
+msgstr ""
+
+#. module: maintenance
+#: selection:maintenance.request,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_warranty
+msgid "Warranty"
+msgstr ""
+
+#. module: maintenance
+#: code:addons/maintenance/models/maintenance.py:75
+#, python-format
+msgid "You cannot delete an equipment category containing equipments or maintenance requests."
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "days"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+msgid "for"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
+msgid "hours"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_graph
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_pivot
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_tree
+msgid "maintenance Request"
+msgstr ""
+
+#. module: maintenance
+#: model:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
+msgid "maintenance Request Search"
+msgstr ""
+
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 57a8cfaaf50..1d41df14137 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,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 ""
@@ -92,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 ""
@@ -191,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 ""
@@ -211,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"
@@ -257,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 ""
@@ -318,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 ""
@@ -340,6 +333,11 @@ msgid "Email Template"
msgstr ""
#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: marketing_campaign
#: model:ir.model,name:marketing_campaign.model_mail_template
msgid "Email Templates"
msgstr ""
@@ -435,21 +433,6 @@ msgid "Group By"
msgstr ""
#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_1
-msgid "Hello, you will receive your welcome pack via email shortly."
-msgstr ""
-
-#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_3
-msgid "Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners"
-msgstr ""
-
-#. module: marketing_campaign
-#: model:mail.template,body_html:marketing_campaign.email_template_2
-msgid "Hi, we are delighted to welcome you among our Silver Partners as of today!"
-msgstr ""
-
-#. module: marketing_campaign
#: selection:marketing.campaign.transition,interval_type:0
msgid "Hour(s)"
msgstr ""
@@ -563,6 +546,11 @@ msgid "Lead Automation"
msgstr ""
#. module: marketing_campaign
+#: model:res.groups,name:marketing_campaign.group_lead_automation_manager
+msgid "Manager"
+msgstr ""
+
+#. module: marketing_campaign
#: model:ir.ui.view,arch_db:marketing_campaign.view_marketing_campaign_search
msgid "Manual Mode"
msgstr ""
@@ -619,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
@@ -697,7 +686,7 @@ msgstr ""
#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
msgid "Odoo's marketing campaign allows you to automate communication\n"
" to your prospects. You can define a segment (set of conditions) on\n"
-" your leads and partners to fullfil the campaign."
+" your leads and partners to fulfill the campaign."
msgstr ""
#. module: marketing_campaign
@@ -711,11 +700,6 @@ msgid "Only records modified after last sync (no duplicates)"
msgstr ""
#. module: marketing_campaign
-#: model:ir.actions.client,name:marketing_campaign.action_client_marketing_menu
-msgid "Open Marketing Menu"
-msgstr ""
-
-#. module: marketing_campaign
#: model:ir.ui.view,arch_db:marketing_campaign.view_marketing_campaign_activity_form
msgid "Outgoing Transitions"
msgstr ""
@@ -732,11 +716,6 @@ 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
msgid "Preview"
@@ -771,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 ""
@@ -918,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 ""
@@ -940,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
@@ -950,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 ""
@@ -994,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
@@ -1026,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 ""
@@ -1036,13 +1016,13 @@ msgid "Unique Field"
msgstr ""
#. module: marketing_campaign
-#: model:ir.model.fields,field_description:marketing_campaign.field_marketing_campaign_activity_variable_cost
-msgid "Variable Cost"
+#: model:res.groups,name:marketing_campaign.group_lead_automation_user
+msgid "User"
msgstr ""
#. module: marketing_campaign
-#: model:mail.template,subject:marketing_campaign.email_template_1
-msgid "Welcome to the Odoo Partner Channel!"
+#: model:ir.model.fields,field_description:marketing_campaign.field_marketing_campaign_activity_variable_cost
+msgid "Variable Cost"
msgstr ""
#. module: marketing_campaign
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index a659da4449c..0eeadcf411d 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -1,13 +1,12 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * marketing_campaign_crm_demo
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,143 +14,3 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_9
-msgid "1 month free trial for an OnDemand offer"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_9
-msgid "<p>Hello,</p>\n"
-" <p>It seems Odoo could do a lot for you. Would you be interested in a free trial of our OnDemand offer?</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_4
-msgid "<p>Hello,</p>\n"
-" <p>Thanks for showing interest and buying the Odoo book.</p>\n"
-" If any further information required kindly revert back.\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_8
-msgid "<p>Hello,</p>\n"
-" <p>Thanks for showing interest and for subscribing to technical training.</p>\n"
-" If any further information required kindly revert back.I really appreciate your co-operation on this.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_3
-msgid "<p>Hello,</p>\n"
-" <p>Thanks for showing interest and for subscribing to the Odoo Discovery Day.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_1
-msgid "<p>Hello,</p>\n"
-" <p>Thanks for the genuine interest you have shown in Odoo.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_5
-msgid "<p>Hello,</p>\n"
-" <p>We have very good offer that might suit you.\n"
-" For our gold partners,We are arranging free technical training on june,2015.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_7
-msgid "<p>Hello,</p>\n"
-" <p>We have very good offer that might suit you.\n"
-" For our silver partners, we are offering Gold partnership.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_6
-msgid "<p>Hello,</p>\n"
-" <p>We have very good offer that might suit you.\n"
-" For our silver partners,We are paid technical training on june,2015.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_2
-msgid "<p>Hello,</p>\n"
-" <p>We have very good offer that might suit you.\n"
-" We suggest you subscribe to the Odoo Discovery Day on May 2015.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,body_html:marketing_campaign_crm_demo.email_template_10
-msgid "<p>Hello,</p>\n"
-" <p>Would you be interested in buying our book? It contains a lot of useful functionnal information to perfect your Odoo training.</p>\n"
-" <p>If any further information is required, do not hesitate to reply to this message.</p>\n"
-" <p>Regards,Odoo Team</p>"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Python Code"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_10
-msgid "Odoo Book"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_5
-msgid "Propose a free technical training to Gold partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the Odoo Discovery Day on May 2015"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_4
-msgid "Thanks for buying the Odoo book"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_1
-msgid "Thanks for showing interest in Odoo"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:mail.template,subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the Odoo Discovery Day"
-msgstr ""
-
diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot
index 569932abe44..0892b43b97c 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 15:46+0000\n"
-"PO-Revision-Date: 2016-01-13 15:46+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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:630
+#: code:addons/mass_mailing/models/mass_mailing.py:451
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -41,41 +41,40 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-10x fa-music\"/>\n"
-" &amp;nbsp;"
+" <span class=\"fa fa-10x fa-music\"/>\n"
+" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-10x fa-music\"/>\n"
-" &amp;nbsp;"
+" <span class=\"fa fa-10x fa-music\"/>\n"
+" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-check fa-3x\"/>\n"
-" &amp;nbsp;"
+" <span class=\"fa fa-check fa-3x\"/>\n"
+" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-truck fa-3x\"/>\n"
-" &amp;nbsp;"
+" <span class=\"fa fa-truck fa-3x\"/>\n"
+" &amp;nbsp;"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "&amp;nbsp;\n"
-" <span class=\"fa fa-usd fa-3x\"/>\n"
-" &amp;nbsp;"
+" <span class=\"fa fa-usd fa-3x\"/>\n"
+" &amp;nbsp;"
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"
@@ -88,40 +87,33 @@ msgid "<div class=\"modal-header text-center\">\n"
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"
-" <i class=\"fa fa-align-justify fa-stack-1x\" style=\" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;\"/>\n"
-" <i class=\"fa fa-arrow-down fa-stack-1x\" style=\"display: inline-block; font-size: 0.6em; margin-top: -0.15em;\"/>\n"
-" </span> Footers"
+" <i class=\"fa fa-align-justify fa-stack-1x\" style=\" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;\"/>\n"
+" <i class=\"fa fa-arrow-down fa-stack-1x\" style=\"display: inline-block; font-size: 0.6em; margin-top: -0.15em;\"/>\n"
+" </span> Footers"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-align-justify fa-stack-1x\" style=\"margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;\"/>\n"
-" <i class=\"fa fa-arrow-up fa-stack-1x\" style=\"margin-top: 0.25em; display: inline-block; font-size: 0.6em;\"/>\n"
-" </span> Headers"
+" <i class=\"fa fa-align-justify fa-stack-1x\" style=\"margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;\"/>\n"
+" <i class=\"fa fa-arrow-up fa-stack-1x\" style=\"margin-top: 0.25em; display: inline-block; font-size: 0.6em;\"/>\n"
+" </span> Headers"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-align-left fa-stack-1x\" style=\"display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;\"/>\n"
-" </span> Extra"
+" <i class=\"fa fa-align-left fa-stack-1x\" style=\"display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;\"/>\n"
+" </span> Extra"
msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-align-left fa-stack-1x\"/>\n"
-" </span> Body"
+" <i class=\"fa fa-align-left fa-stack-1x\"/>\n"
+" </span> Body"
msgstr ""
#. module: mass_mailing
@@ -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 ""
@@ -154,11 +145,6 @@ msgid "AB Testing"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_active
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_active
msgid "Active"
@@ -175,6 +161,11 @@ msgid "Allow using marketing campaigns (advanced)"
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
msgid "Apply"
msgstr ""
@@ -191,6 +182,11 @@ 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"
msgstr ""
@@ -201,6 +197,11 @@ msgid "Attachments"
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_event_registration
+msgid "Attendee"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.mass_mail_theme_list
msgid "Basic Theme"
msgstr ""
@@ -233,12 +234,18 @@ msgid "Bounced Ratio"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_7237
+#: 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 ""
#. module: mass_mailing
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_name
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
msgid "Campaign Name"
msgstr ""
@@ -249,6 +256,13 @@ 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
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search
@@ -291,6 +305,16 @@ 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."
msgstr ""
@@ -338,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 ""
@@ -413,11 +436,6 @@ msgid "Date of technical error leading to the email not being sent"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_scheduled
msgid "Date when the email has been created"
msgstr ""
@@ -444,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 ""
@@ -456,7 +473,7 @@ msgstr ""
#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
msgid "Dear Bob,<br/>\n"
-" We would like you to know that your order has shipped! To track your order or make any changes please click the \"my order\" button below."
+" We would like you to know that your order has shipped! To track your order or make any changes please click the \"my order\" button below."
msgstr ""
#. module: mass_mailing
@@ -480,8 +497,8 @@ msgid "Design"
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Discount Code: <strong>45A9E77DGW8455</strong>"
+#: model:ir.model,name:mass_mailing.model_mail_channel
+msgid "Discussion channel"
msgstr ""
#. module: mass_mailing
@@ -524,7 +541,7 @@ msgid "Domain"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:638
+#: code:addons/mass_mailing/models/mass_mailing.py:459
#: selection:mail.mass_mailing,state:0
#: selection:mail.statistics.report,state:0
#, python-format
@@ -547,11 +564,6 @@ msgid "Email"
msgstr ""
#. module: mass_mailing
-#: model:utm.campaign,name:mass_mailing.mass_mail_campaign_1_utm_campaign
-msgid "Email Campaign - Products"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model,name:mass_mailing.model_mail_mail_statistics
msgid "Email Statistics"
msgstr ""
@@ -578,6 +590,21 @@ msgid "Emails Statistics"
msgstr ""
#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_hr_employee
+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"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_exception
#: selection:mail.mail.statistics,state:0
msgid "Exception"
@@ -610,21 +637,6 @@ msgid "Failed"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: mass_mailing
#: selection:mail.mass_mailing,reply_to_mode:0
msgid "Followers of leads/applicants"
msgstr ""
@@ -636,19 +648,23 @@ msgid "From"
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."
+#: model:ir.model,name:mass_mailing.model_gamification_badge
+msgid "Gamification badge"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_gamification_challenge
+msgid "Gamification challenge"
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 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/>"
+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>"
+#: 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/>"
msgstr ""
#. module: mass_mailing
@@ -671,6 +687,11 @@ msgid "Here you can design your own template from scratch by selecting your favo
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
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_id
@@ -686,34 +707,29 @@ msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics_mail_mail_id_int
-msgid "ID of the related mail_mail. This field is an integer field becausethe related mail_mail can be deleted separately from its statistics.However the ID is needed for several action and controllers."
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_needaction
-msgid "If checked, new messages require your attention."
+msgid "ID of the related mail_mail. This field is an integer field because the related mail_mail can be deleted separately from its statistics. However the ID is needed for several action and controllers."
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_unique_ab_testing
-msgid "If checked, recipients will be mailed only once, allowing to sendvarious mailings in a single campaign to test the effectivenessof the mailings."
+msgid "If checked, recipients will be mailed only once, allowing to send various mailings in a single campaign to test the effectiveness of the mailings."
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:638
+#: code:addons/mass_mailing/models/mass_mailing.py:459
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "In Queue"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_is_follower
-msgid "Is Follower"
+#: model:ir.model,name:mass_mailing.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: mass_mailing
+#: model:ir.model,name:mass_mailing.model_hr_job
+msgid "Job Position"
msgstr ""
#. module: mass_mailing
@@ -723,16 +739,10 @@ 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 ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics___last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing___last_update
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign___last_update
@@ -830,17 +840,23 @@ 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
msgid "Mailing"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:435
+#: code:addons/mass_mailing/models/mass_mailing.py:303
#: 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
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_name
+#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message_mailing_list_ids
#, python-format
msgid "Mailing List"
msgstr ""
@@ -897,6 +913,11 @@ 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"
msgstr ""
@@ -924,6 +945,8 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message_mass_mailing_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_mailing_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_mass_mailing_id
+#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message_mass_mailing_id
+#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message_mass_mailing_name
#: model:ir.ui.menu,name:mass_mailing.mass_mailing_menu_root
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
@@ -944,6 +967,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mass_mailing.field_mail_compose_message_mass_mailing_campaign_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_mass_mailing_campaign_id
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_mass_mailing_campaign_id
+#: model:ir.model.fields,field_description:mass_mailing.field_survey_mail_compose_message_mass_mailing_campaign_id
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
msgid "Mass Mailing Campaign"
@@ -1013,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 ""
@@ -1028,14 +1053,13 @@ msgid "Message-ID"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_ids
-msgid "Messages"
+#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
+msgid "Michael Fletcher"
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"
+#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration
+msgid "More Info"
msgstr ""
#. module: mass_mailing
@@ -1044,7 +1068,6 @@ msgid "My Account"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_stage_name
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_tag_name
@@ -1052,11 +1075,6 @@ msgid "Name"
msgstr ""
#. module: mass_mailing
-#: model:mail.template,subject:mass_mailing.newsletter_template
-msgid "Newsletter"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_next_departure
msgid "Next Departure"
msgstr ""
@@ -1067,11 +1085,6 @@ msgid "No background image"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_clicks_ratio
msgid "Number of Clicks"
msgstr ""
@@ -1087,26 +1100,11 @@ msgid "Number of clicks"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mail_statistics_search
msgid "Open Date"
msgstr ""
#. module: mass_mailing
-#: model:ir.actions.client,name:mass_mailing.action_client_mass_mailing_menu
-msgid "Open Mass Mailing Menu"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_opened
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_opened
#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_opened
@@ -1146,8 +1144,8 @@ msgid "Outgoing Mails"
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Payment"
+#: model:ir.model,name:mass_mailing.model_res_partner
+msgid "Partner"
msgstr ""
#. module: mass_mailing
@@ -1156,12 +1154,7 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken
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:758
+#: code:addons/mass_mailing/models/mass_mailing.py:577
#, python-format
msgid "Please select recipients."
msgstr ""
@@ -1295,13 +1288,13 @@ msgid "Scheduled"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_scheduled_date
-msgid "Scheduled Date"
+#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
+msgid "Scheduled Month"
msgstr ""
#. module: mass_mailing
-#: model:ir.ui.view,arch_db:mass_mailing.view_mail_statistics_report_search
-msgid "Scheduled Month"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_statistics_report_scheduled_date
+msgid "Scheduled date"
msgstr ""
#. module: mass_mailing
@@ -1361,14 +1354,14 @@ msgid "Send to All"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:638
+#: code:addons/mass_mailing/models/mass_mailing.py:459
#: selection:mail.mass_mailing,state:0
#, python-format
msgid "Sending"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:638
+#: code:addons/mass_mailing/models/mass_mailing.py:459
#: 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
@@ -1413,14 +1406,13 @@ msgid "Settings"
msgstr ""
#. module: mass_mailing
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
-msgid "Shipping"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
+msgid "Source"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_source_id
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_source_id
-msgid "Source"
+#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_name
+msgid "Source Name"
msgstr ""
#. module: mass_mailing
@@ -1470,32 +1462,18 @@ 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_name
+#: 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
msgid "Subject"
msgstr ""
@@ -1521,7 +1499,7 @@ msgid "Templates"
msgstr ""
#. module: mass_mailing
-#: code:addons/mass_mailing/models/mass_mailing.py:710
+#: code:addons/mass_mailing/models/mass_mailing.py:514
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
#, python-format
msgid "Test Mailing"
@@ -1538,20 +1516,19 @@ msgid "The contact has chosen not to receive mails anymore from this list"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_7237
-msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_medium_id
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_medium_id
+msgid "This is the delivery method, e.g. Postcard, Email, or Banner Ad"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_medium_id
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
+#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_source_id
+msgid "This is the link source, e.g. Search Engine, another domain, or name of email list"
msgstr ""
#. module: mass_mailing
#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_source_id
-#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
+msgid "This is the link source, e.g. Search Engine, another domain,or name of email list"
msgstr ""
#. module: mass_mailing
@@ -1560,6 +1537,12 @@ msgid "This mass mailing is scheduled to"
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_3637
+msgid "This name helps you tracking your different campaign efforts, e.g. Fall_Drive, Christmas_Special"
+msgstr ""
+
+#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "This will send the email to all recipients. Do you still want to proceed ?"
msgstr ""
@@ -1571,8 +1554,12 @@ 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
-#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form
msgid "Tracking"
msgstr ""
@@ -1582,18 +1569,7 @@ msgid "Twitter"
msgstr ""
#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: mass_mailing
-#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: mass_mailing
#: model:ir.ui.view,arch_db:mass_mailing.email_designer_snippets
-#: model:mail.mass_mailing,body_html:mass_mailing.mass_mail_1
msgid "Unsubscribe"
msgstr ""
@@ -1638,8 +1614,9 @@ 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!"
+#: code:addons/mass_mailing/controllers/main.py:26
+#, python-format
+msgid "You have been unsubscribed successfully"
msgstr ""
#. module: mass_mailing
@@ -1703,11 +1680,6 @@ 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"
msgstr ""
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 6b8e4a015cf..5342c2baf53 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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
@@ -73,12 +73,6 @@ msgid "Associated Partner"
msgstr ""
#. module: membership
-#: model:product.product,name:membership.membership_2
-#: model:product.template,name:membership.membership_2_product_template
-msgid "Basic Membership"
-msgstr ""
-
-#. module: membership
#: model:ir.ui.view,arch_db:membership.view_partner_form
msgid "Buy Membership"
msgstr ""
@@ -225,16 +219,12 @@ 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"
msgstr ""
@@ -258,12 +248,6 @@ msgid "From Month"
msgstr ""
#. module: membership
-#: model:product.product,name:membership.membership_0
-#: model:product.template,name:membership.membership_0_product_template
-msgid "Gold Membership"
-msgstr ""
-
-#. module: membership
#: model:ir.ui.view,arch_db:membership.view_report_membership_search
#: model:ir.ui.view,arch_db:membership.view_res_partner_member_filter
msgid "Group By"
@@ -329,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
@@ -518,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 ""
@@ -567,12 +551,6 @@ msgid "Select if you want to give free membership."
msgstr ""
#. module: membership
-#: model:product.product,name:membership.membership_1
-#: model:product.template,name:membership.membership_1_product_template
-msgid "Silver Membership"
-msgstr ""
-
-#. module: membership
#: model:ir.model.fields,field_description:membership.field_report_membership_start_date
msgid "Start Date"
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 6d3699f7642..eb3cb163f08 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-06 07:28+0000\n"
-"PO-Revision-Date: 2016-07-06 07:28+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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:230
+#: code:addons/mrp/models/stock_warehouse.py:43
#, python-format
msgid " Manufacture"
msgstr ""
@@ -28,52 +28,117 @@ 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
msgid "# Manufacturing Orders"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:332
-#, 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
+#: 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/mrp.py:1009
+#: code:addons/mrp/models/mrp_bom.py:256
#, python-format
-msgid "%s produced"
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Documents are attached to the tasks and issues of your project.</p><p>\n"
+" Send messages or log internal notes with attachments to link\n"
+" documents to your project.\n"
+" </p>"
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_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.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\">Lost</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\">OEE</span>"
+msgstr ""
+
+#. module: mrp
+#: 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
@@ -123,11 +188,6 @@ 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/>"
msgstr ""
@@ -147,56 +207,57 @@ 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 ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_message_needaction
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_needaction
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_active
#: model:ir.model.fields,field_description:mrp.field_mrp_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
@@ -210,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:248
+#, 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
@@ -226,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 ""
@@ -236,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 ""
@@ -252,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
@@ -265,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 ""
@@ -285,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 ""
@@ -307,98 +400,102 @@ msgid "Bills of materials may produce residual products (A + B --> C + D)"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_procurement_order_bom_id
-msgid "BoM"
+#: 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
-#: code:addons/mrp/mrp.py:303
-#, python-format
-msgid "BoM \"%s\" contains a BoM line with a product recursion: \"%s\"."
+#: 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
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_bom_line_ids
-msgid "BoM Lines"
+#: selection:mrp.workcenter,working_state:0
+msgid "Blocked"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_type
-msgid "BoM Type"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_blocked_time
+msgid "Blocked Time"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,tracking:0
-msgid "By Lots"
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_blocked_time
+msgid "Blocked hours over the last month"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,tracking:0
-msgid "By Unique Serial Number"
+#: model:ir.model.fields,field_description:mrp.field_procurement_order_bom_id
+msgid "BoM"
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_stock_move_bom_line_id
+msgid "BoM Line"
msgstr ""
#. module: mrp
-#: code:addons/mrp/stock.py:227
-#, python-format
-msgid "Can't find any generic Manufacture route."
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_bom_line_ids
+msgid "BoM Lines"
msgstr ""
#. module: mrp
-#: 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
-#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
-msgid "Cancel"
+#: model:ir.model.fields,field_description:mrp.field_mrp_bom_type
+msgid "BoM Type"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Cancel Production"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_byproduct
+msgid "By-Products"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Cancelled"
+#: 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:149
+#: code:addons/mrp/models/stock_warehouse.py:36
#, python-format
-msgid "Cannot consume a move with negative or zero quantity."
+msgid "Can't find any generic Manufacture route."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:639
-#, python-format
-msgid "Cannot delete a manufacturing order in state '%s'."
+#: 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
+#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
+msgid "Cancel"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:709
-#, python-format
-msgid "Cannot find a bill of material for this product."
+#: selection:mrp.production,state:0
+#: selection:mrp.workorder,state:0
+msgid "Cancelled"
msgstr ""
#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:66
-#: code:addons/mrp/wizard/change_production_qty.py:71
+#: code:addons/mrp/models/mrp_production.py:258
#, python-format
-msgid "Cannot find bill of material for this product."
+msgid "Cannot delete a manufacturing order not in cancel state"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_view
-msgid "Capacity Information"
+#: code:addons/mrp/wizard/change_production_qty.py:56
+#: code:addons/mrp/wizard/change_production_qty.py:59
+#, python-format
+msgid "Cannot find bill of material for this production."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_capacity_per_cycle
-msgid "Capacity per Cycle"
+#: 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
@@ -408,16 +505,22 @@ msgid "Change Product Qty"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard
-msgid "Change Quantity"
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_change_production_qty
-msgid "Change Quantity of Products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_check_to_done
+msgid "Check Produced Qty"
msgstr ""
#. module: mrp
+#: 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 ""
@@ -428,18 +531,13 @@ 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
@@ -448,17 +546,36 @@ 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"
msgstr ""
@@ -483,8 +600,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
@@ -499,72 +616,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_move_consumed_for
-msgid "Consumed for"
+#: model:ir.model.fields,field_description:mrp.field_stock_quant_consumed_quant_ids
+msgid "Consumed quant ids"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: 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_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
@@ -572,17 +698,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 ""
@@ -591,44 +718,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.model.fields,help:mrp.field_mrp_bom_message_last_post
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_last_post
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_last_post
-msgid "Date of the last message posted on the record."
+#: 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.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 Qty"
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.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.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
@@ -637,25 +780,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
@@ -663,32 +816,100 @@ 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
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_wo
+msgid "Done for Work Order"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Done"
+#: 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_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.oee_tree_view
+msgid "Duration (hours)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_time_mode
+msgid "Duration Computation"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration_percent
+msgid "Duration Deviation (%)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_duration_unit
+msgid "Duration Per Unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Effective Date"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_finished
+msgid "Effective End Date"
+msgstr ""
+
+#. module: mrp
+#: 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_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_production_workcenter_form_view_inherit
+msgid "Efficiency"
msgstr ""
#. module: mrp
@@ -698,72 +919,75 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_production_date_finished
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_date_end
msgid "End Date"
msgstr ""
#. module: mrp
#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Extra Information"
+msgid "Expected Date"
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_workorder_duration_expected
+msgid "Expected Duration"
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_production_date_planned_finished
+msgid "Expected End Date"
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_production_date_planned_start
+msgid "Expected Start Date"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_location_dest_id
-msgid "Finished Products Location"
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_duration_expected
+msgid "Expected duration (in minutes)"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.view_mrp_config
+msgid "Extra Features"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_message_follower_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_follower_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_follower_ids
-msgid "Followers"
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
+msgid "Filters"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_message_channel_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_channel_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_channel_ids
-msgid "Followers (Channels)"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Finish Order"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_message_partner_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_partner_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_partner_ids
-msgid "Followers (Partners)"
+#: 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.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_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 "Force Reservation"
+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.model.fields,field_description:mrp.field_mrp_workcenter_costs_general_account_id
-msgid "General Account"
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+msgid "Fully Productive"
msgstr ""
#. module: mrp
@@ -782,8 +1006,13 @@ msgid "Gives the sequence order when displaying a list of routing Work Centers."
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.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
@@ -792,7 +1021,7 @@ msgid "Gives the sequence order when displaying."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter
msgid "Group By"
msgstr ""
@@ -806,8 +1035,24 @@ msgid "Group By..."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_costs_hour_account_id
-msgid "Hour Account"
+#: 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
@@ -815,21 +1060,22 @@ msgstr ""
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_id
#: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_id
#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_id
#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_id
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_line_id
#: model:ir.model.fields,field_description:mrp.field_mrp_production_id
-#: 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.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 ""
@@ -839,17 +1085,8 @@ msgid "If a product variant is defined the BOM is available only for this produc
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_message_unread
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_unread
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_message_needaction
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_needaction
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_needaction
-msgid "If checked, new messages require your attention."
+#: 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
@@ -868,38 +1105,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.model.fields,field_description:mrp.field_mrp_bom_position
-msgid "Internal Reference"
+#: 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_bom_message_is_follower
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_is_follower
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_is_follower
-msgid "Is Follower"
+#: 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
+#: 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,field_description:mrp.field_mrp_bom_message_last_post
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_last_post
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_last_post
-msgid "Last Message Date"
+#: 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
@@ -907,21 +1179,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 ""
@@ -930,17 +1203,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 ""
@@ -949,26 +1223,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 ""
@@ -984,18 +1264,46 @@ 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_9790
+#: 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"
msgstr ""
@@ -1006,23 +1314,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:224
+#: 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"
@@ -1044,19 +1352,15 @@ 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
#: model:ir.model.fields,field_description:mrp.field_res_company_manufacturing_lead
@@ -1064,24 +1368,32 @@ msgid "Manufacturing Lead Time"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production
-#: 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
@@ -1097,28 +1409,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:774
-#, 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."
@@ -1126,31 +1439,63 @@ 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_bom_message_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_ids
-msgid "Messages"
+#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_mps
+msgid "Master Production Schedule"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_message
+#: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree
+msgid "Message"
+msgstr ""
+
+#. module: mrp
+#: model:ir.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
+#: 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
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+#: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban
+msgid "More <i class=\"fa fa-caret-down\"/>"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_move_id
+msgid "Move"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_message_ids
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_ids
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_ids
-msgid "Messages and communication history"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_lots_done_move
+msgid "Move Done"
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_workorder_move_raw_ids
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Moves"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_move_lot_ids
+msgid "Moves to Track"
msgstr ""
#. module: mrp
@@ -1159,29 +1504,47 @@ msgid "Mrp Workcenter"
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.ui.view,arch_db:mrp.mrp_message_view_search
+msgid "My Messages"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_name
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_name
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
msgid "Name"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
+#: 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
-#: code:addons/mrp/procurement.py:108
+#: 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_workorder_next_work_order_id
+msgid "Next Work Order"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/procurement.py:91
#, python-format
msgid "No BoM exists for this product!"
msgstr ""
#. module: mrp
-#: selection:mrp.product.produce,tracking:0
-msgid "No Tracking"
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+msgid "No Routing"
msgstr ""
#. module: mrp
@@ -1190,78 +1553,92 @@ msgid "No by-products in bills of materials (A + B --> C)"
msgstr ""
#. module: mrp
-#: selection:mrp.config.settings,group_rounding_efficiency:0
-msgid "No rounding and efficiency on bills of materials"
+#: 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
-#: selection:mrp.config.settings,group_product_variant:0
-msgid "No variants on products"
+#: selection:mrp.config.settings,module_mrp_maintenance:0
+msgid "No maintenance machine and work centers"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Normal"
+#: selection:mrp.config.settings,module_mrp_mps:0
+msgid "No need for Master Production Schedule as products have short lead times"
msgstr ""
#. module: mrp
-#: selection:mrp.production,priority:0
-msgid "Not urgent"
+#: selection:mrp.config.settings,module_mrp_plm:0
+msgid "No product lifecycle management"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_property_composition
-msgid "Not used in computations, for information purpose only."
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_loss_action
+msgid "No productivity loss defined."
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
-msgid "Notes"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_report_blocked
+msgid "No productivity loss for this equipment."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_needaction_counter
-msgid "Number of Actions"
+#: selection:mrp.config.settings,module_quality_mrp:0
+msgid "No quality control"
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"
+#: selection:mrp.config.settings,group_product_variant:0
+msgid "No variants on products"
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.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,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."
+#: selection:mrp.production,availability:0
+msgid "None"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_message_needaction_counter
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_needaction_counter
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_needaction_counter
-msgid "Number of messages which requires an action"
+#: selection:ir.attachment,priority:0
+#: selection:mrp.workcenter,working_state:0
+msgid "Normal"
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.model.fields,help:mrp.field_stock_scrap_workorder_id
+msgid "Not to restrict or prefer quants, but informative."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,help:mrp.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_message_unread_counter
-msgid "Number of unread messages"
+#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
+msgid "Notes"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_capacity
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_capacity
+msgid "Number of pieces that can be produced in parallel."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "OEE"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_oee_target
+msgid "OEE Target"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workcenter_oee_target
+msgid "OEE Target in percentage"
msgstr ""
#. module: mrp
@@ -1271,28 +1648,81 @@ msgid "Odoo uses these BoMs to automatically propose manufacturing\n"
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_oee
+msgid "Oee"
+msgstr ""
+
+#. module: mrp
#: model:ir.ui.view,arch_db:mrp.view_stock_move_consume_wizard
msgid "Ok"
msgstr ""
#. module: mrp
-#: model:ir.actions.client,name:mrp.action_client_mrp_menu
-msgid "Open MRP Menu"
+#: selection:mrp.routing.workcenter,batch:0
+msgid "Once a minimum number of products is processed"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_routing_form_view
+#: selection:mrp.routing.workcenter,batch:0
+msgid "Once all products are processed"
+msgstr ""
+
+#. module: mrp
+#: 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.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Order Planning"
+#: 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_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
-#: constraint:mrp.production:0
-msgid "Order quantity cannot be negative or zero!"
+#: 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_workorder_qty_production
+msgid "Original Production Quantity"
+msgstr ""
+
+#. module: mrp
+#: 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.model.fields,help:mrp.field_mrp_workcenter_oee
+msgid "Overall Equipment Effectiveness, based on the last month"
+msgstr ""
+
+#. module: mrp
+#: 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_mrp_config_settings_module_mrp_plm
+msgid "PLM"
msgstr ""
#. module: mrp
@@ -1306,23 +1736,86 @@ msgid "Parent Routing"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
+#: 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.ui.menu,name:mrp.menu_mrp_planning
-msgid "Planning"
+#: 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.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
-#: code:addons/mrp/stock.py:135
+#: 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 "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 provide proper quantity."
+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.model.fields,field_description:mrp.field_mrp_production_priority
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+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_ir_attachment_priority
msgid "Priority"
msgstr ""
@@ -1332,33 +1825,49 @@ 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.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"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_created_ids2
+#: 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 Products"
+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_product_produce_line_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_message_product_id
+#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_id
#: model:ir.model.fields,field_description:mrp.field_mrp_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_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
@@ -1366,49 +1875,26 @@ msgid "Product"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_move_prod_id
-msgid "Product Move"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_product_produce
-msgid "Product Produce"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_product_produce_line
-msgid "Product Produce Consume lines"
-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
-#: 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"
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"
-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
-#: 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_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 ""
@@ -1424,7 +1910,20 @@ 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 ""
@@ -1435,8 +1934,14 @@ 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_mrp_production_product_line_production_id
+#: 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 ""
@@ -1447,135 +1952,138 @@ msgstr ""
#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_stock_move_production_id
-msgid "Production Order for Produced Products"
+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"
+msgid "Production Order for raw materials"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_product_line
-msgid "Production Scheduled Product"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Production Workcenter"
msgstr ""
#. module: mrp
-#: selection:mrp.production,state:0
-msgid "Production Started"
+#: 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 ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Production Work Centers"
+#: model:ir.ui.view,arch_db:mrp.view_production_gantt
+msgid "Productions"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_progress
-msgid "Production progress"
+#: selection:mrp.workcenter.productivity.loss,loss_type:0
+msgid "Productive"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_production_filter
-msgid "Production started late"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productive_time
+msgid "Productive Time"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_production_gantt
-msgid "Productions"
+#: 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_9783
-#: 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 ""
@@ -1585,23 +2093,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:120
+#, python-format
+msgid "Recursion error !"
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 ""
@@ -1616,8 +2147,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
@@ -1626,8 +2168,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
@@ -1656,19 +2203,9 @@ 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
@@ -1678,6 +2215,16 @@ 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
msgid "Routing Work Centers"
@@ -1686,7 +2233,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
@@ -1694,6 +2240,11 @@ msgid "Routings"
msgstr ""
#. module: mrp
+#: 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"
@@ -1702,44 +2253,63 @@ msgid "Routings allow you to create and manage the manufacturing\n"
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.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_production_date_planned
-msgid "Scheduled Date"
+#: 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_product_form_view
-#: model:ir.ui.view,arch_db:mrp.mrp_production_product_tree_view
-msgid "Scheduled Products"
+#: 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_product_lines
-msgid "Scheduled goods"
+#: 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.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Scrap Products"
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids
+msgid "Scrap ids"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.view_mrp_property_search
+#: 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 ""
@@ -1759,6 +2329,11 @@ 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 ""
@@ -1769,21 +2344,23 @@ msgid "Security days for each manufacturing operation."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_qty
-msgid "Select Quantity"
-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
+#: 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
-#: 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."
+#: 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
@@ -1792,28 +2369,45 @@ msgid "Ship this product as a set of components (kit)"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_origin
-msgid "Source Document"
+#: 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,help:mrp.field_mrp_workcenter_costs_cycle
-msgid "Specify Cost of Work Center per cycle."
+#: model:ir.model.fields,field_description:mrp.field_mrp_production_origin
+msgid "Source"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_costs_hour
-msgid "Specify Cost of Work Center per hour."
+#: 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 ""
@@ -1823,6 +2417,12 @@ 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 ""
@@ -1836,48 +2436,132 @@ msgid "Stock value variation"
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_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_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,help:mrp.field_mrp_workorder_is_user_working
+msgid "Technical field indicating whether the current user is working. "
+msgstr ""
+
+#. module: mrp
+#: 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.model.fields,help:mrp.field_mrp_workorder_production_availability
+msgid "Technical: used in views and domains only."
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_workorder_working_state
+msgid "Technical: used in views only"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:342
-#: code:addons/mrp/mrp.py:441
+#: 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
+#: code:addons/mrp/models/mrp_bom.py:70
+#: code:addons/mrp/models/mrp_bom.py:217
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
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."
+#: code:addons/mrp/models/mrp_workcenter.py:138
+#, python-format
+msgid "The capacity must be strictly positive."
msgstr ""
#. module: mrp
-#: constraint:mrp.workcenter:0
-msgid "The capacity per cycle must be strictly positive."
+#: selection:mrp.bom,ready_to_produce:0
+msgid "The components of 1st operation"
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."
+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.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.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_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,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."
+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,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.model,name:mrp.model_stock_picking_type
+msgid "The picking type determines the picking view"
+msgstr ""
+
+#. module: mrp
+#: sql_constraint:mrp.production:0
+msgid "The quantity to produce must be positive!"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model.fields,help:mrp.field_mrp_routing_workcenter_routing_id
+msgid "The routing contains all the Work Centers used and for how long. This will create work orders afterwardswhich alters the execution of the manufacturing order. "
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+msgid "This Month"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.oee_search_view
+#: model:ir.ui.view,arch_db:mrp.view_mrp_production_work_order_search
+msgid "This Year"
msgstr ""
#. module: mrp
@@ -1886,6 +2570,22 @@ msgid "This field depict the efficiency of the resource to complete tasks. e.g
msgstr ""
#. module: mrp
+#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_ids
+msgid "Time Logs"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Time Tracking"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/models/mrp_workorder.py:354
+#, python-format
+msgid "Time Tracking: "
+msgstr ""
+
+#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_stop
msgid "Time after prod."
msgstr ""
@@ -1896,95 +2596,162 @@ msgid "Time before prod."
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_cycle
-msgid "Time for 1 cycle (hour)"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_cycle
-msgid "Time in hours for doing one cycle."
+#: model:ir.model.fields,field_description:mrp.field_mrp_workorder_time_ids
+msgid "Time ids"
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_stop
-msgid "Time in hours for the cleaning."
+msgid "Time in minutes for the cleaning."
msgstr ""
#. module: mrp
#: model:ir.model.fields,help:mrp.field_mrp_workcenter_time_start
-msgid "Time in hours for the setup."
+msgid "Time in minutes for the setup."
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.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.ui.view,arch_db:mrp.view_mrp_product_produce_wizard
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
msgid "To Consume"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: 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.ui.view,arch_db:mrp.mrp_workcenter_kanban
+msgid "To Launch"
+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 Produce"
+msgstr ""
+
+#. module: mrp
+#: 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.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.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.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Total Cost"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost
+#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report
msgid "Total Cost of Raw Materials"
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.model.fields,field_description:mrp.field_mrp_workcenter_workorder_late_count
+msgid "Total Late Orders"
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"
+msgid "Total Qty"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_tree_view
-msgid "Total Qty"
+#: 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.view_mrp_workcenter_search
-msgid "Type"
+#: 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
+#: 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.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit
+msgid "Unblock"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.view,arch_db:mrp.mrp_unbuild_form_view
+msgid "Unbuild"
+msgstr ""
+
+#. module: mrp
+#: 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
+#: 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_report
msgid "Unit Cost"
msgstr ""
#. module: mrp
-#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
-msgid "Unit of Measure"
+#: model:ir.model.fields,field_description:mrp.field_stock_move_unit_factor
+msgid "Unit Factor"
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
-msgid "Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"
+#: 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,field_description:mrp.field_mrp_bom_message_unread
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_unread
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_unread
-msgid "Unread Messages"
+#: 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.model.fields,field_description:mrp.field_mrp_bom_message_unread_counter
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_message_unread_counter
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:mrp.mrp_production_form_view
+msgid "Unreserve"
msgstr ""
#. module: mrp
@@ -1993,60 +2760,68 @@ 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
@@ -2055,27 +2830,13 @@ msgid "Warehouse"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:342
-#: code:addons/mrp/mrp.py:441
+#: code:addons/mrp/models/mrp_bom.py:70
+#: code:addons/mrp/models/mrp_bom.py:217
#, python-format
msgid "Warning"
msgstr ""
#. module: mrp
-#: model:ir.model.fields,field_description:mrp.field_mrp_bom_website_message_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_website_message_ids
-#: model:ir.model.fields,field_description:mrp.field_mrp_production_workcenter_line_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: mrp
-#: model:ir.model.fields,help:mrp.field_mrp_bom_website_message_ids
-#: model:ir.model.fields,help:mrp.field_mrp_production_website_message_ids
-#: model:ir.model.fields,help:mrp.field_mrp_production_workcenter_line_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: mrp
#: model:ir.model.fields,field_description:mrp.field_report_mrp_inout_date
#: model:ir.model.fields,field_description:mrp.field_report_workcenter_load_name
#: model:ir.ui.view,arch_db:mrp.view_workcenter_load_search
@@ -2093,27 +2854,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 ""
@@ -2128,13 +2894,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
@@ -2150,18 +2916,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"
@@ -2169,8 +2936,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 ""
@@ -2180,27 +2955,127 @@ 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"
"Without this module: A + B + C -> D.\n"
@@ -2209,25 +3084,102 @@ msgid "You can configure by-products in the bill of material.\n"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:348
+#: 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:85
#, 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
-#: selection:mrp.property,composition:0
-msgid "min"
+#: 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
+#: 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
@@ -2241,18 +3193,33 @@ msgid "mrp.config.settings"
msgstr ""
#. module: mrp
-#: selection:mrp.property,composition:0
-msgid "plus"
+#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
+msgid "report.mrp.report_mrpbomstructure"
msgstr ""
#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_report_mrpbomstructure
-msgid "report.mrp.report_mrpbomstructure"
+#: model:ir.model,name:mrp.model_report_mrp_bom_cost
+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 82309661897..80d8cc65bf7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,21 +52,11 @@ 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"
msgstr ""
@@ -87,8 +77,8 @@ msgid "Last Updated on"
msgstr ""
#. module: mrp_byproduct
-#: model:ir.model,name:mrp_byproduct.model_mrp_production
-msgid "Manufacturing Order"
+#: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct_operation_id
+msgid "Produced at Operation"
msgstr ""
#. module: mrp_byproduct
@@ -102,28 +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_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 481ceacafa8..02b81516f5d 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,24 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_line_state
-msgid " * The 'Draft' status is set automatically as draft when repair order in draft status. \n"
-"* The 'Confirmed' status is set automatically as confirm when repair order in confirm status. \n"
-"* The 'Done' status is set automatically when repair order is completed. \n"
-"* The 'Cancelled' status is set automatically when user cancel repair order."
-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>Remove</i>)"
msgstr ""
@@ -44,6 +26,16 @@ 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>"
msgstr ""
@@ -80,23 +72,17 @@ msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Total Without Taxes</strong>"
+msgid "<strong>Shipping address :</strong>"
msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "<strong>Total</strong>"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_needaction
-msgid "Action Needed"
+msgid "<strong>Total Without Taxes</strong>"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:24
-#, python-format
-msgid "Active ID not Found"
+#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
+msgid "<strong>Total</strong>"
msgstr ""
#. module: mrp_repair
@@ -177,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."
@@ -219,8 +206,8 @@ msgid "Current Location"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_last_post
-msgid "Date of the last message posted on the record."
+#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_default_address_id
+msgid "Default address id"
msgstr ""
#. module: mrp_repair
@@ -286,21 +273,6 @@ msgid "Fees"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
msgid "Group By"
msgstr ""
@@ -335,16 +307,6 @@ msgid "ID"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
msgid "In a repair order, you can detail the components you remove,\n"
" add or replace and record the time you spent on the different\n"
@@ -416,16 +378,6 @@ msgid "Invoicing Address"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair___last_update
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_cancel___last_update
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee___last_update
@@ -463,16 +415,6 @@ msgid "Make Invoice"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_move_id
msgid "Move"
msgstr ""
@@ -488,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 ""
@@ -524,21 +468,6 @@ msgid "Notes"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_operations
msgid "Operation Lines"
msgstr ""
@@ -642,11 +571,6 @@ msgid "Ready to Repair"
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
-msgid "Reair Orders"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form
msgid "Recreate Invoice"
msgstr ""
@@ -686,6 +610,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
msgid "Repair Orders"
msgstr ""
@@ -700,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 ""
@@ -735,7 +660,7 @@ msgstr ""
#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_repair_order_form_filter
-msgid "Search Reair Orders"
+msgid "Search Repair Orders"
msgstr ""
#. module: mrp_repair
@@ -744,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 ""
@@ -755,11 +680,6 @@ msgid "Set to Draft"
msgstr ""
#. module: mrp_repair
-#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder
-msgid "Shipping address :"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_location_id
msgid "Source Location"
msgstr ""
@@ -796,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 ""
@@ -814,6 +734,11 @@ msgid "The repair order uses the warranty date on the Serial Number in\n"
msgstr ""
#. module: mrp_repair
+#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_line_state
+msgid "The status of a repair line is set automatically to the one of the linked repair order."
+msgstr ""
+
+#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair
msgid "This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"
msgstr ""
@@ -862,16 +787,6 @@ msgid "Unit of Measure"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_amount_untaxed
msgid "Untaxed Amount"
msgstr ""
@@ -887,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 ""
@@ -898,35 +813,21 @@ msgid "Warranty Expiration"
msgstr ""
#. module: mrp_repair
-#: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: mrp_repair
-#: model:ir.model.fields,help:mrp_repair.field_mrp_repair_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: mrp_repair
#: model:ir.ui.view,arch_db:mrp_repair.view_cancel_repair
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 307581e153b..1a567a9ac51 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:10+0000\n"
-"PO-Revision-Date: 2015-09-18 08:10+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: note
#: model:ir.model.fields,field_description:note.field_note_note_open
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Active"
@@ -37,6 +32,11 @@ 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."
msgstr ""
@@ -72,11 +72,6 @@ msgid "Date done"
msgstr ""
#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: note
#: model:ir.ui.view,arch_db:note.view_note_note_kanban
msgid "Delete"
msgstr ""
@@ -94,21 +89,6 @@ msgid "Folded by Default"
msgstr ""
#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: note
#: model:ir.ui.view,arch_db:note.view_note_note_filter
msgid "Group By"
msgstr ""
@@ -121,26 +101,6 @@ msgid "ID"
msgstr ""
#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: note
#: model:ir.model.fields,field_description:note.field_note_note___last_update
#: model:ir.model.fields,field_description:note.field_note_stage___last_update
#: model:ir.model.fields,field_description:note.field_note_tag___last_update
@@ -162,28 +122,17 @@ 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 ""
#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: note
#: model:note.stage,name:note.note_stage_00
msgid "New"
msgstr ""
#. module: note
-#: code:addons/note/note.py:163
+#: code:addons/note/models/note.py:128
#, python-format
msgid "New Note"
msgstr ""
@@ -224,21 +173,6 @@ msgid "Notes"
msgstr ""
#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,help:note.field_note_note_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: note
#: model:ir.model.fields,field_description:note.field_note_note_user_id
#: model:ir.model.fields,field_description:note.field_note_stage_user_id
msgid "Owner"
@@ -246,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
@@ -299,39 +233,25 @@ 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.model.fields,field_description:note.field_note_note_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: note
-#: model:ir.model.fields,field_description:note.field_note_note_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: note
#: model:ir.actions.act_window,help:note.action_note_note
msgid "Use notes to organize personal tasks or notes. All\n"
" notes are private; no one else will be able to see them. However\n"
diff --git a/addons/note_pad/i18n/note_pad.pot b/addons/note_pad/i18n/note_pad.pot
index f30f6fbcd67..0bc65133552 100644
--- a/addons/note_pad/i18n/note_pad.pot
+++ b/addons/note_pad/i18n/note_pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 23b41eda188..36000b2f4b2 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,16 +21,6 @@ msgid "Companies"
msgstr ""
#. module: pad
-#: model:ir.model.fields,field_description:pad.field_pad_common_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: pad
-#: model:ir.model.fields,field_description:pad.field_pad_common_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: pad
#: model:ir.model.fields,field_description:pad.field_pad_common_display_name
msgid "Display Name"
msgstr ""
@@ -56,33 +46,23 @@ msgid "Last Modified on"
msgstr ""
#. module: pad
-#: model:ir.model.fields,field_description:pad.field_pad_common_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: pad
-#: model:ir.model.fields,field_description:pad.field_pad_common_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: pad
#: model:ir.model.fields,field_description:pad.field_res_company_pad_key
msgid "Pad Api Key"
msgstr ""
#. module: pad
-#: model:ir.model.fields,field_description:pad.field_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 ""
@@ -102,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/pad_project/i18n/pad_project.pot b/addons/pad_project/i18n/pad_project.pot
index 3d28e8b8bd7..8bf64a8f040 100644
--- a/addons/pad_project/i18n/pad_project.pot
+++ b/addons/pad_project/i18n/pad_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index f2189bb8ece..d712ad426d6 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,43 +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 "-It 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 "-It 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 "-It 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 "-It 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 "-It 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_transfer
-msgid "-It installs the module payment_transfer."
+#: 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,field_description:payment.field_payment_transaction_html_3ds
-msgid "3D Secure HTML"
+#: 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: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.model.fields,help:payment.field_payment_acquirer_journal_id
+msgid "Account journal used for automatic payment reconciliation."
+msgstr ""
+
+#. module: payment
+#: model:ir.model.fields,field_description:payment.field_payment_acquirer_journal_id
+msgid "Accounting Journal"
msgstr ""
#. module: payment
@@ -62,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 ""
@@ -77,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 ""
@@ -93,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 ""
@@ -104,17 +157,14 @@ msgid "Amount"
msgstr ""
#. module: payment
-#: selection:payment.acquirer,auto_confirm:0
-msgid "At payment no acquirer confirmation needed"
+#: model:payment.acquirer,name:payment.payment_acquirer_authorize
+#: selection:payment.acquirer,provider:0
+msgid "Authorize.Net"
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_buckaroo
+#: model:payment.acquirer,name:payment.payment_acquirer_buckaroo
+#: selection:payment.acquirer,provider:0
msgid "Buckaroo"
msgstr ""
@@ -135,6 +185,16 @@ 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"
msgstr ""
@@ -145,13 +205,28 @@ 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
@@ -162,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 ""
@@ -194,18 +269,28 @@ 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"
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 ""
@@ -237,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 ""
@@ -256,6 +342,11 @@ 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"
msgstr ""
@@ -302,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 ""
@@ -313,6 +404,22 @@ 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"
msgstr ""
@@ -324,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 ""
@@ -349,6 +456,11 @@ 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"
msgstr ""
@@ -401,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
@@ -418,18 +530,23 @@ 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"
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 ""
@@ -440,6 +557,16 @@ msgid "Partner Name"
msgstr ""
#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_payu
+msgid "PayU"
+msgstr ""
+
+#. module: payment
+#: 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
msgid "Payment Acquirer"
@@ -453,20 +580,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 ""
@@ -474,8 +602,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.ui.menu,name:payment.finance_pay_tx_menu
+#: 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
@@ -483,15 +610,22 @@ msgid "Payment Transactions"
msgstr ""
#. module: payment
-#: model:ir.ui.menu,name:payment.finance_payment_menu
+#: 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 ""
@@ -547,13 +681,17 @@ msgid "S2S Form Template"
msgstr ""
#. module: payment
-#: model:ir.actions.act_window,name:payment.payment_method_action
-#: model:ir.ui.menu,name:payment.finance_pay_method_menu
-#: 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"
msgstr ""
@@ -564,6 +702,12 @@ msgid "Server To Server"
msgstr ""
#. module: payment
+#: model:payment.acquirer,name:payment.payment_acquirer_sips
+#: selection:payment.acquirer,provider:0
+msgid "Sips"
+msgstr ""
+
+#. module: payment
#: model:ir.model.fields,field_description:payment.field_payment_acquirer_image_small
msgid "Small-sized image"
msgstr ""
@@ -579,6 +723,12 @@ 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"
msgstr ""
@@ -594,7 +744,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 ""
@@ -610,6 +761,11 @@ msgid "This template renders the acquirer button with all necessary values.\n"
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"
msgstr ""
@@ -635,11 +791,47 @@ 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_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"
msgstr ""
@@ -650,11 +842,6 @@ 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"
msgstr ""
@@ -685,8 +872,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
@@ -705,11 +892,6 @@ msgid "tx_values: transaction values"
msgstr ""
#. module: payment
-#: model:ir.model.fields,field_description:payment.field_account_config_settings_module_payment_authorize
-msgid "unknown"
-msgstr ""
-
-#. module: payment
#: model:ir.ui.view,arch_db:payment.acquirer_form
msgid "user: current user browse record"
msgstr ""
diff --git a/addons/payment_adyen/i18n/payment_adyen.pot b/addons/payment_adyen/i18n/payment_adyen.pot
index 7e1eec316ed..9d329455008 100644
--- a/addons/payment_adyen/i18n/payment_adyen.pot
+++ b/addons/payment_adyen/i18n/payment_adyen.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,62 +16,37 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:123
+#: code:addons/payment_adyen/models/payment.py:181
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:121
+#: code:addons/payment_adyen/models/payment.py:179
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_adyen
-#: model:payment.acquirer,cancel_msg:payment_adyen.payment_acquirer_adyen
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_adyen
-#: model:payment.acquirer,done_msg:payment_adyen.payment_acquirer_adyen
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_adyen
-#: model:payment.acquirer,error_msg:payment_adyen.payment_acquirer_adyen
-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_adyen
-#: model:payment.acquirer,pending_msg:payment_adyen.payment_acquirer_adyen
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_adyen
-#: model:payment.acquirer,name:payment_adyen.payment_acquirer_adyen
-msgid "Adyen"
-msgstr ""
-
-#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:169
+#: code:addons/payment_adyen/models/payment.py:229
#, python-format
msgid "Adyen: feedback error"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:131
+#: code:addons/payment_adyen/models/payment.py:191
#, python-format
msgid "Adyen: invalid merchantSig, received %s, computed %s"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:119
+#: code:addons/payment_adyen/models/payment.py:177
#, python-format
msgid "Adyen: received data for reference %s"
msgstr ""
#. module: payment_adyen
-#: code:addons/payment_adyen/models/adyen.py:112
+#: code:addons/payment_adyen/models/payment.py:170
#, python-format
msgid "Adyen: received data with missing reference (%s) or missing pspReference (%s)"
msgstr ""
@@ -106,8 +81,3 @@ msgstr ""
msgid "Skin HMAC Key"
msgstr ""
-#. module: payment_adyen
-#: model:payment.acquirer,pre_msg:payment_adyen.payment_acquirer_adyen
-msgid "You will be redirected to the Adyen website after clicking on the payment button."
-msgstr ""
-
diff --git a/addons/payment_authorize/i18n/payment_authorize.pot b/addons/payment_authorize/i18n/payment_authorize.pot
index 6bf5dde6f05..69a0a1b664d 100644
--- a/addons/payment_authorize/i18n/payment_authorize.pot
+++ b/addons/payment_authorize/i18n/payment_authorize.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,26 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_authorize
-#: model:payment.acquirer,cancel_msg:payment_authorize.payment_acquirer_authorize
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_authorize
-#: model:payment.acquirer,done_msg:payment_authorize.payment_acquirer_authorize
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_authorize
-#: model:payment.acquirer,error_msg:payment_authorize.payment_acquirer_authorize
-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_authorize
-#: model:payment.acquirer,pending_msg:payment_authorize.payment_acquirer_authorize
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_authorize
#: model:ir.model.fields,field_description:payment_authorize.field_payment_acquirer_authorize_login
msgid "API Login Id"
msgstr ""
@@ -46,11 +26,6 @@ msgid "API Transaction Key"
msgstr ""
#. module: payment_authorize
-#: model:payment.acquirer,name:payment_authorize.payment_acquirer_authorize
-msgid "Authorize.Net"
-msgstr ""
-
-#. module: payment_authorize
#: model:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
msgid "How to configure your Authorize.Net account (look for Getting Started Guide) ?"
msgstr ""
@@ -65,8 +40,3 @@ msgstr ""
msgid "Payment Transaction"
msgstr ""
-#. module: payment_authorize
-#: model:payment.acquirer,pre_msg:payment_authorize.payment_acquirer_authorize
-msgid "You will be redirected to the Authorize website after clicking on the payment button."
-msgstr ""
-
diff --git a/addons/payment_buckaroo/i18n/payment_buckaroo.pot b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
index 55f6b9f3541..f830d2569e9 100644
--- a/addons/payment_buckaroo/i18n/payment_buckaroo.pot
+++ b/addons/payment_buckaroo/i18n/payment_buckaroo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,56 +16,31 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/buckaroo.py:132
+#: code:addons/payment_buckaroo/models/payment.py:143
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/buckaroo.py:130
+#: code:addons/payment_buckaroo/models/payment.py:141
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_buckaroo
-#: model:payment.acquirer,cancel_msg:payment_buckaroo.payment_acquirer_buckaroo
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_buckaroo
-#: model:payment.acquirer,done_msg:payment_buckaroo.payment_acquirer_buckaroo
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_buckaroo
-#: model:payment.acquirer,error_msg:payment_buckaroo.payment_acquirer_buckaroo
-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_buckaroo
-#: model:payment.acquirer,pending_msg:payment_buckaroo.payment_acquirer_buckaroo
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_buckaroo
-#: model:payment.acquirer,name:payment_buckaroo.payment_acquirer_buckaroo
-msgid "Buckaroo"
-msgstr ""
-
-#. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/buckaroo.py:140
+#: code:addons/payment_buckaroo/models/payment.py:150
#, python-format
msgid "Buckaroo: invalid shasign, received %s, computed %s, for data %s"
msgstr ""
#. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/buckaroo.py:128
+#: code:addons/payment_buckaroo/models/payment.py:139
#, python-format
msgid "Buckaroo: received data for reference %s"
msgstr ""
#. module: payment_buckaroo
-#: code:addons/payment_buckaroo/models/buckaroo.py:122
+#: code:addons/payment_buckaroo/models/payment.py:133
#, python-format
msgid "Buckaroo: received data with missing reference (%s) or pay_id (%s) or shasign (%s)"
msgstr ""
@@ -95,8 +70,3 @@ msgstr ""
msgid "WebsiteKey"
msgstr ""
-#. module: payment_buckaroo
-#: model:payment.acquirer,pre_msg:payment_buckaroo.payment_acquirer_buckaroo
-msgid "You will be redirected to the Buckaroo website after clicking on the payment button."
-msgstr ""
-
diff --git a/addons/payment_ogone/i18n/payment_ogone.pot b/addons/payment_ogone/i18n/payment_ogone.pot
index 2e6f71afc7b..af9171b6e2b 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,38 +16,18 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_ogone
-#: code:addons/payment_ogone/models/ogone.py:239
+#: 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:237
+#: 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"
msgstr ""
@@ -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:247
+#: 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:235
+#: 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:228
+#: 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/payment_paypal/i18n/payment_paypal.pot b/addons/payment_paypal/i18n/payment_paypal.pot
index c72083f0f1b..f1588923cd1 100644
--- a/addons/payment_paypal/i18n/payment_paypal.pot
+++ b/addons/payment_paypal/i18n/payment_paypal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,26 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_paypal
-#: model:payment.acquirer,cancel_msg:payment_paypal.payment_acquirer_paypal
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_paypal
-#: model:payment.acquirer,done_msg:payment_paypal.payment_acquirer_paypal
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_paypal
-#: model:payment.acquirer,error_msg:payment_paypal.payment_acquirer_paypal
-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_paypal
-#: model:payment.acquirer,pending_msg:payment_paypal.payment_acquirer_paypal
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_paypal
#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_api_access_token
msgid "Access Token"
msgstr ""
@@ -46,11 +26,6 @@ msgid "Access Token Validity"
msgstr ""
#. module: payment_paypal
-#: model:ir.model,name:payment_paypal.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: payment_paypal
#: model:ir.ui.view,arch_db:payment_paypal.acquirer_form_paypal
msgid "How to configure your paypal account?"
msgstr ""
@@ -66,11 +41,6 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_paypal
-#: model:payment.acquirer,name:payment_paypal.payment_acquirer_paypal
-msgid "Paypal"
-msgstr ""
-
-#. module: payment_paypal
#: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer_paypal_email_account
msgid "Paypal Email ID"
msgstr ""
@@ -91,7 +61,7 @@ msgid "Paypal TX Details"
msgstr ""
#. module: payment_paypal
-#: code:addons/payment_paypal/models/paypal.py:186
+#: code:addons/payment_paypal/models/payment.py:119
#, python-format
msgid "Paypal: received data with missing reference (%s) or txn_id (%s)"
msgstr ""
@@ -126,8 +96,3 @@ msgstr ""
msgid "Use Rest API"
msgstr ""
-#. module: payment_paypal
-#: model:payment.acquirer,pre_msg:payment_paypal.payment_acquirer_paypal
-msgid "You will be redirected to the Paypal website after clicking on the payment button."
-msgstr ""
-
diff --git a/addons/payment_payumoney/i18n/payment_payumoney.pot b/addons/payment_payumoney/i18n/payment_payumoney.pot
index b4de2907c04..86a54d6d429 100644
--- a/addons/payment_payumoney/i18n/payment_payumoney.pot
+++ b/addons/payment_payumoney/i18n/payment_payumoney.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-17 08:19+0000\n"
-"PO-Revision-Date: 2016-03-17 08:19+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
#. module: payment_payumoney
#: model:payment.acquirer,error_msg:payment_payumoney.payment_acquirer_payumoney
-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>"
+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_payumoney
@@ -51,31 +51,31 @@ msgid "PayUmoney"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment_transaction.py:77
+#: code:addons/payment_payumoney/models/payment.py:145
#, python-format
msgid "PayUmoney: feedback error"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment_transaction.py:39
+#: code:addons/payment_payumoney/models/payment.py:107
#, python-format
msgid "PayUmoney: invalid shasign, received %s, computed %s, for data %s"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment_transaction.py:33
+#: code:addons/payment_payumoney/models/payment.py:101
#, python-format
msgid "PayUmoney: received data for reference %s; multiple orders found"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment_transaction.py:30
+#: code:addons/payment_payumoney/models/payment.py:98
#, python-format
msgid "PayUmoney: received data for reference %s; no order found"
msgstr ""
#. module: payment_payumoney
-#: code:addons/payment_payumoney/models/payment_transaction.py:25
+#: code:addons/payment_payumoney/models/payment.py:93
#, python-format
msgid "PayUmoney: received data with missing reference (%s) or pay_id (%s) or shashign (%s)"
msgstr ""
diff --git a/addons/payment_sips/i18n/payment_sips.pot b/addons/payment_sips/i18n/payment_sips.pot
index 1bd64dae684..61a7f5f1514 100644
--- a/addons/payment_sips/i18n/payment_sips.pot
+++ b/addons/payment_sips/i18n/payment_sips.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,45 +16,25 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_sips
-#: code:addons/payment_sips/models/sips.py:166
+#: code:addons/payment_sips/models/payment.py:155
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/sips.py:164
+#: code:addons/payment_sips/models/payment.py:153
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_sips
-#: model:payment.acquirer,cancel_msg:payment_sips.payment_acquirer_sips
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_sips
-#: model:payment.acquirer,done_msg:payment_sips.payment_acquirer_sips
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_sips
-#: model:payment.acquirer,error_msg:payment_sips.payment_acquirer_sips
-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_sips
-#: model:payment.acquirer,pending_msg:payment_sips.payment_acquirer_sips
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_sips
-#: code:addons/payment_sips/models/sips.py:87
+#: code:addons/payment_sips/models/payment.py:76
#, python-format
msgid "Currency not supported by Wordline"
msgstr ""
#. module: payment_sips
-#: code:addons/payment_sips/models/sips.py:68
+#: code:addons/payment_sips/models/payment.py:57
#, python-format
msgid "Incorrect payment acquirer provider"
msgstr ""
@@ -80,18 +60,8 @@ msgid "SIPS Secret"
msgstr ""
#. module: payment_sips
-#: model:payment.acquirer,name:payment_sips.payment_acquirer_sips
-msgid "Sips"
-msgstr ""
-
-#. module: payment_sips
-#: code:addons/payment_sips/models/sips.py:162
+#: code:addons/payment_sips/models/payment.py:151
#, python-format
msgid "Sips: received data for reference %s"
msgstr ""
-#. module: payment_sips
-#: model:payment.acquirer,pre_msg:payment_sips.payment_acquirer_sips
-msgid "You will be redirected to the Sips website after clicking on payment button."
-msgstr ""
-
diff --git a/addons/payment_stripe/i18n/payment_stripe.pot b/addons/payment_stripe/i18n/payment_stripe.pot
new file mode 100644
index 00000000000..11e7df5ed2c
--- /dev/null
+++ b/addons/payment_stripe/i18n/payment_stripe.pot
@@ -0,0 +1,100 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * payment_stripe
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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: payment_stripe
+#: model:ir.model.fields,help:payment_stripe.field_payment_acquirer_stripe_image_url
+msgid "A relative or absolute URL pointing to a square image of your brand or product. As defined in your Stripe profile. See: https://stripe.com/docs/checkout"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "CVC"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "Card Holder Name"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "Card Number"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_image_url
+msgid "Checkout Image URL"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "Confirm <span class=\"fa fa-long-arrow-right\"/>"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "Expiration Date"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.ui.view,arch_db:payment_stripe.stripe_s2s_form
+msgid "MM / YY"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model,name:payment_stripe.model_payment_acquirer
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model,name:payment_stripe.model_payment_transaction
+msgid "Payment Transaction"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_publishable_key
+msgid "Stripe publishable key"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer_stripe_secret_key
+msgid "Stripe secret key"
+msgstr ""
+
+#. module: payment_stripe
+#: code:addons/payment_stripe/models/payment.py:120
+#, python-format
+msgid "Stripe: %s orders found for reference %s"
+msgstr ""
+
+#. module: payment_stripe
+#: code:addons/payment_stripe/models/payment.py:111
+#, python-format
+msgid "Stripe: invalid reply received from provider, missing reference"
+msgstr ""
+
+#. module: payment_stripe
+#: code:addons/payment_stripe/models/payment.py:116
+#, python-format
+msgid "Stripe: no order found for reference %s"
+msgstr ""
+
+#. module: payment_stripe
+#: model:ir.model,name:payment_stripe.model_payment_token
+msgid "payment.token"
+msgstr ""
+
diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_transfer/i18n/payment_transfer.pot
index f2c913e4f96..a4056e85118 100644
--- a/addons/payment_transfer/i18n/payment_transfer.pot
+++ b/addons/payment_transfer/i18n/payment_transfer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,45 +16,25 @@ msgstr ""
"Plural-Forms: \n"
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:68
+#: code:addons/payment_transfer/models/payment.py:63
#, python-format
msgid "; multiple order found"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:66
+#: code:addons/payment_transfer/models/payment.py:61
#, python-format
msgid "; no order found"
msgstr ""
#. module: payment_transfer
-#: model:payment.acquirer,cancel_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,done_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,error_msg:payment_transfer.payment_acquirer_transfer
-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_transfer
-#: model:payment.acquirer,pending_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:30
+#: code:addons/payment_transfer/models/payment.py:26
#, python-format
msgid "Bank Account"
msgstr ""
#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:30
+#: code:addons/payment_transfer/models/payment.py:26
#, python-format
msgid "Bank Accounts"
msgstr ""
@@ -70,24 +50,8 @@ msgid "Payment Transaction"
msgstr ""
#. module: payment_transfer
-#: model:payment.acquirer,pre_msg:payment_transfer.payment_acquirer_transfer
-msgid "Transfer information will be provided after choosing the payment mode."
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,name:payment_transfer.payment_acquirer_transfer
-msgid "Wire Transfer"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:64
+#: code:addons/payment_transfer/models/payment.py:59
#, python-format
msgid "received data for reference %s"
msgstr ""
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:19
-#, python-format
-msgid "Wire Transfer"
-msgstr ""
-
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 6db4a893c65..ad302aee58a 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-09 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,18 @@ msgstr ""
"Plural-Forms: \n"
#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:685
+#, 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
+#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_nbr_lines
msgid "# of Lines"
msgstr ""
@@ -32,20 +38,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1284
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1331
#, python-format
msgid "% discount"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.index
-msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1411
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1451
+#: 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 "&nbsp;"
msgstr ""
@@ -62,33 +63,22 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:277
+#: code:addons/point_of_sale/static/src/xml/pos.xml:279
#, python-format
msgid "123.14 €"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.evian_2l
-#: model:product.template,name:point_of_sale.evian_2l_product_template
-msgid "2L Evian"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.perrier_50cl
-#: model:product.template,name:point_of_sale.perrier_50cl_product_template
-msgid "50cl Perrier"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
-msgid "<br/>\n"
-" Date:"
+#. 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"
-" <span class=\"o_stat_text\">Money In</span>"
+" <span class=\"o_stat_text\">Money In</span>"
msgstr ""
#. module: point_of_sale
@@ -104,7 +94,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
msgid "<span class=\"o_stat_text\">Take</span>\n"
-" <span class=\"o_stat_text\">Money Out</span>"
+" <span class=\"o_stat_text\">Money Out</span>"
msgstr ""
#. module: point_of_sale
@@ -128,297 +118,60 @@ msgid "<span>View</span>"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Closing Date</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "<strong>Company</strong>:\n"
-" <br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
#: 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 ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Currency</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Date</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Description</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Difference</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Disc(%)</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Disc. (%)</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "<strong>Disc.(%)</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>End Period</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Ending Balance</strong>"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "<strong>Ending Balance</strong>:<br/>"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Invoiced</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Journal</strong>"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "<strong>Journal</strong>:<br/>"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "<strong>Net Total</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>No. Of Articles</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "<strong>Opening Date</strong>:<br/>"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Order</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Payment</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Point of Sale</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Price</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: 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_payment
-msgid "<strong>Print date</strong>:\n"
-" <br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Print date</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "<strong>Product</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Qty of product</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "<strong>Qty</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Quantity</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Reference</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Responsible</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Sales total(Revenue)</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Start Period</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Starting Balance</strong>"
-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/>"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Status</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Summary</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Tax</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
-msgid "<strong>Taxes</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "<strong>Total Transactions</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Total Without Taxes</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Total discount</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Total invoiced</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Total of the day</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Total paid</strong>"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
#: 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_payment
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "<strong>Unit Price</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 ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "<strong>Users</strong>:<br/>"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
msgid "= Theoretical Closing Balance"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1854
+#: code:addons/point_of_sale/static/src/js/screens.js:1900
#, 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:1145
+#: code:addons/point_of_sale/static/src/js/screens.js:1189
#, python-format
msgid "A Customer Name Is Required"
msgstr ""
@@ -478,14 +231,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1450
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1497
#, python-format
msgid "ABC"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Account"
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_cashbox
+msgid "Account Bank Statement Cashbox Details"
msgstr ""
#. module: point_of_sale
@@ -495,28 +248,17 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config_journal_id
+#: model:ir.model.fields,help:point_of_sale.field_pos_order_sale_journal
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"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_portal
-msgid "Activate the customer portal"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_res_users_activation
msgid "Activation"
msgstr ""
#. module: point_of_sale
-#: model:ir.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 ""
@@ -527,7 +269,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1698
+#: code:addons/point_of_sale/static/src/js/screens.js:1744
#, python-format
msgid "Add Tip"
msgstr ""
@@ -539,23 +281,13 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:372
-#: code:addons/point_of_sale/static/src/xml/pos.xml:450
+#: code:addons/point_of_sale/static/src/xml/pos.xml:374
+#: code:addons/point_of_sale/static/src/xml/pos.xml:462
#, python-format
msgid "Address"
msgstr ""
#. module: point_of_sale
-#: model:pos.category,name:point_of_sale.alcohol
-msgid "Alcohol"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_alias_domain
-msgid "Alias Domain"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
msgid "All sales lines"
msgstr ""
@@ -571,36 +303,11 @@ msgid "Allow discounts on order lines only"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_share
-msgid "Allow documents sharing"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_auth_signup_uninvited
-msgid "Allow external users to sign up"
-msgstr ""
-
-#. module: point_of_sale
#: selection:pos.config.settings,module_pos_discount:0
msgid "Allow global discounts"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_google_calendar
-msgid "Allow the users to synchronize their calendar with Google Calendar"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_base_import
-msgid "Allow users to import data from CSV/XLS/XLSX/ODS files"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_auth_oauth_google_enabled
-msgid "Allow users to sign in with Google"
-msgstr ""
-
-#. module: point_of_sale
#: selection:pos.config.settings,module_pos_mercury:0
msgid "Allows customers to pay with credit cards."
msgstr ""
@@ -617,11 +324,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_amount
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_amount
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
#: 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 ""
@@ -632,7 +335,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_tree
-#: model:ir.ui.view,arch_db:point_of_sale.view_trans_pos_user_tree
msgid "Amount total"
msgstr ""
@@ -654,27 +356,12 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1846
+#: code:addons/point_of_sale/static/src/js/screens.js:1892
#, python-format
msgid "Are you sure that the customer wants to pay"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_google_drive
-msgid "Attach Google documents to any record"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_google_drive_authorization_code
-msgid "Authorization Code"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_session_rescue
-msgid "Auto-generated session for orphan orders, ignored in constraints"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_auto
msgid "Automatic Receipt Printing"
msgstr ""
@@ -692,6 +379,11 @@ 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"
msgstr ""
@@ -702,14 +394,26 @@ msgid "Average Price"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.bacardi
+#: model:product.template,name:point_of_sale.bacardi_product_template
+msgid "Bacardi"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:265
-#: code:addons/point_of_sale/static/src/xml/pos.xml:585
+#: code:addons/point_of_sale/static/src/xml/pos.xml:267
+#: code:addons/point_of_sale/static/src/xml/pos.xml:597
#, python-format
msgid "Back"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.baileys
+#: model:product.template,name:point_of_sale.baileys_product_template
+msgid "Baileys"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_account_bank_statement
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_statement_ids
msgid "Bank Statement"
@@ -722,8 +426,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:349
-#: code:addons/point_of_sale/static/src/xml/pos.xml:391
+#: code:addons/point_of_sale/static/src/xml/pos.xml:351
+#: code:addons/point_of_sale/static/src/xml/pos.xml:403
#, python-format
msgid "Barcode"
msgstr ""
@@ -735,7 +439,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1158
+#: 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"
@@ -747,31 +451,31 @@ msgid "Barcodes"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.belle_vue_kriek_25cl
-#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
-msgid "Belle-Vue Kriek 25cl"
+#: model:pos.category,name:point_of_sale.beer
+msgid "Beers"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos
#: model:pos.category,name:point_of_sale.beverage
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"
+#: 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"
+#: model:product.product,name:point_of_sale.budweiser
+#: model:product.template,name:point_of_sale.budweiser_product_template
+msgid "Budweiser"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:857
+#: code:addons/point_of_sale/static/src/js/screens.js:886
#, python-format
msgid "Button"
msgstr ""
@@ -783,21 +487,26 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:782
+#: code:addons/point_of_sale/static/src/xml/pos.xml:798
#, python-format
msgid "CHANGE"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.caipirinha
+#: model:product.template,name:point_of_sale.caipirinha_product_template
+msgid "Caipirinha"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:418
-#: code:addons/point_of_sale/static/src/xml/pos.xml:910
-#: code:addons/point_of_sale/static/src/xml/pos.xml:927
-#: code:addons/point_of_sale/static/src/xml/pos.xml:944
-#: code:addons/point_of_sale/static/src/xml/pos.xml:964
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1016
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_confirm
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details
+#: 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: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
@@ -814,19 +523,32 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1835
+#: code:addons/point_of_sale/static/src/js/screens.js:1881
#, python-format
msgid "Cannot return change without a cash payment method"
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"
+#: model:product.product,name:point_of_sale.captain_morgan
+#: model:product.template,name:point_of_sale.captain_morgan_product_template
+msgid "Captain Morgan"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.capuccino
+#: model:product.template,name:point_of_sale.capuccino_product_template
+msgid "Capuccino"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.carlsberg
+#: model:product.template,name:point_of_sale.carlsberg_product_template
+msgid "Carlsberg"
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 ""
@@ -836,28 +558,33 @@ msgid "Cash Journal"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_jl_id
-msgid "Cash Journals"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_cash_register_id
msgid "Cash Register"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:364
+#: 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/point_of_sale.py:1604
+#: code:addons/point_of_sale/models/barcode_rule.py:16
#, python-format
msgid "Cashier"
msgstr ""
@@ -870,47 +597,41 @@ 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:503
#, python-format
msgid "Change"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:101
+#: code:addons/point_of_sale/static/src/js/chrome.js:102
#, python-format
msgid "Change Cashier"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1090
+#: code:addons/point_of_sale/static/src/js/screens.js:1134
#, python-format
msgid "Change Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1698
+#: code:addons/point_of_sale/static/src/js/screens.js:1744
#, python-format
msgid "Change Tip"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:647
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1340
+#: 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 ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.chaudfontaine_petillante_1,5l
-#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
-msgid "Chaudfontaine Petillante 1.5l"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_product_template_to_weight
msgid "Check if the product should be weighted using the hardware scale integration"
msgstr ""
@@ -937,7 +658,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1884
+#: code:addons/point_of_sale/static/src/js/screens.js:1932
#, python-format
msgid "Check your internet connection and try again."
msgstr ""
@@ -948,15 +669,9 @@ msgid "Children Categories"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.chimay_rouge_33cl
-#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
-msgid "Chimay Red 33cl"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:320
-#: code:addons/point_of_sale/static/src/xml/pos.xml:321
+#: code:addons/point_of_sale/static/src/xml/pos.xml:322
+#: code:addons/point_of_sale/static/src/xml/pos.xml:323
#, python-format
msgid "City"
msgstr ""
@@ -992,47 +707,34 @@ msgid "Click to start a new session."
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_auth_oauth_google_client_id
-msgid "Client ID"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_cal_client_id
-msgid "Client_id"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_cal_client_secret
-msgid "Client_key"
+#: code:addons/point_of_sale/models/barcode_rule.py:15
+#, python-format
+msgid "Client"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:642
-#: code:addons/point_of_sale/static/src/js/chrome.js:650
+#: code:addons/point_of_sale/static/src/js/chrome.js:679
+#: code:addons/point_of_sale/static/src/js/chrome.js:687
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
#, python-format
msgid "Close"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:167
#: selection:pos.session,state:0
-#, python-format
msgid "Closed & Posted"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:333
+#: code:addons/point_of_sale/static/src/js/gui.js:335
#, python-format
msgid "Closing ..."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:166
#: selection:pos.session,state:0
-#, python-format
msgid "Closing Control"
msgstr ""
@@ -1042,33 +744,20 @@ msgid "Closing Date"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.coca_light_33cl
-#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
-msgid "Coca-Cola Light 33cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.coca_light_50cl
-#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
-msgid "Coca-Cola Light 50cl"
+#: model:product.product,name:point_of_sale.coke
+#: model:product.template,name:point_of_sale.coke_product_template
+msgid "Coca-Cola"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.coca_light_lemon_2l
-#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
-msgid "Coca-Cola Light Lemon 2L"
+#: model:pos.category,name:point_of_sale.cocktail
+msgid "Cocktails"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.coca_regular_33cl
-#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
-msgid "Coca-Cola Regular 33cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.coca_regular_50cl
-#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
-msgid "Coca-Cola Regular 50cl"
+#: model:product.product,name:point_of_sale.coffee
+#: model:product.template,name:point_of_sale.coffee_product_template
+msgid "Coffee"
msgstr ""
#. module: point_of_sale
@@ -1080,12 +769,6 @@ 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"
msgstr ""
@@ -1102,15 +785,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:647
-#: code:addons/point_of_sale/static/src/xml/pos.xml:907
+#: code:addons/point_of_sale/static/src/js/chrome.js:684
+#: code:addons/point_of_sale/static/src/xml/pos.xml:923
#, python-format
msgid "Confirm"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/models.js:114
+#: code:addons/point_of_sale/static/src/js/models.js:115
#, python-format
msgid "Connecting to the PosBox"
msgstr ""
@@ -1121,15 +804,27 @@ msgid "Continue Selling"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.corona
+#: model:product.template,name:point_of_sale.corona_product_template
+msgid "Corona"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.cosmopolitan
+#: model:product.template,name:point_of_sale.cosmopolitan_product_template
+msgid "Cosmopolitan"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1233
+#: code:addons/point_of_sale/static/src/js/screens.js:1276
#, python-format
msgid "Could Not Read Image"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:328
+#: code:addons/point_of_sale/static/src/xml/pos.xml:330
#, python-format
msgid "Country"
msgstr ""
@@ -1138,13 +833,12 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_create_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_create_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_create_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_create_uid
#: 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 ""
@@ -1153,12 +847,11 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_create_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_create_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_create_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_create_date
+#: 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 ""
@@ -1174,6 +867,12 @@ msgid "Credit Cards"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.cuba_libre
+#: model:product.template,name:point_of_sale.cuba_libre_product_template
+msgid "Cuba Libre"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_currency_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_currency_id
msgid "Currency"
@@ -1185,10 +884,15 @@ msgid "Current Session"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_current_session_state
+msgid "Current session state"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1709
+#: code:addons/point_of_sale/static/src/js/screens.js:1755
#: code:addons/point_of_sale/static/src/xml/pos.xml:116
-#: code:addons/point_of_sale/static/src/xml/pos.xml:615
+#: 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
@@ -1196,31 +900,21 @@ msgid "Customer"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1162
+#: code:addons/point_of_sale/models/pos_order.py:429
+#: code:addons/point_of_sale/models/pos_order.py:474
#, python-format
msgid "Customer Invoice"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
-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_transaction_pos_date_create
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Date"
+#: model:product.product,name:point_of_sale.daiquiri
+#: model:product.template,name:point_of_sale.daiquiri_product_template
+msgid "Daiquiri"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_date_end
-msgid "Date End"
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_dashboard
+msgid "Dashboard"
msgstr ""
#. module: point_of_sale
@@ -1229,25 +923,25 @@ msgid "Date Order"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_date_start
-msgid "Date Start"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1196
+#, python-format
+msgid "Debug Window"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details
-msgid "Dates"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_default_cashbox_lines_ids
+msgid "Default Balance"
msgstr ""
#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1148
-#, python-format
-msgid "Debug Window"
+#: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_account_id
+msgid "Default Debit Account"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_pos_config
-msgid "Default Point of Sale"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_default_fiscal_position_id
+msgid "Default Fiscal Position"
msgstr ""
#. module: point_of_sale
@@ -1262,28 +956,28 @@ 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:1216
#, python-format
msgid "Delete Paid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:260
+#: code:addons/point_of_sale/static/src/js/chrome.js:261
#, python-format
msgid "Delete Paid Orders ?"
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:1217
#, python-format
msgid "Delete Unpaid Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:270
+#: code:addons/point_of_sale/static/src/js/chrome.js:271
#, python-format
msgid "Delete Unpaid Orders ?"
msgstr ""
@@ -1294,37 +988,20 @@ msgid "Delivery Method"
msgstr ""
#. module: point_of_sale
-#: selection:pos.config,state:0
-msgid "Deprecated"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Description"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1093
+#: code:addons/point_of_sale/static/src/js/screens.js:1137
#, python-format
msgid "Deselect Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:52
+#: code:addons/point_of_sale/static/src/js/chrome.js:53
#, python-format
msgid "Destroy Current Order ?"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
-#: model:ir.ui.view,arch_db:point_of_sale.report_detailsofsales
-msgid "Details of Sales"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_cash_register_difference
msgid "Difference"
msgstr ""
@@ -1335,6 +1012,12 @@ msgid "Difference between the theoretical closing balance and the real closing b
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.disaronno
+#: model:product.template,name:point_of_sale.disaronno_product_template
+msgid "Disaronno"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:139
#, python-format
@@ -1342,11 +1025,6 @@ msgid "Disc"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_disc
-msgid "Disc."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_discount
msgid "Discount"
msgstr ""
@@ -1364,21 +1042,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:725
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1313
+#: 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/point_of_sale.py:1602
+#: 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:791
+#: code:addons/point_of_sale/static/src/xml/pos.xml:807
#, python-format
msgid "Discounts"
msgstr ""
@@ -1392,34 +1070,19 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_display_name
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_display_name
#: 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_detailsofsales_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_payment_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_receipt_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_saleslines_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
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_display_name
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_display_name
msgid "Display Name"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_fullscreen
-msgid "Display the Point of Sale in full screen mode"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.actions.act_window,help:point_of_sale.product_template_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"
@@ -1439,32 +1102,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:489
+#: 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.partner_product_4
-#: model:product.template,name:point_of_sale.partner_product_4_product_template
-msgid "Ekomurz.nl"
+#: 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
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1151
+#: 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"
@@ -1472,27 +1123,29 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:341
-#: code:addons/point_of_sale/static/src/xml/pos.xml:376
+#: code:addons/point_of_sale/static/src/xml/pos.xml:343
+#: 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:1806
+#: code:addons/point_of_sale/static/src/js/screens.js:1852
#, python-format
msgid "Empty Order"
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"
+#. openerp-web
+#: code:addons/point_of_sale/static/src/js/screens.js:411
+#, python-format
+msgid "Empty Serial/Lot Number"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_auth_signup_reset_password
-msgid "Enable password reset from Login page"
+#: 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"
msgstr ""
#. module: point_of_sale
@@ -1526,19 +1179,14 @@ msgid "Ending Balance"
msgstr ""
#. module: point_of_sale
-#: constraint:pos.category:0
-msgid "Error ! You cannot create recursive categories."
-msgstr ""
-
-#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1553
+#: code:addons/point_of_sale/models/pos_category.py:13
#, python-format
-msgid "Error!"
+msgid "Error ! You cannot create recursive categories."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1162
+#: code:addons/point_of_sale/static/src/js/screens.js:1205
#, python-format
msgid "Error: Could not Save Changes"
msgstr ""
@@ -1551,69 +1199,34 @@ msgid "Error: The Point of Sale User must belong to the same company as the Poin
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.evian_50cl
-#: model:product.template,name:point_of_sale.evian_50cl_product_template
-msgid "Evian 50cl"
+#: model:product.product,name:point_of_sale.espresso
+#: model:product.template,name:point_of_sale.espresso_product_template
+msgid "Espresso"
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:1218
#, python-format
msgid "Export Paid Orders"
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: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"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_fail_counter
-msgid "Fail Mail"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.fanta_orange_25cl
-#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
-msgid "Fanta Orange 25cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.fanta_orange_33cl
-#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
-msgid "Fanta Orange 33cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.fanta_orange_50cl
-#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
-msgid "Fanta Orange 50cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.fanta_zero_orange_1,5l
-#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
-msgid "Fanta Orange Zero 1.5L"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.fanta_zero_orange_33cl
-#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
-msgid "Fanta Zero Orange 33cl"
+#: model:product.product,name:point_of_sale.fanta
+#: model:product.template,name:point_of_sale.fanta_product_template
+msgid "Fanta"
msgstr ""
#. module: point_of_sale
@@ -1623,7 +1236,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1030
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1075
#, python-format
msgid "Finished Importing Orders"
msgstr ""
@@ -1649,13 +1262,9 @@ msgid "For imprecise industrial touchscreens"
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.model.fields,field_description:point_of_sale.field_pos_config_iface_fullscreen
-msgid "Fullscreen"
+#: model:product.product,name:point_of_sale.fosters
+#: model:product.template,name:point_of_sale.fosters_product_template
+msgid "Foster's"
msgstr ""
#. module: point_of_sale
@@ -1664,26 +1273,6 @@ msgid "General Information"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_confirm
-msgid "Generate Entries"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_confirm
-msgid "Generate Journal Entries"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_confirm
-msgid "Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_portal
-msgid "Give your customers access to their documents."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_res_users_partner_weight
msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
msgstr ""
@@ -1694,27 +1283,15 @@ msgid "Gives the sequence order when displaying a list of product categories."
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"
-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"
+#: model:product.product,name:point_of_sale.gordon
+#: model:product.template,name:point_of_sale.gordon_product_template
+msgid "Gordon"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.grisette_cerise_25cl
-#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
-msgid "Grisette Cherry 25cl"
+#: model:product.product,name:point_of_sale.green_tea
+#: model:product.template,name:point_of_sale.green_tea_product_template
+msgid "Green Tea"
msgstr ""
#. module: point_of_sale
@@ -1730,15 +1307,14 @@ msgid "Group Journal Items"
msgstr ""
#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:706
-#, python-format
-msgid "Guests:"
+#: model:product.product,name:point_of_sale.guinness
+#: model:product.template,name:point_of_sale.guinness_product_template
+msgid "Guinness"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1182
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1230
#, python-format
msgid "Hardware Events"
msgstr ""
@@ -1750,7 +1326,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1178
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1226
#, python-format
msgid "Hardware Status"
msgstr ""
@@ -1766,28 +1342,23 @@ msgid "Header"
msgstr ""
#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.hot
+msgid "Hot Drinks"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_id
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_id
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_id
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_id
#: 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_detailsofsales_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_payment_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_receipt_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_saleslines_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
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_id
msgid "ID"
msgstr ""
@@ -1804,13 +1375,9 @@ msgid "IP Address"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_auth_signup_uninvited
-msgid "If unchecked, only invited users may sign up."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_alias_domain
-msgid "If you have setup a catch-all email domain redirected to the Odoo server, enter the domain name here."
+#: model:product.product,name:point_of_sale.ice_tea
+#: model:product.template,name:point_of_sale.ice_tea_product_template
+msgid "Ice Tea"
msgstr ""
#. module: point_of_sale
@@ -1836,34 +1403,40 @@ msgid "Implemented by"
msgstr ""
#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.alcohol
+msgid "Import Drinks"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1172
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1220
#, python-format
msgid "Import Orders"
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"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_data_drinks
+msgid "Import common drinks data"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos
+msgid "Importable Point of Sales Data"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:165
#: selection:pos.session,state:0
-#, python-format
msgid "In Progress"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:784
+#: code:addons/point_of_sale/models/pos_order.py:407
#, 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 ""
@@ -1874,7 +1447,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:264
+#: code:addons/point_of_sale/static/src/js/gui.js:266
#, python-format
msgid "Incorrect Password"
msgstr ""
@@ -1886,7 +1459,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:623
+#: 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
@@ -1895,11 +1468,6 @@ msgid "Invoice"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_invoice_am
-msgid "Invoice Amount"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_invoiced
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
@@ -1909,19 +1477,31 @@ msgid "Invoiced"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
-msgid "Invoices"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_invoicing
+msgid "Invoicing"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_invoicing
-msgid "Invoicing"
+#: model:product.product,name:point_of_sale.irish_coffee
+#: model:product.template,name:point_of_sale.irish_coffee_product_template
+msgid "Irish Coffee"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_account_bank_statement_account_id
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.jack_daniels
+#: model:product.template,name:point_of_sale.jack_daniels_product_template
+msgid "Jack Daniel's"
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"
+#: model:product.product,name:point_of_sale.jim_beam
+#: model:product.template,name:point_of_sale.jim_beam_product_template
+msgid "Jim Beam"
msgstr ""
#. module: point_of_sale
@@ -1949,25 +1529,15 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement___last_update
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order___last_update
#: 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_detailsofsales___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_payment___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_receipt___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_point_of_sale_report_saleslines___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
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month___last_update
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos___last_update
msgid "Last Modified on"
msgstr ""
@@ -1975,13 +1545,12 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_write_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_write_uid
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_write_uid
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_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 ""
@@ -1990,44 +1559,29 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_write_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_confirm_write_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_open_statement_write_date
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_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 ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_review
-msgid "Latest Partner Review"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.poireaux_poireaux
-#: model:product.template,name:point_of_sale.poireaux_poireaux_product_template
-msgid "Leeks"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.leffe_blonde_33cl
-#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
-msgid "Leffe Blonde 33cl"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_cash
+msgid "Last session closing cash"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.leffe_brune_33cl
-#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
-msgid "Leffe Brune 33cl"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_date
+msgid "Last session closing date"
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_date_review
+msgid "Latest Partner Review"
msgstr ""
#. module: point_of_sale
@@ -2041,12 +1595,6 @@ msgid "Level Weight"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.lindemans_kriek_37,5cl
-#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
-msgid "Lindemans Kriek 37.5cl"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_name
msgid "Line No"
msgstr ""
@@ -2057,14 +1605,14 @@ msgid "Lines of Point of Sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:59
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:33
#, python-format
msgid "List of Cash Registers"
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"
@@ -2083,12 +1631,29 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:291
+#: code:addons/point_of_sale/static/src/js/gui.js:293
#, python-format
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"
msgstr ""
@@ -2099,28 +1664,39 @@ msgid "Make Payment"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_inter_company_rules
-msgid "Manage Inter Company"
+#: model:product.product,name:point_of_sale.malibu
+#: model:product.template,name:point_of_sale.malibu_product_template
+msgid "Malibu"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_product_variant
-msgid "Manage Product Variants"
+#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos
+msgid "Manage loyalty program with points and rewards for customers"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos
-msgid "Manage loyalty program with points and rewards for customers"
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_light_multi_company
-msgid "Manage multiple companies"
+#: model:product.product,name:point_of_sale.manhattan
+#: model:product.template,name:point_of_sale.manhattan_product_template
+msgid "Manhattan"
msgstr ""
#. module: point_of_sale
-#: model:res.groups,name:point_of_sale.group_pos_manager
-msgid "Manager"
+#: model:product.product,name:point_of_sale.margarita
+#: model:product.template,name:point_of_sale.margarita_product_template
+msgid "Margarita"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.martini
+#: model:product.product,name:point_of_sale.martini_cocktail
+#: model:product.template,name:point_of_sale.martini_cocktail_product_template
+#: model:product.template,name:point_of_sale.martini_product_template
+msgid "Martini"
msgstr ""
#. module: point_of_sale
@@ -2134,19 +1710,77 @@ msgid "Medium-sized image of the category. It is automatically resized as a 128x
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_purchase_warn_msg
+msgid "Message for Purchase Order"
+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:504
#, python-format
msgid "Method"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.milkshake_banana
+#: model:product.template,name:point_of_sale.milkshake_banana_product_template
+msgid "Milkshake Banana"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.milkshake_cherry
+#: model:product.template,name:point_of_sale.milkshake_cherry_product_template
+msgid "Milkshake Cherry"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.milkshake_chocolate
+#: model:product.template,name:point_of_sale.milkshake_chocolate_product_template
+msgid "Milkshake Chocolate"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.milkshake_strawberry
+#: model:product.template,name:point_of_sale.milkshake_strawberry_product_template
+msgid "Milkshake Strawberry"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.milkshake_vanilla
+#: model:product.template,name:point_of_sale.milkshake_vanilla_product_template
+msgid "Milkshake Vanilla"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.milkshake
+msgid "Milkshakes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.miller
+#: model:product.template,name:point_of_sale.miller_product_template
+msgid "Miller"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.product,name:point_of_sale.minute_maid
+#: model:product.template,name:point_of_sale.minute_maid_product_template
+msgid "Minute Maid"
+msgstr ""
+
+#. module: point_of_sale
#: model:product.product,name:point_of_sale.product_product_consumable
#: model:product.template,name:point_of_sale.product_product_consumable_product_template
msgid "Miscellaneous"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.mojito
+#: model:product.template,name:point_of_sale.mojito_product_template
+msgid "Mojito"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Month of order date"
msgstr ""
@@ -2157,24 +1791,30 @@ 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"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:385
-#: code:addons/point_of_sale/static/src/xml/pos.xml:396
-#: code:addons/point_of_sale/static/src/xml/pos.xml:405
+#: code:addons/point_of_sale/static/src/xml/pos.xml: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 ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:308
-#: code:addons/point_of_sale/static/src/xml/pos.xml:449
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_complete_name
+#: code:addons/point_of_sale/static/src/xml/pos.xml:310
+#: 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
@@ -2182,18 +1822,19 @@ msgid "Name"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_invoice_id
-msgid "Nbr Invoice"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1816
+#: code:addons/point_of_sale/static/src/js/screens.js:1862
#, python-format
msgid "Negative Bank Payment"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.nescafe
+#: model:product.template,name:point_of_sale.nescafe_product_template
+msgid "Nescafe"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#: selection:pos.order,state:0
#: selection:report.pos.order,state:0
@@ -2207,7 +1848,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:648
+#: code:addons/point_of_sale/static/src/xml/pos.xml:660
#, python-format
msgid "Next Order"
msgstr ""
@@ -2218,7 +1859,7 @@ msgid "Next Partner Review"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:725
+#: 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 ""
@@ -2229,7 +1870,7 @@ msgid "No credit card"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:29
+#: code:addons/point_of_sale/report/pos_invoice.py:25
#, python-format
msgid "No link to an invoice for %s."
msgstr ""
@@ -2240,14 +1881,15 @@ msgid "No reprint"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:40
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:24
#, python-format
msgid "No sequence defined on the journal"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:330
+#: code:addons/point_of_sale/static/src/js/screens.js:1977
+#: code:addons/point_of_sale/static/src/xml/pos.xml:332
#, python-format
msgid "None"
msgstr ""
@@ -2274,52 +1916,44 @@ msgid "Number of Print"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_no_trans
-msgid "Number of Transaction"
-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:387
+#: code:addons/point_of_sale/static/src/js/chrome.js:388
#, python-format
msgid "Offline"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:315
+#: code:addons/point_of_sale/static/src/js/gui.js:317
#, python-format
msgid "Offline Orders"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:839
-#: code:addons/point_of_sale/static/src/xml/pos.xml:853
-#: code:addons/point_of_sale/static/src/xml/pos.xml:867
-#: code:addons/point_of_sale/static/src/xml/pos.xml:893
-#: code:addons/point_of_sale/static/src/xml/pos.xml:924
-#: code:addons/point_of_sale/static/src/xml/pos.xml:941
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1019
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1055
+#: 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: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:412
+#, 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:1219
+#: code:addons/point_of_sale/static/src/js/screens.js:1262
#, python-format
msgid "Only web-compatible Image formats such as .png or .jpeg are supported"
msgstr ""
@@ -2336,8 +1970,8 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:634
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1184
+#: 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 ""
@@ -2371,9 +2005,7 @@ msgid "Opening Balance"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:164
#: selection:pos.session,state:0
-#, python-format
msgid "Opening Control"
msgstr ""
@@ -2383,30 +2015,23 @@ 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:280
+#: 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:1512
-#: code:addons/point_of_sale/static/src/js/models.js:1539
+#: 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 ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_date_order
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_date_order
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_date_order
msgid "Order Date"
msgstr ""
@@ -2429,6 +2054,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 ""
@@ -2444,7 +2070,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1165
+#: 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
@@ -2464,29 +2090,9 @@ msgid "Orders Analysis"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.orval_33cl
-#: model:product.template,name:point_of_sale.orval_33cl_product_template
-msgid "Orval 33cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_trans_user_form
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_form
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_month_form
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_month_tree
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_tree
-#: model:ir.ui.view,arch_db:point_of_sale.view_trans_pos_user_tree
-msgid "POS"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details
-msgid "POS Details"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
-msgid "POS Lines"
+#: code:addons/point_of_sale/models/pos_config.py:196
+#, python-format
+msgid "POS Order %s"
msgstr ""
#. module: point_of_sale
@@ -2510,11 +2116,14 @@ msgid "POS Orders lines"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_calendar
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_month_calendar
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_transaction_pos_calendar
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_transaction_pos_graph
-msgid "POS Report"
+#: 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 ""
#. module: point_of_sale
@@ -2542,24 +2151,18 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_res_partner
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_partner_id
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
#: model:ir.ui.view,arch_db:point_of_sale.report_statement
msgid "Partner"
msgstr ""
#. module: point_of_sale
-#: model:pos.category,name:point_of_sale.partner_services
-msgid "Partner Services"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_partnership
msgid "Partnership Date"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:261
+#: code:addons/point_of_sale/static/src/js/gui.js:263
#, python-format
msgid "Password ?"
msgstr ""
@@ -2572,8 +2175,8 @@ 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:588
-#: code:addons/point_of_sale/wizard/pos_payment.py:57
+#: 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
#, python-format
@@ -2593,7 +2196,6 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_journal_id
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
msgid "Payment Mode"
msgstr ""
@@ -2622,9 +2224,8 @@ 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"
+#: model:ir.filters,name:point_of_sale.filter_orders_per_session
+msgid "Per session"
msgstr ""
#. module: point_of_sale
@@ -2634,16 +2235,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:345
-#: code:addons/point_of_sale/static/src/xml/pos.xml:380
-#: code:addons/point_of_sale/static/src/xml/pos.xml:451
+#: code:addons/point_of_sale/static/src/xml/pos.xml:347
+#: 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:1262
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1310
#, python-format
msgid "Phone:"
msgstr ""
@@ -2654,40 +2255,56 @@ 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
+msgid "Pina Colada"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1845
+#: code:addons/point_of_sale/static/src/js/screens.js:1891
#, python-format
msgid "Please Confirm Large Amount"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1289
+#: code:addons/point_of_sale/models/pos_order.py:273
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1105
+#: code:addons/point_of_sale/models/pos_order.py:450
#, 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:472
+#: 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:1875
+#: code:addons/point_of_sale/static/src/js/screens.js:1923
#, python-format
msgid "Please select the Customer"
msgstr ""
@@ -2793,18 +2410,24 @@ msgid "Pos Product Categories"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_confirm
-msgid "Post All Orders"
+#: 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,name:point_of_sale.model_pos_confirm
-msgid "Post POS Journal Entries"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
+msgid "Pos session username"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:324
+#: code:addons/point_of_sale/static/src/xml/pos.xml:326
#, python-format
msgid "Postcode"
msgstr ""
@@ -2817,12 +2440,6 @@ 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"
msgstr ""
@@ -2830,13 +2447,12 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:144
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
#, python-format
msgid "Price"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1601
+#: code:addons/point_of_sale/models/barcode_rule.py:13
#, python-format
msgid "Priced Product"
msgstr ""
@@ -2850,25 +2466,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:655
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1185
+#: 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 ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_details
-msgid "Print Report"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_print_via_proxy
msgid "Print via Proxy"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:376
+#: code:addons/point_of_sale/static/src/js/chrome.js:377
#, python-format
msgid "Printer"
msgstr ""
@@ -2882,8 +2493,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 ""
@@ -2895,11 +2506,6 @@ msgid "Product Category"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_product_nb
-msgid "Product Nb."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_tree_view
msgid "Product Product Categories"
msgstr ""
@@ -2929,6 +2535,11 @@ msgid "Public Category"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_purchase_warn
+msgid "Purchase Order"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_in
msgid "Put Money In"
msgstr ""
@@ -2936,29 +2547,27 @@ 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 ""
#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_qty
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_qty
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_qty
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
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:1186
+#: 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
@@ -2967,7 +2576,6 @@ msgid "Real Closing Balance"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.action_report_pos_receipt
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form
msgid "Receipt"
msgstr ""
@@ -2993,20 +2601,21 @@ msgid "Receipt Ref"
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"
+#: model:product.product,name:point_of_sale.red_label
+#: model:product.template,name:point_of_sale.red_label_product_template
+msgid "Red Label"
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"
+#: 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:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Reference"
+#: model:product.product,name:point_of_sale.redbull
+#: model:product.template,name:point_of_sale.redbull_product_template
+msgid "RedBull"
msgstr ""
#. module: point_of_sale
@@ -3015,23 +2624,13 @@ msgid "Reports"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
-msgid "Reprint"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_reprint
msgid "Reprints"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_session_rescue
-msgid "Rescue session"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1155
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1203
#, python-format
msgid "Reset"
msgstr ""
@@ -3057,7 +2656,7 @@ msgid "Resume"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/models/pos_order.py:696
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
#, python-format
msgid "Return Products"
@@ -3069,15 +2668,15 @@ msgid "Returned"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.rochefort_8_33cl
-#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
-msgid "Rochefort \"8\" 33cl"
+#: model:product.product,name:point_of_sale.rose_wine
+#: model:product.template,name:point_of_sale.rose_wine_product_template
+msgid "Rose Wine"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
-#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
-msgid "Sale Details"
+#: model:product.product,name:point_of_sale.safari
+#: model:product.template,name:point_of_sale.safari_product_template
+msgid "Safari"
msgstr ""
#. module: point_of_sale
@@ -3094,98 +2693,39 @@ msgid "Sale line"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_pos_details
-msgid "Sales Details"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_journal_id
-msgid "Sales Journal"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
-msgid "Sales Lines"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban
msgid "Sales Orders"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_graph
-#: model:ir.ui.view,arch_db:point_of_sale.view_report_sales_by_user_pos_month_graph
-msgid "Sales by User"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
-msgid "Sales by User Monthly"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
-msgid "Sales by day"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
-msgid "Sales by month"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
-msgid "Sales by user"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
-msgid "Sales by user monthly"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_user_id
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
msgid "Salesman"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_details_user_ids
-msgid "Salespeople"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_user_id
#: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
msgid "Salesperson"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.san_pellegrino_1l
-#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
-msgid "San Pellegrino 1L"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:384
+#: code:addons/point_of_sale/static/src/js/chrome.js:385
#, python-format
msgid "Scale"
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:1209
#, python-format
msgid "Scan"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1162
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1210
#, python-format
msgid "Scan EAN-13"
msgstr ""
@@ -3197,14 +2737,20 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:367
+#: code:addons/point_of_sale/static/src/js/chrome.js:368
#, python-format
msgid "Scanner"
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.schweppes
+#: model:product.template,name:point_of_sale.schweppes_product_template
+msgid "Schweppes"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:422
+#: code:addons/point_of_sale/static/src/xml/pos.xml:434
#, python-format
msgid "Search Customers"
msgstr ""
@@ -3227,38 +2773,44 @@ msgid "Security PIN"
msgstr ""
#. module: point_of_sale
-#: constraint:res.users:0
+#: code:addons/point_of_sale/models/res_users.py:15
+#, python-format
msgid "Security PIN can only contain digits"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:430
+#: code:addons/point_of_sale/static/src/xml/pos.xml:442
#, python-format
msgid "Select Customer"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:235
+#: code:addons/point_of_sale/static/src/js/gui.js:237
#, python-format
msgid "Select User"
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:1988
#, python-format
msgid "Select tax"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1197
+#: code:addons/point_of_sale/models/pos_order.py:203
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_res_users_purchase_warn
+msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_category_sequence
msgid "Sequence"
msgstr ""
@@ -3270,22 +2822,30 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:702
+#: 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:1888
+#: code:addons/point_of_sale/static/src/js/screens.js:1936
#, python-format
msgid "Server Error"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:326
+#: 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
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter
#, python-format
msgid "Session"
@@ -3297,18 +2857,8 @@ msgid "Session ID"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.action_report_pos_session_summary
-msgid "Session Summary"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Session Summary:"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1044
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1089
#, python-format
msgid "Session ids:"
msgstr ""
@@ -3330,81 +2880,25 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1088
+#: code:addons/point_of_sale/static/src/js/screens.js:1132
#, python-format
msgid "Set Customer"
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: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
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_share
-msgid "Share or embbed any screen of Odoo."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_company_share_partner
-msgid "Share partners to all companies"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_company_share_product
-msgid "Share product to all companies"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_company_share_partner
-msgid "Share your partners to all companies defined in your instance.\n"
-" * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n"
-" * Unchecked : Each company can see only its partner (partners where company is defined). Partners not related to a company are visible for all companies."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_company_share_product
-msgid "Share your product to all companies defined in your instance.\n"
-" * Checked : Product are visible for every company, even if a company is defined on the partner.\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: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1264
-#, python-format
-msgid "Shop:"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_google_cal_sync
-msgid "Show Tutorial"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:42
#, python-format
@@ -3427,25 +2921,37 @@ msgid "Small-sized image of the category. It is automatically resized as a 64x64
msgstr ""
#. module: point_of_sale
+#: model:product.product,name:point_of_sale.smirnoff
+#: model:product.template,name:point_of_sale.smirnoff_product_template
+msgid "Smirnoff"
+msgstr ""
+
+#. module: point_of_sale
#: model:pos.category,name:point_of_sale.soft
-msgid "Soft"
+msgid "Soft Drinks"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/gui.js:320
+#: code:addons/point_of_sale/static/src/js/gui.js:322
#, python-format
msgid "Some orders could not be submitted to"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id
-msgid "Start Category"
+#: 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
+msgid "Sprite"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.act_url,name:point_of_sale.action_pos_pos
-msgid "Start Point of Sale"
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_iface_start_categ_id
+msgid "Start Category"
msgstr ""
#. module: point_of_sale
@@ -3460,16 +2966,6 @@ msgid "Statement"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Statement Details:"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_sessionsummary
-msgid "Statement Summary"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form
msgid "Statement lines"
msgstr ""
@@ -3480,7 +2976,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
@@ -3489,15 +2984,9 @@ msgid "Status"
msgstr ""
#. module: point_of_sale
-#: model:product.product,name:point_of_sale.stella_33cl
-#: model:product.template,name:point_of_sale.stella_33cl_product_template
-msgid "Stella Artois 33cl"
-msgstr ""
-
-#. module: point_of_sale
-#: model:product.product,name:point_of_sale.stella_50cl
-#: model:product.template,name:point_of_sale.stella_50cl_product_template
-msgid "Stella Artois 50cl"
+#: model:product.product,name:point_of_sale.stella_artois
+#: model:product.template,name:point_of_sale.stella_artois_product_template
+msgid "Stella Artois"
msgstr ""
#. module: point_of_sale
@@ -3507,21 +2996,15 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:316
-#: code:addons/point_of_sale/static/src/xml/pos.xml:317
+#: code:addons/point_of_sale/static/src/xml/pos.xml:318
+#: code:addons/point_of_sale/static/src/xml/pos.xml:319
#, python-format
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:753
+#: 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"
@@ -3539,21 +3022,21 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1299
+#: 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:1036
+#: 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:1035
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1080
#, python-format
msgid "Successfully imported"
msgstr ""
@@ -3580,7 +3063,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:766
+#: code:addons/point_of_sale/static/src/xml/pos.xml:782
#, python-format
msgid "TOTAL"
msgstr ""
@@ -3592,16 +3075,16 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:1319
-#: code:addons/point_of_sale/static/src/xml/pos.xml:105
+#: code:addons/point_of_sale/models/pos_order.py:301
+#: code:addons/point_of_sale/static/src/js/screens.js:1998
#, python-format
msgid "Tax"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:353
-#: code:addons/point_of_sale/static/src/xml/pos.xml:400
+#: code:addons/point_of_sale/static/src/xml/pos.xml:355
+#: code:addons/point_of_sale/static/src/xml/pos.xml:412
#, python-format
msgid "Tax ID"
msgstr ""
@@ -3610,71 +3093,75 @@ msgstr ""
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_tax
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_tax_ids
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_tax_ids_after_fiscal_position
-#: model:ir.ui.view,arch_db:point_of_sale.report_saleslines
msgid "Taxes"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1134
+#: 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:682
+#: code:addons/point_of_sale/static/src/xml/pos.xml:699
#, python-format
msgid "Tel:"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_auth_signup_template_user_id
-msgid "Template user for new users created through signup"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:490
+#: code:addons/point_of_sale/static/src/xml/pos.xml:502
#, python-format
msgid "Tendered"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1276
+#: model:product.product,name:point_of_sale.tequila
+#: model:product.template,name:point_of_sale.tequila_product_template
+msgid "Tequila"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_order.py:261
#, python-format
msgid "The POS order must have lines when calling this method"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:888
+#: 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
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_google_drive_uri
-msgid "The URL to generate the authorization code from Google"
-msgstr ""
-
-#. module: point_of_sale
-#: constraint:pos.config:0
+#: 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
-#: constraint:pos.config:0
+#: 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
-#: constraint:pos.config:0
+#: 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:171
+#, python-format
+msgid "The default fiscal position must be included in the available fiscal positions of the point of sale"
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_tax_included
msgid "The displayed prices will always include all taxes, even if the taxes have been setup differently"
msgstr ""
@@ -3685,20 +3172,28 @@ msgid "The hostname or ip address of the hardware proxy, Will be autodetected if
msgstr ""
#. module: point_of_sale
+#: code:addons/point_of_sale/models/pos_session.py:93
#: sql_constraint:pos.session:0
+#, python-format
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:1883
+#: code:addons/point_of_sale/static/src/js/screens.js:1931
#, 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:1894
+#: code:addons/point_of_sale/static/src/js/screens.js:1942
#, python-format
msgid "The order could not be sent to the server due to an unknown error"
msgstr ""
@@ -3709,6 +3204,7 @@ msgid "The payment input will behave similarily to bank payment input, and will
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,help:point_of_sale.field_pos_order_config_id
#: model:ir.model.fields,help:point_of_sale.field_pos_session_config_id
msgid "The physical point of sale you will use."
msgstr ""
@@ -3730,7 +3226,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1234
+#: code:addons/point_of_sale/static/src/js/screens.js:1277
#, python-format
msgid "The provided file could not be read due to an unknown error"
msgstr ""
@@ -3742,12 +3238,12 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_config_iface_print_auto
-msgid "The receipt will automatically be printed at the end of each order"
+msgid "The receipt will automatically be p-rinted at the end of each order"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1889
+#: code:addons/point_of_sale/static/src/js/screens.js:1937
#, python-format
msgid "The server encountered an error while receiving your order."
msgstr ""
@@ -3763,7 +3259,7 @@ msgid "The transactions are processed by MercuryPay"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:590
+#: code:addons/point_of_sale/models/pos_session.py:230
#, python-format
msgid "The type of the journal for your payment method should be bank or cash "
msgstr ""
@@ -3782,7 +3278,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1836
+#: code:addons/point_of_sale/static/src/js/screens.js:1882
#, python-format
msgid "There is no cash payment method available in this point of sale to handle the change.\n"
"\n"
@@ -3790,33 +3286,33 @@ msgid "There is no cash payment method available in this point of sale to handle
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:21
#, python-format
msgid "There is no cash register for this PoS Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1022
+#: code:addons/point_of_sale/models/pos_order.py:650
#, 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/point_of_sale.py:1020
+#: code:addons/point_of_sale/models/pos_order.py:648
#, 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:1807
+#: code:addons/point_of_sale/static/src/js/screens.js:1853
#, 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_pos_config_settings_auth_signup_reset_password
-msgid "This allows users to trigger a password reset from the Login page."
+#: 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
@@ -3850,19 +3346,9 @@ msgid "This field is there to pass the id of the pos user group to the point of
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_google_calendar
-msgid "This installs the module google_calendar."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_google_drive
-msgid "This installs the module google_docs."
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_inter_company_rules
-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."
+#: code:addons/point_of_sale/models/pos_order.py:458
+#, 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
@@ -3878,14 +3364,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:261
+#: code:addons/point_of_sale/static/src/js/chrome.js:262
#, python-format
msgid "This operation will permanently destroy all paid orders from the local storage. You will lose all the data. This operation cannot be undone."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:271
+#: code:addons/point_of_sale/static/src/js/chrome.js:272
#, python-format
msgid "This operation will permanently destroy all unpaid orders from all sessions that have been put in the local storage. You will lose all the data and exit the point of sale. This operation cannot be undone."
msgstr ""
@@ -3896,19 +3382,19 @@ msgid "This sequence is automatically created by Odoo but you can change it to c
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."
+#: code:addons/point_of_sale/models/pos_order.py:572
+#, 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:product.product,name:point_of_sale.timmermans_kriek_37,5cl
-#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
-msgid "Timmermans Kriek 37.5cl"
+#: model:ir.model.fields,help:point_of_sale.field_product_template_pos_categ_id
+msgid "Those categories are used to group similar products for point of sale."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:629
+#: code:addons/point_of_sale/static/src/xml/pos.xml:641
#, python-format
msgid "Tip"
msgstr ""
@@ -3924,7 +3410,7 @@ msgid "To Weigh With Scale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1059
+#: code:addons/point_of_sale/models/pos_order.py:681
#, python-format
msgid "To return product(s), you need to open a session that will be used to register the refund."
msgstr ""
@@ -3935,19 +3421,7 @@ msgid "Today"
msgstr ""
#. module: point_of_sale
-#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report
-msgid "Today's Payment"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.report_payment
-msgid "Today's Payments"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,field_description:point_of_sale.field_pos_order_amount_total
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_amount
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_amount
msgid "Total"
msgstr ""
@@ -3968,17 +3442,12 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:803
+#: code:addons/point_of_sale/static/src/xml/pos.xml:819
#, python-format
msgid "Total Taxes"
msgstr ""
#. module: point_of_sale
-#: model:ir.ui.view,arch_db:point_of_sale.view_trans_pos_user_tree
-msgid "Total Transaction"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model.fields,help:point_of_sale.field_pos_session_cash_register_total_entry_encoding
msgid "Total of all paid sale orders"
msgstr ""
@@ -4000,36 +3469,26 @@ 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:1319
+#: 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/point_of_sale.py:1331
+#: code:addons/point_of_sale/models/pos_order.py:313
#, python-format
msgid "Trade Receivables"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_google_drive_uri
-msgid "URI"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_server_uri
-msgid "URI for tuto"
-msgstr ""
-
-#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:985
-#, python-format
-msgid "Unable to cancel the picking."
+#: model:product.product,name:point_of_sale.tuborg
+#: model:product.template,name:point_of_sale.tuborg_product_template
+msgid "Tuborg"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:505
+#: 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 ""
@@ -4041,31 +3500,26 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:884
+#: 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:1893
+#: code:addons/point_of_sale/static/src/js/screens.js:1941
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1218
+#: code:addons/point_of_sale/static/src/js/screens.js:1261
#, python-format
msgid "Unsupported File Format"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_auth_oauth
-msgid "Use external authentication providers, sign in with Google..."
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.actions.act_window,help:point_of_sale.action_pos_pos_form
msgid "Use this menu to browse previous orders. To record new\n"
" orders, you may use the menu <i>Your Session</i> for\n"
@@ -4073,9 +3527,6 @@ msgid "Use this menu to browse previous orders. To record new\n"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_month_user_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_sales_by_user_pos_user_id
-#: model:ir.model.fields,field_description:point_of_sale.field_report_transaction_pos_user_id
#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search
#: model:res.groups,name:point_of_sale.group_pos_user
msgid "User"
@@ -4087,15 +3538,8 @@ 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:1263
-#: model:ir.ui.view,arch_db:point_of_sale.report_receipt
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1311
#, python-format
msgid "User:"
msgstr ""
@@ -4106,15 +3550,20 @@ msgid "Users"
msgstr ""
#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_uuid
+msgid "Uuid"
+msgstr ""
+
+#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:685
+#: 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:589
+#: code:addons/point_of_sale/static/src/xml/pos.xml:601
#, python-format
msgid "Validate"
msgstr ""
@@ -4125,12 +3574,6 @@ 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"
msgstr ""
@@ -4141,34 +3584,52 @@ msgid "Warehouse"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1600
-#, python-format
-msgid "Weighted Product"
+#: model:product.product,name:point_of_sale.water
+#: model:product.template,name:point_of_sale.water_product_template
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model.fields,field_description:point_of_sale.field_res_users_website_tag_ids
+msgid "Website tags"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1180
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1228
#, python-format
-msgid "Weighting"
+msgid "Weighing"
msgstr ""
#. module: point_of_sale
-#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1106
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1283
+#: code:addons/point_of_sale/models/barcode_rule.py:12
#, python-format
-msgid "With a"
+msgid "Weighted Product"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_group_light_multi_company
-msgid "Work in multi-company environments, with appropriate security access between companies."
+#: model:product.product,name:point_of_sale.white_russian
+#: model:product.template,name:point_of_sale.white_russian_product_template
+msgid "White Russian"
msgstr ""
#. module: point_of_sale
-#: model:ir.model.fields,help:point_of_sale.field_pos_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"
+#: model:product.product,name:point_of_sale.white_wine
+#: model:product.template,name:point_of_sale.white_wine_product_template
+msgid "White Wine"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.wine
+msgid "Wine"
+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:1330
+#, python-format
+msgid "With a"
msgstr ""
#. module: point_of_sale
@@ -4177,72 +3638,80 @@ 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"
+#: model:product.product,name:point_of_sale.tea
+#: model:product.template,name:point_of_sale.tea_product_template
+msgid "Yellow Tea"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
+msgid "You can define another list of available currencies on the\n"
+" <i>Cash Registers</i> tab of the"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:771
+#: code:addons/point_of_sale/models/pos_order.py:397
#, python-format
msgid "You cannot change the partner of a POS order for which an invoice has already been issued."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:618
+#: code:addons/point_of_sale/models/pos_session.py:25
#, python-format
msgid "You cannot confirm all orders of this session, because they have not the 'paid' status"
msgstr ""
#. module: point_of_sale
-#: constraint:pos.session:0
+#: 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
-#: constraint:pos.session:0
+#: code:addons/point_of_sale/models/pos_session.py:127
+#, python-format
msgid "You cannot create two active sessions with the same responsible!"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1554
+#: code:addons/point_of_sale/models/product.py:21
#, python-format
msgid "You cannot delete a product saleable in point of sale while a session is still opened."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1817
+#: code:addons/point_of_sale/static/src/js/screens.js:1863
#, 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/point_of_sale.py:631
+#: code:addons/point_of_sale/models/pos_session.py:246
#, 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 ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:32
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:18
#, python-format
msgid "You have to define which payment method must be available in the point of sale by reusing existing bank and cash through \"Accounting / Configuration / Journals / Journals\". Select a journal and check the field \"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create new payment methods directly from menu \"PoS Backend / Configuration / Payment Methods\"."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1036
+#: code:addons/point_of_sale/models/pos_order.py:664
#, python-format
msgid "You have to open at least one cashbox."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1426
+#: code:addons/point_of_sale/models/pos_order.py:769
#, python-format
msgid "You have to select a pricelist in the sale form !"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1407
+#: code:addons/point_of_sale/models/pos_order.py:757
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
@@ -4256,60 +3725,54 @@ 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:1924
#, 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/point_of_sale.py:491
+#: code:addons/point_of_sale/models/pos_session.py:138
#, python-format
msgid "You should assign a Point of Sale to your session."
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/chrome.js:53
+#: code:addons/point_of_sale/static/src/js/chrome.js:54
#, python-format
msgid "You will lose any data associated with the current order"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/js/screens.js:1163
+#: code:addons/point_of_sale/static/src/js/screens.js:1206
#, python-format
msgid "Your Internet connection is probably down."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:588
+#: code:addons/point_of_sale/models/pos_session.py:228
#, 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:1125
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1173
#, python-format
msgid "Your shopping cart is empty"
msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:325
+#: code:addons/point_of_sale/static/src/xml/pos.xml:327
#, python-format
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:1098
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1146
#, python-format
msgid "at"
msgstr ""
@@ -4321,20 +3784,14 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1041
+#: 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:1386
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1433
#, python-format
msgid "caps lock"
msgstr ""
@@ -4351,48 +3808,53 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1413
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1455
+#: 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:1371
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1448
+#: 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:1108
+#: 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:1850
+#: code:addons/point_of_sale/static/src/js/screens.js:1896
#, python-format
msgid "for an order of"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.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:1035
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1080
#, python-format
msgid "paid orders"
msgstr ""
#. module: point_of_sale
+#: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form
+msgid "payment method."
+msgstr ""
+
+#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config
msgid "pos.config"
msgstr ""
@@ -4408,100 +3870,51 @@ msgid "pos.session"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_detailsofsales
-msgid "report.point_of_sale.report_detailsofsales"
-msgstr ""
-
-#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_invoice
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_payment
-msgid "report.point_of_sale.report_payment"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_receipt
-msgid "report.point_of_sale.report_receipt"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_point_of_sale_report_saleslines
-msgid "report.point_of_sale.report_saleslines"
-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/point_of_sale.py:730
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1398
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1453
+#: 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:1399
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1410
+#: 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:1372
+#: code:addons/point_of_sale/static/src/xml/pos.xml:1419
#, python-format
msgid "tab"
msgstr ""
#. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_report_transaction_pos
-msgid "transaction for the pos"
-msgstr ""
-
-#. module: point_of_sale
-#: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_account_id
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_current_session_state
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_cash
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_last_session_closing_date
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_pos_session_username
-msgid "unknown"
-msgstr ""
-
-#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/static/src/xml/pos.xml:1036
+#: 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:1038
+#: 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
-#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_uuid
-msgid "uuid"
-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:1085
#, python-format
msgid "were duplicates of existing orders"
msgstr ""
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index d8eaa7a43eb..59ddf6c8077 100644
--- a/addons/portal/i18n/portal.pot
+++ b/addons/portal/i18n/portal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,39 +18,28 @@ msgstr ""
#. module: portal
#: model:mail.template,body_html:portal.mail_template_data_portal_welcome
msgid "\n"
-" <p>\n"
-" Dear ${object.user_id.name or ''},\n"
-" </p>\n"
-" <p>\n"
-" You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.\n"
-" </p>\n"
-" <p>\n"
-" Your login account data is:\n"
-" </p>\n"
-" <ul>\n"
-" <li>Username: ${object.user_id.login or ''}</li>\n"
-" </ul>\n"
-" <ul>\n"
-" <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
-" </ul>\n"
-" <ul>\n"
-" <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
-" </ul>\n"
-" <p>\n"
-" You can set or change your password via the following url:\n"
-" </p>\n"
-" <ul>\n"
-" <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
-" </ul>\n"
-" <p>\n"
-" ${object.wizard_id.welcome_message or ''}\n"
-" </p>\n"
-" <p>---<br />\n"
-" Odoo - Open Source Business Applications<br />\n"
-" http://www.odoo.com<br />\n"
-" </p>\n"
-" \n"
-" "
+"<p>\n"
+" Dear ${object.user_id.name or ''},\n"
+"</p>\n"
+"<p>\n"
+" You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.\n"
+"</p>\n"
+"<p>\n"
+" Your login account data is:\n"
+"</p>\n"
+"<ul>\n"
+" <li>Username: ${object.user_id.login or ''}</li>\n"
+" <li>Portal: <a href=\"${'portal_url' in ctx and ctx['portal_url'] or ''}\">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>\n"
+" <li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>\n"
+"</ul>\n"
+"<p>\n"
+" You can set or change your password via the following url:\n"
+"</p>\n"
+"<ul>\n"
+" <li><a href=\"${object.user_id.signup_url}\">${object.user_id.signup_url}</a></li>\n"
+"</ul>\n"
+"<p>\n"
+"${object.wizard_id.welcome_message or ''}"
msgstr ""
#. module: portal
@@ -59,21 +48,11 @@ msgid "Access Groups"
msgstr ""
#. module: portal
-#: model:ir.ui.menu,name:portal.portal_after_sales
-msgid "After Sale Services"
-msgstr ""
-
-#. module: portal
#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Apply"
msgstr ""
#. module: portal
-#: model:ir.ui.menu,name:portal.portal_orders
-msgid "Billing"
-msgstr ""
-
-#. module: portal
#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Cancel"
msgstr ""
@@ -84,7 +63,7 @@ msgid "Contact"
msgstr ""
#. module: portal
-#: model:ir.ui.view,arch_db:portal.wizard_user_tree_view
+#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Contacts"
msgstr ""
@@ -163,7 +142,6 @@ msgstr ""
#. module: portal
#: model:ir.model.fields,field_description:portal.field_portal_wizard_portal_id
#: model:ir.model.fields,field_description:portal.field_res_groups_is_portal
-#: model:ir.ui.menu,name:portal.portal_menu
msgid "Portal"
msgstr ""
@@ -185,11 +163,6 @@ msgid "Portal User Config"
msgstr ""
#. module: portal
-#: model:ir.ui.menu,name:portal.portal_projects
-msgid "Projects"
-msgstr ""
-
-#. module: portal
#: model:ir.ui.view,arch_db:portal.wizard_view
msgid "Select which contacts should belong to the portal in the list below.\n"
" The email address of each selected contact must be valid and unique.\n"
@@ -197,19 +170,19 @@ msgid "Select which contacts should belong to the portal in the list below.\n"
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:114
+#: code:addons/portal/wizard/portal_wizard.py:106
#, python-format
msgid "Several contacts have the same email: "
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:111
+#: code:addons/portal/wizard/portal_wizard.py:103
#, python-format
msgid "Some contacts don't have a valid email: "
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:117
+#: code:addons/portal/wizard/portal_wizard.py:109
#, python-format
msgid "Some contacts have the same email as an existing portal user:"
msgstr ""
@@ -230,7 +203,7 @@ msgid "This text is included in the email sent to new users of the portal."
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:120
+#: code:addons/portal/wizard/portal_wizard.py:112
#, python-format
msgid "To resolve this error, you can: \n"
"- Correct the emails of the relevant contacts\n"
@@ -255,6 +228,6 @@ msgstr ""
#. module: portal
#: model:mail.template,subject:portal.mail_template_data_portal_welcome
-msgid "Your Odoo account at ${user.company_id.name|safe}"
+msgid "Your Odoo account at ${user.company_id.name}"
msgstr ""
diff --git a/addons/portal_gamification/i18n/portal_gamification.pot b/addons/portal_gamification/i18n/portal_gamification.pot
index 43dab069227..0eeadcf411d 100644
--- a/addons/portal_gamification/i18n/portal_gamification.pot
+++ b/addons/portal_gamification/i18n/portal_gamification.pot
@@ -3,10 +3,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_sale/i18n/portal_sale.pot b/addons/portal_sale/i18n/portal_sale.pot
index 80ede839b60..5b210fba2b0 100644
--- a/addons/portal_sale/i18n/portal_sale.pot
+++ b/addons/portal_sale/i18n/portal_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-22 11:24+0000\n"
-"PO-Revision-Date: 2016-07-22 11:24+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,216 +16,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: portal_sale
-#: model:mail.template,body_html:portal_sale.email_template_edi_invoice
-msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello ${object.partner_id.name},</p>\n"
-"\n"
-" <p>A new invoice is available for you: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-" &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p> \n"
-"\n"
-" % set signup_url = object.get_signup_url()\n"
-" % if signup_url:\n"
-" <p>\n"
-" You can access the invoice document and pay online via our Customer Portal:\n"
-" </p>\n"
-" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"${signup_url}\">View Invoice</a>\n"
-" % endif\n"
-" \n"
-" % if object.paypal_url:\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"/sale/static/img/btn_paynowcc_lg.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-" \n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" % endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: portal_sale
-#: model:mail.template,body_html:portal_sale.email_template_edi_sale
-msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello ${object.partner_id.name},</p>\n"
-" \n"
-" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${format_tz(object.date_order, tz=user.tz, context={'lang':object.partner_id.lang})}<br />\n"
-" % if object.validity_date and object.state in ('draft', 'sent'):\n"
-" &nbsp;&nbsp;Expiration date: ${object.validity_date}<br />\n"
-" % endif\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.client_order_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" % set signup_url = object.get_signup_url()\n"
-" % if signup_url and object.amount_total:\n"
-" <p>\n"
-" You can access this document and pay online via our Customer Portal:\n"
-" </p>\n"
-" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"${signup_url}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
-" % endif\n"
-"\n"
-" % if object.paypal_url and object.amount_total:\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"/sale/static/img/btn_paynowcc_lg.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" % endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: portal_sale
-#: model:mail.template,report_name:portal_sale.email_template_edi_sale
-msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
-msgstr ""
-
-#. module: portal_sale
-#: model:mail.template,subject:portal_sale.email_template_edi_sale
-msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: portal_sale
-#: model:mail.template,subject:portal_sale.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
-#. module: portal_sale
#: model:ir.model,name:portal_sale.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: portal_sale
-#: model:mail.template,report_name:portal_sale.email_template_edi_invoice
-msgid "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
-msgstr ""
-
-#. module: portal_sale
-#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
-#: model:ir.ui.menu,name:portal_sale.portal_invoices
-msgid "Invoices"
-msgstr ""
-
-#. module: portal_sale
#: model:ir.model,name:portal_sale.model_mail_mail
msgid "Outgoing Mails"
msgstr ""
#. module: portal_sale
-#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
-#: model:ir.ui.menu,name:portal_sale.portal_quotations
-msgid "Quotations"
-msgstr ""
-
-#. module: portal_sale
-#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
-msgid "Sale Orders"
-msgstr ""
-
-#. module: portal_sale
#: model:ir.model,name:portal_sale.model_sale_order
msgid "Sales Order"
msgstr ""
-#. module: portal_sale
-#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
-msgid "Sales Orders"
-msgstr ""
-
-#. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
-msgid "We haven't sent you any invoice."
-msgstr ""
-
-#. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
-msgid "We haven't sent you any quotation."
-msgstr ""
-
-#. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sales order."
-msgstr ""
-
diff --git a/addons/portal_stock/i18n/portal_stock.pot b/addons/portal_stock/i18n/portal_stock.pot
index 43dab069227..0eeadcf411d 100644
--- a/addons/portal_stock/i18n/portal_stock.pot
+++ b/addons/portal_stock/i18n/portal_stock.pot
@@ -3,10 +3,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pos_data_drinks/i18n/pos_data_drinks.pot b/addons/pos_data_drinks/i18n/pos_data_drinks.pot
new file mode 100644
index 00000000000..fbb07ea155b
--- /dev/null
+++ b/addons/pos_data_drinks/i18n/pos_data_drinks.pot
@@ -0,0 +1,16 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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"
+
diff --git a/addons/pos_discount/i18n/pos_discount.pot b/addons/pos_discount/i18n/pos_discount.pot
index da385c04288..27bd67ebe68 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:39+0000\n"
-"PO-Revision-Date: 2015-09-07 14:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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 ""
diff --git a/addons/pos_mercury/i18n/pos_mercury.pot b/addons/pos_mercury/i18n/pos_mercury.pot
index cd84e327443..c934f9f621a 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:39+0000\n"
-"PO-Revision-Date: 2015-09-07 14:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:76
+#: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:75
#, python-format
msgid "&nbsp;&nbsp;APPROVAL CODE:"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:185
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:186
#, python-format
msgid "128 bit CryptoAPI failed"
msgstr ""
@@ -47,14 +47,14 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:61
+#: code:addons/pos_mercury/static/src/xml/pos_mercury.xml:60
#, python-format
msgid "APPROVAL CODE:"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:189
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:190
#, python-format
msgid "All Connections Failed"
msgstr ""
@@ -101,7 +101,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:195
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:196
#, python-format
msgid "Clear Text Request Not Supported"
msgstr ""
@@ -113,28 +113,28 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:163
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:164
#, python-format
msgid "Connect Canceled"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:160
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:161
#, python-format
msgid "Connection Lost"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:184
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:185
#, python-format
msgid "Control failed to find branded serial (password lookup failed)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:201
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:202
#, python-format
msgid "Could Not Encrypt Response- Call Provider"
msgstr ""
@@ -152,14 +152,14 @@ 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 ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:177
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:178
#, python-format
msgid "Disconnecting Socket"
msgstr ""
@@ -172,7 +172,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:179
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:180
#, python-format
msgid "Duplicate Serial Number Detected"
msgstr ""
@@ -186,21 +186,21 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:172
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:173
#, python-format
msgid "Empty Command String"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:197
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:198
#, python-format
msgid "Error Occurred While Decrypting Request"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:187
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:188
#, python-format
msgid "Failed to start Event Thread."
msgstr ""
@@ -214,42 +214,42 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:169
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:170
#, python-format
msgid "General Failure"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:154
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:155
#, python-format
msgid "Global API Not Initialized"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:191
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:192
#, python-format
msgid "Global Response Length Error (Too Short)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:193
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:194
#, python-format
msgid "Global String Error"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:261
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:262
#, python-format
msgid "Go to payment screen to use cards"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:392
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:393
#, python-format
msgid "Handling transaction..."
msgstr ""
@@ -273,232 +273,232 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:183
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:184
#, python-format
msgid "In Process with server"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:164
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:165
#, python-format
msgid "Initialize Failed"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:171
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:172
#, python-format
msgid "Insufficient Fields"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:182
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:183
#, python-format
msgid "Internal Server Error – Call Provider"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:205
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:206
#, python-format
msgid "Invalid Account Number"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:209
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:210
#, python-format
msgid "Invalid Authorization Amount"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:207
#: code:addons/pos_mercury/static/src/js/pos_mercury.js:208
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:209
#, python-format
msgid "Invalid Authorization Code"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:224
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:225
#, python-format
msgid "Invalid Batch Item Count"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:223
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:224
#, python-format
msgid "Invalid Batch Number"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:229
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:230
#, python-format
msgid "Invalid Card Type"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:210
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:211
#, python-format
msgid "Invalid Cash Back Amount"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:198
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:199
#, python-format
msgid "Invalid Check Digit"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:218
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:219
#, python-format
msgid "Invalid Check Type"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:170
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:171
#, python-format
msgid "Invalid Command Format"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:217
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:218
#, python-format
msgid "Invalid Date of Birth"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:215
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:216
#, python-format
msgid "Invalid Derived Key Data"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:226
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:227
#, python-format
msgid "Invalid Driver’s License"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:206
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:207
#, python-format
msgid "Invalid Expiration Date"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:211
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:212
#, python-format
msgid "Invalid Gratuity Amount"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:225
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:226
#, python-format
msgid "Invalid MICR Input Type"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:213
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:214
#, python-format
msgid "Invalid Magnetic Stripe Data"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:204
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:205
#, python-format
msgid "Invalid Memo"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:221
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:222
#, python-format
msgid "Invalid Merchant ID"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:203
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:204
#, python-format
msgid "Invalid Operator ID"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:214
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:215
#, python-format
msgid "Invalid PIN Block Data"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:228
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:229
#, python-format
msgid "Invalid Pass Data"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:212
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:213
#, python-format
msgid "Invalid Purchase Amount"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:219
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:220
#, python-format
msgid "Invalid Routing Number"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:227
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:228
#, python-format
msgid "Invalid Sequence Number"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:216
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:217
#, python-format
msgid "Invalid State Code"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:222
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:223
#, python-format
msgid "Invalid TStream Type"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:220
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:221
#, python-format
msgid "Invalid TranCode"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:202
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:203
#, python-format
msgid "Invalid Transaction Type"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:199
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:200
#, python-format
msgid "Merchant ID Missing"
msgstr ""
@@ -591,29 +591,29 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:333
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:334
#, python-format
msgid "No response from Mercury (Mercury down?)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:335
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:336
#, python-format
msgid "No response from server (connected to network?)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:413
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:560
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:414
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:562
#, python-format
msgid "Odoo error while processing transaction."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:637
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:639
#, python-format
msgid "One credit card swipe already pending."
msgstr ""
@@ -625,35 +625,35 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:459
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:460
#, python-format
msgid "Partially approved"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:180
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:181
#, python-format
msgid "Password Failed (Client / Server)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:175
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:176
#, python-format
msgid "Password Failed – Disconnecting"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:173
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:174
#, python-format
msgid "Password Verified"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:181
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:182
#, python-format
msgid "Password failed (Challenge / Response)"
msgstr ""
@@ -675,7 +675,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:406
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:407
#, python-format
msgid "Please setup your Mercury merchant account."
msgstr ""
@@ -687,7 +687,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:174
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:175
#, python-format
msgid "Queue Full"
msgstr ""
@@ -699,63 +699,63 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:178
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:179
#, python-format
msgid "Refused ‘Max Connections’"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:538
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:540
#, python-format
msgid "Reversal failed, sending VoidSale..."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:574
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:576
#, python-format
msgid "Reversal succeeded"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:541
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:543
#, python-format
msgid "Sending reversal..."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:190
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:191
#, python-format
msgid "Server Login Failed"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:159
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:160
#, python-format
msgid "Socket Connection Failed"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:158
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:159
#, python-format
msgid "Socket Creation Failed"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:156
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:157
#, python-format
msgid "Socket Error sending request"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:157
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:158
#, python-format
msgid "Socket already open or in use"
msgstr ""
@@ -767,14 +767,14 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:176
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:177
#, python-format
msgid "System Going Offline"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:161
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:162
#, python-format
msgid "TCP/IP Failed to Initialize"
msgstr ""
@@ -788,7 +788,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:200
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:201
#, python-format
msgid "TStream Type Missing"
msgstr ""
@@ -820,63 +820,63 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:357
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:358
#, python-format
msgid "This can be caused by a badly executed swipe or by not having your keyboard layout set to US QWERTY (not US International)."
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:186
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:187
#, python-format
msgid "Threaded Auth Started Expect Response"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:162
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:163
#, python-format
msgid "Time Out waiting for server response"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:168
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:169
#, python-format
msgid "Timeout error"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:155
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:156
#, python-format
msgid "Timeout on Response"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:151
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:152
#, python-format
msgid "Transaction approved"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:192
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:193
#, python-format
msgid "Unable to Parse Response from Global (Indistinguishable)"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:165
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:166
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:196
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:197
#, python-format
msgid "Unrecognized Request Format"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:582
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:584
#, python-format
msgid "VoidSale succeeded"
msgstr ""
@@ -911,14 +911,14 @@ msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:194
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:195
#, python-format
msgid "Weak Encryption Request Not Supported"
msgstr ""
#. module: pos_mercury
#. openerp-web
-#: code:addons/pos_mercury/static/src/js/pos_mercury.js:188
+#: code:addons/pos_mercury/static/src/js/pos_mercury.js:189
#, python-format
msgid "XML Parse Error"
msgstr ""
@@ -936,6 +936,11 @@ 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"
msgstr ""
diff --git a/addons/pos_reprint/i18n/pos_reprint.pot b/addons/pos_reprint/i18n/pos_reprint.pot
index c58d1b5a296..191d20b7a9c 100644
--- a/addons/pos_reprint/i18n/pos_reprint.pot
+++ b/addons/pos_reprint/i18n/pos_reprint.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:39+0000\n"
-"PO-Revision-Date: 2015-09-07 14:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot
index 87707664313..bb241f92fd3 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:39+0000\n"
-"PO-Revision-Date: 2015-09-07 14:39+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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:535
+#: code:addons/pos_restaurant/static/src/js/floors.js:550
#, python-format
msgid "Are you sure ?"
msgstr ""
@@ -131,20 +131,13 @@ 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:396
+#: 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:397
-#, 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."
msgstr ""
@@ -198,7 +191,7 @@ msgstr ""
#: model:ir.actions.act_window,help:pos_restaurant.action_restaurant_printer_form
msgid "Each Order Printer has an IP Address that defines the PosBox/Hardware\n"
" Proxy where the printer can be found, and a list of product categories.\n"
-" An Order Printer will only print updates for prodcuts belonging to one of\n"
+" An Order Printer will only print updates for products belonging to one of\n"
" its categories."
msgstr ""
@@ -225,7 +218,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:22
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:28
#: model:ir.model.fields,field_description:pos_restaurant.field_pos_order_customer_count
#, python-format
msgid "Guests"
@@ -233,12 +226,20 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:883
+#: code:addons/pos_restaurant/static/src/js/floors.js:925
#, python-format
msgid "Guests ?"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:10
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:21
+#, python-format
+msgid "Guests:"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_table_height
msgid "Height"
msgstr ""
@@ -305,7 +306,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:468
+#: code:addons/pos_restaurant/static/src/js/floors.js:483
#, python-format
msgid "Number of Seats ?"
msgstr ""
@@ -361,11 +362,6 @@ 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
#, python-format
@@ -389,7 +385,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:536
+#: code:addons/pos_restaurant/static/src/js/floors.js:551
#, python-format
msgid "Removing a table cannot be undone"
msgstr ""
@@ -480,7 +476,7 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/js/floors.js:456
+#: code:addons/pos_restaurant/static/src/js/floors.js:471
#, python-format
msgid "Table Name ?"
msgstr ""
@@ -524,11 +520,6 @@ 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"
msgstr ""
@@ -565,12 +556,19 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:90
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:106
#, python-format
msgid "This floor has no tables yet, use the"
msgstr ""
#. module: pos_restaurant
+#. openerp-web
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:37
+#, python-format
+msgid "Transfer"
+msgstr ""
+
+#. module: pos_restaurant
#: model:ir.model.fields,help:pos_restaurant.field_restaurant_floor_sequence
msgid "Used to sort Floors"
msgstr ""
@@ -601,6 +599,15 @@ 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
#, python-format
msgid "at"
@@ -609,14 +616,14 @@ msgstr ""
#. module: pos_restaurant
#. openerp-web
#: code:addons/pos_restaurant/static/src/xml/floors.xml:6
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:14
+#: code:addons/pos_restaurant/static/src/xml/floors.xml:17
#, python-format
msgid "at table"
msgstr ""
#. module: pos_restaurant
#. openerp-web
-#: code:addons/pos_restaurant/static/src/xml/floors.xml:91
+#: 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 7bfad4b8261..494063cb727 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,17 +17,6 @@ msgstr ""
#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_order_action_exceptions
-msgid "<b>Procurement Orders</b> represent the need for a certain quantity of products, at a given time, in a given location."
-msgstr ""
-
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_order_action_exceptions
-msgid "<b>Sales Orders</b> are one typical source of Procurement Orders (but these are distinct documents). \n"
-" <br>Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc..."
-msgstr ""
-
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_order_action_exceptions
msgid "A <b>Procurement Exception</b> occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message in the chatter)."
msgstr ""
@@ -47,11 +36,6 @@ msgid "Action"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: procurement
#: model:ir.model.fields,field_description:procurement.field_procurement_rule_active
msgid "Active"
msgstr ""
@@ -62,6 +46,11 @@ 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"
msgstr ""
@@ -77,12 +66,6 @@ msgid "Cancelled"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:139
-#, 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"
msgstr ""
@@ -93,11 +76,6 @@ msgid "Chosen rule for the procurement resolution. Usually chosen by the system
msgstr ""
#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_order_action_exceptions
-msgid "Click to create a Procurement order in exception state, or remove the filter on the search bar to display all the procurements."
-msgstr ""
-
-#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_action
#: model:ir.actions.act_window,help:procurement.procurement_order_action_product_product_stat
#: model:ir.actions.act_window,help:procurement.procurement_order_action_product_template_stat
@@ -142,13 +120,8 @@ msgid "Created on"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: procurement
#: model:ir.model.fields,field_description:procurement.field_procurement_group_move_type
-msgid "Delivery Method"
+msgid "Delivery Type"
msgstr ""
#. module: procurement
@@ -200,21 +173,6 @@ msgid "Fixed Procurement Group"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: procurement
#: model:ir.ui.view,arch_db:procurement.view_procurement_rule_filter
msgid "Global"
msgstr ""
@@ -239,16 +197,6 @@ msgid "ID"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: procurement
#: model:ir.ui.view,arch_db:procurement.view_procurement_rule_filter
msgid "If the route is global"
msgstr ""
@@ -259,16 +207,6 @@ msgid "If unchecked, it will allow you to hide the rule without removing it."
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: procurement
#: model:ir.model.fields,field_description:procurement.field_procurement_group___last_update
#: model:ir.model.fields,field_description:procurement.field_procurement_order___last_update
#: model:ir.model.fields,field_description:procurement.field_procurement_order_compute_all___last_update
@@ -308,13 +246,10 @@ msgid "Logistics"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_ids
-msgid "Messages and communication history"
+#: model:ir.actions.act_window,help:procurement.procurement_order_action_exceptions
+msgid "Most common exceptions are products to purchase without\n"
+" having a vendor defined on the product, and products to\n"
+" manufacture without having a bill of materials."
msgstr ""
#. module: procurement
@@ -323,7 +258,7 @@ msgid "Name"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:206
+#: code:addons/procurement/models/procurement.py:189
#, python-format
msgid "No rule matching this procurement"
msgstr ""
@@ -344,21 +279,6 @@ msgid "Notes"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: procurement
#: selection:procurement.group,move_type:0
msgid "Partial"
msgstr ""
@@ -476,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
@@ -559,16 +478,6 @@ msgid "Unit of Measure"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: procurement
#: selection:procurement.order,priority:0
msgid "Urgent"
msgstr ""
@@ -579,25 +488,21 @@ msgid "Very Urgent"
msgstr ""
#. module: procurement
-#: model:ir.model.fields,field_description:procurement.field_procurement_order_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: procurement
-#: model:ir.model.fields,help:procurement.field_procurement_order_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_action
#: model:ir.actions.act_window,help:procurement.procurement_order_action_product_product_stat
#: model:ir.actions.act_window,help:procurement.procurement_order_action_product_template_stat
msgid "When the procurement order is confirmed, it automatically\n"
-" creates the necessary operations to fullfil the need: purchase\n"
+" creates the necessary operations to fulfill the need: purchase\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"
msgstr ""
diff --git a/addons/procurement_jit/i18n/procurement_jit.pot b/addons/procurement_jit/i18n/procurement_jit.pot
index ce0f722c444..41061d53ec8 100644
--- a/addons/procurement_jit/i18n/procurement_jit.pot
+++ b/addons/procurement_jit/i18n/procurement_jit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 493de6613d3..c4e263b1ff5 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,117 +23,42 @@ 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:288
+#: 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:290
+#: code:addons/product/models/product_pricelist.py:394
#, python-format
msgid "%s %% discount and %s surcharge"
msgstr ""
#. module: product
-#: code:addons/product/product.py:710
-#: code:addons/product/product.py:1134
+#: code:addons/product/models/product_template.py:279
#, 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.product,description:product.product_product_26
-#: model:product.template,description:product.product_product_26_product_template
-msgid "17\" Monitor\n"
-"6GB RAM\n"
-"Hi-Speed 234Q 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.product,name:product.product_product_52
-#: model:product.template,name:product.product_product_52_product_template
-msgid "30m RJ45 wire"
-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:product.product,name:product.product_product_51
-#: model:product.template,name:product.product_product_51_product_template
-msgid "8-port Switch"
+#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
+msgid "<span attrs=\"{'invisible':[('base', '!=', 'list_price')]}\">Public Price - </span>\n"
+" <span attrs=\"{'invisible':[('base', '!=', 'standard_price')]}\">Cost - </span>\n"
+" <span attrs=\"{'invisible':[('base', '!=', 'pricelist')]}\">Other Pricelist - </span>"
msgstr ""
#. module: product
-#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
-msgid "<span attrs=\"{'invisible':[('base', 'not in', ('list_price','standard_price'))]}\">Public Price - </span>\n"
-" <span attrs=\"{'invisible':[('base', '!=', 'pricelist')]}\">Other Pricelist - </span>"
+#: model:ir.ui.view,arch_db:product.product_category_form_view
+msgid "<span class=\"o_stat_text\"> Products</span>"
msgstr ""
#. module: product
@@ -164,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:977
+#: code:addons/product/models/product.py:166
#: sql_constraint:product.product:0
#, python-format
msgid "A barcode can only be assigned to one product !"
@@ -181,12 +106,6 @@ msgid "A category of the view type is a virtual category that can be used as the
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
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"
@@ -199,12 +118,6 @@ msgid "A description of the Product that you want to communicate to your vendors
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
msgid "A precise description of the Product, used only for internal information purposes."
@@ -217,25 +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."
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_needaction
-#: model:ir.model.fields,field_description:product.field_product_template_message_needaction
-msgid "Action Needed"
+#: 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
@@ -252,7 +152,7 @@ msgid "All"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:283
+#: code:addons/product/models/product_pricelist.py:387
#, python-format
msgid "All Products"
msgstr ""
@@ -263,42 +163,7 @@ msgid "All general settings about this product are managed on"
msgstr ""
#. module: product
-#: model:product.product,description:product.product_product_37
-#: model:product.template,description:product.product_product_37_product_template
-msgid "All in one hi-speed printer with fax and scanner."
-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
msgid "Applicable On"
msgstr ""
@@ -315,12 +180,6 @@ 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."
msgstr ""
@@ -344,14 +203,12 @@ 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
@@ -359,18 +216,6 @@ 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
msgid "Barcode"
@@ -378,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 ""
@@ -396,24 +242,6 @@ msgid "Based on"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_57
-#: model:product.template,name:product.product_product_57_product_template
-msgid "Basic Computer"
-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"
msgstr ""
@@ -429,68 +257,6 @@ 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,name:product.product_product_35
-#: model:product.template,name:product.product_product_35_product_template
-msgid "Blank CD"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_36
-#: model:product.template,name:product.product_product_36_product_template
-msgid "Blank DVD-RW"
-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."
msgstr ""
@@ -514,6 +280,11 @@ 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
msgid "Category Type"
@@ -525,31 +296,12 @@ msgid "Category name"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:277
+#: 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."
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_category_child_id
msgid "Child Categories"
msgstr ""
@@ -573,7 +325,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 ""
@@ -584,27 +336,14 @@ 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
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
@@ -617,8 +356,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
@@ -627,29 +366,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:460
+#: code:addons/product/models/product_template.py:43
+#: selection:product.template,type:0
#, python-format
msgid "Consumable"
msgstr ""
@@ -660,7 +383,7 @@ msgid "Conversion between Units of Measure can only occur if they belong to the
msgstr ""
#. module: product
-#: code:addons/product/product.py:119
+#: 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 ""
@@ -722,12 +445,6 @@ 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
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_currency_id
@@ -738,32 +455,8 @@ 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_product_46
-#: model:product.template,name:product.product_product_46_product_template
-msgid "Datacard"
+msgid "Customer Ref"
msgstr ""
#. module: product
@@ -772,12 +465,6 @@ msgid "Date"
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_last_post
-#: model:ir.model.fields,help:product.field_product_template_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: product
#: model:product.uom,name:product.product_uom_day
msgid "Day(s)"
msgstr ""
@@ -800,12 +487,6 @@ msgid "Delivery Lead Time"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_49
-#: model:product.template,name:product.product_product_49_product_template
-msgid "Dell Inspiron Laptop without OS"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_description
#: model:ir.model.fields,field_description:product.field_product_template_description
msgid "Description"
@@ -822,37 +503,12 @@ 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:product.product,name:product.product_product_55
-#: model:product.template,name:product.product_product_55_product_template
-msgid "Desktop Computer Table"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_56
-#: model:product.template,name:product.product_product_56_product_template
-msgid "Desktop Lamp"
-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
#: model:ir.model.fields,field_description:product.field_product_attribute_price_display_name
@@ -878,13 +534,6 @@ msgid "Dozen(s)"
msgstr ""
#. module: product
-#: model:product.product,description_sale:product.product_product_57
-#: model:product.template,description_sale:product.product_product_57_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"
" product category...) and a computation that easily helps to achieve\n"
@@ -892,12 +541,6 @@ msgid "Each rule include a set of applicability criteria (date range,\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 "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
msgid "End Date"
@@ -909,139 +552,53 @@ msgid "End date for this vendor price"
msgstr ""
#. module: product
-#: selection:product.template,state:0
-msgid "End of Lifecycle"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_date_end
msgid "Ending valid for the pricelist item validation"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_54
-#: model:product.template,name:product.product_product_54_product_template
-msgid "Ergonomic Mouse"
-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.pricelist.item:0
-msgid "Error! The minimum margin should be lower than the maximum margin."
+#: code:addons/product/models/product_attribute.py:96
+#, python-format
+msgid "Error ! You cannot use this attribute with the following value."
msgstr ""
#. module: product
-#: constraint:product.pricelist.item:0
-msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!"
+#: code:addons/product/models/product.py:292
+#, python-format
+msgid "Error! It is not allowed to choose more than one value for a given attribute."
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'."
+#: 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: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"
+#: 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:product.template:0
+#: code:addons/product/models/product_template.py:244
+#, 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.product_product_0
-#: model:product.template,description:product.product_product_0_product_template
-msgid "Example of product to invoice on order."
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_1b
-#: model:product.template,description:product.product_product_1b_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.product_product_1b
-#: model:product.template,name:product.product_product_1b_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,name:product.product_product_28
-#: model:product.template,name:product.product_product_28_product_template
-msgid "External Hard disk"
-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"
msgstr ""
@@ -1052,24 +609,6 @@ msgid "Fixed Price"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_follower_ids
-#: model:ir.model.fields,field_description:product.field_product_template_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_channel_ids
-#: model:ir.model.fields,field_description:product.field_product_template_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_partner_ids
-#: model:ir.model.fields,field_description:product.field_product_template_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: product
#: model:ir.model.fields,help:product.field_product_pricelist_item_min_quantity
msgid "For the rule to apply, bought/sold quantity must be greater than or equal to the minimum quantity specified in this field.\n"
"Expressed in the default unit of measure of the product."
@@ -1081,49 +620,11 @@ 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,description_sale:product.product_product_44
-#: model:product.template,description_sale:product.product_product_44_product_template
-msgid "Full featured image editing software."
-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
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."
@@ -1135,11 +636,6 @@ msgid "Gives the order in which the pricelist items will be checked. The evaluat
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
msgid "Gives the sequence order when displaying a product list"
@@ -1151,130 +647,18 @@ msgid "Global"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_44
-#: model:product.template,name:product.product_product_44_product_template
-msgid "GrapWorks Software"
-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:ir.model.fields,field_description:product.field_product_product_weight
-#: model:ir.model.fields,field_description:product.field_product_template_weight
-msgid "Gross Weight"
-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,name:product.product_product_18
-#: model:product.template,name:product.product_product_18_product_template
-msgid "HDD SH-2 (mto)"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_19
-#: model:product.template,name:product.product_product_19_product_template
-msgid "HDD on Demand"
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_32
-#: model:product.template,description:product.product_product_32_product_template
-msgid "Hands free headset for laptop PC with in-line microphone and headphone plug."
-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,name:product.product_product_33
-#: model:product.template,name:product.product_product_33_product_template
-msgid "Headset USB"
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_33
-#: model:product.template,description:product.product_product_33_product_template
-msgid "Headset for laptop PC with USB connector."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_32
-#: model:product.template,name:product.product_product_32_product_template
-msgid "Headset standard"
-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
@@ -1298,24 +682,6 @@ msgid "ID"
msgstr ""
#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_unread
-#: model:ir.model.fields,help:product.field_product_template_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_needaction
-#: model:ir.model.fields,help:product.field_product_template_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: product
-#: model: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."
msgstr ""
@@ -1347,41 +713,11 @@ msgid "Image of the product variant (Small-sized image of product template if fa
msgstr ""
#. module: product
-#: selection:product.template,state:0
-msgid "In Development"
-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,name:product.product_product_38
-#: model:product.template,name:product.product_product_38_product_template
-msgid "Ink Cartridge"
-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
#: model:ir.ui.view,arch_db:product.product_template_form_view
@@ -1397,6 +733,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 ""
@@ -1406,64 +743,6 @@ msgid "Inventory"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_is_follower
-#: model:ir.model.fields,field_description:product.field_product_template_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_is_product_variant
-#: model:ir.model.fields,field_description:product.field_product_template_is_product_variant
-msgid "Is a product variant"
-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.product,name:product.product_product_26
-#: model:product.template,name:product.product_product_26_product_template
-msgid "Laptop S3450"
-msgstr ""
-
-#. module: product
-#: model:product.public.category,name:product.laptops
-msgid "Laptops"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_last_post
-#: model:ir.model.fields,field_description:product.field_product_template_message_last_post
-msgid "Last Message Date"
-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
#: model:ir.model.fields,field_description:product.field_product_attribute_price___last_update
@@ -1542,23 +821,11 @@ msgid "Lines"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_50
-#: model:product.template,name:product.product_product_50_product_template
-msgid "Linutop"
-msgstr ""
-
-#. module: product
#: model:product.uom,name:product.product_uom_litre
msgid "Liter(s)"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_58
-#: model:product.template,name:product.product_product_58_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
msgid "Logistical Units"
@@ -1580,7 +847,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 ""
@@ -1591,11 +857,6 @@ 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"
msgstr ""
@@ -1617,23 +878,6 @@ msgid "Medium-sized image of the product. It is automatically resized as a 128x1
msgstr ""
#. module: product
-#: model:product.attribute,name:product.product_attribute_1
-msgid "Memory"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_ids
-#: model:ir.model.fields,field_description:product.field_product_template_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_ids
-#: model:ir.model.fields,help:product.field_product_template_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
msgid "Min. Margin"
msgstr ""
@@ -1654,58 +898,7 @@ 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_21
-#: model:product.template,name:product.product_product_21_product_template
-msgid "Motherboard A20Z7"
-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,name:product.product_product_31
-#: model:product.template,name:product.product_product_31_product_template
-msgid "Multimedia Speakers"
-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
@@ -1715,18 +908,17 @@ 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
#: selection:product.category,type:0
-#: selection:product.template,state:0
msgid "Normal"
msgstr ""
@@ -1736,47 +928,6 @@ msgid "Notes"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_needaction_counter
-#: model:ir.model.fields,field_description:product.field_product_template_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_needaction_counter
-#: model:ir.model.fields,help:product.field_product_template_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,help:product.field_product_product_message_unread_counter
-#: model:ir.model.fields,help:product.field_product_template_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: product
-#: selection:product.template,state:0
-msgid "Obsolete"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_42
-#: model:product.template,description_sale:product.product_product_42_product_template
-msgid "Office Editing Software with word processing, spreadsheets, presentations, graphics, and databases..."
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_42
-#: model:product.template,name:product.product_product_42_product_template
-msgid "Office Suite"
-msgstr ""
-
-#. module: product
-#: model:product.product,description:product.product_product_19
-#: model:product.template,description:product.product_product_19_product_template
-msgid "On demand hard-disk having capacity based on requirement."
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_supplierinfo_form_view
msgid "Other Information"
msgstr ""
@@ -1788,12 +939,6 @@ 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
#: model:ir.ui.view,arch_db:product.product_packaging_tree_view
@@ -1822,23 +967,6 @@ msgid "Partner"
msgstr ""
#. module: product
-#: model:product.public.category,name:product.Pen_Drive
-msgid "Pen Drive"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_29
-#: model:product.template,name:product.product_product_29_product_template
-msgid "Pen drive, SP-2"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_30
-#: model:product.template,name:product.product_product_30_product_template
-msgid "Pen drive, SP-4"
-msgstr ""
-
-#. module: product
#: selection:product.pricelist.item,compute_price:0
msgid "Percentage (discount)"
msgstr ""
@@ -1849,41 +977,11 @@ 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.product_product_0
-#: model:product.template,name:product.product_product_0_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
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_price
#: model:ir.model.fields,field_description:product.field_product_template_price
+#: model:ir.ui.view,arch_db:product.product_normal_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_view
#: model:ir.ui.view,arch_db:product.product_supplierinfo_tree_view
#: model:ir.ui.view,arch_db:product.product_template_form_view
@@ -1959,6 +1057,7 @@ msgstr ""
#: model:ir.model.fields,field_description:product.field_product_pricelist_item_ids
#: model:ir.model.fields,field_description:product.field_product_product_item_ids
#: model:ir.model.fields,field_description:product.field_product_template_item_ids
+#: model:ir.ui.view,arch_db:product.product_normal_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_item_tree_view
#: model:ir.ui.view,arch_db:product.product_pricelist_view
@@ -1977,9 +1076,12 @@ 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 ""
@@ -2005,30 +1107,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_37
-#: model:product.template,name:product.product_product_37_product_template
-msgid "Printer, All-in-one"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_23
-#: model:product.template,name:product.product_product_23_product_template
-msgid "Processor AMD 8-Core"
-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
@@ -2062,7 +1140,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"
@@ -2109,6 +1186,11 @@ msgid "Product Unit of Measure"
msgstr ""
#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product UoM Categories"
+msgstr ""
+
+#. module: product
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_product_id
#: model:ir.ui.view,arch_db:product.product_normal_form_view
#: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view
@@ -2117,31 +1199,27 @@ 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.model.fields,field_description:product.field_base_config_settings_group_product_variant
#: model:ir.ui.menu,name:product.menu_products
#: 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 ""
@@ -2162,12 +1240,17 @@ 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:817
+#: code:addons/product/models/product.py:453
#, python-format
msgid "Products: "
msgstr ""
@@ -2196,13 +1279,8 @@ 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
@@ -2231,24 +1309,6 @@ msgid "Quantity-5"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_14
-#: model:product.template,name:product.product_product_14_product_template
-msgid "RAM SR2 (kit)"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_15
-#: model:product.template,name:product.product_product_15_product_template
-msgid "RAM SR3"
-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"
msgstr ""
@@ -2259,51 +1319,11 @@ 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"
msgstr ""
@@ -2314,12 +1334,6 @@ msgid "Rounding Precision"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_45
-#: model:product.template,name:product.product_product_45_product_template
-msgid "Router R430"
-msgstr ""
-
-#. module: product
#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "Sale Conditions"
msgstr ""
@@ -2358,24 +1372,6 @@ 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
msgid "Select category for the current product"
@@ -2384,7 +1380,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
@@ -2394,22 +1389,14 @@ msgid "Sequence"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_59
-#: model:product.public.category,name:product.server
-#: model:product.template,name:product.product_product_59_product_template
-msgid "Server"
-msgstr ""
-
-#. module: product
-#: code:addons/product/product.py:460
+#: code:addons/product/models/product_template.py:44
+#: 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 ""
@@ -2433,12 +1420,6 @@ msgid "Share your product to all companies defined in your instance.\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 "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
msgid "Small-sized image"
@@ -2455,23 +1436,6 @@ 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."
msgstr ""
@@ -2524,80 +1488,14 @@ msgid "Starting date for the pricelist item validation"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_state
-#: model:ir.model.fields,field_description:product.field_product_template_state
-msgid "Status"
-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_product_47
-#: model:product.template,name:product.product_product_47_product_template
-msgid "Switch, 24 ports"
+#: selection:product.template,type:0
+msgid "Stockable Product"
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."
-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
@@ -2616,45 +1514,22 @@ 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:329
+#: code:addons/product/models/product_attribute.py:73
#, python-format
msgid "The operation cannot be completed:\n"
"You are trying to delete an attribute value with a reference on a product variant."
@@ -2680,33 +1555,8 @@ 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."
-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
@@ -2722,35 +1572,6 @@ 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 !"
msgstr ""
@@ -2771,11 +1592,6 @@ msgid "This field holds the image used as image for the product, limited to 1024
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"
msgstr ""
@@ -2806,50 +1622,13 @@ msgid "This vendor's product name will be used when printing a request for quota
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_39
-#: model:product.template,name:product.product_product_39_product_template
-msgid "Toner Cartridge"
-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,name:product.product_product_53
-#: model:product.template,name:product.product_product_53_product_template
-msgid "TypeMatrix Dvorak Keyboard"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_48
-#: model:product.template,name:product.product_product_48_product_template
-msgid "USB Adapter"
-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
@@ -2866,24 +1645,16 @@ 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)"
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"
@@ -2897,38 +1668,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."
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_unread
-#: model:ir.model.fields,field_description:product.field_product_template_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_message_unread_counter
-#: model:ir.model.fields,field_description:product.field_product_template_message_unread_counter
-msgid "Unread Messages Counter"
+" 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
@@ -2947,11 +1689,6 @@ 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"
msgstr ""
@@ -2962,6 +1699,11 @@ 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"
msgstr ""
@@ -2981,10 +1723,9 @@ msgid "Variants"
msgstr ""
#. module: product
-#: model:ir.model.fields,field_description:product.field_product_product_seller_ids
#: model:ir.model.fields,field_description:product.field_product_supplierinfo_name
-#: model:ir.model.fields,field_description:product.field_product_template_seller_ids
#: 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 ""
@@ -2995,6 +1736,11 @@ 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"
msgstr ""
@@ -3015,6 +1761,8 @@ msgid "Vendor of this product"
msgstr ""
#. module: product
+#: model:ir.model.fields,field_description:product.field_product_product_seller_ids
+#: model:ir.model.fields,field_description:product.field_product_template_seller_ids
#: model:ir.ui.view,arch_db:product.product_template_form_view
msgid "Vendors"
msgstr ""
@@ -3027,36 +1775,20 @@ msgstr ""
#. module: product
#: model:ir.model.fields,field_description:product.field_product_product_volume
#: model:ir.model.fields,field_description:product.field_product_template_volume
+#: model:ir.ui.view,arch_db:product.product_template_form_view
#: model:product.uom.categ,name:product.product_uom_categ_vol
msgid "Volume"
msgstr ""
#. module: product
-#: model: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
msgid "Warranty"
msgstr ""
#. module: product
-#: model:product.product,name:product.product_product_34
-#: model:product.template,name:product.product_product_34_product_template
-msgid "Webcam"
-msgstr ""
-
-#. module: product
-#: model:ir.ui.view,arch_db:product.product_template_form_view
+#: model:ir.model.fields,field_description:product.field_product_product_weight
+#: model:ir.model.fields,field_description:product.field_product_template_weight
#: model:product.uom.categ,name:product.product_uom_categ_kgm
msgid "Weight"
msgstr ""
@@ -3067,78 +1799,36 @@ 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"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_40
-#: model:product.template,name:product.product_product_40_product_template
-msgid "Windows 7 Professional"
-msgstr ""
-
-#. module: product
-#: model:product.product,name:product.product_product_41
-#: model:product.template,name:product.product_product_41_product_template
-msgid "Windows Home Server 2011"
+#: 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
@@ -3152,25 +1842,7 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,help:product.product_template_action
-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_product_43
-#: model:product.template,name:product.product_product_43_product_template
-msgid "Zed+ Antivirus"
+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
@@ -3234,48 +1906,6 @@ 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)"
msgstr ""
@@ -3336,20 +1966,6 @@ msgid "qt"
msgstr ""
#. module: product
-#: model:product.product,description_sale:product.product_product_58
-#: model:product.template,description_sale:product.product_product_58_product_template
-msgid "raid 1 \n"
-" 512ECC ram"
-msgstr ""
-
-#. module: product
-#: model:product.product,description_sale:product.product_product_59
-#: model:product.template,description_sale:product.product_product_59_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"
msgstr ""
@@ -3369,9 +1985,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_email_template/i18n/product_email_template.pot b/addons/product_email_template/i18n/product_email_template.pot
index 85d43a1cd35..944cf39914d 100644
--- a/addons/product_email_template/i18n/product_email_template.pot
+++ b/addons/product_email_template/i18n/product_email_template.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 08:24+0000\n"
-"PO-Revision-Date: 2016-01-13 08:24+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,633 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_email_template
-#: model:mail.template,body_html:product_email_template.product_online_training_email_template
-msgid " \n"
-" <div style=\"height:auto;text-align: center;font-size : 40px;color: #333333;margin-top:30px;font-weight: 300;\">\n"
-" Online Training + Certification\n"
-" </div>\n"
-" <div style=\"height:auto;text-left: center;font-size : 16px;color: #646464;margin-top:30px;margin-left:15px;margin-right:5px;\">\n"
-" These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with\n"
-" modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live\n"
-" sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+\n"
-" Pearson VUE test centers worldwide.\n"
-" </div>\n"
-" <div style=\"height: auto;margin-top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-size:16px;\">\n"
-" <strong>Your advantages</strong>\n"
-" <ul>\n"
-" <li>Modular approach applied to the learning method</li>\n"
-" <li>New interactive learning experience</li>\n"
-" <li>Lower training budget for the same quality courses</li>\n"
-" <li>Better comfort to facilitate your learning process</li>\n"
-" <li>Odoo <a href=\"https://www.openerp.com/certification\">Certification Exam</a> included (Pre-Ordered, available as of November 1st, 2013)</li>\n"
-" </ul>\n"
-" </div>\n"
-" <hr color=\"DCDCFB\"/>\n"
-" <div style=\"height:auto;text-align: center;font-size : 40px;color: #333333;margin-top:30px;font-weight: 300;\">\n"
-" Structure of the Training\n"
-" </div>\n"
-" <div>\n"
-" <table>\n"
-" <tr>\n"
-" <td>\n"
-" <img src=\"/product_email_template/static/img/online_training.png\"/>\n"
-" </td>\n"
-" <td style=\"height: auto;margin-top:10px;margin-bottom:10px;font-size:18px;color: #646464;\">\n"
-" <strong>There are three components to the training</strong>\n"
-" <ul>\n"
-" <li>Videos with detailed demos</li>\n"
-" <li>Hands-on exercises and their solutions</li>\n"
-" <li>Live Q&A sessions with a trainer</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: left;font-size : 14px;color: #646464;margin-top:10px;margin-left:15px;\">\n"
-" The 5-day training is modular, which means that you can choose to participate in the full training or to just 1 or 2 modules.\n"
-" Nevertheless, <b>the first day of the training is compulsory</b> for everyone. The Monday is compulsory because the\n"
-" introduction of Odoo is important before going through the other modules.<br/><br/>\n"
-" Each day of the week starts from 9 AM (CEST/PST) to 12 PM (CEST/PST). A Q&A session will be hosted by an Odoo trainer.\n"
-" Each day, the participants are expected to have done the following <b>BEFORE</b> attending the Q&A session:\n"
-" <ul>\n"
-" <li>Watch the videos for this day</li>\n"
-" <li>Do the related exercises (written solutions will be provided upfront as well)</li>\n"
-" <li>Send their questions by email before 5PM (CEST/PST) on the previous business day</li>\n"
-" </ul><br/>\n"
-" The Q&A session will be hosted on a web conference service.<b> A stable internet connection is required.</b> The trainer will\n"
-" screen the questions for the day and select the most relevant ones to be answered during the session. The purpose of the\n"
-" <b>Q&A session is not to cover questions related to a specific implementation project </b>or company-specific business\n"
-" workflows. The <b>questions should be about the material covered in the videos </b>and the exercises and should benefit\n"
-" the other participants of the training as well.<br/>\n"
-" Each day of the week is dedicated to specific applications in Odoo as per the following planning:\n"
-" <ul style=\"color: #6d57e0\">\n"
-" <li>\n"
-" <strong><a href=\"https://www.openerp.com/online-training#Monday\" style=\"text-decoration:none;\" target=_new>Monday: </a></strong>\n"
-" <a href=\"https://www.openerp.com/online-training#Monday_1\" style=\"text-decoration:none;\" target=_new>Introduction</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Monday_2\" style=\"text-decoration:none;\" target=_new>CRM</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Monday_3\" style=\"text-decoration:none;\" target=_new>Sales Management</a>\n"
-" </li>\n"
-" <li>\n"
-" <strong><a href=\"https://www.openerp.com/online-training#Tuesday\" style=\"text-decoration:none;\" target=_new>Tuesday: </a></strong>\n"
-" <a href=\"https://www.openerp.com/online-training#Tuesday_1\" style=\"text-decoration:none;\" target=_new>Access rights</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Tuesday_2\" style=\"text-decoration:none;\" target=_new>Purchase</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Tuesday_2\" style=\"text-decoration:none;\" target=_new>Sales &amp; Purchase management</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Tuesday_4\" style=\"text-decoration:none;\" target=_new>Financial accounting</a>\n"
-" </li>\n"
-" <li>\n"
-" <strong><a href=\"https://www.openerp.com/online-training#Wednesday\" style=\"text-decoration:none;\" target=_new>Wednesday: </a></strong>\n"
-" <a href=\"https://www.openerp.com/online-training#Wednesday_1\" style=\"text-decoration:none;\" target=_new>Project management</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Wednesday_2\" style=\"text-decoration:none;\" target=_new>Human resources</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Wednesday_3\" style=\"text-decoration:none;\" target=_new>Contract management</a>\n"
-" </li>\n"
-" <li>\n"
-" <strong><a href=\"https://www.openerp.com/online-training#Thursday\" style=\"text-decoration:none;\" target=_new>Thursday: </a></strong>\n"
-" <a href=\"https://www.openerp.com/online-training#Thursday_1\" style=\"text-decoration:none;\" target=_new>Warehouse management</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Thursday_2\" style=\"text-decoration:none;\" target=_new>Manufacturing (MRP) &amp; Sales</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Thursday_4\" style=\"text-decoration:none;\" target=_new>Import/Export</a>\n"
-" </li>\n"
-" <li>\n"
-" <strong><a href=\"https://www.openerp.com/online-training#Friday\" style=\"text-decoration:none;\" target=_new>Friday: </a></strong>\n"
-" <a href=\"https://www.openerp.com/online-training#Friday_1\" style=\"text-decoration:none;\" target=_new>Pricelists</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Friday_2\" style=\"text-decoration:none;\" target=_new>Point of Sale (POS)</a>,\n"
-" <a href=\"https://www.openerp.com/online-training#Friday_3\" style=\"text-decoration:none;\" target=_new>Introduction to report customization</a>\n"
-" </li>\n"
-" </ul>\n"
-" </div>\n"
-" <div style=\"text-align: center;margin-top:30px;\" >\n"
-" <table cellspacing=\"5\" align=\"center\" cellpadding=\"5\">\n"
-" <tr style=\"font-size : 20px;color: #333333;margin-top:30px;\">\n"
-" <td>English</td></td>\n"
-" <td>English</td></td>\n"
-" <td>Spanish</td>\n"
-" </tr>\n"
-" <tr style=\"font-size : 10px;color: #646464;\">\n"
-" <td>Europe</td>\n"
-" <td>USA & Canada</td>\n"
-" <td>USA & Latin America</td>\n"
-" </tr>\n"
-" <tr style=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\">\n"
-" <td><a href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" <td><a href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" <td><a href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <hr color=\"DCDCFB\"/>\n"
-" <div style=\"height:auto;text-align: center;font-size : 40px;color: #333333;margin-top:40px;font-weight: 300;\">\n"
-" Content of the Training\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: center;font-size : 24px;color: #646464;margin-top:30px;\">\n"
-" <hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: 25px;\" />Monday<hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/>\n"
-" Introduction, CRM & Sales\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Introduction: Get familiar with the V7.</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Odoo’s architecture</li>\n"
-" <li>How to create an Odoo Online instance</li>\n"
-" <li>List and form views, search and filter features</li>\n"
-" <li>Tooltips and drill-downs</li>\n"
-" <li>Advanced navigation</li>\n"
-" <li>Calendar, Graph, Kanban and Gantt views</li>\n"
-" <li>Social network features: emailing, internal communication</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" The introduction exercises have been created to help you discover Odoo in an easy way. Their main objective is to present the different applications, menus, view types, shortcuts, field types, wizards, actions, etc. It will help you to discover how to navigate in Odoo!<br/></br>\n"
-" Therefore, the Introduction is compulsory for everyone, even if you need to learn a specific module given on an other date. This obligation has been made to make sure that you are not lost if you arrive in the middle of the training for another module.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">CRM Module</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Manage Lead & Opportunities</li>\n"
-" <li>Call, Meeting</li>\n"
-" <li>Partners & contacts</li>\n"
-" <li>Automated actions</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Track all leads coming in and push them to real opportunities</li>\n"
-" <li>Improve the productivity of the sales force</li>\n"
-" <li>Access all documents and messages related to one lead/opportunity in one place</li>\n"
-" <li>Track the sales pipeline by month and stage to produce\n"
-" accurate sales forecasts at the individual and group\n"
-" levels</li>\n"
-" <li>Track individual performance of sales people</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Sales Module</div>\n"
-" <table>\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Customers</li>\n"
-" <li>Products to sell</li>\n"
-" <li>Manual discounts</li>\n"
-" <li>Margins</li>\n"
-" <li>Sales & Warehouse: Invoicing control (On demand / On\n"
-" Delivery Order), Shipping policy (At once / Each product\n"
-" when available)</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Register orders from customers and create invoices</li>\n"
-" <li>Schedule deliveries (for products) or tasks (for service)</li>\n"
-" <li>Ensure that sales orders are properly invoiced by tracking pending sales orders</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <strong>CRM & Sales management:</strong>\n"
-" <ul>\n"
-" <li>From an opportunity to a sale order</li>\n"
-" <li>Claims</li>\n"
-" <li>Aftersale communication</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" Odoo can work with independent applications, so the\n"
-" whole commercial process can be integrated together in\n"
-" order to accomplish complete business flows.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: center;font-size : 24px;color: #646464;margin-top:30px;\">\n"
-" <hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: 25px;\" />Tuesday<hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/>\n"
-" Access rights, Sales & Purchase, Financial accounting\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Access rights</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Users</li>\n"
-" <li>Groups</li>\n"
-" <li>Access rights and access rules</li>\n"
-" <li>Modules configuration</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" Thanks to the integrated access rights management integrated, each user has an access to its relevant information. No overloaded screen with a lot of irrelevant data, no unwanted menu, etc. Only a clean interface!\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Purchase</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Vendors</li>\n"
-" <li>Products</li>\n"
-" <li>Request for Quotation</li>\n"
-" <li>Purchase order</li>\n"
-" <li>Invoicing & Invoice control</li>\n"
-" <li>Incoming order (Complete/partial receipt)</li>\n"
-" <li>Purchase requisition</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Better negotiate volumes and prices based on historical data</li>\n"
-" <li>Centralize all the data to be able to build reporting and statistics</li>\n"
-" <li>Control the invoicing process</li>\n"
-" <li>Work with purchase requisitions to ask different vendors to submit quotations</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <strong>Sales & Purchase management</strong>\n"
-" <ul>\n"
-" <li>Make to order product</li>\n"
-" <li>Retailer process: buy a product and sell it without any customization/manufacturing</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" Keep control of the replenishment process based on sales demands! Thanks to this integration, you will be able to automate the ordering for the missing units ordered by a customer\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Financial accounting</div>\n"
-" <table>\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Invoices</li>\n"
-" <li>Refunds</li>\n"
-" <li>Journal Entries & Reconciliations</li>\n"
-" <li>Reports / Closing of fiscal year</li>\n"
-" <li>Accounts</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Rapidly encode your financial operations or accounting transactions</li>\n"
-" <li>Carry out payments easily and adequately reconcile these payments with invoices</li>\n"
-" <li>Quick creation of invoices with pre-set defaults on debtor/creditor and income/expense accounts</li>\n"
-" <li>Multiple manners to reconcile</li>\n"
-" <li>Configuration of accounts to ensure correct display in balance sheet and profit & loss statement</li>\n"
-" <li>Apply correct deferral methods to ensure the close of the fiscal year</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: center;font-size : 24px;color: #646464;margin-top:30px;\">\n"
-" <hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: 25px;\" />Wednesday<hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/>\n"
-" Project management, Human resources, Contract management\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Project Management</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Projects</li>\n"
-" <li>Tasks</li>\n"
-" <li>Issues</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Manage and follow your projects, tasks and issues</li>\n"
-" <li>Discover the Kanban view to quickly operate some actions and to quickly detect any bottlenecks in your projects flows</li>\n"
-" <li>Discover the Gantt view to see how your project has been planned and adapt it according to new elements or to the people agenda</li>\n"
-" <li>Define project members & delegate tasks</li>\n"
-" <li>Create automatically timesheet lines in the Human Resources menu from recorded work activities</li>\n"
-" <li>Track and invoice (to customers) the costs associated to a project</li>\n"
-" <li>Manage a support ticket system</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Human Resources</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Employees</li>\n"
-" <li>Recruitment</li>\n"
-" <li>Expenses</li>\n"
-" <li>Allocations and leaves requests</li>\n"
-" <li>Time management: timesheet and timesheet lines</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <strong>About Recruiting:</strong>\n"
-" <ul>\n"
-" <li>Better negotiate volumes and prices based on historical data</li>\n"
-" <li>Centralize all the data to be able to build reporting and statistics</li>\n"
-" <li>Control the invoicing process</li>\n"
-" <li>Work with purchase requisitions to ask different vendors to submit quotations</li>\n"
-" </ul>\n"
-" <strong>About Holidays:</strong>\n"
-" <ul>\n"
-" <li>Track the number of vacation days accrued by each employee</li>\n"
-" <li>Allow managers to approve leave requests and plan backups for their teams</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Contract management</div>\n"
-" <table>\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Contracts</li>\n"
-" <li>Invoicing methods\n"
-" <li>Sale orders</li>\n"
-" <li>Timesheets</li>\n"
-" <li>Expenses</li>\n"
-" </li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Centralize the data related to a specific contract in one single point</li>\n"
-" <li>Perform the invoicing from one single place (Sales order / Timesheet / Expenses)</li>\n"
-" <li>Follow the renewal process</li>\n"
-" <li>Compute statistics based on expected revenues</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: center;font-size : 24px;color: #646464;margin-top:30px;\">\n"
-" <hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: 25px;\" />Thursday<hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/>\n"
-" Warehouse management, Manufacturing (MRP) & Sales, Import/Export\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Warehouse management</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Stock moves</li>\n"
-" <li>Inventory</li>\n"
-" <li>Partial delivery / receipt</li>\n"
-" <li>Units of measure</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" Odoo Warehouse Management is at once very simple, flexible and complete. It is based on the concept of double entry that revolutionized accounting: ‘Nothing lost, everything moved’. In Odoo, we don’t talk about disappearance, consumption or loss of products: instead we speak only of stock moves from one place to another.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Manufacturing (MRP)</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Bill of materials</li>\n"
-" <li>Multi-level BoM</li>\n"
-" <li>Routings</li>\n"
-" <li>Work center operations</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Manage the production planning</li>\n"
-" <li>Organize the different manufacturing orders to optimize the workload of the different resources</li>\n"
-" <li>From an operational perspective, track which products and quantities need to be manufactured</li>\n"
-" </ul>\n"
-" <strong>As a manager:</strong>\n"
-" <ul>\n"
-" <li>Define products to be assembled or to be sold as a kit</li>\n"
-" <li>Organize the pipeline of the production</li>\n"
-" <li>Track the cost of a manufacturing order and measure the efficiency of the department</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <strong>MRP & Sales</strong>\n"
-" <ul>\n"
-" <li>Product configuration Make to Stock / to Order</li>\n"
-" <li>Commercial BoM (kit)</li>\n"
-" <li>Just in Time</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" From the sales perspective, you will have a manufacturing order generated based on a request coming from a customer without any manual operation. This integration of those two aplications allows you to perform the following flow in an automated way: Sale order –> Stock level verification –> Production of the missing units –> Receival in stock of the finished goods –> Delivery to the customer.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Import/Export</div>\n"
-" <table>\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Import from CSV files</li>\n"
-" <li>Export as CSV or as Excel file</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Transfer data from one system to Odoo.</li>\n"
-" </ul>\n"
-" Odoo offers a simple way to import and export data. Odoo will guide you for this phase thanks to a FAQ directly integrated into the import screen\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: center;font-size : 24px;color: #646464;margin-top:30px;\">\n"
-" <hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-right: 25px;\" />Friday<hr style=\"display: inline-block; width: 15%; margin-bottom: 4px;margin-left: 25px;\" /><br/><br/>\n"
-" Pricelists, Point of Sale (POS), Introduction to report customization\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Pricelists</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Prices for returning customers</li>\n"
-" <li>Prices in foreign currencies (with exchange fees)</li>\n"
-" <li>Retailer prices (based on a minimal margin)</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Keep control on the pricing policy</li>\n"
-" <li>Allow discounts for some periods</li>\n"
-" <li>Ensure your margins even when you define discounts</li>\n"
-" <li>Allow different pricing by customer and/or vendor</li>\n"
-" <li>Update the prices in an easy way</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Point of Sale (POS)</div>\n"
-" <table cellspacing=\"5\">\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Payment methods (journals)</li>\n"
-" <li>POS Configuration</li>\n"
-" <li>POS front-end</li>\n"
-" <li>POS back-end</li>\n"
-" <li>Shops</li>\n"
-" <li>Sessions</li>\n"
-" <li>POS Orders</li>\n"
-" <li>Re-Invoicing</li>\n"
-" <li>Scanning / Self-scanning</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" Odoo POS is the first POS running in a 100% web based environment, which means any computer with a browser can host the POS. The POS is a two-part system with a front-end (interaction with the client) and a back-end (managers can configure the system, print reports, analyse, ...)<br/><br/>\n"
-" <strong>About the front-end:</strong>\n"
-" <ul>\n"
-" <li>Offline mode. Imagine several cases were having an offline mode is of prime interest: Connexion to server shutdown at a big supermarket / Use in environments that requires mobility but without wifi / Use in large environments like restaurants and gardens / Use in low tech environments</li>\n"
-" </ul>\n"
-" <strong>About the back-end:</strong>\n"
-" <ul>\n"
-" <li>Configure the products being sold in the POS</li>\n"
-" <li>Configure the payments methods</li>\n"
-" <li>Print daily sales report</li>\n"
-" <li>Analyze sales</li>\n"
-" </ul>\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" <div style=\"text-align: left;font-size : 24px;color: #646464;margin-top:30px;\">Introduction to report customization</div>\n"
-" <table>\n"
-" <tr style=\"text-align: center;font-size : 20px;color: #FFFFFF;background-color:#969696;\">\n"
-" <th>Content</th>\n"
-" <th>What will you learn?</th>\n"
-" </tr>\n"
-" <tr style=\"text-align: left;font-size : 16px;color: #646464;\">\n"
-" <td style=\"width:50%;\">\n"
-" <ul>\n"
-" <li>Customize the layout of your invoices</li>\n"
-" <li>Change the footer/header of documents</li>\n"
-" <li>Add a field in a standard document / report</li>\n"
-" </ul>\n"
-" </td>\n"
-" <td style=\"width:50%;\">\n"
-" This features will help you to fully customize the standard documents made from Odoo.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <div style=\"text-align: center;background-color:#FFFFFF;margin-top:30px;\" >\n"
-" <table cellspacing=\"5\" align=\"center\" cellpadding=\"5\">\n"
-" <tr style=\"font-size : 20px;color: #333333;margin-top:30px;\">\n"
-" <td>English</td>\n"
-" <td>English</td>\n"
-" <td>Spanish</td>\n"
-" </tr>\n"
-" <tr style=\"font-size : 10px;color: #646464;\">\n"
-" <td>Europe</td>\n"
-" <td>USA & Canada</td>\n"
-" <td>USA & Latin America</td>\n"
-" </tr>\n"
-" <tr style=\"font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;\">\n"
-" <td><a href=\"http://onlinetrainingencet.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" <td><a href=\"http://onlinetrainingenpst.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" <td><a href=\"http://onlinetrainingespst.eventbrite.com\" style=\"text-decoration:none;color:#FFFFFF;\" target=_new>Register</a></td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-" <hr color=\"DCDCFB\"/>\n"
-" <div style=\"height:auto;text-align: center;font-size : 30px;color: #333333;margin-top:10px;\">\n"
-" Training Material\n"
-" </div>\n"
-" <div style=\"height:auto;text-align: left;font-size : 16px;color: #646464;margin-top:30px;\">\n"
-" As soon as registration will be finalized (ie. payment confirmation), the participants will be provided with the material listed\n"
-" below:\n"
-" <ul>\n"
-" <li>Access to online videos with detailed demos</li>\n"
-" <li>Training material with exercises</li>\n"
-" <li>Written solutions to the exercises</li>\n"
-" </ul>\n"
-" Therefore, there is an advantage to registering early to the training if you are interested in preparing your live sessions ahead of time. Moreover, the number of participants is limited per online session which is another reason to consider registering early and securing your seat.\n"
-" </div>\n"
-" <div style=\"text-align: center;background-color:#FFFFFF;margin-top:30px;font-size:20px;color:#4e66e7\">\n"
-" <table cellspacing=\"5\">\n"
-" <tr>\n"
-" <td>\n"
-" With the live sessions, we learned a lot more than what was covered in the videos. Definitely a good start for building up a solid base of working knowledge of Odoo.\n"
-" </td>\n"
-" <td>\n"
-" The trainer did a wonderful job with the training! He was well informed and interactive online and offline. Thank you so much for the experience! \n"
-" </td>\n"
-" </tr>\n"
-" <tr>\n"
-" <td>\n"
-" It would be very difficult to cover all of the possibilities of Odoo and I believe the major aspects were covered very well \n"
-" </td>\n"
-" <td>\n"
-" The trainer has a very good knowledge of the subject, he understands the issues of the trainees very fast and provided answers with the right level of illustration.\n"
-" </td>\n"
-" </tr>\n"
-" </table>\n"
-" </div>\n"
-"</div>\n"
-" \n"
-" "
-msgstr ""
-
-#. module: product_email_template
#: model:ir.ui.view,arch_db:product_email_template.email_template_form_simplified
msgid "Body"
msgstr ""
@@ -668,13 +41,6 @@ msgid "Miscellaneous"
msgstr ""
#. module: product_email_template
-#: model:mail.template,subject:product_email_template.product_online_training_email_template
-#: model:product.product,name:product_email_template.product_online_training
-#: model:product.template,name:product_email_template.product_online_training_product_template
-msgid "Online Training"
-msgstr ""
-
-#. module: product_email_template
#: model:ir.model.fields,field_description:product_email_template.field_product_template_email_template_id
msgid "Product Email Template"
msgstr ""
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 87d820893b1..f4853974a03 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"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"
msgstr ""
@@ -26,18 +31,6 @@ 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"
msgstr ""
@@ -48,18 +41,6 @@ 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"
msgstr ""
@@ -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 995c40797c2..c9ab3838c49 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,100 +16,20 @@ 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."
-msgstr ""
-
-#. module: product_extended
-#: model:ir.model,name:product_extended.model_mrp_bom
-msgid "Bill of Material"
-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
-msgid "Compute Price Wizard"
-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.model,name:product_extended.model_wizard_price
-msgid "Compute price wizard"
-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"
-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"
+#: model:ir.model,name:product_extended.model_product_product
+msgid "Product"
msgstr ""
#. module: product_extended
@@ -117,24 +37,3 @@ msgstr ""
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"
-msgstr ""
-
-#. module: product_extended
-#: code:addons/product_extended/wizard/wizard_price.py:38
-#, python-format
-msgid "This wizard is build for product templates, while you are currently running it from a product variant."
-msgstr ""
-
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index a3c3a5ec9e8..8026ff8a0b3 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -251,7 +251,7 @@ msgid "Product Margin"
msgstr ""
#. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:66
+#: code:addons/product_margin/wizard/product_margin.py:49
#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
#: model:ir.ui.view,arch_db:product_margin.view_product_margin_form
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index edb71446e23..a6bf60a1f41 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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 e376d3e83c5..aad848300eb 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:17+0000\n"
-"PO-Revision-Date: 2015-10-09 09:17+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,113 @@ msgstr ""
"Plural-Forms: \n"
#. 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([('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"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:2px;width:30%;\">\n"
+" <img src=\"web/static/src/img/logo.png\"/>\n"
+" </td>\n"
+" <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
+" <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #a24689;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:15px 10px;font-size:20px\">\n"
+" <p dir=\"ltr\" style=\"font-size:15px;margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Your Odoo Project application is up and running</span></p><br>\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-size:13px;font-weight:bold;\">What’s next?</span></p>\n"
+" <ul style=\"margin-top:0pt;margin-bottom:0pt;font-size:13px;list-style-type:disc;\">\n"
+" % if last_created_project:\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Try creating a task by sending an email to </span>\n"
+" <a href=\"mailto:${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">${last_created_project.alias_id.name_get()[0][1] if last_created_project.alias_id.alias_domain else user.company_id.email}</span>\n"
+" </a>\n"
+" </p>\n"
+" </li>\n"
+" % endif\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span><a href=\"/web#view_type=list&model=res.users&action=base.action_res_users\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">Invite new users</span></a></span>\n"
+" <span>to collaborate</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul> <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Discover the </span>\n"
+" <span><a href=\"/web#view_type=kanban&model=project.project&action=project.open_view_project_all\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">project planner</span></a></span>\n"
+" <span> to activate extra features</span>\n"
+" <span style=\"color:#a24689;margin:0;font-weight:bold\">(${user.env['web.planner'].get_planner_progress('planner_project')}% done)</span>\n"
+" </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>Track hours with timesheets,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Plan tasks and resources with forecasts,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Get smart reporting and accurate dashboards,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:0pt;\">\n"
+" <span>Bill time on tasks or issues,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>And much more...</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul>\n"
+" <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Need Help?</span>\n"
+" <span style=\"font-style:italic;\">You’re not alone</span>\n"
+" </p>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>We would be delighted to assist you along the way. Contact us 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"
+" how to get the best out of Odoo Project with our </span>\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\">\n"
+" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
+" </p>\n"
+" <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
+" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
+" </div>\n"
+" </div>"
+msgstr ""
+
+#. module: project
#: model:ir.model.fields,field_description:project.field_res_partner_task_count
msgid "# Tasks"
msgstr ""
@@ -32,21 +139,13 @@ msgid "# of Tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:248
-#: code:addons/project/project.py:267
-#: code:addons/project/project.py:413
+#: code:addons/project/models/project.py:235
+#: code:addons/project/models/project.py:404
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: project
-#. openerp-web
-#: code:addons/project/static/src/xml/project.xml:8
-#, python-format
-msgid "&times;"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "(Un)archiving a project automatically (un)archives its tasks and issues. Do you want to proceed?"
msgstr ""
@@ -67,12 +166,47 @@ 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 &amp; 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:139
+#: 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"
@@ -82,6 +216,12 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
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>"
msgstr ""
@@ -382,7 +522,7 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "<strong>Follow only what you need</strong><br/>\n"
-" The simplest way to use notifications is to follow a whole Project: you will then receive all the selected notifications for all the Project's new and existing and new Tasks or Issues."
+" The simplest way to use notifications is to follow a whole project: you will receive notifications for all the new and existing tasks or issues of a project."
msgstr ""
#. module: project
@@ -575,12 +715,6 @@ msgid "Account Preferences"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_needaction
-#: model:ir.model.fields,field_description:project.field_project_task_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:38
#, python-format
@@ -593,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
@@ -610,6 +744,13 @@ 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 &gt; Development &gt; Done</i>"
+msgstr ""
+
+#. module: project
+#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:55
#, python-format
msgid "Added in current sprint"
@@ -651,22 +792,6 @@ msgid "Aliased Model"
msgstr ""
#. module: project
-#: code:addons/project/project.py:121
-#, 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."
msgstr ""
@@ -757,7 +882,7 @@ msgid "At the end of the week, each employee should review\n"
msgstr ""
#. module: project
-#: code:addons/project/project.py:132
+#: code:addons/project/models/project.py:115
#: model:ir.model.fields,field_description:project.field_project_task_attachment_ids
#, python-format
msgid "Attachments"
@@ -817,11 +942,6 @@ 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"
" For example, you'll understand why you shouldn’t use Odoo to plan but instead to\n"
@@ -829,11 +949,6 @@ msgid "But because change is never easy, we've created this Planner to guide you
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"
msgstr ""
@@ -848,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 ""
@@ -866,15 +979,15 @@ msgid "Check this box to manage internal activities through this project"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project_use_timesheets
-msgid "Check this field if this project manages timesheets"
+#. openerp-web
+#: code:addons/project/static/src/js/tour.js:23
+#, python-format
+msgid "Choose a <b>project name</b>. (e.g. Website Launch, Product Development, Office Party, etc.)"
msgstr ""
#. module: project
-#: code:addons/project/project.py:612
-#, python-format
-msgid "Child task still open.\n"
-"Please cancel or complete child task first."
+#: model:ir.ui.view,arch_db:project.edit_project_simplified
+msgid "Choose a Project Email"
msgstr ""
#. module: project
@@ -885,6 +998,34 @@ 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."
msgstr ""
@@ -895,15 +1036,13 @@ msgid "Click to add a stage in the task pipeline."
msgstr ""
#. module: project
-#. openerp-web
-#: code:addons/project/static/src/xml/project.xml:25
-#, python-format
-msgid "Close"
+#: model:ir.ui.view,arch_db:project.view_project_kanban
+msgid "Click to add/remove from favorite"
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
@@ -950,6 +1089,13 @@ 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"
msgstr ""
@@ -994,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
@@ -1004,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 ""
@@ -1025,6 +1175,11 @@ msgid "Create bills automatically based on Time &amp; 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"
msgstr ""
@@ -1082,7 +1237,7 @@ msgid "Current Timesheet"
msgstr ""
#. module: project
-#: code:addons/project/project.py:829
+#: 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
@@ -1091,18 +1246,12 @@ msgid "Customer"
msgstr ""
#. module: project
-#: code:addons/project/project.py:829
+#: code:addons/project/models/project.py:663
#, python-format
msgid "Customer Email"
msgstr ""
#. module: project
-#: code:addons/project/project.py:120
-#, 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"
msgstr ""
@@ -1157,12 +1306,6 @@ msgid "Date"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_last_post
-#: model:ir.model.fields,help:project.field_project_task_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: project
#: model:ir.model.fields,field_description:project.field_report_project_task_user_opening_days
msgid "Days to Assign"
msgstr ""
@@ -1197,11 +1340,6 @@ msgid "Define the steps that will be used in the project from the\n"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_task_child_ids
-msgid "Delegated Tasks"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.view_task_kanban
msgid "Delete"
msgstr ""
@@ -1245,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 ""
@@ -1286,21 +1425,6 @@ 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_timesheet:0
-msgid "Do not record timesheets 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
#, python-format
@@ -1338,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 ""
@@ -1364,6 +1487,11 @@ msgid "Email Alias"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_task_type_mail_template_id
+msgid "Email Template"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.edit_project
msgid "Emails"
msgstr ""
@@ -1386,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 ""
@@ -1418,11 +1542,6 @@ msgid "Every business is different.<br/>\n"
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"
msgstr ""
@@ -1455,13 +1574,13 @@ msgid "Extra Info"
msgstr ""
#. module: project
-#: model:ir.ui.view,arch_db:project.view_config_settings
-msgid "Extra features"
+#: model:ir.ui.view,arch_db:project.project_planner
+msgid "Extra useful for when you're with a customer or in a meeting."
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."
+#: model:ir.ui.view,arch_db:project.view_project_kanban
+msgid "Favorite"
msgstr ""
#. module: project
@@ -1494,24 +1613,6 @@ msgid "Followed by Me"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_follower_ids
-#: model:ir.model.fields,field_description:project.field_project_task_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_channel_ids
-#: model:ir.model.fields,field_description:project.field_project_task_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_partner_ids
-#: model:ir.model.fields,field_description:project.field_project_task_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "For employees, the"
msgstr ""
@@ -1553,11 +1654,6 @@ 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"
msgstr ""
@@ -1611,11 +1707,6 @@ 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>"
msgstr ""
@@ -1633,23 +1724,22 @@ msgstr ""
#. module: project
#: model:ir.model,name:project.model_project_task_history
-#: model:ir.model,name:project.model_project_task_history_cumulative
msgid "History of Tasks"
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:760
+#: code:addons/project/models/project.py:591
#, python-format
msgid "I take it"
msgstr ""
@@ -1703,15 +1793,8 @@ msgid "Identify problems and blocking points more easily"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_unread
-#: model:ir.model.fields,help:project.field_project_task_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_needaction
-#: model:ir.model.fields,help:project.field_project_task_message_needaction
-msgid "If checked, new messages require your attention."
+#: model:ir.model.fields,help:project.field_project_task_type_mail_template_id
+msgid "If set an email will be sent to the customer when the task or issue reaches this step."
msgstr ""
#. module: project
@@ -1750,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 ""
@@ -1794,12 +1875,6 @@ msgid "Internal notes are messages that will appear in the Chatter but will not
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_is_follower
-#: model:ir.model.fields,field_description:project.field_project_task_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Issue Tracking app."
msgstr ""
@@ -1911,17 +1986,6 @@ msgid "Last Message"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_last_post
-#: model:ir.model.fields,field_description:project.field_project_task_message_last_post
-msgid "Last Message Date"
-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
#: model:ir.model.fields,field_description:project.field_project_tags___last_update
@@ -1962,6 +2026,13 @@ msgid "Learn how to better organize your company using Projects, Tasks, Issues a
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"
"-This installs the module pad."
@@ -1983,11 +2054,6 @@ 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
msgid "Manager"
@@ -2014,15 +2080,8 @@ msgid "Marketing Department"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_ids
-#: model:ir.model.fields,field_description:project.field_project_task_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_ids
-#: model:ir.model.fields,help:project.field_project_task_message_ids
-msgid "Messages and communication history"
+#: model:ir.model.fields,field_description:project.field_project_project_favorite_user_ids
+msgid "Members"
msgstr ""
#. module: project
@@ -2036,11 +2095,17 @@ 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"
msgstr ""
#. module: project
+#: model:ir.ui.view,arch_db:project.view_project_project_filter
#: model:ir.ui.view,arch_db:project.view_task_history_search
msgid "My Projects"
msgstr ""
@@ -2057,24 +2122,18 @@ 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:762
+#: code:addons/project/models/project.py:593
#, python-format
msgid "New Task"
msgstr ""
@@ -2087,11 +2146,6 @@ 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"
msgstr ""
@@ -2105,11 +2159,6 @@ 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"
msgstr ""
@@ -2120,9 +2169,10 @@ msgid "Notifications"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_needaction_counter
-#: model:ir.model.fields,field_description:project.field_project_task_message_needaction_counter
-msgid "Number of Actions"
+#. 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
@@ -2141,18 +2191,6 @@ msgid "Number of documents attached"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_needaction_counter
-#: model:ir.model.fields,help:project.field_project_task_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,help:project.field_project_project_message_unread_counter
-#: model:ir.model.fields,help:project.field_project_task_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Odoo Project is a super fast and easy way to make your activities and tasks visible to\n"
" everyone in your company. Follow how things progress, see when things are stuck, know\n"
@@ -2170,23 +2208,25 @@ 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
-#: model:ir.actions.client,name:project.action_client_project_menu
-msgid "Open Project Menu"
+#: model:ir.model.fields,help:project.field_project_project_alias_force_thread_id
+msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_project_alias_force_thread_id
-msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "Or"
msgstr ""
#. module: project
@@ -2200,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 ""
@@ -2221,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 ""
@@ -2256,11 +2298,6 @@ 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))"
msgstr ""
@@ -2271,12 +2308,6 @@ 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"
msgstr ""
@@ -2293,7 +2324,7 @@ msgid "Planner"
msgstr ""
#. module: project
-#: code:addons/project/project.py:895
+#: 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 ""
@@ -2303,7 +2334,7 @@ msgstr ""
msgid "Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
-"- followers: only followers of the related document\n"
+"- followers: only followers of the related document or members of following channels\n"
""
msgstr ""
@@ -2325,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:122
-#, python-format
-msgid "Private Project: followers only"
+msgid "Privacy"
msgstr ""
#. module: project
@@ -2345,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
@@ -2359,6 +2384,12 @@ 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"
msgstr ""
@@ -2374,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"
@@ -2398,12 +2430,6 @@ msgid "Project Tasks"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_res_company_project_time_mode_id
-#: model:ir.model.fields,field_description:project.project_time_mode_id_duplicate_xmlid
-msgid "Project Time Unit"
-msgstr ""
-
-#. module: project
#: model:res.request.link,name:project.req_link_task
msgid "Project task"
msgstr ""
@@ -2414,18 +2440,15 @@ msgid "Project's tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:282
#: 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 ""
@@ -2435,14 +2458,8 @@ 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
@@ -2487,11 +2504,6 @@ 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
#: code:addons/project/static/src/js/web_planner_project.js:105
@@ -2505,11 +2517,6 @@ msgid "Record Thread ID"
msgstr ""
#. module: project
-#: selection:project.config.settings,module_project_timesheet:0
-msgid "Record timesheet lines per tasks"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Red: the Task is blocked (there's a problem)"
msgstr ""
@@ -2597,11 +2604,6 @@ 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"
msgstr ""
@@ -2652,7 +2654,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/xml/project.xml:9
+#: code:addons/project/static/src/js/project.js:45
#, python-format
msgid "Set a Cover Image"
msgstr ""
@@ -2674,6 +2676,11 @@ msgid "Share files and manage versions"
msgstr ""
#. module: project
+#: model:ir.model.fields,field_description:project.field_project_project_is_favorite
+msgid "Show Project on dashboard"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "So if you're looking for the history of a Task, or the latest message on an Issue, simply go to the corresponding Document and you'll find it!"
msgstr ""
@@ -2763,23 +2770,12 @@ 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_project_subscription_ids
-msgid "Subscriptions"
-msgstr ""
-
-#. module: project
#: sql_constraint:project.tags:0
msgid "Tag name already exists !"
msgstr ""
@@ -2907,17 +2903,11 @@ msgid "Task's Analysis"
msgstr ""
#. module: project
-#: model:res.groups,name:project.group_tasks_work_on_tasks
-msgid "Task's Work on Tasks"
-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
@@ -2967,11 +2957,6 @@ 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
#, python-format
@@ -3024,7 +3009,7 @@ msgstr ""
#. module: project
#. openerp-web
-#: code:addons/project/static/src/xml/project.xml:20
+#: code:addons/project/static/src/xml/project.xml:7
#, python-format
msgid "There is no available image to be set as cover. Send a message on the task with an attached image."
msgstr ""
@@ -3035,18 +3020,6 @@ msgid "This allows customers to give rating on provided services"
msgstr ""
#. module: project
-#: model:ir.model.fields,help:project.field_project_config_settings_module_project_timesheet
-msgid "This allows you to transfer the entries under tasks defined for Project Management to the timesheet line entries for particular date and user, with the effect of creating, editing and deleting either ways.\n"
-"-This installs the module project_timesheet."
-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!"
msgstr ""
@@ -3074,10 +3047,12 @@ 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"
-"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
msgstr ""
#. module: project
@@ -3086,37 +3061,12 @@ 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.model.fields,field_description:project.field_project_project_use_timesheets
-#: 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"
" They are also prone to human error, repetitive, annoying, and sometimes stressful to employees.<br/>\n"
@@ -3129,11 +3079,6 @@ msgid "Timesheets can be used for several purposes:"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_timesheet
-msgid "Timesheets on Project"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Timesheets to Approve"
msgstr ""
@@ -3146,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 ""
@@ -3172,8 +3116,8 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_account_type
-msgid "Type of Account"
+#: selection:project.config.settings,module_rating_project:0
+msgid "Track customer satisfaction on tasks"
msgstr ""
#. module: project
@@ -3188,8 +3132,6 @@ msgid "Unassigned Tasks"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_unread
-#: model:ir.model.fields,field_description:project.field_project_task_message_unread
#: model:ir.ui.view,arch_db:project.view_project_project_filter
#: model:ir.ui.view,arch_db:project.view_task_kanban
#: model:ir.ui.view,arch_db:project.view_task_search_form
@@ -3197,13 +3139,8 @@ msgid "Unread Messages"
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_message_unread_counter
-#: model:ir.model.fields,field_description:project.field_project_task_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: project
-#: 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 ""
@@ -3223,11 +3160,6 @@ msgid "Use separate meetings to solve big issues or issues that aren’t importa
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"
msgstr ""
@@ -3263,6 +3195,20 @@ 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
#: code:addons/project/static/src/js/web_planner_project.js:81
@@ -3279,6 +3225,13 @@ 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:"
msgstr ""
@@ -3304,18 +3257,6 @@ msgid "We've developed a super simple and efficient Chrome extension to enter yo
msgstr ""
#. module: project
-#: model:ir.model.fields,field_description:project.field_project_project_website_message_ids
-#: model:ir.model.fields,field_description:project.field_project_task_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: project
-#: model:ir.model.fields,help:project.field_project_project_website_message_ids
-#: model:ir.model.fields,help:project.field_project_task_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Welcome"
msgstr ""
@@ -3351,6 +3292,11 @@ msgid "What is their average number of working hours over the year?"
msgstr ""
#. module: project
+#: model:ir.model.fields,help:project.field_project_project_is_favorite
+msgid "Whether this project should be displayed on the dashboard or not"
+msgstr ""
+
+#. module: project
#. openerp-web
#: code:addons/project/static/src/js/web_planner_project.js:39
#, python-format
@@ -3368,6 +3314,11 @@ 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."
msgstr ""
@@ -3399,11 +3350,11 @@ msgstr ""
#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
-msgid "You can save your reports to for easy reuse later"
+msgid "You can save your reports to easily reuse it later"
msgstr ""
#. module: project
-#: code:addons/project/project.py:87
+#: 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 ""
@@ -3419,6 +3370,11 @@ msgid "Your Objectives"
msgstr ""
#. module: project
+#: model:mail.template,subject:project.mail_template_data_module_install_project
+msgid "Your Odoo Project application is up and running"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "Your Projects"
msgstr ""
@@ -3429,11 +3385,21 @@ 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.."
msgstr ""
@@ -3459,12 +3425,17 @@ msgid "project.config.settings"
msgstr ""
#. module: project
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "project.task.history.cumulative"
+msgstr ""
+
+#. module: project
#: model:ir.ui.view,arch_db:project.project_planner
msgid "send us an email"
msgstr ""
#. module: project
-#: code:addons/project/project.py:569
+#: code:addons/project/models/project.py:460
#, python-format
msgid "tasks"
msgstr ""
@@ -3475,11 +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_subscription_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 ce264a40258..eef7c4fea0e 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:25+0000\n"
-"PO-Revision-Date: 2015-09-29 10:25+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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:212
+#: code:addons/project_issue/models/project_issue.py:148
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -52,16 +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"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_needaction
-msgid "Action Needed"
+#: selection:project.config.settings,module_project_issue_sheet:0
+msgid "Activate timesheets on issues"
msgstr ""
#. module: project_issue
@@ -75,6 +67,17 @@ 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"
msgstr ""
@@ -140,11 +143,6 @@ 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"
msgstr ""
@@ -198,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:367
+#: code:addons/project_issue/models/project_issue.py:286
#, python-format
msgid "Customer"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:369
+#: code:addons/project_issue/models/project_issue.py:288
#, python-format
msgid "Customer Email"
msgstr ""
@@ -234,11 +237,6 @@ msgid "Date of Opening"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_days_since_creation
msgid "Days since creation date"
msgstr ""
@@ -295,6 +293,11 @@ 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"
msgstr ""
@@ -325,34 +328,24 @@ msgid "Feature description"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_partner_ids
-msgid "Followers (Partners)"
-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
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
msgid "High"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:345
+#: code:addons/project_issue/models/project_issue.py:261
#, python-format
msgid "I take it"
msgstr ""
@@ -364,21 +357,6 @@ msgid "ID"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_name
#: model:ir.ui.view,arch_db:project_issue.project_issue_form_view
#: model:ir.ui.view,arch_db:project_issue.view_project_issue_filter
@@ -435,20 +413,17 @@ msgstr ""
#. module: project_issue
#: model:mail.message.subtype,description:project_issue.mt_issue_ready
-msgid "Issue ready for next sStage"
+msgid "Issue ready for next stage"
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_use_issues
+#: model:ir.model.fields,field_description:project_issue.field_project_project_issue_needaction_count
#: 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
@@ -494,11 +469,6 @@ msgid "Last Message"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue___last_update
#: model:ir.model.fields,field_description:project_issue.field_project_issue_report___last_update
msgid "Last Modified on"
@@ -516,19 +486,14 @@ msgid "Last Updated by"
msgstr ""
#. module: project_issue
-#: selection:project.issue,priority:0
-#: selection:project.issue.report,priority:0
-msgid "Low"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_ids
-msgid "Messages"
+#: model:ir.model.fields,field_description:project_issue.field_project_issue_write_date
+msgid "Last Updated on"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_message_ids
-msgid "Messages and communication history"
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
msgstr ""
#. module: project_issue
@@ -543,7 +508,7 @@ msgid "New"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:347
+#: code:addons/project_issue/models/project_issue.py:265
#, python-format
msgid "New Issue"
msgstr ""
@@ -554,12 +519,17 @@ msgid "Next Action"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:390
+#: 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
#: selection:project.issue.report,priority:0
@@ -567,11 +537,6 @@ msgid "Normal"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: project_issue
#: model:ir.model.fields,help:project_issue.field_project_issue_report_delay_close
msgid "Number of Days to close the project issue"
msgstr ""
@@ -582,13 +547,18 @@ msgid "Number of Days to open the project issue."
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_message_needaction_counter
-msgid "Number of messages which requires an action"
+#: 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_message_unread_counter
-msgid "Number of unread messages"
+#: 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
@@ -597,7 +567,7 @@ msgid "Partner"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:480
+#: 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 ""
@@ -640,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
@@ -696,23 +662,29 @@ msgid "Task"
msgstr ""
#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_task_type
+msgid "Task Stage"
+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
@@ -721,36 +693,46 @@ 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_project_issue_filter
-#: model:ir.ui.view,arch_db:project_issue.view_project_issue_report_filter
-msgid "Unassigned"
+#: 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_issue_message_unread
-#: model:ir.ui.view,arch_db:project_issue.project_issue_kanban_view
-#: model:ir.ui.view,arch_db:project_issue.view_project_issue_filter
-msgid "Unread Messages"
+#: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_project_issue_sheet
+msgid "Timesheets on Issues"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_message_unread_counter
-msgid "Unread Messages Counter"
+#: selection:project.config.settings,module_rating_project_issue:0
+msgid "Track customer satisfaction on issues"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_write_date
-msgid "Update Date"
+#: 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
+msgid "Unassigned"
msgstr ""
#. module: project_issue
-#: model:ir.ui.view,arch_db:project_issue.view_project_form_inherited
+#: model:ir.ui.view,arch_db:project_issue.project_issue_kanban_view
+#: model:ir.ui.view,arch_db:project_issue.view_project_issue_filter
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project_issue
+#: 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 ""
@@ -770,16 +752,6 @@ msgid "Watchers Emails"
msgstr ""
#. module: project_issue
-#: model:ir.model.fields,field_description:project_issue.field_project_issue_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.model.fields,help:project_issue.field_project_issue_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: project_issue
#: model:ir.model.fields,field_description:project_issue.field_project_issue_working_hours_open
msgid "Working Hours to assign the Issue"
msgstr ""
@@ -795,15 +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."
+#: code:addons/project_issue/models/project_issue.py:183
+#, python-format
+msgid "issues"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:260
-#, python-format
-msgid "issues"
+#: 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 f6a46ef950a..abda50d601a 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-21 09:19+0000\n"
-"PO-Revision-Date: 2015-09-21 09:19+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 1a653b9bab9..de01a87c861 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-09 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,120 +16,65 @@ msgstr ""
"Plural-Forms: \n"
#. module: purchase
-#: model:mail.template,body_html:purchase.email_template_edi_purchase_done
+#: model:mail.template,body_html:purchase.email_template_edi_purchase
msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"\n"
-" <p>Hello ${object.partner_id.name},</p>\n"
-"\n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>\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"
+"% endif\n"
+",</p><p>\n"
+"Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} <strong>${object.name}</strong>\n"
+"% if object.partner_ref:\n"
+" with reference: ${object.partner_ref}\n"
+"% endif\n"
+"% if object.origin:\n"
+" (RFQ origin: ${object.origin})\n"
+"% endif\n"
+"amounting in <strong>${object.amount_total} ${object.currency_id.name}</strong>\n"
+"from ${object.company_id.name}.\n"
+"</p>\n"
"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.create_uid:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.create_uid.email or ''}?subject=Order%20${object.name}\">${object.create_uid.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
+"<p>If you have any question, do not hesitate to contact us.</p>\n"
+"<p>Best regards,</p>\n"
+""
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"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"\n"
-" <p>Hello ${object.partner_id.name},</p>\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>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;RFQ date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;RFQ reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.create_uid:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.create_uid.email or ''}?subject=Order%20${object.name}\">${object.create_uid.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\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"
-"Creates the dropship Route and add more complex tests-This installs the module stock_dropshipping."
+"Creates the dropship Route and add more complex tests\n"
+"-This installs the module stock_dropshipping."
msgstr ""
#. module: purchase
-#: code:addons/purchase/stock.py:62
+#: code:addons/purchase/models/stock.py:87
#, python-format
msgid " Buy"
msgstr ""
@@ -147,11 +92,11 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_count
-msgid "# of Invoices"
+msgid "# of Bills"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_report_nbr
+#: model:ir.model.fields,field_description:purchase.field_purchase_report_nbr_lines
msgid "# of Lines"
msgstr ""
@@ -162,10 +107,6 @@ msgstr ""
#. module: purchase
#: model:mail.template,subject:purchase.email_template_edi_purchase
-msgid "${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: purchase
#: model:mail.template,subject:purchase.email_template_edi_purchase_done
msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
msgstr ""
@@ -239,8 +180,8 @@ msgid "<strong>Your Order Reference</strong>"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_needaction
-msgid "Action Needed"
+#: model:res.groups,name:purchase.group_warning_purchase
+msgid "A warning can be set on a product or a customer (Purchase)"
msgstr ""
#. module: purchase
@@ -249,23 +190,18 @@ msgid "Add Purchase Order"
msgstr ""
#. module: purchase
-#: model:res.groups,name:purchase.group_advance_bidding
-msgid "Advance bidding process"
-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
@@ -299,6 +235,11 @@ msgid "An administrator can set up default Terms and conditions in your Company
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
msgid "Analytic Account"
@@ -310,6 +251,11 @@ 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 ""
@@ -350,13 +296,39 @@ 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:605
-#: code:addons/purchase/stock.py:56
+#: 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:787
+#: code:addons/purchase/models/stock.py:81
#: model:stock.location.route,name:purchase.route_warehouse0_buy
#, python-format
msgid "Buy"
@@ -380,8 +352,7 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,help:purchase.field_purchase_config_settings_module_purchase_requisition
msgid "Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products.\n"
-" You can configure per product if you directly do a Request for Quotation\n"
-" to one vendor or if you want a Call for Tenders to compare offers from several vendors."
+"You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors."
msgstr ""
#. module: purchase
@@ -392,13 +363,13 @@ msgid "Can be Purchased"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:621
+#: code:addons/purchase/models/purchase.py:803
#, 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:59
+#: code:addons/purchase/models/stock.py:84
#, python-format
msgid "Can't find any generic Buy route."
msgstr ""
@@ -416,7 +387,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:529
+#: code:addons/purchase/models/purchase.py:653
#, python-format
msgid "Cannot delete a purchase order line which is in state '%s'."
msgstr ""
@@ -427,11 +398,6 @@ 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."
msgstr ""
@@ -442,13 +408,14 @@ msgid "Click to create a request for quotation."
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.product_normal_action_puchased
-msgid "Click to define a new product."
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Click to create a vendor bill."
msgstr ""
#. module: purchase
-#: model:web.tip,description:purchase.purchase_tip_1
-msgid "Click to mark products as received."
+#: 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 ""
#. module: purchase
@@ -475,7 +442,7 @@ msgid "Company"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:237
+#: code:addons/purchase/models/purchase.py:291
#, python-format
msgid "Compose Email"
msgstr ""
@@ -502,6 +469,11 @@ 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"
msgstr ""
@@ -543,12 +515,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_report_date
+#: model:ir.model.fields,help:purchase.field_purchase_report_date_order
msgid "Date on which this document has been created"
msgstr ""
@@ -597,7 +564,6 @@ msgid "Display Name"
msgstr ""
#. module: purchase
-#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "Done"
msgstr ""
@@ -608,11 +574,6 @@ 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"
msgstr ""
@@ -633,6 +594,11 @@ msgid "Email composition wizard"
msgstr ""
#. module: purchase
+#: model:ir.model,name:purchase.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
+msgstr ""
+
+#. module: purchase
#: model:ir.model.fields,help:purchase.field_account_invoice_purchase_id
msgid "Encoding help. When selected, the associated purchase order lines are added to the vendor bill. Several PO can be selected."
msgstr ""
@@ -655,28 +621,13 @@ msgid "Fiscal Position"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: purchase
#: selection:res.company,po_double_validation:0
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."
+#: model:ir.model.fields,field_description:purchase.field_purchase_report_weight
+msgid "Gross Weight"
msgstr ""
#. module: purchase
@@ -700,37 +651,12 @@ 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
-#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "If a purchase order is done, you cannot modify it manually anymore. You will not be able to receive invoices anymore for this purchase order."
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:184
+#: 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"
msgstr ""
@@ -741,11 +667,6 @@ msgid "Incoming Shipments"
msgstr ""
#. module: purchase
-#: model:ir.ui.view,arch_db:purchase.view_picking_in_search_picking_inherit
-msgid "Incoming Shipments to Invoice"
-msgstr ""
-
-#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_incoterm_id
msgid "Incoterm"
msgstr ""
@@ -766,27 +687,11 @@ 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 ""
@@ -797,13 +702,8 @@ msgid "Invoices and Incoming Shipments"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_last_post
-msgid "Last Message Date"
+#: model:ir.model.fields,field_description:purchase.field_purchase_order_is_shipped
+msgid "Is shipped"
msgstr ""
#. module: purchase
@@ -839,6 +739,16 @@ msgid "Location & Warehouse"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Lock"
+msgstr ""
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Locked"
+msgstr ""
+
+#. module: purchase
#: model:res.groups,name:purchase.group_manage_vendor_price
msgid "Manage Vendor Price"
msgstr ""
@@ -864,13 +774,14 @@ msgid "Margin of error for vendor lead times. When the system generates Purchase
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_ids
-msgid "Messages"
+#: 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,help:purchase.field_purchase_order_message_ids
-msgid "Messages and communication history"
+#: 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
@@ -895,12 +806,18 @@ 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:771
+#: code:addons/purchase/models/purchase.py:936
#, python-format
msgid "No vendor associated to product %s. Please set one to fix this procurement."
msgstr ""
@@ -911,28 +828,13 @@ msgid "Not Invoiced"
msgstr ""
#. module: purchase
-#: selection:purchase.order,invoice_status:0
-msgid "Not purchased"
-msgstr ""
-
-#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
msgid "Notes"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,help:purchase.field_purchase_order_message_unread_counter
-msgid "Number of unread messages"
+#: selection:purchase.order,invoice_status:0
+msgid "Nothing to Bill"
msgstr ""
#. module: purchase
@@ -941,19 +843,21 @@ msgid "On ordered quantities"
msgstr ""
#. module: purchase
-#: selection:product.template,purchase_method:0
-msgid "On received quantities"
+#: 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: control bills based on ordered quantities.\n"
+"On received quantities: control bills based on received quantity."
msgstr ""
#. module: purchase
-#: model:ir.actions.client,name:purchase.action_client_purchase_menu
-msgid "Open Purchase Menu"
+#: selection:product.template,purchase_method:0
+msgid "On received quantities"
msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_order_date_order
#: model:ir.model.fields,field_description:purchase.field_purchase_order_line_date_order
-#: model:ir.model.fields,field_description:purchase.field_purchase_report_date
+#: model:ir.model.fields,field_description:purchase.field_purchase_report_date_order
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
msgid "Order Date"
msgstr ""
@@ -986,6 +890,12 @@ msgid "Order of Day"
msgstr ""
#. module: purchase
+#: code:addons/purchase/models/purchase.py:760
+#, python-format
+msgid "Ordered quantity decreased!"
+msgstr ""
+
+#. module: purchase
#: model:ir.ui.view,arch_db:purchase.view_purchase_order_search
msgid "Orders"
msgstr ""
@@ -1034,11 +944,6 @@ 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"
msgstr ""
@@ -1080,7 +985,7 @@ msgid "Product Category"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_report_quantity
+#: model:ir.model.fields,field_description:purchase.field_purchase_report_unit_quantity
msgid "Product Quantity"
msgstr ""
@@ -1096,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 ""
@@ -1129,8 +1036,8 @@ msgid "Provide a double validation mechanism for purchases"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_mail_mail_website_published
-msgid "Published"
+#: model:ir.ui.menu,name:purchase.menu_product_normal_action_puchased
+msgid "Purchasable Products"
msgstr ""
#. module: purchase
@@ -1158,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
@@ -1183,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
@@ -1196,6 +1106,16 @@ 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
#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
@@ -1211,7 +1131,7 @@ msgid "Purchase Orders Statistics"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:530
+#: code:addons/purchase/models/purchase.py:655
#, python-format
msgid "Purchase order line deleted."
msgstr ""
@@ -1265,6 +1185,11 @@ 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"
msgstr ""
@@ -1297,11 +1222,6 @@ 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"
msgstr ""
@@ -1386,6 +1306,13 @@ 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"
msgstr ""
@@ -1396,13 +1323,18 @@ 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"
msgstr ""
#. module: purchase
#: model:ir.ui.view,arch_db:purchase.purchase_order_form
-msgid "Set to Done"
+msgid "Set date to all order lines"
msgstr ""
#. module: purchase
@@ -1421,13 +1353,8 @@ 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 unit of measures (advanced)"
+msgid "Some products may be sold/puchased in different units of measure (advanced)"
msgstr ""
#. module: purchase
@@ -1464,11 +1391,6 @@ 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)"
msgstr ""
@@ -1496,6 +1418,13 @@ 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"
" purchase process: prices, procurement logistics, accounting data,\n"
@@ -1528,11 +1457,40 @@ msgid "This account will be used to value price difference between purchase pric
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:964
+#, 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:977
+#, 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:167
+#, python-format
+msgid "This vendor bill has been created from: %s"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/models/account_invoice.py:181
+#, 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."
msgstr ""
@@ -1543,6 +1501,7 @@ msgid "This will determine picking type of incoming shipment"
msgstr ""
#. module: purchase
+#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter
#: selection:purchase.order,state:0
#: selection:purchase.report,state:0
msgid "To Approve"
@@ -1575,15 +1534,15 @@ msgid "Transfer"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:283
+#: code:addons/purchase/models/purchase.py:340
#, python-format
msgid "Unable to cancel purchase order %s as some receptions have already been done."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:286
+#: code:addons/purchase/models/purchase.py:343
#, python-format
-msgid "Unable to cancel this purchase order.i You must first cancel related vendor bills."
+msgid "Unable to cancel this purchase order. You must first cancel related vendor bills."
msgstr ""
#. module: purchase
@@ -1598,23 +1557,13 @@ msgstr ""
#. module: purchase
#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_group_uom
-msgid "Unit of Measures"
-msgstr ""
-
-#. module: purchase
-#: 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.model.fields,field_description:purchase.field_purchase_order_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:purchase.purchase_order_form
+msgid "Unlock"
msgstr ""
#. module: purchase
@@ -1635,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 ""
@@ -1689,11 +1638,21 @@ 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"
" orders or receipts. This allows you to control bills\n"
@@ -1702,13 +1661,13 @@ msgid "Vendors bills can be pre-generated based on purchase\n"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,help:purchase.field_mail_mail_website_published
-msgid "Visible on the website as a comment"
+#: model:ir.model.fields,field_description:purchase.field_purchase_report_volume
+msgid "Volume"
msgstr ""
#. module: purchase
#: selection:purchase.order,invoice_status:0
-msgid "Waiting Invoices"
+msgid "Waiting Bills"
msgstr ""
#. module: purchase
@@ -1718,13 +1677,27 @@ msgid "Warehouse"
msgstr ""
#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_purchase_order_website_message_ids
-msgid "Website Messages"
+#: 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
-#: model:ir.model.fields,help:purchase.field_purchase_order_website_message_ids
-msgid "Website communication history"
+#: code:addons/purchase/models/purchase.py:248
+#: code:addons/purchase/models/purchase.py:721
+#, 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
@@ -1738,25 +1711,45 @@ msgid "Work with product variant allows you to define some variant of the same p
msgstr ""
#. module: purchase
+#: code:addons/purchase/models/purchase.py:761
+#, 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"
" it's a physical product, a consumable or services you buy to\n"
-" subcontractants."
+" subcontractors."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:335
+#: code:addons/purchase/models/purchase.py:380
#, 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 ""
@@ -1766,8 +1759,3 @@ msgstr ""
msgid "purchase.config.settings"
msgstr ""
-#. module: purchase
-#: model:ir.model.fields,field_description:purchase.field_mail_mail_description
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/purchase_mrp/i18n/purchase_mrp.pot b/addons/purchase_mrp/i18n/purchase_mrp.pot
new file mode 100644
index 00000000000..80ee53a7116
--- /dev/null
+++ b/addons/purchase_mrp/i18n/purchase_mrp.pot
@@ -0,0 +1,22 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * purchase_mrp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_mrp
+#: model:ir.model,name:purchase_mrp.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index e29ba3d6f1d..7b5108ca359 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgid "Agreement Selection Type"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_4984
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_11210
#: 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"
@@ -110,58 +110,22 @@ 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"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_name
-msgid "Call for Tenders Reference"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Call for Tenders in negotiation"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter
-msgid "Call for Tenders where tenders are closed"
-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"
-msgstr ""
-
-#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
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:98
+#: code:addons/purchase_requisition/models/purchase_requisition.py:76
#, python-format
msgid "Cancelled by the agreement associated to this quotation."
msgstr ""
@@ -189,17 +153,11 @@ 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_type_create_uid
@@ -207,7 +165,6 @@ 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_type_create_date
@@ -230,7 +187,6 @@ 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_type_display_name
@@ -278,7 +234,6 @@ 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_type_id
@@ -299,17 +254,6 @@ msgid "In negotiation"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.model.fields,field_description:purchase_requisition.field_bid_line_qty___last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition___last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line___last_update
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type___last_update
@@ -317,7 +261,6 @@ 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_type_write_uid
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_write_uid
@@ -325,7 +268,6 @@ 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_type_write_date
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_write_date
@@ -358,6 +300,11 @@ msgid "New Quotation"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_order_count
+msgid "Number of Orders"
+msgstr ""
+
+#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_qty_ordered
msgid "Ordered Quantities"
msgstr ""
@@ -369,11 +316,6 @@ msgid "Ordering Date"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "PO Created"
-msgstr ""
-
-#. module: purchase_requisition
#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_picking_type_id
msgid "Picking Type"
msgstr ""
@@ -391,11 +333,6 @@ 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"
msgstr ""
@@ -412,11 +349,6 @@ 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"
msgstr ""
@@ -480,7 +412,7 @@ msgid "Purchase Requisition Line"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:315
+#: code:addons/purchase_requisition/models/purchase_requisition.py:297
#, python-format
msgid "Purchase Requisition created"
msgstr ""
@@ -501,24 +433,11 @@ msgid "Quantities"
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"
-msgstr ""
-
-#. module: purchase_requisition
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
msgid "RFQs/Orders"
msgstr ""
@@ -556,16 +475,10 @@ 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 Purchase Agreements"
msgstr ""
@@ -614,26 +527,6 @@ 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"
msgstr ""
@@ -684,13 +577,13 @@ msgid "Warehouse"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
+#: code:addons/purchase_requisition/models/purchase_requisition.py:82
#, python-format
msgid "You cannot confirm call because there is no product line."
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:118
+#: code:addons/purchase_requisition/models/purchase_requisition.py:99
#, python-format
msgid "You have to cancel or validate every RfQ before closing the purchase requisition."
msgstr ""
@@ -699,3 +592,4 @@ msgstr ""
#: model:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form
msgid "e.g. PO0025"
msgstr ""
+
diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot
index a879de49713..469939c769d 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,27 @@ msgstr ""
"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"
msgstr ""
@@ -68,11 +89,26 @@ 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"
msgstr ""
@@ -122,11 +158,6 @@ 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
#, python-format
@@ -166,12 +197,17 @@ 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"
msgstr ""
#. module: rating
#: model:ir.model.fields,help:rating.field_rating_rating_rated_partner_id
-msgid "Owner of the rated ressource"
+msgid "Owner of the rated resource"
msgstr ""
#. module: rating
@@ -180,8 +216,17 @@ 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
+#: model:ir.model.fields,field_description:rating.field_mail_channel_rating_ids
+#: model:ir.model.fields,field_description:rating.field_product_template_rating_ids
+#: model:ir.model.fields,field_description:rating.field_project_issue_rating_ids
+#: model:ir.model.fields,field_description:rating.field_project_task_rating_ids
#: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_ids
#: model:ir.model.fields,field_description:rating.field_rating_rating_rating
#: model:ir.ui.view,arch_db:rating.view_rating_rating_search
@@ -195,18 +240,41 @@ 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
@@ -230,28 +298,23 @@ 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
#: model:ir.model.fields,help:rating.field_rating_rating_res_name
-msgid "The name of the rated ressource."
+msgid "The name of the rated resource."
msgstr ""
#. module: rating
@@ -265,18 +328,50 @@ 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:55
+#: 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 56c958da66f..c3628044afd 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+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 informations 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,8 +218,12 @@ msgid "Project"
msgstr ""
#. module: rating_project
-#: model:ir.model,name:rating_project.model_rating_rating
-#: model:ir.model.fields,field_description:rating_project.field_project_task_rating_ids
+#: 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 ""
@@ -116,6 +233,26 @@ 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."
msgstr ""
@@ -126,7 +263,28 @@ 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 48002b2db46..d9f9c955f72 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,44 @@ msgstr ""
"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
@@ -36,8 +67,12 @@ msgid "Project Issue"
msgstr ""
#. module: rating_project_issue
-#: model:ir.model,name:rating_project_issue.model_rating_rating
-#: model:ir.model.fields,field_description:rating_project_issue.field_project_issue_rating_ids
+#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_form_inherit_rating
msgid "Rating"
msgstr ""
+#. module: rating_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 6763e9e5750..70c239768a1 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,6 @@ msgid "&amp;bull;"
msgstr ""
#. module: report
-#: model:ir.ui.view,arch_db:report.layout
#: model:ir.ui.view,arch_db:report.minimal_layout
msgid "&lt;!DOCTYPE html&gt;"
msgstr ""
@@ -142,7 +141,7 @@ msgid "B9 23 33 x 62 mm"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:257
+#: code:addons/report/models/report.py:273
#, python-format
msgid "Bad Report Reference"
msgstr ""
@@ -195,6 +194,14 @@ 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
#: model:ir.model.fields,field_description:report.field_report_display_name
#: model:ir.model.fields,field_description:report.field_report_paperformat_display_name
@@ -207,6 +214,13 @@ 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"
msgstr ""
@@ -227,8 +241,9 @@ msgid "Email:"
msgstr ""
#. module: report
-#: constraint:report.paperformat:0
-msgid "Error ! You cannot select a format AND speficic page width/height."
+#: code:addons/report/models/report_paperformat.py:68
+#, python-format
+msgid "Error ! You cannot select a format AND specific page width/height."
msgstr ""
#. module: report
@@ -252,11 +267,17 @@ 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"
msgstr ""
#. module: report
+#: model:ir.model.fields,field_description:report.field_ir_qweb_field_barcode_id
#: model:ir.model.fields,field_description:report.field_report_abstract_report_id
#: model:ir.model.fields,field_description:report.field_report_id
#: model:ir.model.fields,field_description:report.field_report_paperformat_id
@@ -269,6 +290,7 @@ msgid "Landscape"
msgstr ""
#. module: report
+#: model:ir.model.fields,field_description:report.field_ir_qweb_field_barcode___last_update
#: model:ir.model.fields,field_description:report.field_report___last_update
#: model:ir.model.fields,field_description:report.field_report_abstract_report___last_update
#: model:ir.model.fields,field_description:report.field_report_paperformat___last_update
@@ -388,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"
@@ -409,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
@@ -439,7 +478,12 @@ msgid "This is a sample of an internal report."
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:257
+#: 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 ""
@@ -451,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"
@@ -464,14 +508,14 @@ msgid "Website:"
msgstr ""
#. module: report
-#: code:addons/report/models/report.py:413
+#: 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."
@@ -479,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"
@@ -493,6 +537,11 @@ msgid "ir.actions.report.xml"
msgstr ""
#. module: report
+#: model:ir.model,name:report.model_ir_qweb_field_barcode
+msgid "ir.qweb.field.barcode"
+msgstr ""
+
+#. module: report
#: model:ir.model,name:report.model_report_abstract_report
msgid "report.abstract_report"
msgstr ""
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index b80ae149d13..93e624dbef1 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 9c88808172f..eb17bc08601 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: resource
-#: code:addons/resource/resource.py:689
+#: code:addons/resource/models/resource.py:689
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -101,7 +101,8 @@ msgid "End Date"
msgstr ""
#. module: resource
-#: constraint:resource.calendar.leaves:0
+#: code:addons/resource/models/resource.py:738
+#, python-format
msgid "Error! leave start-date must be lower then leave end-date."
msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 94dc4ff890d..553fad4c183 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:17+0000\n"
-"PO-Revision-Date: 2015-10-09 09:17+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,68 +18,42 @@ msgstr ""
#. module: sale
#: model:mail.template,body_html:sale.email_template_edi_sale
msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"% set access_action = object.get_access_action()\n"
+"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n"
+"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n"
+"% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n"
+"% set access_url = is_online and access_action['url'] or object.get_signup_url()\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"
+"Here is your ${doc_name} <strong>${object.name}</strong>\n"
+"% if object.origin:\n"
+"(with reference: ${object.origin} )\n"
+"% endif\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>Hello ${object.partner_id.name},</p>\n"
-" \n"
-" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.client_order_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p>\n"
-" <p>\n"
-" You can view your quotation online:\n"
-" </p>\n"
-" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"/quote/${object.id}/${object.access_token}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
-"\n"
-" % if object.paypal_url:\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"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"/sale/static/img/btn_paynowcc_lg.gif\"/>\n"
-" </a>\n"
-" % endif\n"
"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\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"
+""
msgstr ""
#. module: sale
@@ -120,7 +94,18 @@ msgstr ""
#. module: sale
#: model:mail.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name|safe} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+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 "&amp;bull;"
msgstr ""
#. module: sale
@@ -129,8 +114,98 @@ msgid "(update)"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.report_saleorder_document
-msgid "<span groups=\"sale.group_discount_per_so_line\">Disc.(%)</span>"
+#. 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"
+" to buy an extra pack of hours, because he used all his support\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
@@ -149,11 +224,18 @@ 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>"
msgstr ""
@@ -174,13 +256,23 @@ 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_order_message_needaction
-msgid "Action Needed"
+#: 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
@@ -194,7 +286,7 @@ msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:126
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:146
#, python-format
msgid "Advance: %s"
msgstr ""
@@ -205,6 +297,16 @@ 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"
msgstr ""
@@ -215,9 +317,14 @@ msgid "Allow to edit sales order from the 'Sales Order' menu (not from the Quota
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
@@ -236,7 +343,13 @@ 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 ""
@@ -252,11 +365,47 @@ 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"
msgstr ""
@@ -299,6 +448,13 @@ 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"
msgstr ""
@@ -322,11 +478,23 @@ 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"
msgstr ""
@@ -357,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"
@@ -364,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 ""
@@ -394,7 +564,6 @@ msgid "Customer Reference"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_product_product_taxes_id
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_taxes_id
msgid "Customer Taxes"
msgstr ""
@@ -405,6 +574,11 @@ 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"
msgstr ""
@@ -415,13 +589,13 @@ msgid "Date Ordered:"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_message_last_post
-msgid "Date of the last message posted on the record."
+#: model:ir.model.fields,help:sale.field_sale_order_create_date
+msgid "Date on which sales order is created."
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_create_date
-msgid "Date on which sales order is created."
+#: model:ir.model.fields,help:sale.field_sale_order_confirmation_date
+msgid "Date on which the sale order is confirmed."
msgstr ""
#. module: sale
@@ -460,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 ""
@@ -470,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
@@ -487,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 ""
@@ -497,6 +672,12 @@ 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 ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_discount_per_so_line
msgid "Discount"
msgstr ""
@@ -507,6 +688,11 @@ 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"
msgstr ""
@@ -518,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
@@ -535,12 +722,12 @@ msgid "Display margins on quotations and sales orders"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-msgid "Done"
+#: selection:sale.config.settings,group_sale_layout:0
+msgid "Do not personalize sale orders and invoice reports"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:85
#, python-format
msgid "Down Payment"
msgstr ""
@@ -566,7 +753,7 @@ msgid "Down payment (percentage)"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:67
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:82
#, python-format
msgid "Down payment of %s%%"
msgstr ""
@@ -582,13 +769,13 @@ msgid "Email composition wizard"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_portal
-msgid "Enable customer portal to track orders, delivery and invoices"
+#: model:ir.model,name:sale.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_product_product_property_account_expense_id
-msgid "Expense Account"
+#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_website_portal
+msgid "Enable customer portal to track orders, delivery and invoices"
msgstr ""
#. module: sale
@@ -614,21 +801,6 @@ msgid "Fix Price: all price manage from products sale price.\n"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: sale
#: model:ir.actions.act_window,help:sale.action_account_invoice_report_salesteam
msgid "From this report, you can have an overview of the amount invoiced to your customer. The search tool can also be used to personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
@@ -640,6 +812,11 @@ msgid "Fully Invoiced"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_sale_report_weight
+msgid "Gross Weight"
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_product_search
#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
@@ -647,7 +824,13 @@ 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
@@ -656,21 +839,10 @@ 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."
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_message_unread
-msgid "If checked new messages require your attention."
+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
-#: model:ir.model.fields,help:sale.field_sale_order_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_product_product_property_account_income_id
#: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_deposit_account_id
msgid "Income Account"
msgstr ""
@@ -686,7 +858,7 @@ msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:785
+#: code:addons/sale/models/account_invoice.py:52
#, python-format
msgid "Invoice %s paid"
msgstr ""
@@ -744,16 +916,6 @@ msgstr ""
#. module: sale
#: selection:sale.config.settings,default_invoice_policy:0
-msgid "Invoice based on costs (time and material, expenses)"
-msgstr ""
-
-#. module: sale
-#: selection:product.template,invoice_policy:0
-msgid "Invoice based on time and material"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.settings,default_invoice_policy:0
msgid "Invoice delivered quantities"
msgstr ""
@@ -813,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 ""
@@ -827,15 +989,18 @@ msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_product_product_invoice_policy
#: model:ir.model.fields,field_description:sale.field_product_template_invoice_policy
+#: model:ir.ui.view,arch_db:sale.product_template_form_view_invoice_policy
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 ""
@@ -851,17 +1016,8 @@ msgid "Invoicing/Progression Ratio"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_last_post
-msgid "Last Message Date"
-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
@@ -870,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"
@@ -877,12 +1034,36 @@ 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"
msgstr ""
@@ -893,18 +1074,42 @@ msgid "Manually set quantities on order"
msgstr ""
#. module: sale
+#: model:ir.model.fields,help:sale.field_product_product_track_service
+#: model:ir.model.fields,help:sale.field_product_template_track_service
+msgid "Manually set quantities on order: Invoice based on the manually entered quantity, without creating an analytic account.\n"
+"Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n"
+"Create a task and track hours: Create a task on the sale order validation and track the work hours."
+msgstr ""
+
+#. module: sale
+#: model:ir.model.fields,help:sale.field_sale_order_validity_date
+msgid "Manually set the expiration date of your quotation (offer), or it will set the date automatically based on the template if online quotation is installed."
+msgstr ""
+
+#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_margin
msgid "Margins"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_ids
-msgid "Messages"
+#: 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.model.fields,help:sale.field_sale_order_message_ids
-msgid "Messages and communication history"
+#: model:ir.ui.view,arch_db:sale.view_sales_config
+msgid "More Info"
msgstr ""
#. module: sale
@@ -918,12 +1123,18 @@ 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:96
+#: code:addons/sale/models/sale.py:101
#, python-format
msgid "New"
msgstr ""
@@ -934,11 +1145,27 @@ 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"
msgstr ""
@@ -950,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."
@@ -957,7 +1189,6 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-#: model:ir.actions.act_window,help:sale.action_orders
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
msgid "Note that once a Quotation becomes a Sale Order, it will be moved from the Quotations list to the Sales Order list."
msgstr ""
@@ -969,23 +1200,16 @@ msgid "Nothing to Invoice"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: sale
#: model:ir.model.fields,help:sale.field_sale_order_line_customer_lead
msgid "Number of days between the order confirmation and the shipping of the products to the customer"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,help:sale.field_sale_order_message_unread_counter
-msgid "Number of unread messages"
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid "Once the quotation is confirmed, it becomes a sales order.\n"
+" You'll be able to invoice it and collect payments.\n"
+" From the <i>Sales Orders</i> menu, you can track delivery\n"
+" orders or services."
msgstr ""
#. module: sale
@@ -1001,11 +1225,6 @@ msgid "Only Integer Value should be valid."
msgstr ""
#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
-msgstr ""
-
-#. module: sale
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
msgid "Order"
msgstr ""
@@ -1040,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 ""
@@ -1059,6 +1279,13 @@ msgid "Ordered Quantity"
msgstr ""
#. module: sale
+#: 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 (time or deliveries)."
+msgstr ""
+
+#. module: sale
#: model:ir.ui.view,arch_db:sale.view_order_product_search
msgid "Ordered date of the sales order"
msgstr ""
@@ -1075,6 +1302,20 @@ msgid "Orders to Upsell"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders_upselling
+msgid "Orders to upsell are orders having products with an invoicing\n"
+" policy based on <i>ordered quantities</i> for which you have\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"
msgstr ""
@@ -1101,18 +1342,29 @@ msgid "Payment Term"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:233
+#: 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/models/sale.py:277
#, python-format
msgid "Please define an accounting sale journal for this company."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:654
+#: code:addons/sale/models/sale.py:782
#, 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 ""
@@ -1123,6 +1375,16 @@ 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
msgid "Pricelist"
@@ -1134,6 +1396,12 @@ 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"
msgstr ""
@@ -1159,6 +1427,11 @@ 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
#: model:ir.model.fields,field_description:sale.field_sale_order_product_id
@@ -1168,6 +1441,11 @@ 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
msgid "Product Category"
@@ -1185,6 +1463,7 @@ msgid "Product Variants"
msgstr ""
#. module: sale
+#: model:ir.ui.menu,name:sale.prod_config_main
#: model:ir.ui.view,arch_db:sale.view_sales_config
msgid "Products"
msgstr ""
@@ -1226,6 +1505,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 ""
@@ -1285,7 +1565,8 @@ msgstr ""
#: model:ir.model.fields,field_description:sale.field_crm_team_use_quotations
#: model:ir.ui.menu,name:sale.menu_sale_quotations
#: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
+#: model:ir.ui.view,arch_db:sale.view_order_product_search
msgid "Quotations"
msgstr ""
@@ -1300,16 +1581,39 @@ msgid "Quotations Analysis"
msgstr ""
#. module: sale
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_quotation
+msgid "Quotations Sent"
+msgstr ""
+
+#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
msgid "Quotations and Sales"
msgstr ""
#. module: sale
+#: model:ir.model.fields,field_description:sale.field_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
+#: 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
#: model:ir.ui.view,arch_db:sale.view_order_form
msgid "Reporting"
msgstr ""
@@ -1342,14 +1646,25 @@ msgid "Sale Price"
msgstr ""
#. module: sale
+#: 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
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
msgid "Sales"
msgstr ""
@@ -1385,6 +1700,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
@@ -1400,6 +1716,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 ""
@@ -1420,11 +1738,6 @@ msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
#. module: sale
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-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
#: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams
@@ -1478,12 +1791,30 @@ 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"
msgstr ""
@@ -1499,11 +1830,17 @@ 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
#, python-format
@@ -1512,11 +1849,6 @@ 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"
msgstr ""
@@ -1531,6 +1863,18 @@ 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"
msgstr ""
@@ -1541,8 +1885,18 @@ 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 unit of measures (advanced)"
+msgid "Some products may be sold/purchased in different units of measure (advanced)"
msgstr ""
#. module: sale
@@ -1568,14 +1922,35 @@ 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 ""
@@ -1591,18 +1966,13 @@ msgid "Terms and conditions"
msgstr ""
#. module: sale
-#: code:addons/sale/sale_analytic.py:54
-#, 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."
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 ""
@@ -1612,31 +1982,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:124
+#: 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:122
+#: 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:64
+#: 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:60
+#: 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:316
+#: code:addons/sale/models/sale.py:367
+#: code:addons/sale/models/sale.py:371
#, python-format
msgid "There is no invoicable line."
msgstr ""
@@ -1647,22 +2018,6 @@ msgid "This Year"
msgstr ""
#. module: sale
-#: model:ir.model.fields,help:sale.field_product_product_property_account_expense_id
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product."
-msgstr ""
-
-#. module: sale
-#: model:ir.model.fields,help:sale.field_product_product_property_account_income_id
-msgid "This account will be used for invoices instead of the default one to value sales for the current product."
-msgstr ""
-
-#. 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."
msgstr ""
@@ -1679,12 +2034,12 @@ msgstr ""
#. module: sale
#: selection:product.template,track_service:0
-msgid "Timesheets on contract"
+msgid "Timesheets on project"
msgstr ""
#. module: sale
#: model:ir.model.fields,field_description:sale.field_sale_order_line_qty_to_invoice
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale
#: model:ir.ui.view,arch_db:sale.view_sales_order_line_filter
#: selection:sale.order,invoice_status:0
#: selection:sale.order.line,invoice_status:0
@@ -1694,12 +2049,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 ""
@@ -1717,6 +2075,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 ""
@@ -1729,19 +2088,20 @@ msgid "Unit of Measure"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_uom
-msgid "Unit of Measures"
+#: 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_order_message_unread
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
-msgid "Unread Messages"
+#: 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 ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+msgid "Unread Messages"
msgstr ""
#. module: sale
@@ -1751,11 +2111,11 @@ 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
-#: model:ir.ui.view,arch_db:sale.view_sales_order_filter
+#: model:ir.ui.view,arch_db:sale.sale_order_view_search_inherit_sale
msgid "Upselling"
msgstr ""
@@ -1766,14 +2126,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
@@ -1782,13 +2150,31 @@ msgid "VAT:"
msgstr ""
#. module: sale
-#: model:ir.model.fields,field_description:sale.field_sale_order_website_message_ids
-msgid "Website Messages"
+#: model:ir.model.fields,field_description:sale.field_sale_report_volume
+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
-#: model:ir.model.fields,help:sale.field_sale_order_website_message_ids
-msgid "Website communication history"
+#: code:addons/sale/models/sale.py:862
+#, 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
@@ -1798,7 +2184,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
@@ -1809,20 +2196,36 @@ msgid "Wrong value entered!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:741
+#: code:addons/sale/models/sale.py:164
+#, 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/models/sale.py:891
#, python-format
msgid "You can not remove a sale order line.\n"
"Discard changes and try setting the quantity to 0."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:153
-#, python-format
-msgid "You can only delete draft quotations!"
+#: model:ir.actions.act_window,help:sale.action_orders_to_invoice
+msgid "You can select all orders and invoice them in batch, or check\n"
+" every order and invoice them one by one."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders_to_invoice
+msgid "You will find here all orders that are ready to be invoiced."
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."
@@ -1830,7 +2233,6 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-#: model:ir.actions.act_window,help:sale.action_orders
#: model:ir.actions.act_window,help:sale.action_orders_salesteams
msgid "Your next actions should flow efficiently: confirm the Quotation to a Sale Order, then create the Invoice and collect the Payment."
msgstr ""
@@ -1851,7 +2253,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 a926973ca63..ac7fc047a23 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,21 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_claim_count
-msgid "# Claims"
-msgstr ""
-
-#. module: sale_crm
#: model:ir.model.fields,field_description:sale_crm.field_res_users_issue_count
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"
msgstr ""
@@ -47,7 +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."
+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
@@ -56,18 +46,20 @@ msgid "Associate Member"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_sale_order_campaign_id
-msgid "Campaign"
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_cancel
+msgid "Cancel Membership Date"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_membership_cancel
-msgid "Cancel Membership Date"
+#. 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_method_count
-msgid "Count Payment Method"
+#: model:ir.model.fields,field_description:sale_crm.field_res_users_payment_token_count
+msgid "Count Payment Token"
msgstr ""
#. module: sale_crm
@@ -101,18 +93,8 @@ msgid "Free Member"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_partner_latitude
-msgid "Geo Latitude"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_date_localization
-msgid "Geo Localization Date"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_res_users_partner_longitude
-msgid "Geo Longitude"
+#: model:ir.model,name:sale_crm.model_account_invoice
+msgid "Invoice"
msgstr ""
#. module: sale_crm
@@ -137,13 +119,15 @@ msgid "Lead/Opportunity"
msgstr ""
#. module: sale_crm
-#: model:ir.ui.view,arch_db:sale_crm.sale_view_inherit123
-msgid "Log in the chatter from which opportunity the order originates"
+#. 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
-#: model:ir.model.fields,field_description:sale_crm.field_sale_order_medium_id
-msgid "Medium"
+#: model:ir.ui.view,arch_db:sale_crm.sale_view_inherit123
+msgid "Log in the chatter from which opportunity the order originates"
msgstr ""
#. module: sale_crm
@@ -167,6 +151,16 @@ msgid "Membership Start Date"
msgstr ""
#. module: sale_crm
+#: 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_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 ""
@@ -187,8 +181,8 @@ msgid "Orders"
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
@@ -204,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 ""
@@ -213,8 +208,14 @@ msgid "Select if you want to give free membership."
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,field_description:sale_crm.field_sale_order_source_id
-msgid "Source"
+#: 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
@@ -228,31 +229,11 @@ 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"
msgstr ""
#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_sale_order_campaign_id
-msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_sale_order_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model.fields,help:sale_crm.field_sale_order_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
-msgstr ""
-
-#. module: sale_crm
#: model:ir.model.fields,help:sale_crm.field_res_users_property_stock_customer
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
msgstr ""
diff --git a/addons/sale_expense/i18n/sale_expense.pot b/addons/sale_expense/i18n/sale_expense.pot
index 16c880dbaf1..0eeadcf411d 100644
--- a/addons/sale_expense/i18n/sale_expense.pot
+++ b/addons/sale_expense/i18n/sale_expense.pot
@@ -1,13 +1,12 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * sale_expense
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,33 +14,3 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: sale_expense
-#: model:ir.model,name:sale_expense.model_account_analytic_line
-msgid "Analytic Line"
-msgstr ""
-
-#. module: sale_expense
-#: selection:product.template,expense_policy:0
-msgid "At Cost"
-msgstr ""
-
-#. module: sale_expense
-#: selection:product.template,expense_policy:0
-msgid "At Sales Price"
-msgstr ""
-
-#. module: sale_expense
-#: model:ir.model.fields,field_description:sale_expense.field_product_template_expense_policy
-msgid "Expense Invoice Policy"
-msgstr ""
-
-#. module: sale_expense
-#: model:ir.model.fields,help:sale_expense.field_product_template_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_expense
-#: model:ir.model,name:sale_expense.model_product_template
-msgid "Product Template"
-msgstr ""
-
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index e21fdf8982e..549c03c59aa 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 40a57336a19..f6edca32030 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,13 +26,13 @@ msgid "Indicate the name of sales order."
msgstr ""
#. module: sale_mrp
-#: model:ir.model,name:sale_mrp.model_mrp_production
-msgid "Manufacturing Order"
+#: model:ir.model,name:sale_mrp.model_account_invoice_line
+msgid "Invoice Line"
msgstr ""
#. module: sale_mrp
-#: model:ir.model.fields,field_description:sale_mrp.field_sale_order_line_property_ids
-msgid "Properties"
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Production"
msgstr ""
#. module: sale_mrp
@@ -50,8 +50,3 @@ msgstr ""
msgid "Sales Order Line"
msgstr ""
-#. module: sale_mrp
-#: model:ir.model,name:sale_mrp.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 59f072cb73a..ea0e03c7218 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgid "Requested Date"
msgstr ""
#. module: sale_order_dates
-#: code:addons/sale_order_dates/sale_order_dates.py:51
+#: code:addons/sale_order_dates/models/sale_order.py:56
#, python-format
msgid "Requested date is too soon!"
msgstr ""
@@ -64,7 +64,7 @@ msgid "Sales Order Line"
msgstr ""
#. module: sale_order_dates
-#: code:addons/sale_order_dates/sale_order_dates.py:52
+#: code:addons/sale_order_dates/models/sale_order.py:57
#, python-format
msgid "The date requested by the customer is sooner than the commitment date. You may be unable to honor the customer's request."
msgstr ""
diff --git a/addons/sale_service_rating/i18n/sale_service_rating.pot b/addons/sale_service_rating/i18n/sale_service_rating.pot
new file mode 100644
index 00000000000..62ec750b7d1
--- /dev/null
+++ b/addons/sale_service_rating/i18n/sale_service_rating.pot
@@ -0,0 +1,22 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * sale_service_rating
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_service_rating
+#: model:ir.model,name:sale_service_rating.model_project_task
+msgid "Task"
+msgstr ""
+
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 04465439a79..dec29c4a4e0 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-01 06:27+0000\n"
-"PO-Revision-Date: 2015-10-01 06:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"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
msgid "<strong>Incoterms:</strong>"
@@ -128,13 +133,13 @@ msgid "No shipping costs on sales orders"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:141
+#: 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
+#: code:addons/sale_stock/models/sale_config_settings.py:42
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -145,7 +150,7 @@ msgid "Order Routing"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:152
+#: code:addons/sale_stock/models/sale_order.py:156
#, python-format
msgid "Ordered quantity decreased!"
msgstr ""
@@ -166,6 +171,11 @@ msgid "Procurement"
msgstr ""
#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: sale_stock
#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_product_tmpl_id
msgid "Product Template"
msgstr ""
@@ -176,6 +186,11 @@ 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"
msgstr ""
@@ -247,9 +262,19 @@ msgid "Stock Move"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:194
+#: code:addons/sale_stock/models/sale_order.py:202
#, python-format
-msgid "This product is packaged by %d . You should sell %d ."
+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
@@ -258,25 +283,31 @@ 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
msgid "Warehouse"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:193
+#: code:addons/sale_stock/models/sale_order.py:201
#, python-format
msgid "Warning"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:153
+#: 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:142
+#: code:addons/sale_stock/models/sale_order.py:146
#, python-format
msgid "You plan to sell %s %s but you only have %s %s available!\n"
"The stock on hand is %s %s."
@@ -286,3 +317,9 @@ msgstr ""
#: model:ir.model,name:sale_stock.model_sale_config_settings
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 44388566191..af09f3cbd82 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:28+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,28 +26,109 @@ 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 ""
+
+#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_project_project_id
+msgid "Project associated to this sale"
+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 "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"
+"If you use the timesheet linked to projects, don't forget to setup the right unit of measure in your employees."
msgstr ""
#. module: sale_timesheet
@@ -56,6 +137,11 @@ msgid "Timesheet Cost"
msgstr ""
#. module: sale_timesheet
+#: model:ir.model.fields,field_description:sale_timesheet.project_time_mode_id_duplicate_xmlid
+msgid "Timesheet UoM"
+msgstr ""
+
+#. module: sale_timesheet
#: model:ir.model.fields,field_description:sale_timesheet.field_sale_order_timesheet_count
msgid "Timesheet activities"
msgstr ""
@@ -67,12 +153,39 @@ msgstr ""
#. module: sale_timesheet
#: model:ir.ui.view,arch_db:sale_timesheet.hr_timesheet_employee_extd_form
+#: model:ir.ui.view,arch_db:sale_timesheet.view_order_form_inherit_sale_timesheet
msgid "Timesheets"
msgstr ""
#. module: sale_timesheet
-#: code:addons/sale_timesheet/models/sale_timesheet.py:101
+#: 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
+#: 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 4e2a0d52694..bdbf92d7ca7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -59,11 +59,6 @@ msgid "<span>View</span>"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: sales_team
#: model:ir.model.fields,field_description:sales_team.field_crm_team_active
msgid "Active"
msgstr ""
@@ -76,6 +71,26 @@ 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
#: model:ir.actions.act_window,help:sales_team.sales_team_config_action
@@ -96,11 +111,6 @@ 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"
msgstr ""
@@ -112,23 +122,67 @@ 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
#: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
@@ -138,38 +192,24 @@ msgid "Dashboard"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_crm_team_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: sales_team
#: model:crm.team,name:sales_team.team_sales_department
msgid "Direct Sales"
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.view,arch_db:sales_team.crm_team_view_form
-msgid "Follow this salesteam to automatically track the events associated to users of this team."
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_channel_ids
-msgid "Followers (Channels)"
+#: model:ir.ui.menu,name:sales_team.menu_country_state_partner
+msgid "Fed. States"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_partner_ids
-msgid "Followers (Partners)"
+#: 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."
msgstr ""
#. module: sales_team
@@ -193,17 +233,14 @@ 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_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_crm_team_message_needaction
-msgid "If checked, new messages require your attention."
+#: 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
@@ -212,11 +249,6 @@ msgid "If the active field is set to false, it will allow you to hide the sales
msgstr ""
#. module: sales_team
-#: model:crm.team,name:sales_team.crm_team_1
-msgid "Indirect Sales"
-msgstr ""
-
-#. module: sales_team
#. openerp-web
#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:140
#, python-format
@@ -224,17 +256,8 @@ msgid "Invoiced"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_last_post
-msgid "Last Message Date"
-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 ""
@@ -247,29 +270,36 @@ 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
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:25
-#, python-format
-msgid "Meetings"
+#: model:ir.ui.menu,name:sales_team.menu_crm_config_lead
+msgid "Leads & Opportunities"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_ids
-msgid "Messages"
+#: model:ir.ui.menu,name:sales_team.menu_localisation
+msgid "Localization"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_crm_team_message_ids
-msgid "Messages and communication history"
+#: 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
+#, python-format
+msgid "Meetings"
msgstr ""
#. module: sales_team
@@ -283,6 +313,15 @@ msgid "More Info"
msgstr ""
#. module: sales_team
+#. openerp-web
+#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:42
+#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:44
+#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:216
+#, python-format
+msgid "My Pipeline"
+msgstr ""
+
+#. module: sales_team
#: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search
msgid "My Salesteams"
msgstr ""
@@ -302,37 +341,37 @@ msgid "Next Actions"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_needaction_counter
-msgid "Number of Actions"
+#. openerp-web
+#: 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.model.fields,help:sales_team.field_crm_team_message_needaction_counter
-msgid "Number of messages which requires an action"
+#: model:ir.ui.menu,name:sales_team.menu_crm_config_opportunity
+msgid "Opportunities"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,help:sales_team.field_crm_team_message_unread_counter
-msgid "Number of unread messages"
+#: model:ir.model,name:sales_team.model_res_partner
+msgid "Partner"
msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:87
+#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
#, python-format
-msgid "Only Integer Value should be valid."
+msgid "Performance"
msgstr ""
#. module: sales_team
-#: model:ir.model,name:sales_team.model_res_partner
-msgid "Partner"
+#: model:ir.ui.menu,name:sales_team.menu_product
+msgid "Product Variants"
msgstr ""
#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102
-#, python-format
-msgid "Performance"
+#: model:ir.ui.menu,name:sales_team.menu_product_template_action
+msgid "Products"
msgstr ""
#. module: sales_team
@@ -346,6 +385,13 @@ 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
#: model:ir.model.fields,field_description:sales_team.field_res_partner_team_id
@@ -357,6 +403,11 @@ msgid "Sales Team"
msgstr ""
#. module: sales_team
+#: model:ir.model.fields,help:sales_team.field_res_users_sale_team_id
+msgid "Sales Team the user is member of. Used to compute the members of a sales team through the inverse one2many"
+msgstr ""
+
+#. module: sales_team
#: model:ir.actions.act_window,name:sales_team.crm_team_act
#: model:ir.actions.act_window,name:sales_team.sales_team_config_action
msgid "Sales Teams"
@@ -378,6 +429,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 ""
@@ -402,8 +454,8 @@ msgid "Team Members"
msgstr ""
#. module: sales_team
-#: sql_constraint:crm.team:0
-msgid "The code of the sales team must be unique !"
+#: model:ir.model.fields,help:sales_team.field_crm_team_color
+msgid "The color of the team"
msgstr ""
#. module: sales_team
@@ -486,16 +538,6 @@ msgid "Today"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: sales_team
#: model:ir.actions.act_window,help:sales_team.crm_team_act
#: model:ir.actions.act_window,help:sales_team.crm_team_salesteams_act
#: model:ir.actions.act_window,help:sales_team.sales_team_config_action
@@ -505,36 +547,32 @@ msgid "Use sales team to organize your different salespersons or\n"
msgstr ""
#. module: sales_team
-#: model:ir.model,name:sales_team.model_res_users
-msgid "Users"
+#: model:res.groups,name:sales_team.group_sale_salesman_all_leads
+msgid "User: All Documents"
msgstr ""
#. module: sales_team
-#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:127
-#, python-format
-msgid "Won in Opportunities"
+#: model:res.groups,name:sales_team.group_sale_salesman
+msgid "User: Own Documents Only"
msgstr ""
#. module: sales_team
-#: model:ir.model.fields,field_description:sales_team.field_crm_team_working_hours
-msgid "Working Hours"
+#: model:ir.model,name:sales_team.model_res_users
+msgid "Users"
msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:87
+#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:127
#, python-format
-msgid "Wrong value entered!"
+msgid "Won in Opportunities"
msgstr ""
#. module: sales_team
#. openerp-web
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:42
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:44
-#: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:216
+#: code:addons/sales_team/static/src/js/sales_team_dashboard.js:83
#, python-format
-msgid "Your Pipeline"
+msgid "Wrong value entered!"
msgstr ""
#. module: sales_team
@@ -545,9 +583,34 @@ 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
#, python-format
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 e223e20044d..acc9a68024b 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 09:40+0000\n"
-"PO-Revision-Date: 2016-01-13 09:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,87 +16,34 @@ msgstr ""
"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"
-"Creates the dropship route and add more complex tests-This installs the module stock_dropshipping."
+"Creates the dropship route and add more complex tests\n"
+"-This installs the module stock_dropshipping."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/models/stock_move.py:217
#, python-format
msgid " (%s reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1850
+#: code:addons/stock/models/stock_move.py:220
#, python-format
msgid " (reserved)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3482
-#, python-format
-msgid " MTO"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:209
-#: code:addons/stock/product.py:382
-#, python-format
-msgid " On Hand"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3619
-#: code:addons/stock/stock.py:3912
-#, python-format
-msgid " Sequence in"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3623
-#: code:addons/stock/stock.py:3920
-#, python-format
-msgid " Sequence internal"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3620
-#: code:addons/stock/stock.py:3914
-#, python-format
-msgid " Sequence out"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3621
-#: code:addons/stock/stock.py:3916
-#, python-format
-msgid " Sequence packing"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3622
-#: code:addons/stock/stock.py:3918
-#, 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
@@ -105,19 +52,13 @@ msgid "#Products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2739
-#, python-format
-msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3299
+#: code:addons/stock/models/stock_warehouse.py:449
#, python-format
msgid "%s: Supply Product from %s"
msgstr ""
#. module: stock
-#: code:addons/stock/res_config.py:25
+#: code:addons/stock/models/res_company.py:24
#, python-format
msgid "%s: Transit Location"
msgstr ""
@@ -126,7 +67,7 @@ msgstr ""
#: model:ir.model.fields,help:stock.field_stock_move_state
msgid "* New: When the stock move is created and not yet confirmed.\n"
"* Waiting Another Move: This state can be seen when a move is waiting for another one, for example in a chained flow.\n"
-"* Waiting Availability: This state is reached when the procurement resolution is not straight forward. It may need the scheduler to run, a component to me manufactured...\n"
+"* Waiting Availability: This state is reached when the procurement resolution is not straight forward. It may need the scheduler to run, a component to be manufactured...\n"
"* Available: When products are reserved, it is set to 'Available'.\n"
"* Done: When the shipment is processed, the state is 'Done'."
msgstr ""
@@ -134,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
@@ -283,7 +216,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.report_delivery_document
-msgid "<span><strong>Contact Address:</strong></span>"
+msgid "<span class=\"pull-left\">Lot/Serial Number</span>"
msgstr ""
#. module: stock
@@ -373,11 +306,17 @@ 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>"
msgstr ""
@@ -398,12 +337,16 @@ 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"
msgstr ""
@@ -450,6 +393,11 @@ 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>"
msgstr ""
@@ -467,24 +415,17 @@ 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"
msgstr ""
@@ -500,11 +441,6 @@ 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."
msgstr ""
@@ -525,17 +461,12 @@ msgid "<strong>When you process an incoming shipment, internal transfer or deliv
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2881
+#: 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:"
msgstr ""
@@ -549,23 +480,22 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "A good inventory management aims to optimize stock levels: not too low (or\n"
" you may find yourself out of stock) and not too high (your products occupy\n"
-" space and may loose value)."
+" space and may lose value)."
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.inventory_planner
-msgid "API Documentation"
+#: 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 "Accurate visibility on all your operations"
+msgid "API Documentation"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_needaction
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_needaction
-msgid "Action Needed"
+#: model:ir.ui.view,arch_db:stock.inventory_planner
+msgid "Accurate visibility on all your operations"
msgstr ""
#. module: stock
@@ -575,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 ""
@@ -586,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
@@ -606,12 +537,6 @@ 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"
msgstr ""
@@ -632,6 +557,11 @@ 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"
msgstr ""
@@ -648,7 +578,12 @@ msgid "All at once"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2867
+#: 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 ""
@@ -664,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 ""
@@ -687,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
@@ -702,6 +638,16 @@ 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"
msgstr ""
@@ -732,6 +678,17 @@ 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."
msgstr ""
@@ -752,8 +709,17 @@ 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 ""
@@ -774,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 ""
@@ -796,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:1104
+#: code:addons/stock/models/stock_picking.py:972
#, python-format
msgid "Back order <em>%s</em> <b>created</b>."
msgstr ""
@@ -818,7 +783,7 @@ msgid "Backorder creation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4732
+#: code:addons/stock/models/stock_picking.py:66
#, python-format
msgid "Backorder exists"
msgstr ""
@@ -860,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
@@ -886,7 +851,7 @@ msgid "By Unique Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2162
+#: code:addons/stock/models/stock_move.py:396
#, python-format
msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order."
msgstr ""
@@ -898,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
@@ -917,23 +882,24 @@ msgid "Calendar View"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3358
+#: 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:3466
+#: 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 ""
@@ -946,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:2022
+#: code:addons/stock/models/stock_move.py:357
#, python-format
msgid "Cannot unreserve a done move"
msgstr ""
@@ -979,18 +944,13 @@ 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
@@ -1000,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 ""
@@ -1014,11 +975,6 @@ 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
#: model:ir.actions.act_window,help:stock.action_picking_tree_backorder
@@ -1042,6 +998,11 @@ 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."
msgstr ""
@@ -1052,17 +1013,12 @@ 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 ""
@@ -1072,6 +1028,11 @@ 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."
msgstr ""
@@ -1092,6 +1053,11 @@ 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."
msgstr ""
@@ -1202,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:1576
+#: code:addons/stock/models/stock_picking.py:808
#, 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
@@ -1288,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
@@ -1298,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"
@@ -1320,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
@@ -1328,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"
@@ -1357,7 +1358,7 @@ msgid "Creation Date, usually the time of the order"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3806
+#: code:addons/stock/models/stock_warehouse.py:401
#, python-format
msgid "Cross-Dock"
msgstr ""
@@ -1388,7 +1389,7 @@ msgid "Current quantity of products.\n"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4828
+#: code:addons/stock/models/stock_picking.py:103
#: model:ir.ui.view,arch_db:stock.view_location_search
#, python-format
msgid "Customer"
@@ -1418,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 ""
@@ -1468,12 +1468,6 @@ msgid "Date of latest Stock Move"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_message_last_post
-#: model:ir.model.fields,help:stock.field_stock_production_lot_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.report_stock_lines_date_tree
msgid "Dates of Inventories"
msgstr ""
@@ -1500,18 +1494,6 @@ 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"
msgstr ""
@@ -1537,6 +1519,13 @@ 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"
msgstr ""
@@ -1569,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
@@ -1598,7 +1587,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:305
+#: code:addons/stock/models/product.py:320
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1616,13 +1605,7 @@ msgid "Delivery"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_move_type
-msgid "Delivery Method"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:3667
-#: 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"
@@ -1639,6 +1622,11 @@ msgid "Delivery Slip"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_picking_move_type
+msgid "Delivery Type"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_product_product_route_ids
#: model:ir.model.fields,help:stock.field_product_template_route_ids
msgid "Depending on the modules installed, this will allow you to define the route of the product: whether it will be bought, manufactured, MTO/MTS,..."
@@ -1689,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"
@@ -1727,11 +1716,6 @@ 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
#: model:ir.model.fields,field_description:stock.field_product_putaway_display_name
@@ -1751,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
@@ -1761,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"
@@ -1777,40 +1761,31 @@ msgid "Do not hesitate to send us an email to describe your experience or to sug
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
msgid "Do not manage packaging"
msgstr ""
#. module: stock
-#: selection:stock.config.settings,group_stock_multiple_locations:0
-msgid "Do not record internal moves within a warehouse"
-msgstr ""
-
-#. module: stock
#: selection:stock.config.settings,group_stock_production_lot:0
msgid "Do not track individual product items"
msgstr ""
#. module: stock
#: selection:stock.config.settings,module_product_expiry:0
-msgid "Do not use Expiration Date"
+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 ""
@@ -1832,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 ""
@@ -1858,21 +1833,16 @@ 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:4186
+#: code:addons/stock/models/stock_quant.py:629
#, python-format
msgid "Everything inside a package should be in the same location"
msgstr ""
@@ -1889,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 ""
@@ -1904,7 +1875,12 @@ msgid "External note..."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1500
+#: model:ir.ui.view,arch_db:stock.view_stock_config_settings
+msgid "Extra Features"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_picking.py:947
#, python-format
msgid "Extra Move: "
msgstr ""
@@ -1935,24 +1911,6 @@ msgid "Fixed Locations Per Product Category"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_follower_ids
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_channel_ids
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_partner_ids
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "For the Odoo Team,<br/>\n"
" Fabien Pinckaers, Founder"
@@ -1982,7 +1940,7 @@ msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:299
+#: code:addons/stock/models/product.py:315
#: 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
@@ -1990,11 +1948,6 @@ msgid "Forecasted Quantity"
msgstr ""
#. module: stock
-#: model:ir.ui.view,arch_db:stock.product_template_kanban_stock_view
-msgid "Forecasted:"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_from_loc
msgid "From"
msgstr ""
@@ -2005,51 +1958,36 @@ msgid "Full Location Name"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:303
+#: code:addons/stock/models/product.py:318
#, python-format
msgid "Future Deliveries"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:309
+#: code:addons/stock/models/product.py:323
#, python-format
msgid "Future P&L"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:321
+#: code:addons/stock/models/product.py:333
#, python-format
msgid "Future Productions"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:315
+#: code:addons/stock/models/product.py:328
#, python-format
msgid "Future Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:293
+#: code:addons/stock/models/product.py:310
#, 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."
msgstr ""
@@ -2081,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
@@ -2106,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
@@ -2184,51 +2123,34 @@ 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_8488
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8722
#: 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:3177
+#: code:addons/stock/models/stock_inventory.py:374
#, python-format
msgid "INV:"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:84
+#: 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"
msgstr ""
@@ -2239,18 +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_message_unread
-#: model:ir.model.fields,help:stock.field_stock_production_lot_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_message_needaction
-#: model:ir.model.fields,help:stock.field_stock_production_lot_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_picking_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 ""
@@ -2302,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 ""
@@ -2352,7 +2264,7 @@ msgid "Immediate Transfer"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1559
+#: code:addons/stock/models/stock_picking.py:790
#, python-format
msgid "Immediate Transfer?"
msgstr ""
@@ -2403,6 +2315,11 @@ msgid "In short, you will get a more efficient warehouse management that leads\n
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
msgid "Incoming"
@@ -2433,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 ""
@@ -2443,12 +2361,6 @@ msgid "Incoterms are series of sales terms. They are used to divide transaction
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2161
-#, python-format
-msgid "Information"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Initial Demand"
msgstr ""
@@ -2459,7 +2371,7 @@ msgid "Initial Inventory"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3755
+#: code:addons/stock/models/stock_warehouse.py:93
#: model:stock.location,name:stock.stock_location_company
#, python-format
msgid "Input"
@@ -2482,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 ""
@@ -2504,7 +2415,7 @@ msgid "Internal Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3680
+#: code:addons/stock/models/stock_warehouse.py:228
#: model:stock.picking.type,name:stock.picking_type_internal
#, python-format
msgid "Internal Transfers"
@@ -2522,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
@@ -2609,11 +2525,6 @@ 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
msgid "Inventory Location"
@@ -2630,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
@@ -2656,7 +2562,12 @@ msgid "Inventory Settings"
msgstr ""
#. module: stock
+#: model:ir.actions.act_window,name:stock.quantsact
#: model:ir.ui.menu,name:stock.menu_quants
+#: model:ir.ui.view,arch_db:stock.quant_search_view
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_graph_value
+#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
msgid "Inventory Valuation"
msgstr ""
@@ -2666,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
@@ -2682,12 +2593,6 @@ msgid "Inventory of"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_is_follower
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_location_return_location
msgid "Is a Return Location?"
msgstr ""
@@ -2731,12 +2636,6 @@ msgid "Last 10 Done Pickings"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_last_post
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_make_procurement___last_update
#: model:ir.model.fields,field_description:stock.field_procurement_orderpoint_compute___last_update
#: model:ir.model.fields,field_description:stock.field_product_putaway___last_update
@@ -2756,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
@@ -2766,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"
@@ -2788,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
@@ -2799,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"
@@ -2821,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
@@ -2832,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:4730
+#: 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
@@ -2894,11 +2793,6 @@ msgid "Like with the sales flow, Odoo inventory management is\n"
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"
msgstr ""
@@ -2919,18 +2813,24 @@ msgid "Localization"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4912
+#: 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
@@ -2992,15 +2892,8 @@ msgid "Logistics"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4913
-#: 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 ""
@@ -3011,49 +2904,50 @@ msgid "Lot BarCode"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4473
-#, 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
@@ -3070,6 +2964,31 @@ msgid "Lots can be encoded on incoming shipments, internal transfers and\n"
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"
msgstr ""
@@ -3080,7 +2999,7 @@ msgid "Make Procurements"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3463
+#: code:addons/stock/models/stock_warehouse.py:442
#: model:stock.location.route,name:stock.route_warehouse0_mto
#, python-format
msgid "Make To Order"
@@ -3102,11 +3021,6 @@ msgid "Manage Lots / Serial Numbers"
msgstr ""
#. module: stock
-#: model:res.groups,name:stock.group_locations
-msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
-
-#. module: stock
#: model:res.groups,name:stock.group_tracking_lot
msgid "Manage Packages"
msgstr ""
@@ -3132,6 +3046,26 @@ msgid "Manage default locations per product"
msgstr ""
#. module: stock
+#: model:res.groups,name:stock.group_stock_multi_locations
+msgid "Manage multiple stock_locations"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_multi_warehouses
+msgid "Manage multiple warehouses"
+msgstr ""
+
+#. module: stock
+#: selection:stock.config.settings,warehouse_and_location_usage_level:0
+msgid "Manage only 1 Warehouse with only 1 stock location"
+msgstr ""
+
+#. module: stock
+#: selection:stock.config.settings,warehouse_and_location_usage_level:0
+msgid "Manage only 1 Warehouse, composed by several stock locations"
+msgstr ""
+
+#. module: stock
#: selection:stock.config.settings,module_stock_picking_wave:0
msgid "Manage picking in batch per worker"
msgstr ""
@@ -3147,8 +3081,23 @@ msgid "Manage product manufacturing chains"
msgstr ""
#. module: stock
-#: selection:stock.config.settings,group_stock_multiple_locations:0
-msgid "Manage several locations per warehouse"
+#: 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"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations
+msgid "Manage several stock locations"
+msgstr ""
+
+#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_warehouses
+msgid "Manage several warehouses"
msgstr ""
#. module: stock
@@ -3162,6 +3111,11 @@ 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"
msgstr ""
@@ -3177,9 +3131,8 @@ msgid "Maximum Quantity"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_ids
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_ids
-msgid "Messages"
+#: model:ir.model.fields,field_description:stock.field_res_partner_picking_warn_msg
+msgid "Message for Stock Picking"
msgstr ""
#. module: stock
@@ -3235,6 +3188,11 @@ 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"
" to your preconfigured logistics rules, but you can also record\n"
@@ -3248,17 +3206,12 @@ 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"
msgstr ""
@@ -3279,6 +3232,11 @@ msgid "Move date: scheduled date until move is done, then date of actual move pr
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"
msgstr ""
@@ -3323,15 +3281,9 @@ msgid "Moves that operate(d) on this quant"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multiple_locations
-msgid "Multi Locations"
-msgstr ""
-
-#. module: stock
#: 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 ""
@@ -3352,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 ""
@@ -3382,6 +3338,11 @@ 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"
msgstr ""
@@ -3397,19 +3358,19 @@ msgid "No automatic routing of products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1589
+#: code:addons/stock/models/stock_picking.py:821
#, python-format
msgid "No negative quantities allowed"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:73
+#: 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 ""
@@ -3420,11 +3381,6 @@ 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"
msgstr ""
@@ -3449,7 +3405,7 @@ msgid "Notes"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1040
+#: code:addons/stock/models/stock_picking.py:461
#, python-format
msgid "Nothing to check the availability for."
msgstr ""
@@ -3460,12 +3416,6 @@ msgid "Now, all your product quantities are correctly set."
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_procurement_rule_delay
msgid "Number of Days"
msgstr ""
@@ -3481,19 +3431,7 @@ msgid "Number of days needed to transfer the goods"
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_message_needaction_counter
-#: model:ir.model.fields,help:stock.field_stock_production_lot_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,help:stock.field_stock_production_lot_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:4734
+#: code:addons/stock/models/stock_picking.py:68
#, python-format
msgid "OK"
msgstr ""
@@ -3548,32 +3486,33 @@ msgid "Once it's fully working, give us some feedback: we love to hear from our
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2879
+#: code:addons/stock/models/stock_inventory.py:100
#, python-format
msgid "One Lot/Serial Number"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2876
+#: code:addons/stock/models/stock_inventory.py:98
#, python-format
msgid "One owner only"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2877
+#: code:addons/stock/models/stock_inventory.py:91
#, python-format
-msgid "One product for a specific owner"
+msgid "One product category"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2867
+#: code:addons/stock/models/stock_inventory.py:98
#, python-format
-msgid "One product only"
+msgid "One product for a specific owner"
msgstr ""
#. module: stock
-#: model:ir.actions.client,name:stock.action_client_warehouse_menu
-msgid "Open Warehouse Menu"
+#: code:addons/stock/models/stock_inventory.py:92
+#, python-format
+msgid "One product only"
msgstr ""
#. module: stock
@@ -3582,7 +3521,7 @@ msgid "Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4490
+#: code:addons/stock/models/stock_pack_operation.py:215
#, python-format
msgid "Operation Details"
msgstr ""
@@ -3593,6 +3532,18 @@ msgid "Operation Name"
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_type_form
+#: model:ir.ui.view,arch_db:stock.view_picking_type_list
+#: model:ir.ui.view,arch_db:stock.view_picking_type_tree
+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
msgid "Operations"
@@ -3641,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
@@ -3667,7 +3619,12 @@ msgid "Original Move"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:576
+#: 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 ""
@@ -3689,7 +3646,7 @@ msgid "Outgoing Shippings"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3757
+#: code:addons/stock/models/stock_warehouse.py:95
#: model:stock.location,name:stock.stock_location_output
#, python-format
msgid "Output"
@@ -3707,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 ""
@@ -3727,13 +3685,13 @@ msgid "Owner of the quants"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:311
+#: code:addons/stock/models/product.py:325
#, python-format
msgid "P&L Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3692
+#: 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
@@ -3746,13 +3704,19 @@ 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:4914
+#: 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
@@ -3772,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 ""
@@ -3794,9 +3757,20 @@ msgid "Package Transfers"
msgstr ""
#. module: stock
+#: model:ir.model.fields,field_description:stock.field_stock_quant_package_packaging_id
+msgid "Package Type"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_packagings
+msgid "Package Types"
+msgstr ""
+
+#. module: stock
#: model:ir.actions.act_window,name:stock.action_package_view
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot
#: model:ir.ui.menu,name:stock.menu_package
+#: model:ir.ui.menu,name:stock.menu_packages_config
#: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form
msgid "Packages"
msgstr ""
@@ -3807,7 +3781,6 @@ msgid "Packages are usually created by pack operations made on transfers and can
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_quant_package_packaging_id
#: model:ir.ui.view,arch_db:stock.quant_package_search_view
msgid "Packaging"
msgstr ""
@@ -3818,11 +3791,6 @@ msgid "Packaging Methods"
msgstr ""
#. module: stock
-#: model:ir.ui.menu,name:stock.menu_packagings
-msgid "Packagings"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_warehouse_wh_pack_stock_loc_id
msgid "Packing Location"
msgstr ""
@@ -3833,7 +3801,7 @@ msgid "Packing Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3758
+#: code:addons/stock/models/stock_warehouse.py:96
#: model:stock.location,name:stock.location_pack_zone
#, python-format
msgid "Packing Zone"
@@ -3861,13 +3829,17 @@ 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"
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 ""
@@ -3893,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
@@ -3919,19 +3891,19 @@ msgid "Physical Packages"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3704
+#: code:addons/stock/models/stock_warehouse.py:221
#, python-format
msgid "Pick"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3809
+#: code:addons/stock/models/stock_warehouse.py:403
#, python-format
msgid "Pick + Pack + Ship"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3808
+#: code:addons/stock/models/stock_warehouse.py:402
#, python-format
msgid "Pick + Ship"
msgstr ""
@@ -3948,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 ""
@@ -3993,15 +3966,6 @@ msgid "Picking Type for Returns"
msgstr ""
#. module: stock
-#: model:ir.ui.menu,name:stock.stock_picking_type_config
-#: model:ir.ui.view,arch_db:stock.view_picking_type_form
-#: model:ir.ui.view,arch_db:stock.view_picking_type_list
-#: model:ir.ui.view,arch_db:stock.view_picking_type_tree
-#: model:ir.ui.view,arch_db:stock.view_warehouse
-msgid "Picking Types"
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_picking_wave
msgid "Picking Waves"
msgstr ""
@@ -4047,27 +4011,26 @@ msgid "Planner"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1546
+#: code:addons/stock/models/stock_picking.py:777
#, python-format
msgid "Please create some Initial Demand or Mark as Todo and create some Operations. "
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1706
+#: code:addons/stock/models/stock_picking.py:1006
#, python-format
msgid "Please process some quantities to put in the pack first!"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2712
+#: 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:155
-#, 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
@@ -4076,6 +4039,11 @@ 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
msgid "Preferred Routes"
@@ -4178,7 +4146,7 @@ msgid "Procurements"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:323
+#: code:addons/stock/models/product.py:335
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -4187,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:253
+#: 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
@@ -4249,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 ""
@@ -4260,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 ""
@@ -4283,8 +4252,9 @@ msgid "Production Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:243
+#: 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
@@ -4308,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:298
#, python-format
msgid "Products: "
msgstr ""
@@ -4339,7 +4314,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_location_path
-msgid "Pushed Flows"
+msgid "Pushed Flow"
msgstr ""
#. module: stock
@@ -4359,12 +4334,6 @@ 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"
msgstr ""
@@ -4375,7 +4344,12 @@ msgid "Qty Multiple must be greater than or equal to zero."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3756
+#: 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 ""
@@ -4386,7 +4360,7 @@ msgid "Quality Control Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2105
+#: 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 ""
@@ -4395,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 ""
@@ -4421,7 +4395,7 @@ msgid "Quantity Reserved"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:73
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
#, python-format
msgid "Quantity cannot be negative."
msgstr ""
@@ -4473,18 +4447,24 @@ msgid "Quantity that has already been reserved for this move"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.quantsact
+#: 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.quant_search_view
#: model:ir.ui.view,arch_db:stock.view_quant_package_form
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_form
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_graph_value
-#: model:ir.ui.view,arch_db:stock.view_stock_quant_tree
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
#: model:ir.ui.view,arch_db:stock.view_picking_internal_search
@@ -4492,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 ""
@@ -4508,28 +4489,27 @@ msgid "Receipt Route"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3803
+#: code:addons/stock/models/stock_warehouse.py:400
#, python-format
msgid "Receipt in 1 step"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3804
+#: code:addons/stock/models/stock_warehouse.py:400
#, python-format
msgid "Receipt in 2 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3805
+#: code:addons/stock/models/stock_warehouse.py:401
#, python-format
msgid "Receipt in 3 steps"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3656
+#: 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"
@@ -4541,7 +4521,7 @@ msgid "Receive goods directly in stock (1 step)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:295
+#: code:addons/stock/models/product.py:312
#, python-format
msgid "Received Qty"
msgstr ""
@@ -4563,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
@@ -4612,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
@@ -4627,7 +4608,7 @@ msgid "Removal Strategy"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:529
+#: code:addons/stock/models/stock_quant.py:449
#, python-format
msgid "Removal strategy %s not implemented."
msgstr ""
@@ -4652,6 +4633,18 @@ 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"
msgstr ""
@@ -4668,12 +4661,12 @@ msgstr ""
#. module: stock
#: selection:stock.config.settings,module_procurement_jit:0
-msgid "Reserve sale orders immediately on confirmation"
+msgid "Reserve products immediately after the sale order confirmation"
msgstr ""
#. module: stock
#: selection:stock.config.settings,module_procurement_jit:0
-msgid "Reserve sale orders manually or by running the schedulers"
+msgid "Reserve products manually or based on automatic scheduler"
msgstr ""
#. module: stock
@@ -4712,11 +4705,6 @@ 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"
msgstr ""
@@ -4727,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 ""
@@ -4742,17 +4731,12 @@ msgid "Return Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:178
+#: 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"
msgstr ""
@@ -4767,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 ""
@@ -4865,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:1013
+#: 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:2867
+#: code:addons/stock/models/stock_inventory.py:93
#, python-format
msgid "Select products manually"
msgstr ""
@@ -4919,6 +4909,11 @@ 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
#: model:ir.model.fields,field_description:stock.field_stock_move_sequence
@@ -4928,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
@@ -4994,22 +4999,12 @@ 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:3807
+#: code:addons/stock/models/stock_warehouse.py:402
#, python-format
msgid "Ship Only"
msgstr ""
@@ -5040,19 +5035,14 @@ 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 unit of measures (advanced)"
+msgid "Some products may be sold/purchased in different units of measure (advanced)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1554
+#: code:addons/stock/models/stock_picking.py:785
#, 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
@@ -5063,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 ""
@@ -5075,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"
@@ -5091,11 +5083,6 @@ 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."
msgstr ""
@@ -5111,6 +5098,11 @@ 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."
msgstr ""
@@ -5129,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
@@ -5137,8 +5131,7 @@ msgid "Status"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3754
-#: 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"
@@ -5184,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
@@ -5209,16 +5202,27 @@ 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)"
msgstr ""
@@ -5234,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
@@ -5250,12 +5253,6 @@ msgid "Supplied Warehouse"
msgstr ""
#. module: stock
-#: selection:stock.picking,picking_type_code:0
-#: selection:stock.picking.type,code:0
-msgid "Suppliers"
-msgstr ""
-
-#. module: stock
#: selection:stock.config.settings,module_stock_dropshipping:0
msgid "Suppliers always deliver to your warehouse(s)"
msgstr ""
@@ -5302,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
@@ -5311,11 +5308,6 @@ msgid "Technical field used to depict a restriction on the ownership of quants t
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"
msgstr ""
@@ -5331,6 +5323,22 @@ msgid "Technical field used to track the origin of a split move, which can be us
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"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,field_description:stock.field_make_procurement_product_tmpl_id
#: model:ir.model.fields,field_description:stock.field_stock_change_product_qty_product_tmpl_id
msgid "Template"
@@ -5338,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
@@ -5358,12 +5366,6 @@ msgid "The barcode for a location must be unique per company !"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4316
-#, 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!"
msgstr ""
@@ -5374,6 +5376,11 @@ msgid "The combination of serial number and product must be unique !"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_warehouse_company_id
+msgid "The company is automatically set from your user preferences."
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_stock_quant_company_id
msgid "The company to which the quants belong"
msgstr ""
@@ -5384,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:3940
+#: 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:1192
+#: 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 ""
@@ -5431,6 +5438,11 @@ msgid "The package containing this quant"
msgstr ""
#. module: stock
+#: model:ir.model.fields,help:stock.field_stock_location_location_id
+msgid "The parent location that includes this location. Example : The 'Dispatch Zone' is the 'Gate 1' parent location."
+msgstr ""
+
+#. module: stock
#: model:ir.model,name:stock.model_stock_picking_type
msgid "The picking type determines the picking view"
msgstr ""
@@ -5445,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
@@ -5459,7 +5471,7 @@ msgid "The push rule that created this stock move"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4421
+#: 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 ""
@@ -5470,37 +5482,34 @@ msgid "The quotation becomes a Sale Order and a Transfer Order is created"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1884
+#: 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:2641
+#: code:addons/stock/models/stock_move.py:814
#, python-format
-msgid "The roundings of your Unit of Measures %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. "
+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:4309
+#: 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:573
+#: code:addons/stock/models/stock_quant.py:246
#, python-format
-msgid "The serial number %s is already in stock"
+msgid "The serial number %s is already in stock."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1195
+#: 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 ""
@@ -5548,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 ""
@@ -5575,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
@@ -5594,13 +5604,18 @@ 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."
msgstr ""
@@ -5621,6 +5636,11 @@ msgid "This rule can be applied when a move is confirmed that has this location
msgstr ""
#. module: stock
+#: model:ir.ui.view,arch_db:stock.report_delivery_document
+msgid "This shipment is a backorder of"
+msgstr ""
+
+#. module: stock
#: model:ir.model.fields,help:stock.field_res_partner_property_stock_customer
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
msgstr ""
@@ -5654,11 +5674,6 @@ msgid "This way you can receive products attributed to a certain owner. "
msgstr ""
#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_multiple_locations
-msgid "This will show you the locations and allows you to define multiple picking types and warehouses."
-msgstr ""
-
-#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_to_loc
msgid "To"
msgstr ""
@@ -5688,7 +5703,7 @@ msgstr ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.inventory_planner
msgid "To check the trajectory of a lot, find it back in <strong><i>Inventory Control &gt; Serial Numbers / lots</i></strong>.\n"
-" Choose a Lo t in the list and click on <i>Traceability</i>i&gt;. You may also\n"
+" Choose a lot in the list and click on <i>Traceability</i>i&gt;. You may also\n"
" filter the Quantitative Valuation of a product with a certain lot."
msgstr ""
@@ -5708,12 +5723,17 @@ 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:1746
+#: 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
@@ -5726,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
@@ -5742,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:2835
+#: code:addons/stock/models/stock_move.py:956
#: 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
@@ -5786,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 ""
@@ -5806,14 +5828,15 @@ msgid "USPS integration"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:730
+#: 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
@@ -5835,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
@@ -5852,10 +5877,6 @@ msgstr ""
#. module: stock
#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_uom
-msgid "Unit of Measures"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
#: model:ir.ui.view,arch_db:stock.inventory_planner
@@ -5868,7 +5889,7 @@ msgid "Units of Measures"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4169
+#: code:addons/stock/models/stock_quant.py:551
#, python-format
msgid "Unknown Pack"
msgstr ""
@@ -5894,34 +5915,17 @@ msgid "Unpack"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:317
+#: code:addons/stock/models/product.py:330
#, python-format
msgid "Unplanned Qty"
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_unread
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_message_unread_counter
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: stock
#: model:ir.ui.view,arch_db:stock.view_picking_form
msgid "Unreserve"
msgstr ""
#. 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"
msgstr ""
@@ -5947,20 +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."
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_type_list
-msgid "Use your scanner to validate the transferred quantity quicker."
+" 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
@@ -5994,14 +5993,17 @@ 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 ""
#. module: stock
#: model:ir.ui.view,arch_db:stock.view_location_search
-#: model:ir.ui.view,arch_db:stock.view_move_tree_receipt_picking
msgid "Vendor"
msgstr ""
@@ -6018,6 +6020,7 @@ msgstr ""
#. module: stock
#: model:stock.location,name:stock.stock_location_suppliers
+#: selection:stock.picking.type,code:0
msgid "Vendors"
msgstr ""
@@ -6058,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 ""
@@ -6066,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 ""
@@ -6091,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
@@ -6124,7 +6126,7 @@ msgid "Warehouse to consider for the route selection"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:3977
+#: code:addons/stock/models/stock_warehouse.py:688
#, python-format
msgid "Warehouse's Routes"
msgstr ""
@@ -6138,22 +6140,25 @@ msgid "Warehouses"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:338
-#: code:addons/stock/wizard/stock_return_picking.py:48
-#, python-format
-msgid "Warning!"
+#: model:ir.model.fields,field_description:stock.field_stock_config_settings_warehouse_and_location_usage_level
+msgid "Warehouses and Locations usage level"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:4308
-#, python-format
-msgid "Warning: wrong UoM!"
+#: 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:4315
+#: model:ir.ui.view,arch_db:stock.view_partner_stock_warnings_form
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/product.py:291
#, python-format
-msgid "Warning: wrong quantity!"
+msgid "Warning!"
msgstr ""
#. module: stock
@@ -6178,15 +6183,9 @@ msgid "We hope this guide helped you implement Odoo Inventory."
msgstr ""
#. module: stock
-#: model:ir.model.fields,field_description:stock.field_stock_picking_website_message_ids
-#: model:ir.model.fields,field_description:stock.field_stock_production_lot_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: stock
-#: model:ir.model.fields,help:stock.field_stock_picking_website_message_ids
-#: model:ir.model.fields,help:stock.field_stock_production_lot_website_message_ids
-msgid "Website communication history"
+#: code:addons/stock/models/barcode.py:11
+#, python-format
+msgid "Weighted Product"
msgstr ""
#. module: stock
@@ -6269,11 +6268,6 @@ msgid "You can delete lines to ignore some products."
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_type_list
-msgid "You can either do it immediatly or mark it as Todo for future processing."
-msgstr ""
-
-#. module: stock
#: model:ir.actions.act_window,help:stock.action_picking_form
#: model:ir.actions.act_window,help:stock.action_picking_tree_all
#: model:ir.actions.act_window,help:stock.action_picking_tree_backorder
@@ -6282,30 +6276,31 @@ msgstr ""
#: model:ir.actions.act_window,help:stock.action_picking_tree_late
#: model:ir.actions.act_window,help:stock.action_picking_tree_ready
#: model:ir.actions.act_window,help:stock.action_picking_tree_waiting
+#: model:ir.actions.act_window,help:stock.action_picking_type_list
#: model:ir.actions.act_window,help:stock.stock_picking_action_picking_type
-msgid "You can either do it immediatly or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker."
+msgid "You can either do it immediately or mark it as Todo for future processing. Use your scanner to validate the transferred quantity quicker."
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:517
+#: code:addons/stock/models/product.py:458
#, 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:4432
+#: 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:384
+#: 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:2696
+#: code:addons/stock/models/stock_move.py:898
#, python-format
msgid "You can only delete draft moves."
msgstr ""
@@ -6316,32 +6311,44 @@ msgid "You can review and edit the predefined units via the"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2435
+#: code:addons/stock/models/stock_move.py:651
#, python-format
msgid "You cannot cancel a stock move that has been set to 'Done'."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:718
+#: 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 validatethe first inventory adjustement with this product before creating another one."
+msgstr ""
+
+#. module: stock
+#: 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:2946
+#: 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:2772
+#: code:addons/stock/models/stock_move.py:915
#, python-format
msgid "You cannot split a draft move. It needs to be confirmed first."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2768
+#: code:addons/stock/models/stock_move.py:911
#, python-format
msgid "You cannot split a move done"
msgstr ""
@@ -6353,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:2595
+#: code:addons/stock/models/stock_move.py:797
#, python-format
msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. "
msgstr ""
@@ -6369,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:129
+#: code:addons/stock/wizard/stock_picking_return.py:114
#, python-format
msgid "You have manually created product lines, please delete them to proceed"
msgstr ""
@@ -6380,55 +6387,51 @@ msgid "You have processed less products than the initial demand."
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:339
+#: code:addons/stock/models/product.py:292
#, 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:2320
-#: code:addons/stock/stock.py:4443
+#: code:addons/stock/models/stock_move.py:552
+#: 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:568
+#: 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:4447
+#: 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 ""
@@ -6461,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 ""
@@ -6544,12 +6546,8 @@ msgid "is displayed on the transfer if your products supply chain is properly co
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 ""
@@ -6569,11 +6567,6 @@ 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"
msgstr ""
@@ -6594,6 +6587,11 @@ 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"
msgstr ""
@@ -6604,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
@@ -6659,3 +6635,4 @@ msgstr ""
#: model:ir.ui.view,arch_db:stock.view_inventory_form
msgid "⇒ Set quantities to 0"
msgstr ""
+
diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot
index 35fce9a4c0d..95c3bd14be8 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-01 06:26+0000\n"
-"PO-Revision-Date: 2015-10-01 06:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,49 +26,40 @@ 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:58
-#, 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."
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_asset_category_id
-msgid "Asset Type"
-msgstr ""
-
-#. module: stock_account
#: selection:product.category,property_cost_method:0
#: selection:product.template,property_cost_method:0
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
msgid "Cancel"
msgstr ""
#. module: stock_account
+#: 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/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 ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
msgid "Change Price"
msgstr ""
@@ -96,27 +87,35 @@ 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
msgid "Company"
msgstr ""
#. module: stock_account
+#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
msgid "Compute from average price"
msgstr ""
#. module: stock_account
+#: 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 ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
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
#: model:ir.model.fields,field_description:stock_account.field_product_template_property_cost_method
@@ -124,6 +123,11 @@ msgid "Costing Method"
msgstr ""
#. module: stock_account
+#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_counterpart_account_id
+msgid "Counter-Part Account"
+msgstr ""
+
+#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_create_uid
#: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history_create_uid
msgid "Created by"
@@ -141,11 +145,6 @@ msgid "Date"
msgstr ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_deferred_revenue_category_id
-msgid "Deferred Revenue Type"
-msgstr ""
-
-#. module: stock_account
#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_display_name
#: model:ir.model.fields,field_description:stock_account.field_stock_history_display_name
#: model:ir.model.fields,field_description:stock_account.field_wizard_valuation_history_display_name
@@ -268,17 +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:124
+#: code:addons/stock_account/models/product.py:111
#, python-format
msgid "No difference between standard price and new price!"
msgstr ""
@@ -328,11 +328,6 @@ 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
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
@@ -340,21 +335,11 @@ 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
#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_search
@@ -362,11 +347,6 @@ 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"
msgstr ""
@@ -388,9 +368,9 @@ 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"
+#: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit
+#: model:ir.ui.view,arch_db:stock_account.view_template_property_form
+msgid "Set standard price"
msgstr ""
#. module: stock_account
@@ -399,24 +379,14 @@ 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
msgid "Standard Price"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/product.py:145
-#: code:addons/stock_account/product.py:152
+#: code:addons/stock_account/models/product.py:126
+#: code:addons/stock_account/models/product.py:131
#, python-format
msgid "Standard Price changed"
msgstr ""
@@ -425,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
@@ -437,6 +407,11 @@ msgid "Standard Price: The cost price is manually updated at the end of a specif
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
#: model:ir.model.fields,field_description:stock_account.field_product_template_property_stock_account_input
@@ -444,7 +419,7 @@ msgid "Stock Input Account"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:418
+#: 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"
@@ -453,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 ""
@@ -479,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
@@ -494,18 +470,14 @@ msgid "Templates for Account Chart"
msgstr ""
#. module: stock_account
-#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
-msgid "Total Value"
-msgstr ""
-
-#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_uos_coeff
-msgid "Unit of Measure -> UOS Coeff"
+#: 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 ""
#. module: stock_account
-#: model:ir.model.fields,field_description:stock_account.field_product_product_uos_id
-msgid "Unit of Sale"
+#: model:ir.ui.view,arch_db:stock_account.view_stock_history_report_tree
+msgid "Total Value"
msgstr ""
#. module: stock_account
@@ -519,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
@@ -581,12 +539,18 @@ msgid "Wizard that opens the stock valuation history table"
msgstr ""
#. module: stock_account
-#: code:addons/stock_account/stock_account.py:275
+#: 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/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 ""
+
+#. module: stock_account
#: model:ir.ui.view,arch_db:stock_account.view_change_standard_price
msgid "_Apply"
msgstr ""
@@ -601,11 +565,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 0198db7a946..e31ffc868b2 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:40+0000\n"
-"PO-Revision-Date: 2015-09-07 14:40+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+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
@@ -56,11 +56,6 @@ 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"
msgstr ""
diff --git a/addons/stock_dropshipping/i18n/stock_dropshipping.pot b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
index 78747a388a2..a4702aeda5c 100644
--- a/addons/stock_dropshipping/i18n/stock_dropshipping.pot
+++ b/addons/stock_dropshipping/i18n/stock_dropshipping.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot
index 6ec868e2b10..882fa3126fb 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:10+0000\n"
-"PO-Revision-Date: 2015-09-18 08:10+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,10 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:126
-#: code:addons/stock_landed_costs/stock_landed_costs.py:130
+#: 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 ""
@@ -33,11 +35,6 @@ msgid "Account Journal"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_additional_landed_cost
msgid "Additional Landed Cost"
msgstr ""
@@ -108,6 +105,12 @@ 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
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_create_uid
@@ -127,18 +130,13 @@ msgid "Date"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines_name
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_name
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 ""
@@ -169,23 +167,17 @@ msgid "Equal"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_final_cost
-msgid "Final Cost"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_channel_ids
-msgid "Followers (Channels)"
+#: model:ir.model.fields,help:stock_landed_costs.field_product_template_split_method
+msgid "Equal : Cost will be equally divided.\n"
+"By Quantity : Cost will be divided according to product's quantity.\n"
+"By Current cost : Cost will be divided according to product's current cost.\n"
+"By Weight : Cost will be divided depending on its weight.\n"
+"By Volume : Cost will be divided depending on its volume."
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_partner_ids
-msgid "Followers (Partners)"
+#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_final_cost
+msgid "Final Cost"
msgstr ""
#. module: stock_landed_costs
@@ -211,26 +203,11 @@ msgid "ID"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form
msgid "Information"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_description
msgid "Item Description"
msgstr ""
@@ -268,13 +245,13 @@ msgid "Landed Costs"
msgstr ""
#. module: stock_landed_costs
-#: model:mail.message.subtype,description:stock_landed_costs.mt_stock_landed_cost_open
-msgid "Landed cost validated"
+#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
+msgid "Landed cost are computed based on the purchase unit of measure."
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_last_post
-msgid "Last Message Date"
+#: model:mail.message.subtype,description:stock_landed_costs.mt_stock_landed_cost_open
+msgid "Landed cost validated"
msgstr ""
#. module: stock_landed_costs
@@ -299,16 +276,6 @@ msgid "Last Updated on"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_search
msgid "Month"
msgstr ""
@@ -320,22 +287,13 @@ msgid "Name"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_message_unread_counter
-msgid "Number of unread messages"
+#: 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/stock_landed_costs.py:181
+#: code:addons/stock_landed_costs/models/stock_landed_cost.py:75
#, python-format
msgid "Only draft landed costs can be validated"
msgstr ""
@@ -346,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 ""
@@ -420,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 ""
@@ -431,22 +389,12 @@ msgid "Total"
msgstr ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form
msgid "Validate"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:212
+#: 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 ""
@@ -463,33 +411,17 @@ 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 ""
#. module: stock_landed_costs
-#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: stock_landed_costs
-#: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: stock_landed_costs
#: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines_weight
msgid "Weight"
msgstr ""
#. module: stock_landed_costs
-#: code:addons/stock_landed_costs/stock_landed_costs.py:183
-#, 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..."
msgstr ""
diff --git a/addons/stock_picking_wave/i18n/stock_picking_wave.pot b/addons/stock_picking_wave/i18n/stock_picking_wave.pot
index b936d005d7f..309cdf1785d 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:11+0000\n"
-"PO-Revision-Date: 2015-09-18 08:11+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,11 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.model,name:stock_picking_wave.model_stock_picking_to_wave
msgid "Add pickings to a picking wave"
msgstr ""
@@ -81,11 +76,6 @@ msgid "Created on"
msgstr ""
#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave_display_name
#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_display_name
msgid "Display Name"
@@ -103,21 +93,6 @@ msgid "Draft"
msgstr ""
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_form
msgid "Force availability"
msgstr ""
@@ -134,51 +109,11 @@ 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 stucks"
-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.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
msgid "In Progress"
msgstr ""
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_to_wave___last_update
#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave___last_update
msgid "Last Modified on"
@@ -202,51 +137,26 @@ msgid "List of picking associated to this wave"
msgstr ""
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_name
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 ""
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_user_id
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_9563
+#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_id_10313
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
#, python-format
msgid "Picking Wave"
@@ -269,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_9563
+#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_id_10313
msgid "Picking wave associated to this picking"
msgstr ""
@@ -281,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
@@ -305,24 +215,12 @@ 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
msgid "Stage Changed"
@@ -342,7 +240,7 @@ msgstr ""
#. module: stock_picking_wave
#: model:ir.actions.act_window,help:stock_picking_wave.action_picking_wave
-msgid "The Goal of the picking waves is to group operations that may \n"
+msgid "The goal of the picking waves is to group operations that may\n"
" (needs to) be done together in order to increase their efficiency.\n"
" It may also be useful to assign jobs (one person = one wave) or\n"
" help the timing management of operations (tasks to be done at 1pm)."
@@ -354,22 +252,12 @@ 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 ""
#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: stock_picking_wave
#: model:ir.ui.view,arch_db:stock_picking_wave.view_picking_wave_filter
msgid "User"
msgstr ""
@@ -379,13 +267,3 @@ msgstr ""
msgid "Wave"
msgstr ""
-#. module: stock_picking_wave
-#: model:ir.model.fields,field_description:stock_picking_wave.field_stock_picking_wave_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: stock_picking_wave
-#: model:ir.model.fields,help:stock_picking_wave.field_stock_picking_wave_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index 6c621e86e56..1b1cba55c0f 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -147,7 +147,7 @@ msgstr ""
#. module: subscription
#: model:ir.model.fields,field_description:subscription.field_subscription_subscription_interval_number
-msgid "Interval Qty"
+msgid "Internal Qty"
msgstr ""
#. module: subscription
@@ -198,7 +198,7 @@ msgstr ""
#. module: subscription
#: model:ir.model.fields,field_description:subscription.field_subscription_subscription_exec_init
-msgid "Number of documents"
+msgid "Number of Documents"
msgstr ""
#. module: subscription
@@ -213,7 +213,7 @@ msgid "Partner"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:101
+#: code:addons/subscription/models/subscription.py:88
#, python-format
msgid "Please provide another source document.\n"
"This one does not exist!"
@@ -282,6 +282,11 @@ msgid "Subscription"
msgstr ""
#. module: subscription
+#: model:ir.ui.view,arch_db:subscription.view_subscription_form
+msgid "Subscription Data"
+msgstr ""
+
+#. module: subscription
#: model:ir.model,name:subscription.model_subscription_document
#: model:ir.model.fields,field_description:subscription.field_subscription_document_fields_document_id
#: model:ir.ui.view,arch_db:subscription.document_form
@@ -315,11 +320,6 @@ msgid "Subscriptions"
msgstr ""
#. module: subscription
-#: model:ir.ui.view,arch_db:subscription.view_subscription_form
-msgid "Subsription Data"
-msgstr ""
-
-#. module: subscription
#: model:ir.model.fields,field_description:subscription.field_subscription_subscription_user_id
#: model:ir.ui.view,arch_db:subscription.view_subscription_filter
msgid "User"
@@ -336,7 +336,7 @@ msgid "Weeks"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:128
+#: code:addons/subscription/models/subscription.py:111
#, python-format
msgid "You cannot delete an active subscription!"
msgstr ""
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index ab38f37bac4..568fccbddfe 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,10 @@ msgstr ""
#: model:mail.template,body_html:survey.email_template_survey
msgid "\n"
" \n"
-" <div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); \">\n"
-" <p>Hello,</p>\n"
-" <p>We are conducting a survey, and your response would be appreciated.</p>\n"
-" <p><a href=\"__URL__\">Please, click here to start survey</a></p>\n"
-" <p>Thanks for your participation!</p>\n"
-" </div>\n"
+"<p>Hello,</p>\n"
+"<p>We are conducting a survey, and your response would be appreciated.</p>\n"
+"<p><a style=\"margin-left: 85px; padding:5px 10px; border-radius: 3px; background-color:#a24689; text-align:center; text-decoration:none; color:#F7FBFD;\" href=\"__URL__\">Please, click here to start survey</a></p>\n"
+"<p>Thanks for your participation!</p>\n"
" \n"
" "
msgstr ""
@@ -35,9 +33,7 @@ msgid "#Questions"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:229
-#: code:addons/survey/survey.py:525
-#: code:addons/survey/survey.py:647
+#: code:addons/survey/models/survey.py:136
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -165,11 +161,6 @@ msgid "<span>\n"
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!"
msgstr ""
@@ -190,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 ""
@@ -205,18 +192,8 @@ 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_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_active_domain
-msgid "Active domain"
+#: model:ir.model.fields,field_description:survey.field_survey_survey_active
+msgid "Active"
msgstr ""
#. module: survey
@@ -230,14 +207,6 @@ 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"
msgstr ""
@@ -273,18 +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:ir.model.fields,help:survey.field_survey_mail_compose_message_no_auto_thread
-msgid "Answers do not go in the original document discussion thread. This has an impact on the generated message-id."
-msgstr ""
-
-#. module: survey
-#: model: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
@@ -293,23 +258,8 @@ msgid "Attachments"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_author_id
-msgid "Author"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_author_id
-msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_author_avatar
-msgid "Author's avatar"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_body
-msgid "Automatically sanitized HTML contents"
+#: 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
@@ -318,26 +268,11 @@ msgid "Back to Survey"
msgstr ""
#. module: survey
-#: model:survey.label,value:survey.choice_1_2_4
-msgid "CRM"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Cancel"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_channel_ids
-msgid "Channels"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_child_ids
-msgid "Child Messages"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Choices"
msgstr ""
@@ -348,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
@@ -384,7 +317,6 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.result_comments
-#: selection:survey.mail.compose.message,message_type:0
msgid "Comment"
msgstr ""
@@ -399,11 +331,6 @@ 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
#: selection:survey.user_input,state:0
@@ -416,31 +343,16 @@ msgid "Compose Email"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_composition_mode
-msgid "Composition mode"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.menu,name:survey.menu_surveys_configuration
msgid "Configuration"
msgstr ""
#. 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"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_body
-msgid "Contents"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Copy and paste the HTML code below to add this web link to any webpage."
msgstr ""
@@ -485,12 +397,6 @@ msgid "Creation Date"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_starred
-msgid "Current user has a starred notification linked to this message"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_date
#: selection:survey.user_input_line,answer_type:0
msgid "Date"
msgstr ""
@@ -511,18 +417,13 @@ msgid "Date by which the person can open the survey and submit answers"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_deadline
msgid "Deadline"
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
@@ -543,11 +444,6 @@ 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"
msgstr ""
@@ -563,14 +459,6 @@ msgid "Design easily your survey, send invitations to answer by email and analys
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
#: model:ir.model.fields,field_description:survey.field_survey_page_display_name
@@ -589,21 +477,6 @@ 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"
msgstr ""
@@ -625,7 +498,6 @@ msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
-#: selection:survey.mail.compose.message,message_type:0
msgid "Email"
msgstr ""
@@ -635,23 +507,12 @@ msgid "Email Template"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_email_from
-msgid "Email address of the sender. This field is set when no matching partner is found and replaces the author_id field in the chatter."
-msgstr ""
-
-#. module: survey
#: model:ir.model,name:survey.model_survey_mail_compose_message
msgid "Email composition wizard for Survey"
msgstr ""
#. 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 ""
@@ -661,41 +522,11 @@ 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:ir.model.fields,field_description:survey.field_survey_mail_compose_message_starred_partner_ids
-msgid "Favorited By"
-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"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Format"
msgstr ""
@@ -711,11 +542,6 @@ msgid "Free Text answer"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_email_from
-msgid "From"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_page_search
#: model:ir.ui.view,arch_db:survey.survey_question_search
#: model:ir.ui.view,arch_db:survey.survey_response_line_search
@@ -724,66 +550,6 @@ 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 Ressources"
-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
#: model:ir.model.fields,field_description:survey.field_survey_page_id
@@ -801,47 +567,20 @@ msgid "Identification token"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,help:survey.field_survey_survey_users_can_go_back
msgid "If checked, users can go back to previous pages."
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:631
-#: 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, precise:"
-msgstr ""
-
-#. module: survey
-#: model:survey.page,description:survey.feedback_4
-msgid "If you do not contribute or develop in Odoo, skip this page."
+msgid "If other, please specify:"
msgstr ""
#. module: survey
@@ -855,8 +594,9 @@ msgid "In progress"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_parent_id
-msgid "Initial thread message."
+#: code:addons/survey/wizard/survey_email_compose_message.py:66
+#, python-format
+msgid "Incorrect Email Address: %s"
msgstr ""
#. module: survey
@@ -870,8 +610,8 @@ msgid "Invitations sent"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_is_follower
-msgid "Is Follower"
+#: model:ir.model.fields,field_description:survey.field_survey_survey_is_closed
+msgid "Is closed"
msgstr ""
#. module: survey
@@ -880,36 +620,6 @@ 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"
-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"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label_sequence
msgid "Label Sequence order"
msgstr ""
@@ -921,11 +631,6 @@ msgid "Labels"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_label___last_update
#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message___last_update
#: model:ir.model.fields,field_description:survey.field_survey_page___last_update
@@ -977,11 +682,6 @@ msgid "List of emails"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_is_log
-msgid "Log an Internal Note"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_auth_required
#: model:ir.ui.view,arch_db:survey.auth_required
msgid "Login required"
@@ -1044,36 +744,6 @@ msgid "Maximum value"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_record_name
-msgid "Message Record Name"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_message_type
-msgid "Message type: email for email message, notification for system message, comment for other messages such as user replies"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_message_id
-msgid "Message unique identifier"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_message_id
-msgid "Message-Id"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question_validation_min_date
msgid "Minimum Date"
msgstr ""
@@ -1114,18 +784,6 @@ msgid "Name"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_record_name
-msgid "Name get of the related document."
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_needaction_partner_ids
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_needaction
-msgid "Need Action"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
msgid "New"
msgstr ""
@@ -1136,16 +794,6 @@ msgid "Next page"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_no_auto_thread
-msgid "No threading for answers"
-msgstr ""
-
-#. module: survey
-#: model: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."
msgstr ""
@@ -1171,26 +819,11 @@ msgid "Not started yet"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_notify
-msgid "Notify followers"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_notify
-msgid "Notify followers of the document (mass post only)"
-msgstr ""
-
-#. module: survey
#: selection:survey.user_input_line,answer_type:0
msgid "Number"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_question_column_nb
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Number of columns"
@@ -1202,11 +835,6 @@ msgid "Number of completed surveys"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_tot_sent_survey
msgid "Number of sent surveys"
msgstr ""
@@ -1217,11 +845,6 @@ msgid "Number of started surveys"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_survey_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: survey
#: selection:survey.question,type:0
msgid "Numerical Value"
msgstr ""
@@ -1242,28 +865,12 @@ 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.actions.client,name:survey.action_client_survey_menu
-msgid "Open Survey Menu"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_form
#: model:ir.ui.view,arch_db:survey.survey_question_form
msgid "Options"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_mail_server_id
-msgid "Outgoing mail server"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line_page_id
#: model:ir.ui.view,arch_db:survey.page
#: model:ir.ui.view,arch_db:survey.survey_page_search
@@ -1291,11 +898,6 @@ msgid "Pages"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_parent_id
-msgid "Parent Message"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
#: selection:survey.user_input,state:0
msgid "Partially completed"
@@ -1319,18 +921,12 @@ msgid "Permanent"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_email_compose_message.py:196
+#: 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"
msgstr ""
@@ -1351,11 +947,6 @@ 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"
msgstr ""
@@ -1386,13 +977,7 @@ 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
@@ -1400,6 +985,11 @@ 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
msgid "Question Name"
@@ -1420,13 +1010,8 @@ 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
@@ -1435,26 +1020,6 @@ msgid "Radio Buttons"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_res_id
-msgid "Related Document ID"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_model
-msgid "Related Document Model"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_reply_to
-msgid "Reply email address. Setting the reply_to bypasses the automatic thread creation."
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_reply_to
-msgid "Reply-To"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_survey_result_url
msgid "Results link"
msgstr ""
@@ -1490,16 +1055,6 @@ 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"
msgstr ""
@@ -1560,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
@@ -1622,11 +1177,6 @@ msgid "Skipped"
msgstr ""
#. module: survey
-#: model:ir.model.fields,help:survey.field_survey_mail_compose_message_author_avatar
-msgid "Small-sized image of this contact. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required."
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.page
msgid "Something went wrong while contacting survey server. <strong class=\"text-danger\">Your answers have probably not been recorded.</strong> Try refreshing."
msgstr ""
@@ -1643,11 +1193,6 @@ msgid "Stage"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_starred
-msgid "Starred"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_init
msgid "Start Survey"
msgstr ""
@@ -1663,11 +1208,6 @@ msgid "Status"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_subject
-msgid "Subject"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Subject..."
msgstr ""
@@ -1678,11 +1218,6 @@ msgid "Submit survey"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_subtype_id
-msgid "Subtype"
-msgstr ""
-
-#. module: survey
#: model:ir.model.fields,field_description:survey.field_survey_user_input_line_value_suggested
msgid "Suggested answer"
msgstr ""
@@ -1708,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"
@@ -1787,11 +1323,6 @@ msgid "Surveys"
msgstr ""
#. module: survey
-#: selection:survey.mail.compose.message,message_type:0
-msgid "System notification"
-msgstr ""
-
-#. module: survey
#: model:ir.ui.view,arch_db:survey.survey_kanban
#: model:ir.ui.view,arch_db:survey.survey_user_input_search
msgid "Test"
@@ -1818,140 +1349,62 @@ 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:629
-#: 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:171
+#: 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:685
-#: 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:727
-#: 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:704
-#: 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
@@ -1960,20 +1413,7 @@ msgid "This message will be displayed when survey is completed"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:628
-#: 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 ""
@@ -1994,48 +1434,11 @@ 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.model.fields,help:survey.field_survey_mail_compose_message_tracking_value_ids
-msgid "Tracked values are stored in a separate model. This field allow to reconstructthe tracking and to generate statistics on the model."
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_tracking_value_ids
-msgid "Tracking values"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_message_type
#: model:ir.ui.view,arch_db:survey.survey_question_search
msgid "Type"
msgstr ""
@@ -2056,34 +1459,13 @@ msgid "Types of answers"
msgstr ""
#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_survey_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_use_active_domain
-msgid "Use active domain"
-msgstr ""
-
-#. module: survey
-#: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message_template_id
#: model:ir.ui.view,arch_db:survey.survey_email_compose_message
msgid "Use template"
msgstr ""
#. 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
@@ -2135,6 +1517,11 @@ 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"
msgstr ""
@@ -2150,47 +1537,6 @@ 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:ir.model.fields,help:survey.field_survey_mail_compose_message_is_log
-msgid "Whether the message is an internal note (comment mode only)"
-msgstr ""
-
-#. module: survey
-#: model: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"
msgstr ""
@@ -2202,21 +1548,6 @@ msgid "YYYY-MM-DD hh:mm:ss\n"
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."
msgstr ""
@@ -2227,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:422
+#: 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:427
+#: code:addons/survey/models/survey.py:333
#, python-format
msgid "You cannot send invitations for closed surveys."
msgstr ""
@@ -2249,13 +1580,18 @@ 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"
msgstr ""
#. module: survey
#: model:ir.ui.view,arch_db:survey.page
-msgid "on"
+msgid "of"
msgstr ""
#. module: survey
diff --git a/addons/survey_crm/i18n/survey_crm.pot b/addons/survey_crm/i18n/survey_crm.pot
index 9db242017eb..bbf083f3be3 100644
--- a/addons/survey_crm/i18n/survey_crm.pot
+++ b/addons/survey_crm/i18n/survey_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/utm/i18n/utm.pot b/addons/utm/i18n/utm.pot
index 1bd6687717b..bee1622ea5e 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:37+0000\n"
+"PO-Revision-Date: 2016-08-18 08:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,6 +22,11 @@ msgstr ""
#. module: utm
#: model:ir.model,name:utm.model_utm_campaign
+#: model:ir.model.fields,field_description:utm.field_account_invoice_campaign_id
+#: model:ir.model.fields,field_description:utm.field_crm_lead_campaign_id
+#: model:ir.model.fields,field_description:utm.field_hr_applicant_campaign_id
+#: model:ir.model.fields,field_description:utm.field_link_tracker_campaign_id
+#: model:ir.model.fields,field_description:utm.field_sale_order_campaign_id
#: model:ir.model.fields,field_description:utm.field_utm_mixin_campaign_id
#: model:ir.ui.view,arch_db:utm.utm_campaign_form
#: model:ir.ui.view,arch_db:utm.utm_campaign_tree
@@ -154,6 +159,11 @@ msgstr ""
#. module: utm
#: model:ir.actions.act_window,name:utm.utm_medium_action
+#: model:ir.model.fields,field_description:utm.field_account_invoice_medium_id
+#: model:ir.model.fields,field_description:utm.field_crm_lead_medium_id
+#: model:ir.model.fields,field_description:utm.field_hr_applicant_medium_id
+#: model:ir.model.fields,field_description:utm.field_link_tracker_medium_id
+#: model:ir.model.fields,field_description:utm.field_sale_order_medium_id
#: model:ir.model.fields,field_description:utm.field_utm_mixin_medium_id
#: model:ir.ui.menu,name:utm.menu_utm_medium
#: model:ir.ui.view,arch_db:utm.utm_medium_view_tree
@@ -178,6 +188,11 @@ msgstr ""
#. module: utm
#: model:ir.model,name:utm.model_utm_source
+#: model:ir.model.fields,field_description:utm.field_account_invoice_source_id
+#: model:ir.model.fields,field_description:utm.field_crm_lead_source_id
+#: model:ir.model.fields,field_description:utm.field_hr_applicant_source_id
+#: model:ir.model.fields,field_description:utm.field_link_tracker_source_id
+#: model:ir.model.fields,field_description:utm.field_sale_order_source_id
#: model:ir.model.fields,field_description:utm.field_utm_mixin_source_id
msgid "Source"
msgstr ""
@@ -194,18 +209,33 @@ msgid "Sources"
msgstr ""
#. module: utm
+#: model:ir.model.fields,help:utm.field_account_invoice_campaign_id
+#: model:ir.model.fields,help:utm.field_crm_lead_campaign_id
+#: model:ir.model.fields,help:utm.field_hr_applicant_campaign_id
+#: model:ir.model.fields,help:utm.field_link_tracker_campaign_id
+#: model:ir.model.fields,help:utm.field_sale_order_campaign_id
#: model:ir.model.fields,help:utm.field_utm_mixin_campaign_id
msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special"
msgstr ""
#. module: utm
+#: model:ir.model.fields,help:utm.field_account_invoice_medium_id
+#: model:ir.model.fields,help:utm.field_crm_lead_medium_id
+#: model:ir.model.fields,help:utm.field_hr_applicant_medium_id
+#: model:ir.model.fields,help:utm.field_link_tracker_medium_id
+#: model:ir.model.fields,help:utm.field_sale_order_medium_id
#: model:ir.model.fields,help:utm.field_utm_mixin_medium_id
-msgid "This is the method of delivery. Ex: Postcard, Email, or Banner Ad"
+msgid "This is the method of delivery.Ex: Postcard, Email, or Banner Ad"
msgstr ""
#. module: utm
+#: model:ir.model.fields,help:utm.field_account_invoice_source_id
+#: model:ir.model.fields,help:utm.field_crm_lead_source_id
+#: model:ir.model.fields,help:utm.field_hr_applicant_source_id
+#: model:ir.model.fields,help:utm.field_link_tracker_source_id
+#: model:ir.model.fields,help:utm.field_sale_order_source_id
#: model:ir.model.fields,help:utm.field_utm_mixin_source_id
-msgid "This is the source of the link Ex: Search Engine, another domain, or name of email list"
+msgid "This is the source of the link Ex:Search Engine, another domain,or name of email list"
msgstr ""
#. module: utm
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index 6f67a15c487..1a0edd63728 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-18 04:43+0000\n"
-"PO-Revision-Date: 2016-01-18 04:43+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,122 +17,107 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:870
+#: 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:442
+#: 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/views/search_filters.js:115
-#: code:addons/web/static/src/js/views/search_filters.js:290
+#: code:addons/web/static/src/js/views/form_widgets.js:430
#, python-format
-msgid "%(field)s %(operator)s"
+msgid " selected records"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_filters.js:116
+#: code:addons/web/static/src/js/view_manager.js:222
#, python-format
-msgid "%(field)s %(operator)s \"%(value)s\""
+msgid " view couldn't be loaded"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1579
+#: 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 "%(page)d/%(page_count)d"
+msgid "%(field)s %(operator)s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/view_manager.js:66
+#: code:addons/web/static/src/js/views/search_filters.js:108
#, python-format
-msgid "%(view_type)s view"
+msgid "%(field)s %(operator)s \"%(value)s\""
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:443
+#: code:addons/web/static/src/js/view_manager.js:65
#, python-format
-msgid "%d / %d"
+msgid "%(view_type)s view"
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:441
+#: 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:1488
+#: 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 "&lt;!--[if lte IE 9]&gt;"
-msgstr ""
-
-#. module: web
-#: model:ir.ui.view,arch_db:web.layout
-#: model:ir.ui.view,arch_db:web.qunit_suite
-msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
-
-#. module: web
-#: model:ir.ui.view,arch_db:web.webclient_bootstrap
-msgid "&lt;![endif]--&gt;"
-msgstr ""
-
-#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:171
+#: code:addons/web/static/src/js/framework/formats.js:177
#, python-format
msgid "'%s' is not a correct date"
msgstr ""
@@ -146,7 +131,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:166
+#: code:addons/web/static/src/js/framework/formats.js:169
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
@@ -167,7 +152,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/formats.js:176
+#: code:addons/web/static/src/js/framework/formats.js:182
#, python-format
msgid "'%s' is not a correct time"
msgstr ""
@@ -188,7 +173,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:106
+#: code:addons/web/static/src/xml/base.xml:1298
#, python-format
msgid "(Community Edition)"
msgstr ""
@@ -209,14 +194,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/utils.js:300
-#, python-format
-msgid ",k,M"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1012
+#: code:addons/web/static/src/xml/base.xml:913
#, python-format
msgid "...Upload in progress..."
msgstr ""
@@ -233,43 +211,43 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/user_menu.js:81
-#: code:addons/web/static/src/xml/base.xml:84
+#: code:addons/web/static/src/js/widgets/user_menu.js:66
+#: code:addons/web/static/src/xml/base.xml:1279
#, 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:1503
+#: code:addons/web/static/src/xml/base.xml:1337
#, 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:1106
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1116
#, python-format
msgid "Action Button"
msgstr ""
@@ -283,165 +261,172 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:660
+#: code:addons/web/static/src/js/views/form_widgets.js:634
#, 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 Assets Debugging"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1326
#, python-format
msgid "Activate the developer mode"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:657
+#: code:addons/web/static/src/js/views/form_widgets.js:631
+#: code:addons/web/static/src/js/views/form_widgets.js:637
#, python-format
msgid "Active"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1367
-#: code:addons/web/static/src/xml/base.xml:1110
-#: code:addons/web/static/src/xml/base.xml:1343
+#: 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:1216
+#: 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:1217
+#: 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:1016
+#: 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:1227
+#: 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:323
+#: 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:1308
+#: 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:1123
+#: code:addons/web/static/src/xml/base.xml:930
#, python-format
msgid "Advanced Search..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:162
+#: code:addons/web/static/src/js/framework/dialog.js:169
#, python-format
msgid "Alert"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:564
+#: 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:1508
+#: code:addons/web/static/src/xml/base.xml:1342
#, python-format
msgid "And more"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1217
-#: code:addons/web/static/src/xml/base.xml:1237
+#: 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:664
-#: code:addons/web/static/src/js/views/list_view.js:308
+#: code:addons/web/static/src/js/views/form_widgets.js:638
+#: 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:671
+#: code:addons/web/static/src/js/views/form_widgets.js:639
#, 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:295
+#: 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:1327
+#: 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:616
+#: 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:1507
+#: code:addons/web/static/src/xml/base.xml:1341
#, python-format
msgid "Bugfixes guarantee"
msgstr ""
@@ -476,31 +461,24 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:352
-#, 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/dialog.js:176
-#: code:addons/web/static/src/js/views/form_common.js:1029
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:44
-#: code:addons/web/static/src/js/views/form_widgets.js:1667
-#: code:addons/web/static/src/xml/base.xml:60
+#: 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: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:829
-#: code:addons/web/controllers/main.py:831
-#: code:addons/web/controllers/main.py:837
-#: code:addons/web/controllers/main.py:838
-#: code:addons/web/static/src/js/widgets/change_password.js:14
-#: code:addons/web/static/src/xml/base.xml:59
+#: code:addons/web/controllers/main.py:724
+#: code:addons/web/controllers/main.py:726
+#: code:addons/web/controllers/main.py:732
+#: code:addons/web/controllers/main.py:733
+#: code:addons/web/static/src/js/widgets/change_password.js:15
+#: code:addons/web/static/src/xml/base.xml:55
#, python-format
msgid "Change Password"
msgstr ""
@@ -514,60 +492,80 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:447
+#: code:addons/web/static/src/js/views/form_widgets.js:435
#, python-format
msgid "Change selection "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:967
-#: code:addons/web/static/src/xml/base.xml:1021
-#: code:addons/web/static/src/xml/base.xml:1023
+#: 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:864
-#: code:addons/web/static/src/js/views/form_view.js:1128
-#: code:addons/web/static/src/js/widgets/data_export.js:40
+#: 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:487
+#: 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
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:187
+#: code:addons/web/static/src/js/framework/dialog.js:194
#, python-format
msgid "Confirmation"
msgstr ""
#. module: web
#. openerp-web
+#: code:addons/web/static/src/js/abstract_web_client.js:207
+#, python-format
+msgid "Connection lost"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/abstract_web_client.js:216
+#, python-format
+msgid "Connection restored"
+msgstr ""
+
+#. module: web
+#. openerp-web
#: code:addons/web/static/src/xml/base_common.xml:59
#, python-format
msgid "Context:"
@@ -575,21 +573,21 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:116
+#: code:addons/web/static/src/xml/base.xml:1308
#, python-format
msgid "Copyright © 2004-2015 Odoo S.A."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1347
+#: code:addons/web/static/src/js/views/form_widgets.js:1252
#, python-format
msgid "Could not display the selected image."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:1110
+#: code:addons/web/static/src/js/views/list_view.js:1019
#, python-format
msgid "Could not find id in dataset"
msgstr ""
@@ -603,76 +601,87 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1032
-#: 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:2024
-#: code:addons/web/static/src/xml/base.xml:451
+#: 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: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:223
+#: 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:234
+#: 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:279
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:1064
+#: 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:249
+#: 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:200
+#: 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:196
+#: 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:1065
-#: 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 ""
@@ -684,88 +693,95 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:110
+#: code:addons/web/static/src/xml/base.xml:1302
#, python-format
msgid "Database expiration:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:675
+#: 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:658
+#: code:addons/web/static/src/js/views/form_widgets.js:632
#, python-format
msgid "Deactivate"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:521
+#: 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:210
-#: code:addons/web/static/src/js/views/list_view.js:310
-#: code:addons/web/static/src/xml/base.xml:1368
+#: 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:260
+#: 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:1019
+#: 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:864
-#: code:addons/web/static/src/xml/base.xml:408
-#: code:addons/web/static/src/xml/base.xml:457
+#: 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:780
+#: 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:630
+#: 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:1277
#, python-format
msgid "Documentation"
msgstr ""
@@ -779,74 +795,66 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:17
+#: code:addons/web/static/src/js/framework/misc.js:16
#, python-format
msgid "Don't leave yet,<br />it's still loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1278
-#: code:addons/web/static/src/js/views/list_view.js:1946
+#: 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:1962
+#: 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:123
+#: 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:211
+#: 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:352
-#, python-format
-msgid "E-mail Error"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:171
-#: code:addons/web/static/src/xml/base.xml:446
-#: code:addons/web/static/src/xml/base.xml:915
+#: 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:173
+#: 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:172
+#: 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:180
-#: code:addons/web/static/src/xml/base.xml:174
+#: 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 ""
@@ -858,6 +866,13 @@ 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
#, python-format
msgid "End This Tutorial"
@@ -865,99 +880,99 @@ 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: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
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:458
+#: code:addons/web/controllers/main.py:733
#, python-format
-msgid "Error: Bad domain"
+msgid "Error, password not changed !"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:838
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:425
#, python-format
-msgid "Error, password not changed !"
+msgid "Error: Bad domain"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:981
+#: code:addons/web/static/src/js/framework/pyeval.js:993
#, python-format
msgid "Evaluation Error"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:599
+#: 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:307
-#: code:addons/web/static/src/xml/base.xml:1259
+#: 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:50
+#: 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:1277
+#: 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:41
+#: 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:1271
+#: 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:1274
+#: 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:370
+#: 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:1197
+#: 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:1292
+#: code:addons/web/static/src/js/views/form_view.js:1270
#, python-format
msgid "Field '%s' specified in view could not be found."
msgstr ""
@@ -971,107 +986,123 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:135
-#: code:addons/web/static/src/xml/base.xml:167
+#: 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:1285
+#: 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:1193
+#: code:addons/web/static/src/js/views/form_widgets.js:1115
#, python-format
msgid "File Upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1173
+#: code:addons/web/static/src/js/views/form_widgets.js:1095
#, python-format
msgid "File upload"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:540
+#: 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:484
+#: 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:1213
+#: 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:649
+#: code:addons/web/static/src/xml/base.xml:596
#, python-format
msgid "Flip axis"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:119
+#: code:addons/web/static/src/js/views/pivot_view.js:821
+#, python-format
+msgid "For Excel compatibility, data cannot be exported if there is more than 256 columns.\n"
+"\n"
+"Tip: try to flip axis, filter further or reduce the number of measures."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1311
#, 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:357
+#: 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
+#: code:addons/web/static/src/xml/base.xml:1310
#, python-format
msgid "GNU Lesser General Public License"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1500
+#: code:addons/web/static/src/xml/base.xml:1334
#, 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 ""
@@ -1085,24 +1116,22 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:465
+#: 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:685
-#: code:addons/web/static/src/xml/base.xml:1179
+#: 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:660
-#, python-format
-msgid "Group by: %s"
+#: model:ir.model,name:web.model_ir_http
+msgid "HTTP routing"
msgstr ""
#. module: web
@@ -1114,122 +1143,126 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:184
+#: 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:1351
+#: code:addons/web/static/src/js/views/form_widgets.js:1252
#, python-format
msgid "Image"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1273
+#: 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:665
+#: code:addons/web/static/src/js/views/form_widgets.js:633
#, python-format
msgid "Inactive"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:190
-#: code:addons/web/static/src/js/views/graph_widget.js:197
+#: 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:106
-#: code:addons/web/static/src/xml/base.xml:211
+#: 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:769
+#: code:addons/web/controllers/main.py:740
#, python-format
msgid "Languages"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:254
+#: 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:250
+#: 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:223
+#: 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
+#: code:addons/web/static/src/xml/base.xml:1310
#, python-format
msgid "Licenced under the terms of"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:617
+#: 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 ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:14
-#: code:addons/web/static/src/xml/base.xml:5
+#: code:addons/web/static/src/js/framework/misc.js:13
#, python-format
msgid "Loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:985
+#: code:addons/web/static/src/js/framework/pyeval.js:997
#, python-format
msgid "Local evaluation failure\n"
"%s\n"
@@ -1244,7 +1277,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:84
+#: code:addons/web/static/src/xml/base.xml:1283
#, python-format
msgid "Log out"
msgstr ""
@@ -1258,7 +1291,7 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/search_inputs.js:440
+#: 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 ""
@@ -1270,36 +1303,30 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:141
-#: code:addons/web/static/src/xml/base.xml:168
+#: 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 ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:20
+#: code:addons/web/static/src/js/framework/misc.js:19
#, python-format
msgid "Maybe you should consider reloading the application by pressing F5..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:570
-#, python-format
-msgid "Measure"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:602
+#: 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:89
+#: code:addons/web/static/src/js/widgets/debug_manager.js:347
#, python-format
msgid "Metadata (%s)"
msgstr ""
@@ -1313,28 +1340,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:1505
+#: code:addons/web/static/src/xml/base.xml:1339
#, python-format
msgid "Mobile support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/debug_manager.js:129
-#, python-format
-msgid "Model %s fields"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:254
+#: code:addons/web/static/src/xml/base.xml:255
#, python-format
msgid "Modified by :"
msgstr ""
@@ -1348,14 +1368,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:626
+#: 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:900
+#: code:addons/web/static/src/xml/base.xml:813
#, python-format
msgid "More"
msgstr ""
@@ -1367,141 +1387,127 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1303
+#: 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:1302
+#: code:addons/web/static/src/xml/base.xml:1132
#, python-format
msgid "Move Up"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/tour.js:180
-#, python-format
-msgid "Move your mouse"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/tour.js:181
-#, python-format
-msgid "Move your mouse here to open the insert block"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:83
+#: code:addons/web/static/src/xml/base.xml:1282
#, python-format
msgid "My Odoo.com account"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1322
+#: 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:1381
+#: 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:362
+#: 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:1504
+#: code:addons/web/static/src/xml/base.xml:1338
#, 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:192
+#: 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:89
+#: 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:642
+#: 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."
+" 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:123
+#: code:addons/web/static/src/js/views/graph_widget.js:95
#, python-format
-msgid "No data provided."
+msgid "No data to display"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:88
+#: code:addons/web/static/src/xml/base.xml:627
#, python-format
-msgid "No data to display"
+msgid "No data to display."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:641
+#: code:addons/web/static/src/js/widgets/debug_manager.js:342
#, python-format
-msgid "No data to display."
+msgid "No metadata available"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:243
+#: 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:456
+#: code:addons/web/static/src/js/views/form_widgets.js:444
#, python-format
msgid "No selected record"
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:324
#, python-format
msgid "No value found for the field %s for value %s"
msgstr ""
@@ -1522,21 +1528,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:669
-#, python-format
-msgid "Not Archived"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/graph_widget.js:226
+#: 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:838
+#: code:addons/web/static/src/xml/base.xml:765
#, python-format
msgid "Not shown in kanban"
msgstr ""
@@ -1550,86 +1549,80 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:36
-#: model:ir.ui.view,arch_db:web.layout
+#: code:addons/web/static/src/js/framework/dialog.js:37
#, python-format
msgid "Odoo"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:101
+#: code:addons/web/static/src/xml/base.xml:1293
#, 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:1675
+#: 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
+#: code:addons/web/static/src/xml/base.xml:1309
#, 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
+#: code:addons/web/static/src/xml/base.xml:1309
#, python-format
msgid "Odoo is a trademark of"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:119
+#: code:addons/web/static/src/xml/base.xml:1311
#, python-format
msgid "Odoo.com"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:671
+#: code:addons/web/static/src/js/views/form_widgets.js:651
#, python-format
msgid "Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/dialog.js:40
-#: code:addons/web/static/src/js/framework/dialog.js:152
-#: code:addons/web/static/src/js/framework/dialog.js:170
-#: code:addons/web/static/src/xml/base.xml:1356
+#: 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: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:675
+#: code:addons/web/static/src/js/views/form_widgets.js:649
#, python-format
msgid "On"
msgstr ""
@@ -1650,24 +1643,31 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:557
+#: 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 Debug Menu"
+msgid "Open Developer Tools"
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:928
+#: code:addons/web/static/src/xml/base.xml:115
+#, python-format
+msgid "Open View"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: 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:1324
+#: code:addons/web/static/src/js/views/form_relational_widgets.js:1312
#, python-format
msgid "Open: "
msgstr ""
@@ -1679,63 +1679,70 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:567
+#: 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:198
+#: 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:191
+#: 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:25
+#: 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:165
+#: 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:1316
+#: 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:1313
+#: 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:414
+#: 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:401
+#: code:addons/web/static/src/js/widgets/data_export.js:406
#, python-format
msgid "Please select fields to save export list..."
msgstr ""
@@ -1752,14 +1759,14 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:1281
#, 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 ""
@@ -1773,17 +1780,14 @@ 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:16
-#: code:addons/web/static/src/xml/base.xml:578
-#: code:addons/web/static/src/xml/base.xml:610
+#: code:addons/web/static/src/js/views/form_widgets.js:643
#, python-format
-msgid "Count"
+msgid "Production Environment"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:627
+#: code:addons/web/static/src/xml/base.xml:614
#, python-format
msgid "Quarter"
msgstr ""
@@ -1797,147 +1801,141 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1300
+#: 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:1301
+#: 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:382
+#: 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:870
-#: code:addons/web/static/src/xml/base.xml:456
-#: code:addons/web/static/src/xml/base.xml:507
-#: code:addons/web/static/src/xml/base.xml:1253
+#: 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:885
+#: 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:1014
-#: code:addons/web/static/src/xml/base.xml:1016
-#, python-format
-msgid "Save As"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1204
+#: code:addons/web/static/src/js/views/form_widgets.js:1132
+#: 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:1398
+#: 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:1245
+#: 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:1134
+#: 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:1331
+#: 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:1404
+#: 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:349
+#: 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:391
+#: 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:1077
+#: 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:209
+#: 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:279
+#: 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:444
+#: code:addons/web/static/src/js/views/form_widgets.js:432
#, python-format
msgid "See selection "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1043
-#: code:addons/web/static/src/xml/base.xml:1008
+#: 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 ""
@@ -1949,21 +1947,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:468
+#: 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:446
+#, python-format
+msgid "Select records "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:456
#, python-format
msgid "Select records..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_common.js:1078
+#: 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:468
+#: code:addons/web/static/src/js/views/form_widgets.js:456
#, python-format
msgid "Selected records"
msgstr ""
@@ -1977,35 +1989,35 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_view.js:1126
+#: 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:163
+#: 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:1013
+#: 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:1207
+#: 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 ""
@@ -2018,7 +2030,7 @@ msgid "Size:"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:1067
+#: code:addons/web/controllers/main.py:1036
#, python-format
msgid "Something horrible happened"
msgstr ""
@@ -2032,181 +2044,203 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:15
+#: 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
#, python-format
msgid "Still loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:16
+#: code:addons/web/static/src/js/framework/misc.js:15
#, python-format
msgid "Still loading...<br />Please be patient."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:83
+#: code:addons/web/static/src/xml/base.xml:1278
#, python-format
msgid "Support"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:670
+#: code:addons/web/static/src/js/views/form_widgets.js:650
#, python-format
msgid "Switch Off"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:672
+#: code:addons/web/static/src/js/views/form_widgets.js:652
#, python-format
msgid "Switch On"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:19
+#: code:addons/web/static/src/js/views/form_widgets.js:646
+#, python-format
+msgid "Switch to production environment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:644
+#, python-format
+msgid "Switch to test environment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/framework/misc.js:18
#, python-format
msgid "Take a minute to get a coffee,<br />because it's loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:216
+#: 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:458
+#: code:addons/web/static/src/js/views/form_widgets.js:645
+#, python-format
+msgid "Test Environment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/form_widgets.js:425
#, python-format
msgid "The domain is wrong."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:1208
+#: code:addons/web/static/src/js/views/form_widgets.js:1132
#, 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:939
+#: 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:121
+#: 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:831
+#: code:addons/web/controllers/main.py:726
#, 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:1107
+#: 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:837
+#: code:addons/web/controllers/main.py:732
#, 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:357
+#: 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:802
+#: 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:1172
+#: code:addons/web/static/src/js/views/form_widgets.js:1094
#, 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:1520
+#: 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:1193
+#: code:addons/web/static/src/js/views/form_widgets.js:1115
#, 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:382
-#, python-format
-msgid "This resource is empty"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:1264
+#: 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:944
+#: code:addons/web/static/src/js/views/form_widgets.js:864
#, 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:162
+#: 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:20
+#: 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 ""
@@ -2220,9 +2254,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
@@ -2234,111 +2268,117 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/form_widgets.js:672
-#: code:addons/web/static/src/js/views/list_view.js:309
+#: code:addons/web/static/src/js/views/form_widgets.js:640
+#: 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:73
-#: code:addons/web/static/src/js/views/list_view.js:1463
-#: code:addons/web/static/src/js/views/list_view.js:1469
-#: code:addons/web/static/src/js/views/list_view.js:1481
-#: code:addons/web/static/src/js/views/pivot_view.js:494
+#: 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:958
+#: code:addons/web/controllers/main.py:853
#, python-format
msgid "Underscore prefixed methods cannot be remotely called"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:650
+#: 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:884
+#: code:addons/web/static/src/js/views/form_widgets.js:803
#, python-format
msgid "Unknown"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1075
+#: 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:1163
+#: code:addons/web/static/src/js/views/list_view.js:1081
#, python-format
msgid "Unknown m2m command %s"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/pyeval.js:949
+#: code:addons/web/static/src/js/framework/pyeval.js:961
#, python-format
msgid "Unknown nonliteral type "
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/data.js:1067
+#: 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:368
+#: 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/js/views/form_widgets.js:1658
+#: code:addons/web/static/src/xml/base.xml:1265
+#, python-format
+msgid "Update translations"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: 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:1506
+#: code:addons/web/static/src/xml/base.xml:1340
#, python-format
msgid "Upgrade to future versions"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:970
-#: code:addons/web/static/src/xml/base.xml:1031
+#: 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:1633
-#: 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 ""
@@ -2346,27 +2386,29 @@ 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:1204
+#: 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
+#: code:addons/web/static/src/xml/base.xml:1297
#, python-format
msgid "Version"
msgstr ""
@@ -2380,55 +2422,55 @@ msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/views/list_view.js:2024
-#: code:addons/web/static/src/xml/base.xml:171
+#: 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:166
+#: 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:161
+#: 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:746
+#: 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:807
-#: code:addons/web/static/src/js/views/list_view.js:756
-#: 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:625
+#: 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:1296
+#: code:addons/web/static/src/js/views/form_view.js:1274
#, python-format
msgid "Widget type '%s' is not implemented"
msgstr ""
@@ -2441,35 +2483,35 @@ msgid "Widget:"
msgstr ""
#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/widgets/progress_bar.js:76
+#: code:addons/web/controllers/main.py:482
#, python-format
-msgid "Wrong value entered!"
+msgid "Wrong login/password"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:188
+#: code:addons/web/static/src/js/widgets/progress_bar.js:79
#, python-format
-msgid "XML ID:"
+msgid "Wrong value entered!"
msgstr ""
#. module: web
-#: code:addons/web/controllers/main.py:513
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:192
#, python-format
-msgid "Wrong login/password"
+msgid "XML ID:"
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/xml/base.xml:628
+#: 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"
@@ -2477,232 +2519,253 @@ 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:829
+#: code:addons/web/controllers/main.py:724
#, python-format
msgid "You cannot leave any password empty."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/framework/misc.js:18
+#: code:addons/web/static/src/xml/base.xml:1263
+#, python-format
+msgid "You have updated"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/framework/misc.js:17
#, python-format
msgid "You may not believe it,<br />but the application is actually loading..."
msgstr ""
#. module: web
#. openerp-web
-#: code:addons/web/static/src/js/widgets/sidebar.js: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:756
+#: 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 ""
#. 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/framework/utils.js:303
+#, python-format
+msgid "kMGTPE"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: 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:1214
+#: 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_calendar/i18n/web_calendar.pot b/addons/web_calendar/i18n/web_calendar.pot
index 54af95aefd8..0b3367cba3b 100644
--- a/addons/web_calendar/i18n/web_calendar.pot
+++ b/addons/web_calendar/i18n/web_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,57 +17,57 @@ msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:33
+#: code:addons/web_calendar/static/src/js/web_calendar.js:52
#, python-format
msgid "All day"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:940
+#: code:addons/web_calendar/static/src/js/web_calendar.js:992
#, python-format
msgid "Are you sure you want to delete this record ?"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:65
+#: code:addons/web_calendar/static/src/js/web_calendar.js:98
#, python-format
msgid "Calendar"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:115
+#: code:addons/web_calendar/static/src/js/web_calendar.js:123
#, python-format
msgid "Calendar view has not defined 'date_start' attribute."
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/widgets.js:45
+#: code:addons/web_calendar/static/src/js/widgets.js:44
#, python-format
msgid "Cancel"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:885
+#: code:addons/web_calendar/static/src/js/web_calendar.js:937
#, python-format
msgid "Close"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/widgets.js:37
-#: code:addons/web_calendar/static/src/js/widgets.js:53
+#: code:addons/web_calendar/static/src/js/widgets.js:36
+#: code:addons/web_calendar/static/src/js/widgets.js:52
#, python-format
msgid "Create"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/widgets.js:58
+#: code:addons/web_calendar/static/src/js/widgets.js:57
#, python-format
msgid "Create: "
msgstr ""
@@ -81,15 +81,15 @@ msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:881
+#: code:addons/web_calendar/static/src/js/web_calendar.js:933
#, python-format
msgid "Delete"
msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:876
-#: code:addons/web_calendar/static/src/js/widgets.js:42
+#: code:addons/web_calendar/static/src/js/web_calendar.js:928
+#: code:addons/web_calendar/static/src/js/widgets.js:41
#, python-format
msgid "Edit"
msgstr ""
@@ -124,7 +124,7 @@ msgstr ""
#. module: web_calendar
#. openerp-web
-#: code:addons/web_calendar/static/src/js/web_calendar.js:288
+#: code:addons/web_calendar/static/src/js/web_calendar.js:312
#, python-format
msgid "Week "
msgstr ""
diff --git a/addons/web_diagram/i18n/web_diagram.pot b/addons/web_diagram/i18n/web_diagram.pot
index deb6465ffde..c7d8306486f 100644
--- a/addons/web_diagram/i18n/web_diagram.pot
+++ b/addons/web_diagram/i18n/web_diagram.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,23 +17,23 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:240
-#: code:addons/web_diagram/static/src/js/diagram.js:268
+#: code:addons/web_diagram/static/src/js/diagram.js:237
+#: code:addons/web_diagram/static/src/js/diagram.js:265
#, python-format
msgid "Activity"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:273
-#: code:addons/web_diagram/static/src/js/diagram.js:317
+#: code:addons/web_diagram/static/src/js/diagram.js:270
+#: code:addons/web_diagram/static/src/js/diagram.js:314
#, python-format
msgid "Create:"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:211
+#: code:addons/web_diagram/static/src/js/diagram.js:208
#, python-format
msgid "Deleting this node cannot be undone.\n"
"It will also delete all connected transitions.\n"
@@ -43,7 +43,7 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:229
+#: code:addons/web_diagram/static/src/js/diagram.js:226
#, python-format
msgid "Deleting this transition cannot be undone.\n"
"\n"
@@ -52,14 +52,14 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:18
+#: code:addons/web_diagram/static/src/js/diagram.js:19
#, python-format
msgid "Diagram"
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:115
+#: code:addons/web_diagram/static/src/js/diagram.js:112
#, python-format
msgid "New"
msgstr ""
@@ -73,16 +73,16 @@ msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:245
-#: code:addons/web_diagram/static/src/js/diagram.js:301
+#: code:addons/web_diagram/static/src/js/diagram.js:242
+#: code:addons/web_diagram/static/src/js/diagram.js:298
#, python-format
msgid "Open: "
msgstr ""
#. module: web_diagram
#. openerp-web
-#: code:addons/web_diagram/static/src/js/diagram.js:296
-#: code:addons/web_diagram/static/src/js/diagram.js:312
+#: code:addons/web_diagram/static/src/js/diagram.js:293
+#: code:addons/web_diagram/static/src/js/diagram.js:309
#, python-format
msgid "Transition"
msgstr ""
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index 1fc952a9e18..364d104ba15 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,78 +16,69 @@ msgstr ""
"Plural-Forms: \n"
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.layout
-msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:727
+#: code:addons/web_editor/static/src/js/rte.summernote.js:899
#, 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:235
+#: code:addons/web_editor/static/src/xml/editor.xml:193
#, python-format
msgid "(Youtube, Vimeo, Dailymotion)"
msgstr ""
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.snippets
-msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-th-large fa-stack-1x\"/>\n"
-" </span> First Panel"
+msgid "<i class=\"fa fa-th-large\"/> First Panel"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:779
+#: code:addons/web_editor/static/src/js/rte.summernote.js:951
#, python-format
msgid "Action"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:112
+#: code:addons/web_editor/static/src/xml/editor.xml:114
#, python-format
msgid "Add"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:109
+#: code:addons/web_editor/static/src/xml/editor.xml:111
#, python-format
msgid "Add an image URL"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:761
+#: code:addons/web_editor/static/src/js/rte.summernote.js:933
#, python-format
msgid "Align center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:760
+#: code:addons/web_editor/static/src/js/rte.summernote.js:932
#, python-format
msgid "Align left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:762
+#: code:addons/web_editor/static/src/js/rte.summernote.js:934
#, python-format
msgid "Align right"
msgstr ""
#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:199
-#, python-format
-msgid "Alt:"
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Alpha"
msgstr ""
#. module: web_editor
@@ -98,108 +89,184 @@ msgid "Alternate Upload"
msgstr ""
#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:335
+#, python-format
+msgid "Assign a focal point that will always be visible"
+msgstr ""
+
+#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_ir_attachment_local_url
msgid "Attachment URL"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:48
+#: 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:271
+#: 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:768
+#: code:addons/web_editor/static/src/js/rte.summernote.js:940
+#: code:addons/web_editor/static/src/xml/snippets.xml:49
#, python-format
msgid "Background Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:321
+#: code:addons/web_editor/static/src/js/snippets.options.js:405
#, python-format
-msgid "Basic"
+msgid "Background Image Options"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:8
+#: code:addons/web_editor/static/src/xml/editor.xml:374
#, python-format
-msgid "Block style"
+msgid "Background height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:688
+#: code:addons/web_editor/static/src/xml/editor.xml:384
#, python-format
-msgid "Bold"
+msgid "Background position"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:187
+#: code:addons/web_editor/static/src/xml/editor.xml:406
#, python-format
-msgid "Cancel"
+msgid "Background repeat"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:72
+#: code:addons/web_editor/static/src/xml/editor.xml:362
#, python-format
-msgid "Center"
+msgid "Background size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:196
+#: 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:258
#, python-format
-msgid "Change media Alt and Title"
+msgid "Basic"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Beta"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.snippet_options
-msgid "Change..."
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Black"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:777
-#: code:addons/web_editor/static/src/xml/translator.xml:26
+#: code:addons/web_editor/static/src/js/snippets.editor.js:842
+#, python-format
+msgid "Block"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/snippets.xml:8
+#, python-format
+msgid "Block style"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:860
+#, python-format
+msgid "Bold"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:127
+#, python-format
+msgid "Center"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/widgets.js:53
+#, python-format
+msgid "Change media description and tooltip"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:949
+#: code:addons/web_editor/static/src/js/translator.js:74
#, python-format
msgid "Close"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:739
+#: code:addons/web_editor/static/src/js/rte.summernote.js:911
#, python-format
msgid "Code"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:754
+#: code:addons/web_editor/static/src/js/rte.summernote.js:926
#, python-format
msgid "Code View"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:315
+#: code:addons/web_editor/static/src/xml/editor.xml:250
#, python-format
msgid "Color Style"
msgstr ""
#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/snippets.editor.js:840
+#, python-format
+msgid "Column"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: 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:329
+#, python-format
+msgid "Cover"
+msgstr ""
+
+#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_create_uid
msgid "Created by"
msgstr ""
@@ -211,48 +278,62 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:35
+#: code:addons/web_editor/static/src/xml/editor.xml:331
#, python-format
-msgid "Customize"
+msgid "Custom"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:336
+#: code:addons/web_editor/static/src/xml/snippets.xml:32
#, python-format
-msgid "Danger"
+msgid "Customize"
msgstr ""
#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:278
#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Danger Color"
+#, python-format
+msgid "Danger"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/summernote.js:1837
-#: code:addons/web_editor/static/src/xml/editor.xml:352
+#: code:addons/web_editor/static/src/js/summernote.js:1920
+#: 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:8
-#: code:addons/web_editor/static/src/xml/editor.xml:27
-#: code:addons/web_editor/static/src/xml/editor.xml:78
-#: code:addons/web_editor/static/src/xml/editor.xml:138
-#: code:addons/web_editor/static/src/xml/editor.xml:185
-#: code:addons/web_editor/static/src/xml/translator.xml:9
+#: code:addons/web_editor/static/src/xml/editor.xml:407
#, python-format
-msgid "Discard"
+msgid "Define if/how the background image will be repeated"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Delta"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:200
+#: 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/xml/editor.xml:175
+#: 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 edition"
+msgid "Discard"
msgstr ""
#. module: web_editor
@@ -262,50 +343,57 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:44
+#: 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:781
+#: code:addons/web_editor/static/src/js/rte.summernote.js:953
#, python-format
msgid "Document Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:708
+#: code:addons/web_editor/static/src/js/rte.summernote.js:767
+#, python-format
+msgid "Double-click to edit"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:880
#, python-format
msgid "Drag an image here"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:38
+#: code:addons/web_editor/static/src/xml/snippets.xml:35
#, python-format
msgid "Drag to Move"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:39
+#: code:addons/web_editor/static/src/xml/snippets.xml:36
#, python-format
msgid "Duplicate Container"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:134
-#: code:addons/web_editor/static/src/js/rte.summernote.js:717
+#: code:addons/web_editor/static/src/js/rte.summernote.js:186
+#: code:addons/web_editor/static/src/js/rte.summernote.js:889
#, python-format
msgid "Edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:247
+#: code:addons/web_editor/static/src/xml/editor.xml:200
#, python-format
msgid "Embed Video (HTML)"
msgstr ""
@@ -325,220 +413,258 @@ msgid "English (edit mode)"
msgstr ""
#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Epsilon"
+msgstr ""
+
+#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:346
+#: 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:705
+#: 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:877
#, python-format
msgid "Float Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:707
+#: code:addons/web_editor/static/src/js/rte.summernote.js:879
#, python-format
msgid "Float None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:706
+#: code:addons/web_editor/static/src/js/rte.summernote.js:878
#, python-format
msgid "Float Right"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:696
+#: code:addons/web_editor/static/src/js/rte.summernote.js:941
#, python-format
-msgid "Font Family"
+msgid "Font Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:697
+#: code:addons/web_editor/static/src/js/rte.summernote.js:868
#, python-format
-msgid "Font Size"
+msgid "Font Family"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:769
+#: code:addons/web_editor/static/src/js/rte.summernote.js:869
#, python-format
-msgid "Foreground Color"
+msgid "Font Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:753
+#: code:addons/web_editor/static/src/js/rte.summernote.js:925
#, python-format
msgid "Full Screen"
msgstr ""
#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gamma"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gray"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gray Dark"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gray Darker"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gray Light"
+msgstr ""
+
+#. module: web_editor
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
+msgid "Gray Lighter"
+msgstr ""
+
+#. module: web_editor
#: model:ir.model,name:web_editor.model_ir_http
msgid "HTTP routing"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:740
+#: code:addons/web_editor/static/src/js/rte.summernote.js:912
#, python-format
msgid "Header 1"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:741
+#: code:addons/web_editor/static/src/js/rte.summernote.js:913
#, python-format
msgid "Header 2"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:742
+#: code:addons/web_editor/static/src/js/rte.summernote.js:914
#, python-format
msgid "Header 3"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:743
+#: code:addons/web_editor/static/src/js/rte.summernote.js:915
#, python-format
msgid "Header 4"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:744
+#: code:addons/web_editor/static/src/js/rte.summernote.js:916
#, python-format
msgid "Header 5"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:745
+#: code:addons/web_editor/static/src/js/rte.summernote.js:917
#, python-format
msgid "Header 6"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:752
+#: code:addons/web_editor/static/src/js/rte.summernote.js:924
#, python-format
msgid "Help"
msgstr ""
#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/xml/editor.xml:387
+#, python-format
+msgid "Horizontal"
+msgstr ""
+
+#. module: web_editor
#: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_id
msgid "ID"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:178
+#: 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:43
+#: 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:710
+#: code:addons/web_editor/static/src/js/rte.summernote.js:882
#, python-format
msgid "Image URL"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:759
+#: code:addons/web_editor/static/src/js/rte.summernote.js:931
#, python-format
msgid "Indent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:330
-#, python-format
-msgid "Info"
-msgstr ""
-
-#. module: web_editor
+#: code:addons/web_editor/static/src/xml/editor.xml:270
#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Info Color"
-msgstr ""
-
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:20
#, python-format
-msgid "Insert Blocks"
+msgid "Info"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:733
+#: code:addons/web_editor/static/src/js/rte.summernote.js:905
#, python-format
msgid "Insert Horizontal Rule"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:701
+#: code:addons/web_editor/static/src/js/rte.summernote.js:873
#, python-format
msgid "Insert Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:715
+#: code:addons/web_editor/static/src/js/rte.summernote.js:887
#, python-format
msgid "Insert Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:725
+#: code:addons/web_editor/static/src/js/rte.summernote.js:897
#, python-format
msgid "Insert Video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:689
+#: code:addons/web_editor/static/src/js/rte.summernote.js:861
#, python-format
msgid "Italic"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:763
+#: code:addons/web_editor/static/src/js/rte.summernote.js:935
#, python-format
msgid "Justify full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:776
+#: code:addons/web_editor/static/src/js/rte.summernote.js:948
#, python-format
msgid "Keyboard shortcuts"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:94
-#: code:addons/web_editor/static/src/xml/editor.xml:355
+#: code:addons/web_editor/static/src/js/rte.summernote.js:141
+#: code:addons/web_editor/static/src/xml/editor.xml:302
#, python-format
msgid "Large"
msgstr ""
@@ -559,216 +685,250 @@ msgid "Last Updated on"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Light"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:695
+#: code:addons/web_editor/static/src/js/rte.summernote.js:867
#, python-format
msgid "Line Height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:714
-#: code:addons/web_editor/static/src/xml/editor.xml:318
+#: code:addons/web_editor/static/src/js/rte.summernote.js:886
+#: 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:284
+#: 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:279
+#: 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:93
+#: code:addons/web_editor/static/src/js/rte.summernote.js:140
#, python-format
msgid "Medium"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:767
+#: code:addons/web_editor/static/src/js/rte.summernote.js:939
#, 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:50
+#: 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/js/rte.summernote.js:91
+#: 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:138
+#: code:addons/web_editor/static/src/xml/snippets.xml:51
#, python-format
msgid "None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:737
+#: code:addons/web_editor/static/src/js/rte.summernote.js:909
#, python-format
msgid "Normal"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.layout
-msgid "Odoo Editor layout"
+#. openerp-web
+#: 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:720
-#: code:addons/web_editor/static/src/xml/editor.xml:295
+#: code:addons/web_editor/static/src/js/rte.summernote.js:892
+#: 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:749
+#: code:addons/web_editor/static/src/js/rte.summernote.js:921
#, python-format
msgid "Ordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:758
+#: code:addons/web_editor/static/src/js/rte.summernote.js:930
#, python-format
msgid "Outdent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:87
+#: code:addons/web_editor/static/src/js/rte.summernote.js:145
#, python-format
msgid "Padding"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:757
+#: code:addons/web_editor/static/src/js/rte.summernote.js:929
#, python-format
msgid "Paragraph"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:780
+#: code:addons/web_editor/static/src/js/rte.summernote.js:952
#, python-format
msgid "Paragraph formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:45
+#: 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:700
+#: code:addons/web_editor/static/src/js/rte.summernote.js:872
#, python-format
msgid "Picture"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:244
-#: code:addons/web_editor/static/src/xml/editor.xml:255
-#: code:addons/web_editor/static/src/xml/editor.xml:364
+#: 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:327
+#: code:addons/web_editor/static/src/xml/editor.xml:266
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Primary"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Primary Color"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:738
+#: code:addons/web_editor/static/src/js/rte.summernote.js:910
#, python-format
msgid "Quote"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.js:341
+#: code:addons/web_editor/static/src/js/rte.js:343
#, python-format
msgid "Readonly field"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:766
+#: code:addons/web_editor/static/src/js/rte.summernote.js:938
#, python-format
msgid "Recent Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:785
+#: code:addons/web_editor/static/src/js/rte.summernote.js:957
#, python-format
msgid "Redo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:138
+#: code:addons/web_editor/static/src/js/rte.summernote.js:190
#, python-format
msgid "Remove"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:40
+#: code:addons/web_editor/static/src/xml/snippets.xml:37
#, python-format
msgid "Remove Block"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:694
+#: code:addons/web_editor/static/src/js/rte.summernote.js:866
#, python-format
msgid "Remove Font Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:711
+#: code:addons/web_editor/static/src/js/rte.summernote.js:883
#, python-format
msgid "Remove Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:772
+#: 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:410
+#, python-format
+msgid "Repeat both"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: 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:412
+#, python-format
+msgid "Repeat y"
+msgstr ""
+
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:944
#, python-format
msgid "Reset"
msgstr ""
@@ -782,45 +942,43 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:773
+#: code:addons/web_editor/static/src/js/rte.summernote.js:945
#, python-format
msgid "Reset to default"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:49
+#: code:addons/web_editor/static/src/js/rte.summernote.js:874
#, python-format
-msgid "Resize"
+msgid "Resize Full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:702
+#: code:addons/web_editor/static/src/js/rte.summernote.js:875
#, python-format
-msgid "Resize Full"
+msgid "Resize Half"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:703
+#: code:addons/web_editor/static/src/js/rte.summernote.js:876
#, python-format
-msgid "Resize Half"
+msgid "Resize Quarter"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:704
+#: code:addons/web_editor/static/src/xml/snippets.xml:25
#, python-format
-msgid "Resize Quarter"
+msgid "Resize to force the height of this block"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:6
-#: code:addons/web_editor/static/src/xml/editor.xml:23
-#: code:addons/web_editor/static/src/xml/editor.xml:75
-#: code:addons/web_editor/static/src/xml/translator.xml:7
+#: code:addons/web_editor/static/src/js/widgets.js:25
+#: code:addons/web_editor/static/src/xml/editor.xml:13
#, python-format
msgid "Save"
msgstr ""
@@ -841,147 +999,150 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:33
+#: code:addons/web_editor/static/src/xml/snippets.xml:30
#, python-format
msgid "Select Container Block"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:39
+#: 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:131
+#: 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:709
+#: code:addons/web_editor/static/src/js/rte.summernote.js:881
#, python-format
msgid "Select from files"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:236
+#: 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/js/rte.summernote.js:771
+#: 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:943
#, python-format
msgid "Set transparent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:100
+#: code:addons/web_editor/static/src/xml/editor.xml:363
#, python-format
-msgid "Shadow"
+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/xml/editor.xml:343
+#: code:addons/web_editor/static/src/js/rte.summernote.js:152
#, python-format
-msgid "Size"
+msgid "Shadow"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:92
-#: code:addons/web_editor/static/src/xml/editor.xml:349
+#: code:addons/web_editor/static/src/xml/editor.xml:286
#, python-format
-msgid "Small"
+msgid "Size"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/snippets.xml:24
+#: code:addons/web_editor/static/src/js/rte.summernote.js:139
+#: code:addons/web_editor/static/src/xml/editor.xml:294
#, python-format
-msgid "Snippets are loading..."
+msgid "Small"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:108
+#: code:addons/web_editor/static/src/js/rte.summernote.js:160
#, python-format
msgid "Spin"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:691
+#: code:addons/web_editor/static/src/js/rte.summernote.js:863
#, python-format
msgid "Strikethrough"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:736
-#: code:addons/web_editor/static/src/xml/editor.xml:310
+#: code:addons/web_editor/static/src/js/rte.summernote.js:908
+#: 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:692
+#: code:addons/web_editor/static/src/js/rte.summernote.js:864
#, python-format
msgid "Subscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:324
+#: code:addons/web_editor/static/src/xml/editor.xml:262
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Success"
msgstr ""
#. module: web_editor
-#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Success Color"
-msgstr ""
-
-#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:693
+#: code:addons/web_editor/static/src/js/rte.summernote.js:865
#, python-format
msgid "Superscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:730
+#: code:addons/web_editor/static/src/js/rte.summernote.js:902
#, python-format
msgid "Table"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:778
+#: code:addons/web_editor/static/src/js/rte.summernote.js:950
#, python-format
msgid "Text formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:718
+#: code:addons/web_editor/static/src/js/rte.summernote.js:890
#, python-format
msgid "Text to display"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:157
+#: 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:"
@@ -989,71 +1150,71 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/editor.js:93
-#: code:addons/web_editor/static/src/js/translator.js:148
+#: 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!"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:203
+#: code:addons/web_editor/static/src/js/rte.summernote.js:891
#, python-format
-msgid "Title:"
+msgid "To what URL should this link go?"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:719
+#: code:addons/web_editor/static/src/xml/editor.xml:40
#, python-format
-msgid "To what URL should this link go?"
+msgid "Tooltip"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/translator.xml:20
+#: 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:770
+#: code:addons/web_editor/static/src/js/rte.summernote.js:942
#, python-format
msgid "Transparent"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:300
+#: 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:690
+#: code:addons/web_editor/static/src/js/rte.summernote.js:862
#, python-format
msgid "Underline"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:784
+#: code:addons/web_editor/static/src/js/rte.summernote.js:956
#, python-format
msgid "Undo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:716
+#: code:addons/web_editor/static/src/js/rte.summernote.js:888
#, python-format
msgid "Unlink"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:748
+#: code:addons/web_editor/static/src/js/rte.summernote.js:920
#, python-format
msgid "Unordered list"
msgstr ""
@@ -1062,104 +1223,108 @@ msgstr ""
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:96
#, python-format
-msgid "Upload an image from your computer"
+msgid "Upload an image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:102
+#: 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:105
+#: 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/js/rte.summernote.js:723
-#: code:addons/web_editor/static/src/xml/editor.xml:46
+#: 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:895
+#: 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:724
+#: code:addons/web_editor/static/src/js/rte.summernote.js:896
#, python-format
msgid "Video Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:726
+#: code:addons/web_editor/static/src/js/rte.summernote.js:898
#, python-format
msgid "Video URL?"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:333
+#: code:addons/web_editor/static/src/xml/editor.xml:274
+#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Warning"
msgstr ""
#. module: web_editor
#: model:ir.ui.view,arch_db:web_editor.colorpicker
-msgid "Warning Color"
+msgid "White"
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:95
+#: code:addons/web_editor/static/src/js/rte.summernote.js:142
#, python-format
msgid "Xl"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:182
-#, 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:179
+#: 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 "all"
+msgid "auto"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:305
+#: 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:111
+#: 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
@@ -1178,6 +1343,11 @@ msgid "ir.qweb.field"
msgstr ""
#. module: web_editor
+#: model:ir.model,name:web_editor.model_ir_qweb_field_barcode
+msgid "ir.qweb.field.barcode"
+msgstr ""
+
+#. module: web_editor
#: model:ir.model,name:web_editor.model_ir_qweb_field_contact
msgid "ir.qweb.field.contact"
msgstr ""
@@ -1258,29 +1428,6 @@ msgid "ir.ui.view"
msgstr ""
#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:7
-#: code:addons/web_editor/static/src/xml/editor.xml:26
-#: code:addons/web_editor/static/src/xml/editor.xml:76
-#: code:addons/web_editor/static/src/xml/editor.xml:185
-#: code:addons/web_editor/static/src/xml/translator.xml:8
-#, python-format
-msgid "or"
-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:179
-#, 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"
msgstr ""
@@ -1292,15 +1439,15 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/xml/editor.xml:108
-#: code:addons/web_editor/static/src/xml/editor.xml:247
+#: 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:49
+#: 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 6f6e72876d3..65e316aa876 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,60 +17,60 @@ msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_column.js:168
-#: code:addons/web_kanban/static/src/js/kanban_column.js:170
+#: code:addons/web_kanban/static/src/js/kanban_column.js:176
+#: code:addons/web_kanban/static/src/js/kanban_column.js:178
#, python-format
msgid " records"
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 ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_relational.js:50
+#: code:addons/web_kanban/static/src/js/kanban_relational.js:53
#, python-format
msgid "Add: "
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 ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_column.js:206
+#: code:addons/web_kanban/static/src/js/kanban_column.js:214
#, python-format
msgid "Are you sure that you want to remove this column ?"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_view.js:475
+#: code:addons/web_kanban/static/src/js/kanban_view.js:541
#, python-format
msgid "Are you sure you want to delete this record ?"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_column.js:200
+#: code:addons/web_kanban/static/src/js/kanban_column.js:208
#, python-format
msgid "Cancel"
msgstr ""
@@ -78,94 +78,94 @@ 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:651
+#: 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:216
+#: 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 ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_column.js:195
+#: code:addons/web_kanban/static/src/js/kanban_column.js:203
#, python-format
msgid "Ok"
msgstr ""
#. module: web_kanban
#. openerp-web
-#: code:addons/web_kanban/static/src/js/kanban_relational.js:64
+#: code:addons/web_kanban/static/src/js/kanban_relational.js:67
#, python-format
msgid "Open: "
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:209
-#: code:addons/web_kanban/static/src/js/kanban_view.js:224
-#: code:addons/web_kanban/static/src/js/kanban_view.js:231
+#: 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_kanban_gauge/i18n/web_kanban_gauge.pot b/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
index 364c84bef01..b8e8b522fbf 100644
--- a/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
+++ b/addons/web_kanban_gauge/i18n/web_kanban_gauge.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,21 +17,21 @@ msgstr ""
#. module: web_kanban_gauge
#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:157
+#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:210
#, python-format
msgid "Click to change value"
msgstr ""
#. module: web_kanban_gauge
#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:119
+#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:172
#, python-format
msgid "Only Integer Value should be valid."
msgstr ""
#. module: web_kanban_gauge
#. openerp-web
-#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:119
+#: code:addons/web_kanban_gauge/static/src/js/kanban_gauge.js:172
#, python-format
msgid "Wrong value entered!"
msgstr ""
diff --git a/addons/web_planner/i18n/web_planner.pot b/addons/web_planner/i18n/web_planner.pot
index 22eafcd5a5d..761e4074392 100644
--- a/addons/web_planner/i18n/web_planner.pot
+++ b/addons/web_planner/i18n/web_planner.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-15 15:34+0000\n"
-"PO-Revision-Date: 2016-02-15 15:34+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,12 @@ msgstr ""
#. module: web_planner
#: model:ir.model.fields,help:web_planner.field_web_planner_active
-msgid "If the active field is set to False, it will allow you to hide the planner. This change requires a refreshing a your page."
+msgid "If the active field is set to False, it will allow you to hide the planner. This change requires a refresh of your page."
+msgstr ""
+
+#. module: web_planner
+#: model:ir.ui.view,arch_db:web_planner.web_planner_view_search
+msgid "Inactive"
msgstr ""
#. module: web_planner
@@ -123,8 +128,3 @@ msgstr ""
msgid "Template"
msgstr ""
-#. module: web_planner
-#: model:ir.ui.view,arch_db:web_planner.web_planner_view_search
-msgid "Unactive"
-msgstr ""
-
diff --git a/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot b/addons/web_settings_dashboard/i18n/web_settings_dashboard.pot
index c9a10eb48d7..63274684523 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-17 08:01+0000\n"
-"PO-Revision-Date: 2016-06-17 08:01+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:78
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:90
#, python-format
msgid "%\n"
" Implementation"
@@ -53,7 +53,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:90
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:102
#, python-format
msgid "Browse the documentation."
msgstr ""
@@ -66,28 +66,28 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:64
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:66
#, python-format
msgid "Enter e-mail addresses (one per line)"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:92
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:94
#, python-format
msgid "Follow these implementation guides to get the most out of Odoo."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:149
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:151
#, python-format
msgid "Get more features with the Enterprise Edition!"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:131
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:133
#, python-format
msgid "Help us spread the word: Share Odoo's awesomeness with your friends!"
msgstr ""
@@ -108,28 +108,28 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:59
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:67
#, python-format
msgid "Invite"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:57
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:65
#, python-format
msgid "Invite new users:"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:53
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:61
#, python-format
msgid "Manage access rights"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:89
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:101
#, python-format
msgid "Need more help?"
msgstr ""
@@ -143,14 +143,14 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:148
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:150
#, python-format
msgid "Odoo Enterprise"
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:71
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
#, python-format
msgid "Pending invitations:"
msgstr ""
@@ -164,9 +164,9 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:129
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:131
#, python-format
-msgid "Social Share"
+msgid "Share the Love"
msgstr ""
#. module: web_settings_dashboard
@@ -178,7 +178,7 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:152
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:154
#, python-format
msgid "Upgrade Now"
msgstr ""
@@ -190,14 +190,14 @@ msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:107
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:109
#, python-format
msgid "You need to install some apps first."
msgstr ""
#. module: web_settings_dashboard
#. openerp-web
-#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:77
+#: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:79
#, python-format
msgid "more"
msgstr ""
diff --git a/addons/web_tour/i18n/web_tour.pot b/addons/web_tour/i18n/web_tour.pot
new file mode 100644
index 00000000000..22b7469367b
--- /dev/null
+++ b/addons/web_tour/i18n/web_tour.pot
@@ -0,0 +1,95 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * web_tour
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: web_tour
+#. openerp-web
+#: code:addons/web_tour/static/src/js/tour_manager.js:360
+#, python-format
+msgid "Click the <i>Home icon</i> to navigate across apps."
+msgstr ""
+
+#. module: web_tour
+#. openerp-web
+#: code:addons/web_tour/static/src/xml/debug_manager.xml:7
+#, python-format
+msgid "Consume Tours"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour_user_id
+msgid "Consumed by"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model,name:web_tour.model_ir_http
+msgid "HTTP routing"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour_id
+msgid "ID"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_ir_ui_menu_load_xmlid
+msgid "Load xmlid"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.ui.view,arch_db:web_tour.edit_tour_list
+msgid "Menu"
+msgstr ""
+
+#. module: web_tour
+#. openerp-web
+#: code:addons/web_tour/static/src/js/tour_manager.js:129
+#, python-format
+msgid "Skip tour"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.ui.view,arch_db:web_tour.edit_tour_search
+msgid "Tip"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model.fields,field_description:web_tour.field_web_tour_tour_name
+msgid "Tour name"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.actions.act_window,name:web_tour.edit_tour_action
+#: model:ir.model,name:web_tour.model_web_tour_tour
+#: model:ir.ui.menu,name:web_tour.menu_tour_action
+msgid "Tours"
+msgstr ""
+
+#. module: web_tour
+#: model:ir.model,name:web_tour.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index 282fec6c8f5..6716e70e515 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-09 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,6 @@ msgid "&amp;times;"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.sitemap_index_xml
#: model:ir.ui.view,arch_db:website.sitemap_xml
msgid "&lt;?xml version=\"1.0\" encoding=\"UTF-8\"?&gt;"
@@ -40,15 +35,15 @@ msgid "&times;"
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
@@ -67,11 +62,6 @@ msgid "- The Odoo Team"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.sitemap_index_xml
-msgid ".xml"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "1. Add your <strong>desired languages</strong><br/>\n"
" Use the link in the footer of your website (when logged in) to add\n"
@@ -81,7 +71,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:28
+#: code:addons/website/static/src/xml/website.seo.xml:17
#, python-format
msgid "1. Define Keywords"
msgstr ""
@@ -108,7 +98,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:56
+#: code:addons/website/static/src/xml/website.seo.xml:45
#, python-format
msgid "2. Reference Your Page"
msgstr ""
@@ -125,7 +115,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:73
+#: code:addons/website/static/src/xml/website.seo.xml:62
#, python-format
msgid "3. Preview"
msgstr ""
@@ -151,13 +141,29 @@ msgid "5s"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.xml:69
+#, python-format
+msgid ":&nbsp;"
+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
@@ -172,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 asist 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."
@@ -189,6 +195,11 @@ 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>"
msgstr ""
@@ -200,14 +211,69 @@ msgid "<i class=\"fa fa-arrow-right\"/>\n"
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"
+msgstr ""
+
+#. module: website
+#: model:ir.ui.view,arch_db:website.snippets
+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"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<i class=\"fa fa-th-large\"/> Website<b class=\"caret\"/>"
+msgid "<i class=\"fa fa-th-large\"/> WEBSITE <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
@@ -246,22 +312,26 @@ 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
-#: model:ir.ui.view,arch_db:website.s_text_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>"
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 ""
@@ -278,11 +348,6 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
-msgid "<span class=\"fa fa-envelope-o\"/> Email Our Website Expert"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
msgid "<span class=\"fa fa-lightbulb-o fa-2x\"/>\n"
" <strong>Tips for a good domain:</strong>"
msgstr ""
@@ -294,41 +359,23 @@ msgid "<span class=\"fa fa-lightbulb-o fa-2x\"/>\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "<span class=\"fa fa-thumbs-o-down\"/> <strong> Bad practices</strong>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "<span class=\"fa fa-thumbs-o-up\"/> <strong> Good practices</strong>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippets
-msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-align-justify fa-stack-1x\"/>\n"
-" </span> Content"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span class=\"fa fa-pencil\"/> EDIT PAGE"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippets
-msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-paper-plane fa-stack-1x\"/>\n"
-" </span> Effect"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "<span class=\"fa fa-plus\"/> NEW PAGE"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippets
-msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-pie-chart fa-stack-1x\"/>\n"
-" </span> Feature"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "<span class=\"fa fa-thumbs-o-down\"/> <strong> Bad practices</strong>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippets
-msgid "<span class=\"fa-stack\">\n"
-" <i class=\"fa fa-th-large fa-stack-1x\"/>\n"
-" </span> Structure"
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "<span class=\"fa fa-thumbs-o-up\"/> <strong> Good practices</strong>"
msgstr ""
#. module: website
@@ -358,29 +405,6 @@ msgid "<span class=\"panel-title\"><span class=\"fa fa-magic\"/><strong> 1. Choo
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.layout
-msgid "<span class=\"sr-only\">Toggle navigation</span>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>\n"
-" <span class=\"icon-bar\"/>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span title=\"Edit Top Menu\">Edit Menu</span>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span title=\"Optimize your AdWords account\">Optimize AdWords Campaign</span>"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "<span title=\"Promote page on the web\">Optimize SEO</span>"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.s_comparisons
msgid "<span>$</span><b style=\"font-size: 60px\">125</b><small>.00</small>"
msgstr ""
@@ -500,12 +524,6 @@ msgid "<strong>Blogs</strong>"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_image_floating
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "<strong>Click Here</strong>"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "<strong>Community builder</strong>"
msgstr ""
@@ -723,7 +741,7 @@ msgstr ""
#. module: website
#: model:ir.model.fields,help:website.field_ir_act_server_website_published
-msgid "A code server action can be executed from the website, using a dedicatedcontroller. The address is <base>/website/action/<website_path>.Set this field as True to allow users to run this action. If itset to is False the action cannot be run through the website."
+msgid "A code server action can be executed from the website, using a dedicated controller. The address is <base>/website/action/<website_path>. Set this field as True to allow users to run this action. If it is set to False the action cannot be run through the website."
msgstr ""
#. module: website
@@ -801,14 +819,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:48
+#: code:addons/website/static/src/xml/website.seo.xml:37
#, python-format
msgid "Add"
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"
@@ -816,18 +834,12 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:55
-#: code:addons/website/static/src/xml/website.contentMenu.xml:63
+#: 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"
msgstr ""
@@ -842,21 +854,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:31
+#: code:addons/website/static/src/xml/website.seo.xml:20
#, python-format
msgid "Add keyword:"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:103
-#, python-format
-msgid "Add new pages and menus"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:70
+#: code:addons/website/static/src/js/website.contentMenu.js:66
#, python-format
msgid "Add page in menu"
msgstr ""
@@ -867,6 +872,13 @@ 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!"
msgstr ""
@@ -929,7 +941,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
-msgid "As you add more pages to your website, you main menu will begin to feel overcrowded.\n"
+msgid "As you add more pages to your website, your main menu will begin to feel overcrowded.\n"
" You can regroup similar pages into a sub-menu, so they will appear under a unique drop-down menu."
msgstr ""
@@ -969,11 +981,6 @@ msgid "Back"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Background"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Background image"
msgstr ""
@@ -989,13 +996,6 @@ msgid "Basic sales &amp; marketing for up to 2 users"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:95
-#, python-format
-msgid "Be careful !"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Be mobile"
msgstr ""
@@ -1042,13 +1042,6 @@ 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&amp;A, mailing lists."
msgstr ""
@@ -1081,14 +1074,14 @@ msgid "Can I afford to advertise on the keyword?"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
#: model:ir.ui.view,arch_db:website.s_faq_collapse
msgid "Can I use it to manage projects based on agile methodologies?"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:88
+#: 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
@@ -1107,23 +1100,11 @@ msgid "Change Icons"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:95
-#, python-format
-msgid "Check Mobile Preview"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Check its availability"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "Check now and discover more today!"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Check your references before deciding to work with you"
msgstr ""
@@ -1146,13 +1127,6 @@ msgid "Circle"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:42
-#, 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"
msgstr ""
@@ -1163,11 +1137,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:48
#: 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 ""
@@ -1175,28 +1145,12 @@ msgstr ""
#. openerp-web
#: code:addons/website/static/src/xml/website.ace.xml:14
#: code:addons/website/static/src/xml/website.gallery.xml:97
-#: code:addons/website/static/src/xml/website.seo.xml:19
#: code:addons/website/static/src/xml/website.translator.xml:13
-#: code:addons/website/static/src/xml/website.xml:8
-#: code:addons/website/static/src/xml/website.xml:24
-#: code:addons/website/static/src/xml/website.xml:41
#, python-format
msgid "Close"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:105
-#, python-format
-msgid "Close Tutorial"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Color"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Color Splash"
msgstr ""
@@ -1298,10 +1252,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 ""
@@ -1317,7 +1269,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Content <span class=\"caret\"/>"
+msgid "Content"
msgstr ""
#. module: website
@@ -1329,11 +1281,8 @@ 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:82
-#: code:addons/website/static/src/js/website.tour.banner.js:97
-#: code:addons/website/static/src/xml/website.contentMenu.xml:28
-#: code:addons/website/static/src/xml/website.xml:87
+#: code:addons/website/static/src/js/website.contentMenu.js:179
+#: code:addons/website/static/src/xml/website.xml:56
#, python-format
msgid "Continue"
msgstr ""
@@ -1360,7 +1309,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.editor.js:138
+#: code:addons/website/static/src/js/website.editor.js:141
#, python-format
msgid "Create page '%s'"
msgstr ""
@@ -1369,7 +1318,6 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_website_config_settings_create_uid
#: model:ir.model.fields,field_description:website.field_website_create_uid
#: model:ir.model.fields,field_description:website.field_website_menu_create_uid
-#: model:ir.model.fields,field_description:website.field_website_seo_metadata_create_uid
msgid "Created by"
msgstr ""
@@ -1377,7 +1325,6 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_website_config_settings_create_date
#: model:ir.model.fields,field_description:website.field_website_create_date
#: model:ir.model.fields,field_description:website.field_website_menu_create_date
-#: model:ir.model.fields,field_description:website.field_website_seo_metadata_create_date
msgid "Created on"
msgstr ""
@@ -1391,7 +1338,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Customize <span class=\"caret\"/>"
+msgid "Customize"
msgstr ""
#. module: website
@@ -1401,23 +1348,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:59
+#: 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:41
-#, python-format
-msgid "Customize banner's text"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:58
-#, python-format
-msgid "Customize the banner"
+#: model:ir.ui.menu,name:website.menu_dashboard
+msgid "Dashboard"
msgstr ""
#. module: website
@@ -1439,7 +1377,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:130
+#: code:addons/website/static/src/js/website.contentMenu.js:127
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Delete Page"
@@ -1460,22 +1398,15 @@ msgid "Deploy new stores with just an internet connection: no\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "Deploy new stores with just an internet connection: no\n"
-" installation, no specific hardware required. It works with any\n"
-" iPad, Tablet PC, laptop or industrial POS machine."
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:65
+#: code:addons/website/static/src/xml/website.seo.xml:54
#, python-format
msgid "Description"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:136
+#: code:addons/website/static/src/xml/website.seo.xml:109
#, python-format
msgid "Description..."
msgstr ""
@@ -1492,22 +1423,12 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:87
+#: code:addons/website/static/src/js/website.seo.js:364
#, python-format
msgid "Discard"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "Discover more about Odoo"
-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."
msgstr ""
@@ -1529,7 +1450,6 @@ msgid "Do not show this dialog later."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
#: model:ir.ui.view,arch_db:website.s_faq_collapse
msgid "Does it works offline?"
msgstr ""
@@ -1541,48 +1461,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:66
-#, 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:33
-#, 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:67
+#: 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:34
+#: 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
@@ -1602,22 +1515,20 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.publish_management
-#: model:ir.ui.view,arch_db:website.user_navbar
msgid "Edit"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:38
+#: code:addons/website/static/src/js/website.contentMenu.js:201
+#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Edit Menu"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:64
-#, python-format
-msgid "Edit Menu Entry"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Edit Top Menu"
msgstr ""
#. module: website
@@ -1626,15 +1537,15 @@ msgid "Edit in backend"
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."
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:29
+#, python-format
+msgid "Edit my Analytics Client ID"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:26
-#, python-format
-msgid "Edit this page"
+#: model:ir.ui.view,arch_db:website.page_404
+msgid "Edit the content below this line to adapt the default \"page not found\" page."
msgstr ""
#. module: website
@@ -1658,13 +1569,6 @@ msgid "Error"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:27
-#, 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"
msgstr ""
@@ -1726,6 +1630,11 @@ 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"
msgstr ""
@@ -1787,6 +1696,13 @@ msgid "Folded list"
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"
msgstr ""
@@ -1813,7 +1729,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
@@ -1855,16 +1771,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:51
+#: 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/xml/website.seo.xml:21
-#, 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
@@ -1874,15 +1788,29 @@ msgid "GitHub Account"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:42
+#, 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"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:80
+#: 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
@@ -1958,13 +1886,18 @@ 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,"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Help <span class=\"caret\"/>"
+msgid "Help"
msgstr ""
#. module: website
@@ -1980,33 +1913,25 @@ msgid "Here is a basic guide for your first A/B testing:"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Hide link"
-msgstr ""
-
-#. module: website
#: 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:135
+#: code:addons/website/static/src/xml/website.xml:92
#, python-format
msgid "I'm sure, I want to delete this page definitively"
msgstr ""
@@ -2014,7 +1939,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_1976
+#: 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"
@@ -2053,22 +1978,6 @@ msgid "Improve your conversion from visitor to customer."
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "In case you still feel a bit puzzled about all\n"
-" of our yesterday's announcements, here is a little\n"
-" summary for you. <br/>\n"
-" We have decided to change the\n"
-" name because <b>\"OpenERP\"</b> didn't reflect the offering\n"
-" of the company anymore. With our newest apps, such\n"
-" as Website Builder, PoS or eCommerce, we have\n"
-" moved beyond the ERP territory. <br/>\n"
-" But <u>don't worry</u>, <b>Odoo</b> is and always will be\n"
-" fully open source. You can read more about the new name here.\n"
-" We have also prepared a short FAQ to explain all these changes\n"
-" to all of you. <br/>"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "In the left-side menu of the project, go to <strong>APIs and auth &gt; APIs</strong> and activate <strong>Analytics API</strong> by clicking on the"
msgstr ""
@@ -2097,6 +2006,13 @@ 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"
msgstr ""
@@ -2113,6 +2029,11 @@ 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"
msgstr ""
@@ -2133,11 +2054,6 @@ 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"
" then that tells you no one is typing that phrase into Google. There is no\n"
@@ -2156,10 +2072,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:33
+#: code:addons/website/static/src/xml/website.xml:13
#, python-format
-msgid "It might be possible to edit the relevant items\n"
-" or fix the issue in"
+msgid "It might be possible to edit the relevant items or fix the issue in"
msgstr ""
#. module: website
@@ -2192,7 +2107,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:39
+#: code:addons/website/static/src/xml/website.seo.xml:28
#, python-format
msgid "Language:"
msgstr ""
@@ -2220,7 +2135,6 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_config_settings_write_uid
#: model:ir.model.fields,field_description:website.field_website_menu_write_uid
-#: model:ir.model.fields,field_description:website.field_website_seo_metadata_write_uid
#: model:ir.model.fields,field_description:website.field_website_write_uid
msgid "Last Updated by"
msgstr ""
@@ -2228,7 +2142,6 @@ msgstr ""
#. module: website
#: model:ir.model.fields,field_description:website.field_website_config_settings_write_date
#: model:ir.model.fields,field_description:website.field_website_menu_write_date
-#: model:ir.model.fields,field_description:website.field_website_seo_metadata_write_date
#: model:ir.model.fields,field_description:website.field_website_write_date
msgid "Last Updated on"
msgstr ""
@@ -2256,9 +2169,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:89
+#: 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
@@ -2267,6 +2180,13 @@ msgid "Limited customization"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:25
+#, 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
msgid "LinkedIn Account"
@@ -2279,7 +2199,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.seo.js:82
+#: code:addons/website/static/src/js/website.seo.js:83
#, python-format
msgid "Loading..."
msgstr ""
@@ -2290,11 +2210,6 @@ 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"
msgstr ""
@@ -2331,7 +2246,7 @@ msgid "Meet your existing customers and encourage them to 'repeat buy'."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:308
+#: code:addons/website/models/website.py:320
#: model:ir.model.fields,field_description:website.field_website_menu_name
#: model:ir.ui.view,arch_db:website.view_website_config_settings
#, python-format
@@ -2339,33 +2254,27 @@ msgid "Menu"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:312
-#, python-format
-msgid "Menu <b>%s</b> seems to have a link to this page !"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.contentMenu.xml:68
+#: code:addons/website/static/src/js/website.mobile.js:42
#, python-format
-msgid "Menu Label"
+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/xml/website.xml:9
+#: code:addons/website/static/src/xml/website.backend.xml:48
#, 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
@@ -2380,7 +2289,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:52
+#: code:addons/website/static/src/xml/website.seo.xml:41
#, python-format
msgid "Most searched topics related to your keywords, ordered by importance:"
msgstr ""
@@ -2411,20 +2320,13 @@ 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:150
-#, python-format
-msgid "New Name"
+#: model:ir.ui.view,arch_db:website.view_website_config_settings
+msgid "New Language"
msgstr ""
#. module: website
@@ -2442,14 +2344,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:148
-#, python-format
-msgid "New name"
-msgstr ""
-
-#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.editor.js:123
+#: code:addons/website/static/src/js/website.editor.js:126
#, python-format
msgid "New or existing page"
msgstr ""
@@ -2476,15 +2371,6 @@ 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."
msgstr ""
@@ -2525,11 +2411,6 @@ msgid "Odoo CMS- Sample image floating"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "Odoo Members"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.show_website_info
msgid "Odoo Version"
msgstr ""
@@ -2546,12 +2427,6 @@ msgid "Odoo provides essential platform for our project management.\n"
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"
" Things are better organized and more visible with it."
@@ -2574,12 +2449,6 @@ msgid "Odoo's POS is a web application that can run on any device that\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "Odoo's POS is a web application that can run on any device that\n"
-" can display websites with little to no setup required."
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Off"
msgstr ""
@@ -2614,6 +2483,11 @@ msgid "Open Source eCommerce"
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.snippet_options
msgid "Orange Red"
msgstr ""
@@ -2639,6 +2513,11 @@ msgid "Our Offers"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.footer_default
+msgid "Our Products &amp; Services"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.s_references
msgid "Our References"
msgstr ""
@@ -2649,11 +2528,6 @@ msgid "Our Team"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.footer_default
-msgid "Our products &amp; Services"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.aboutus
msgid "Our products are designed for small to medium size companies willing to optimize\n"
" their performance."
@@ -2667,16 +2541,16 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/models/website.py:286
-#: code:addons/website/static/src/xml/website.editor.xml:11
+#: code:addons/website/models/website.py:299
+#: code:addons/website/static/src/xml/website.editor.xml:10
#, python-format
msgid "Page"
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:291
+#: code:addons/website/models/website.py:305
#, 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
@@ -2704,7 +2578,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
@@ -2713,13 +2587,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
@@ -2744,7 +2618,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.theme.js:293
+#: code:addons/website/static/src/js/website.theme.js:277
#, python-format
msgid "Please install or update node-less"
msgstr ""
@@ -2755,7 +2629,6 @@ msgid "Please note that you'll need an Odoo Standard or Business subscriptions f
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
#: model:ir.ui.view,arch_db:website.s_faq_collapse
msgid "Point of Sale Questions <small>v7</small>"
msgstr ""
@@ -2766,13 +2639,6 @@ msgid "Powered by"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.editor.js:38
-#, python-format
-msgid "Press The Top-Left Edit Button"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.kanban_contain
#: model:ir.ui.view,arch_db:website.pager
msgid "Prev"
@@ -2789,26 +2655,17 @@ msgid "Professional"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "Project Management Questions <small>v7</small>"
-msgstr ""
-
-#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:5
+#: model:ir.ui.view,arch_db:website.user_navbar
#: model:ir.ui.view,arch_db:website.website_planner
#, python-format
msgid "Promote"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
-msgid "Promote <span class=\"caret\"/>"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:20
+#: code:addons/website/static/src/js/website.seo.js:360
#, python-format
msgid "Promote This Page"
msgstr ""
@@ -2816,6 +2673,7 @@ msgstr ""
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:5
+#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
msgid "Promote page on the web"
msgstr ""
@@ -2842,9 +2700,9 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:75
+#: 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
@@ -2887,48 +2745,37 @@ 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:121
-#, python-format
-msgid "Reference(s) found:"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove Slide"
+msgid "Remove all images"
msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove all images"
+msgid "Remove from gallery"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Remove from gallery"
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "Rename Page"
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:96
-#: model:ir.ui.view,arch_db:website.user_navbar
+#: code:addons/website/static/src/xml/website.xml:105
#, python-format
-msgid "Rename Page"
+msgid "Rename Page To:"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Reset Transformation"
+#. openerp-web
+#: code:addons/website/static/src/js/website.contentMenu.js:93
+#, python-format
+msgid "Rename This Page"
msgstr ""
#. module: website
@@ -2963,32 +2810,19 @@ 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
-#: code:addons/website/static/src/xml/website.seo.xml:85
#, python-format
msgid "Save"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:74
-#, 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:96
-#, 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"
msgstr ""
@@ -3015,7 +2849,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:178
#, python-format
msgid "Select a Menu"
msgstr ""
@@ -3026,13 +2860,6 @@ msgid "Select and delete blocks to remove some features."
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:52
-#, 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"
msgstr ""
@@ -3048,16 +2875,6 @@ 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"
msgstr ""
@@ -3073,6 +2890,11 @@ 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 &gt; Website"
msgstr ""
@@ -3103,13 +2925,6 @@ msgid "Simple and obvious"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:20
-#, python-format
-msgid "Skip It"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Slideshow"
msgstr ""
@@ -3136,20 +2951,13 @@ msgid "Social Media"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:95
-#, 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.view_website_config_settings
-msgid "Optimization"
+msgid "Speed"
msgstr ""
#. module: website
@@ -3158,13 +2966,6 @@ msgid "Square"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:20
-#, python-format
-msgid "Start Tutorial"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Start by looking how often people search phrases related to your business,\n"
" how competitive the keywords are in AdWords, and how much it’ll cost to\n"
@@ -3196,11 +2997,6 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Style"
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Styling"
msgstr ""
@@ -3225,6 +3021,11 @@ msgid "Sunflower"
msgstr ""
#. module: website
+#: model:ir.ui.view,arch_db:website.user_navbar
+msgid "TRANSLATE"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.show_website_info
msgid "Technical name:"
msgstr ""
@@ -3240,14 +3041,14 @@ msgid "Tell what's the value for the<br/>customer for this feature."
msgstr ""
#. module: website
-#: code:addons/website/models/website.py:296
+#: code:addons/website/models/website.py:310
#, 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:254
+#: code:addons/website/static/src/js/website.ace.js:247
#, python-format
msgid "Template ID: %s"
msgstr ""
@@ -3258,27 +3059,15 @@ msgid "Template fallback"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:88
-#, 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 add pages or add 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
@@ -3289,13 +3078,6 @@ msgid "The Point of Sale works perfectly on any kind of touch enabled\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "The Point of Sale works perfectly on any kind of touch enabled\n"
-" device, whether it's multi-touch tablets like an iPad or\n"
-" keyboardless resistive touchscreen terminals."
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "The best and simplest way to start is to create a few pages and link them directly from the main menu.\n"
" Just try not to go over 6 items, otherwise your main menu will be difficult to use."
@@ -3332,6 +3114,21 @@ msgid "The following error was raised in the website controller"
msgstr ""
#. module: website
+#: model:ir.model.fields,help:website.field_blog_post_website_url
+#: model:ir.model.fields,help:website.field_delivery_carrier_website_url
+#: model:ir.model.fields,help:website.field_event_event_website_url
+#: model:ir.model.fields,help:website.field_event_track_website_url
+#: model:ir.model.fields,help:website.field_hr_employee_website_url
+#: model:ir.model.fields,help:website.field_hr_job_website_url
+#: model:ir.model.fields,help:website.field_im_livechat_channel_website_url
+#: model:ir.model.fields,help:website.field_payment_acquirer_website_url
+#: model:ir.model.fields,help:website.field_product_template_website_url
+#: model:ir.model.fields,help:website.field_project_project_website_url
+#: model:ir.model.fields,help:website.field_res_partner_grade_website_url
+#: model:ir.model.fields,help:website.field_res_partner_tag_website_url
+#: model:ir.model.fields,help:website.field_res_partner_website_url
+#: model:ir.model.fields,help:website.field_slide_channel_website_url
+#: model:ir.model.fields,help:website.field_slide_slide_website_url
#: model:ir.model.fields,help:website.field_website_published_mixin_website_url
msgid "The full URL to access the document through the website."
msgstr ""
@@ -3375,14 +3172,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:32
+#: code:addons/website/static/src/xml/website.xml:12
#, python-format
msgid "The web site has encountered an error."
msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.theme.js:297
+#: code:addons/website/static/src/js/website.theme.js:280
#, python-format
msgid "Theme Error"
msgstr ""
@@ -3423,15 +3220,26 @@ 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:19
+#: code:addons/website/models/website.py:324
#, 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
@@ -3441,7 +3249,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:59
+#: code:addons/website/static/src/xml/website.seo.xml:48
#, python-format
msgid "Title"
msgstr ""
@@ -3471,9 +3279,8 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.contentMenu.js:176
+#: code:addons/website/static/src/js/website.contentMenu.js:173
#: model:website.menu,name:website.main_menu
-#: model:website.menu,name:website.website2_main_menu
#, python-format
msgid "Top Menu"
msgstr ""
@@ -3484,12 +3291,13 @@ msgid "Traceback"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.snippet_options
-msgid "Transform"
+#. openerp-web
+#: code:addons/website/static/src/js/website.snippets.editor.js:641
+#, python-format
+msgid "Transform the picture (click twice to reset transformation)"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.user_navbar
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Translate"
msgstr ""
@@ -3540,6 +3348,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 ""
@@ -3559,6 +3368,15 @@ 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."
msgstr ""
@@ -3584,7 +3402,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Use Google Adword"
+msgid "Use Google Adwords"
msgstr ""
#. module: website
@@ -3608,6 +3426,13 @@ msgid "Use the Newsletter subscription (from mass mailing application) or the Bi
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:42
+#, python-format
+msgid "User Documentation"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.robots
msgid "User-agent: *\n"
"Sitemap:"
@@ -3634,6 +3459,16 @@ msgid "View our themes selection"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_blog_post_website_published
+#: model:ir.model.fields,field_description:website.field_event_track_website_published
+#: model:ir.model.fields,field_description:website.field_hr_employee_website_published
+#: model:ir.model.fields,field_description:website.field_hr_job_website_published
+#: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_published
+#: model:ir.model.fields,field_description:website.field_product_template_website_published
+#: model:ir.model.fields,field_description:website.field_project_project_website_published
+#: model:ir.model.fields,field_description:website.field_res_partner_website_published
+#: model:ir.model.fields,field_description:website.field_slide_channel_website_published
+#: model:ir.model.fields,field_description:website.field_slide_slide_website_published
#: model:ir.model.fields,field_description:website.field_website_published_mixin_website_published
msgid "Visible in Website"
msgstr ""
@@ -3644,6 +3479,20 @@ msgid "Visitors might not be interested in your products or services when they c
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:16
+#, python-format
+msgid "Visits"
+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"
" life through disruptive products. We build great products to solve your\n"
@@ -3678,6 +3527,7 @@ msgstr ""
#: model:ir.model.fields,field_description:website.field_ir_ui_view_website_id
#: model:ir.model.fields,field_description:website.field_website_menu_website_id
#: model:ir.ui.menu,name:website.menu_website
+#: model:ir.ui.view,arch_db:website.user_navbar
#: model:ir.ui.view,arch_db:website.view_server_action_search_website
msgid "Website"
msgstr ""
@@ -3693,11 +3543,21 @@ 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"
msgstr ""
@@ -3715,16 +3575,6 @@ 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"
msgstr ""
@@ -3746,19 +3596,33 @@ msgid "Website Theme"
msgstr ""
#. module: website
-#: model:ir.model.fields,field_description:website.field_ir_act_server_website_url
+#: model:ir.model.fields,field_description:website.field_blog_post_website_url
+#: model:ir.model.fields,field_description:website.field_delivery_carrier_website_url
+#: model:ir.model.fields,field_description:website.field_event_event_website_url
+#: model:ir.model.fields,field_description:website.field_event_track_website_url
+#: model:ir.model.fields,field_description:website.field_hr_employee_website_url
+#: model:ir.model.fields,field_description:website.field_hr_job_website_url
+#: model:ir.model.fields,field_description:website.field_im_livechat_channel_website_url
+#: model:ir.model.fields,field_description:website.field_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
+#: model:ir.model.fields,field_description:website.field_res_partner_grade_website_url
+#: model:ir.model.fields,field_description:website.field_res_partner_tag_website_url
+#: model:ir.model.fields,field_description:website.field_res_partner_website_url
+#: model:ir.model.fields,field_description:website.field_slide_channel_website_url
+#: model:ir.model.fields,field_description:website.field_slide_slide_website_url
#: model:ir.model.fields,field_description:website.field_website_published_mixin_website_url
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
@@ -3767,19 +3631,64 @@ msgid "Website menu"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_blog_blog_website_meta_description
+#: model:ir.model.fields,field_description:website.field_blog_post_website_meta_description
+#: model:ir.model.fields,field_description:website.field_blog_tag_website_meta_description
+#: model:ir.model.fields,field_description:website.field_event_event_website_meta_description
+#: model:ir.model.fields,field_description:website.field_event_track_website_meta_description
+#: model:ir.model.fields,field_description:website.field_forum_documentation_toc_website_meta_description
+#: model:ir.model.fields,field_description:website.field_forum_forum_website_meta_description
+#: model:ir.model.fields,field_description:website.field_forum_post_website_meta_description
+#: model:ir.model.fields,field_description:website.field_forum_tag_website_meta_description
+#: model:ir.model.fields,field_description:website.field_hr_job_website_meta_description
#: model:ir.model.fields,field_description:website.field_ir_ui_view_website_meta_description
+#: model:ir.model.fields,field_description:website.field_product_public_category_website_meta_description
+#: model:ir.model.fields,field_description:website.field_product_template_website_meta_description
+#: model:ir.model.fields,field_description:website.field_res_partner_website_meta_description
+#: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_description
+#: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_description
#: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_blog_blog_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_blog_post_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_blog_tag_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_event_event_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_event_track_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_forum_documentation_toc_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_forum_forum_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_forum_post_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_forum_tag_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_hr_job_website_meta_keywords
#: model:ir.model.fields,field_description:website.field_ir_ui_view_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_product_public_category_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_product_template_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_res_partner_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_keywords
+#: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_keywords
#: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website
+#: model:ir.model.fields,field_description:website.field_blog_blog_website_meta_title
+#: model:ir.model.fields,field_description:website.field_blog_post_website_meta_title
+#: model:ir.model.fields,field_description:website.field_blog_tag_website_meta_title
+#: model:ir.model.fields,field_description:website.field_event_event_website_meta_title
+#: model:ir.model.fields,field_description:website.field_event_track_website_meta_title
+#: model:ir.model.fields,field_description:website.field_forum_documentation_toc_website_meta_title
+#: model:ir.model.fields,field_description:website.field_forum_forum_website_meta_title
+#: model:ir.model.fields,field_description:website.field_forum_post_website_meta_title
+#: model:ir.model.fields,field_description:website.field_forum_tag_website_meta_title
+#: model:ir.model.fields,field_description:website.field_hr_job_website_meta_title
#: model:ir.model.fields,field_description:website.field_ir_ui_view_website_meta_title
+#: model:ir.model.fields,field_description:website.field_product_public_category_website_meta_title
+#: model:ir.model.fields,field_description:website.field_product_template_website_meta_title
+#: model:ir.model.fields,field_description:website.field_res_partner_website_meta_title
+#: model:ir.model.fields,field_description:website.field_slide_channel_website_meta_title
+#: model:ir.model.fields,field_description:website.field_slide_slide_website_meta_title
#: model:ir.model.fields,field_description:website.field_website_seo_metadata_website_meta_title
msgid "Website meta title"
msgstr ""
@@ -3795,27 +3704,22 @@ msgid "Websites to translate"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "Welcome"
-msgstr ""
-
-#. module: website
#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:18
+#: code:addons/website/static/src/xml/website.backend.xml:47
#, python-format
-msgid "Welcome to your website!"
+msgid "Week"
msgstr ""
#. module: website
-#. openerp-web
-#: code:addons/website/static/src/js/website.tour.banner.js:81
-#, python-format
-msgid "Well done, you created your homepage."
+#: model:ir.ui.view,arch_db:website.website_planner
+msgid "Welcome"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "What a day it was yesterday - such a big day for us!"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:20
+#, python-format
+msgid "Welcome to your"
msgstr ""
#. module: website
@@ -3829,7 +3733,6 @@ msgid "Whether this view is a web page template (complete)"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
#: model:ir.ui.view,arch_db:website.s_faq_collapse
msgid "Which hardware does Odoo POS support?"
msgstr ""
@@ -3841,27 +3744,17 @@ msgid "While an internet connection is required to start the Point of\n"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "While an internet connection is required to start the Point of\n"
-" Sale, it will stay operational even after a complete disconnection."
-msgstr ""
-
-#. module: website
-#: model:ir.ui.view,arch_db:website.s_text_image_floating
-msgid "With Odoo's fully integrated software, you can easily manage your\n"
-" meetings, schedule business calls, create recurring meetings,\n"
-" synchronize your agenda and easily keep in touch with your colleagues,\n"
-" partners and other people involved in projects or business discussions.\n"
-" <br/><br/>"
-msgstr ""
-
-#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "With Odoo, you can automatically check which keywords are ranked best for a\n"
" 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"
msgstr ""
@@ -3873,12 +3766,6 @@ msgid "Write a quote here from one of your customers. Quotes are a\n"
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"
" great way to build confidence in your products or services."
@@ -3905,6 +3792,11 @@ msgid "Write one or two paragraphs describing your product,\n"
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."
msgstr ""
@@ -3915,6 +3807,13 @@ 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:49
+#, python-format
+msgid "Year"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.snippet_options
msgid "Yellow Green"
msgstr ""
@@ -3925,11 +3824,6 @@ msgid "Yes"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.s_faq
-msgid "Yes."
-msgstr ""
-
-#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.translator.xml:18
#, python-format
@@ -3971,14 +3865,28 @@ msgid "You can set Odoo on a custom domain name (e.g. yourcompany.com) for both
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:37
+#, 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:36
+#, 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
-msgid "You should try others search criteria."
+msgid "You should try other search criteria."
msgstr ""
#. module: website
@@ -3987,10 +3895,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:47
#: model:ir.ui.view,arch_db:website.s_banner
-#, python-format
msgid "Your Banner Title"
msgstr ""
@@ -4005,6 +3910,13 @@ msgid "Your Footer"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:40
+#, python-format
+msgid "Your Google Analytic Client ID:"
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "Your Homepage"
msgstr ""
@@ -4086,12 +3998,19 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:28
+#: code:addons/website/static/src/xml/website.seo.xml:17
#, python-format
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"
msgstr ""
@@ -4103,7 +4022,7 @@ msgstr ""
#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
-msgid "ex: Contact us, Our Customers, Privacy Policy, Events, Bolg, Jobs"
+msgid "ex: Contact us, Our Customers, Privacy Policy, Events, Blog, Jobs"
msgstr ""
#. module: website
@@ -4118,7 +4037,14 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:73
+#: 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
#, python-format
msgid "how your page will be listed on Google"
msgstr ""
@@ -4225,13 +4151,6 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:85
-#, python-format
-msgid "or"
-msgstr ""
-
-#. module: website
-#. openerp-web
#: code:addons/website/static/src/xml/website.translator.xml:5
#: model:ir.ui.view,arch_db:website.user_navbar
#, python-format
@@ -4254,8 +4173,10 @@ msgid "send us an email"
msgstr ""
#. module: website
-#: model:ir.ui.view,arch_db:website.sitemap_index_xml
-msgid "sitemap-"
+#. openerp-web
+#: code:addons/website/static/src/xml/website.editor.xml:22
+#, python-format
+msgid "signs to start."
msgstr ""
#. module: website
@@ -4265,7 +4186,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.xml:35
+#: code:addons/website/static/src/xml/website.xml:13
#, python-format
msgid "the classic Odoo interface"
msgstr ""
@@ -4283,6 +4204,13 @@ msgid "to do that (make sure the Advanced Options are set to your country and\n"
msgstr ""
#. module: website
+#. openerp-web
+#: code:addons/website/static/src/xml/website.backend.xml:42
+#, python-format
+msgid "to get more information."
+msgstr ""
+
+#. module: website
#: model:ir.ui.view,arch_db:website.website_planner
msgid "to get started."
msgstr ""
@@ -4299,7 +4227,7 @@ msgstr ""
#. module: website
#. openerp-web
-#: code:addons/website/static/src/xml/website.seo.xml:56
+#: code:addons/website/static/src/xml/website.seo.xml:45
#, python-format
msgid "using above suggested keywords"
msgstr ""
diff --git a/addons/website_blog/i18n/website_blog.pot b/addons/website_blog/i18n/website_blog.pot
index b936a8dc175..11734a63aa7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,10 +16,8 @@ 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 "&amp;mdash;"
msgstr ""
#. module: website_blog
@@ -33,204 +31,63 @@ msgid "&lt;?xml version=\"1.0\" encoding=\"utf-8\"?&gt;"
msgstr ""
#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_1
-msgid "<div class=\"container\">\n"
-" <section class=\"mt16 mb16 readable\">\n"
-" <iframe width=\"100%\" height=\"250\" src=\"http://www.youtube.com/embed/EkbBFmIWoTE\" frameborder=\"0\" allowfullscreen></iframe>\n"
-" <p data-chatter-id=\"counter_52500/div/section\">\n"
-" Emails are broken.\n"
-" </p><p data-chatter-id=\"counter_15339/div/section\">\n"
-" 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!\n"
-" </p><p data-chatter-id=\"counter_98391/div/section\">\n"
-" 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!\n"
-" </p>\n"
-" </section>\n"
-" <section class=\"mt16 mb16 readable\">\n"
-" <p data-chatter-id=\"counter_99844/div/section\">\n"
-" 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.\n"
-" </p><p data-chatter-id=\"counter_72514/div/section\">\n"
-" To disrupt emails, you need more than just another user\n"
-" interface. We need to rethink the whole communication flow.\n"
-" </p>\n"
-" <h3>The Communication Mechanism of Odoo</h3>\n"
-" <p data-chatter-id=\"counter_44333/div/section\">\n"
-" Here are the ideas behind the Odoo communication tools:\n"
-" </p>\n"
-" <ul>\n"
-" <li>\n"
-" 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.\n"
-" <img class=\"img-responsive\" src=\"/website_blog/static/src/img/mail-sc-00.png\">\n"
-" </li><li>\n"
-" 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.\n"
-" </li><li>\n"
-" 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.\n"
-" <img class=\"img-responsive\" src=\"/website_blog/static/src/img/mail-sc-03.png\">\n"
-" </li><li>\n"
-" A mix of push &amp; pull: Today, people\n"
-" are victims of what others decide to push to them.\n"
-" Odoo differentiates:\n"
-" <ul>\n"
-" <li>\n"
-" 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.\n"
-" </li><li>\n"
-" 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.\n"
-" </li>\n"
-" </ul>\n"
-" </li><li>\n"
-" 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)\n"
-" </li><li>\n"
-" 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.\n"
-" </li>\n"
-" </ul>\n"
-" </section>\n"
-" </div>\n"
-"\n"
-""
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,content:website_blog.blog_post_2
-msgid "<section><div class=\"container\">\n"
-" <div class=\"row\">\n"
-" <div class=\"col-md-6 mt16\"><img class=\"img img-responsive mb16\" src=\"/website_blog/static/src/img/CMS_WMS_screens.jpg\" style=\"\"></div>\n"
-"\n"
-" <div class=\"col-md-6 mt16\">\n"
-" <h3>New Features Launched</h3>\n"
-"\n"
-" <p data-chatter-id=\"counter_0/section/div/div/div\">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.</p>\n"
-" </div>\n"
-" </div>\n"
-" \n"
-" <section class=\"readable\">\n"
-" <p data-chatter-id=\"counter_75695/section/div/section\">\n"
-" 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?\n"
-" </p><p data-chatter-id=\"counter_63354/section/div/section\">\n"
-" \"Odoo's latest launch will allow a business to go from\n"
-" zero to trading online quicker than ever before,&#8221; Stuart\n"
-" Mackintosh, MD of Open Source specialist and Odoo\n"
-" integration partner, OpusVL, explains. &#8220;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.\"\n"
-" </p>\n"
-" <blockquote>\n"
-" <p data-chatter-id=\"counter_92702/section/div/section/blockquote\">\n"
-" \"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.\"\n"
-" </p>\n"
-" </blockquote>\n"
-" <p data-chatter-id=\"counter_70446/section/div/section\">\n"
-" \"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.\"\n"
-" </p><p data-chatter-id=\"counter_44493/section/div/section\">\n"
-" \"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.\"\n"
-" </p>\n"
-" <h4>Adding to industry leading technology</h4>\n"
-" <p data-chatter-id=\"counter_41774/section/div/section\">\n"
-" 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.\n"
-" </p><p data-chatter-id=\"counter_58203/section/div/section\">\n"
-" 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.\n"
-" </p><p data-chatter-id=\"counter_39750/section/div/section\">\n"
-" 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.\n"
-" </p><p data-chatter-id=\"counter_74064/section/div/section\">\n"
-" 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.\n"
-" </p>\n"
-" </section>\n"
-"\n"
-"</div></section>"
-msgstr ""
-
-#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:219
+#: 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
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:53
#, python-format
-msgid "A new post %s has been published on the %s blog."
+msgid "<b>Click on Save</b> to record yoru changes."
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
-msgid "About us"
+#. 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.model.fields,field_description:website_blog.field_blog_blog_message_needaction
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_needaction
-msgid "Action Needed"
+#. 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
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:24
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:44
#, python-format
-msgid "Add Content"
+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
+#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
+msgid "A new post"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
+msgid "About us"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
+msgid "Access post"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.model.fields,field_description:website_blog.field_blog_blog_active
+#: model:ir.model.fields,field_description:website_blog.field_blog_post_active
+msgid "Active"
+msgstr ""
+
+#. module: website_blog
+#: model:ir.ui.view,arch_db:website_blog.blog_blog_view_search
+#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
+msgid "Archived"
msgstr ""
#. module: website_blog
@@ -245,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 ""
@@ -258,6 +114,7 @@ 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
@@ -270,7 +127,7 @@ msgid "Blog Name"
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:287
+#: 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
@@ -279,20 +136,14 @@ msgid "Blog Post"
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:291
+#: 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 ""
@@ -335,13 +186,8 @@ 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"
@@ -349,36 +195,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
-#, 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"
-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:35
#, python-format
msgid "Choose an image from the library."
msgstr ""
#. module: website_blog
-#: code:addons/website_blog/models/website_blog.py:220
+#. openerp-web
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:30
#, python-format
-msgid "Click here to access the post."
+msgid "Clich here to change your post cover."
msgstr ""
#. module: website_blog
@@ -388,23 +214,9 @@ msgstr ""
#. module: website_blog
#. openerp-web
-#: code:addons/website_blog/static/src/js/website.tour.blog.js:94
-#, 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
+#: code:addons/website_blog/static/src/js/website.tour.blog.js:40
#, 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
@@ -413,59 +225,24 @@ 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 ""
@@ -478,20 +255,9 @@ 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,help:website_blog.field_blog_blog_message_last_post
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_last_post
-msgid "Date of the last message posted on the record."
-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
+#: model:ir.model.fields,field_description:website_blog.field_survey_mail_compose_message_path
msgid "Discussion Path"
msgstr ""
@@ -508,26 +274,13 @@ msgid "Duplicate"
msgstr ""
#. module: website_blog
-#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
-msgid "Follow us"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_follower_ids
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_follower_ids
-msgid "Followers"
+#: model:ir.model,name:website_blog.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_channel_ids
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_partner_ids
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_partner_ids
-msgid "Followers (Partners)"
+#: model:ir.model,name:website_blog.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
msgstr ""
#. module: website_blog
@@ -563,51 +316,17 @@ 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.model.fields,help:website_blog.field_blog_blog_message_unread
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_blog_message_needaction
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: website_blog
#: model:ir.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:ir.model.fields,field_description:website_blog.field_blog_blog_message_is_follower
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_write_uid
#: model:ir.ui.view,arch_db:website_blog.view_blog_post_search
msgid "Last Contributor"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_last_post
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_blog___last_update
#: model:ir.model.fields,field_description:website_blog.field_blog_post___last_update
#: model:ir.model.fields,field_description:website_blog.field_blog_post_write_date
@@ -633,13 +352,6 @@ 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:ir.ui.view,arch_db:website_blog.website_blog
msgid "Low"
msgstr ""
@@ -655,22 +367,8 @@ msgid "Message"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_ids
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_blog_message_ids
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_ids
-msgid "Messages and communication history"
-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
@@ -685,8 +383,6 @@ 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
@@ -725,32 +421,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:ir.model.fields,field_description:website_blog.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_blog_message_needaction_counter
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,help:website_blog.field_blog_post_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: website_blog
-#: model:blog.post,website_meta_keywords:website_blog.blog_post_1
-msgid "Odoo, email"
+msgid "Once you have reviewed the content on mobile, close the preview."
msgstr ""
#. module: website_blog
@@ -774,56 +447,40 @@ 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
-#: model:ir.ui.view,arch_db:website_blog.opt_blog_post_complete_comment
-#, 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
-#: code:addons/website_blog/controllers/main.py:267
+#: 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
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
@@ -837,7 +494,7 @@ 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 ""
@@ -848,44 +505,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 Blog"
-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
@@ -894,32 +523,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:90
-#: 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. Click on save in the upper left corner when you are done."
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us
+msgid "Stay updated :"
msgstr ""
#. module: website_blog
@@ -929,6 +552,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 ""
@@ -954,26 +578,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,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
+msgid "Teaser"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_post_website_url
-msgid "The full URL to access the document through the website."
+#: 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
@@ -983,27 +599,13 @@ msgid "This page is great to improve your <strong>Search Engine Optimization</st
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 right customize menu. You can also add some cool content with your text by clicking on 'Insert Blocks' in the edit mode."
-msgstr ""
-
-#. module: website_blog
#: model:ir.model.fields,field_description:website_blog.field_blog_post_name
msgid "Title"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_unread
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_message_unread_counter
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_status
+msgid "Unpublished"
msgstr ""
#. module: website_blog
@@ -1013,9 +615,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 <em>'Content'</em> menu 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
@@ -1024,22 +626,19 @@ msgid "Used in:"
msgstr ""
#. module: website_blog
+#: model:ir.model.fields,help:website_blog.field_mail_compose_message_path
#: model:ir.model.fields,help:website_blog.field_mail_message_path
+#: model:ir.model.fields,help:website_blog.field_survey_mail_compose_message_path
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:266
+#: code:addons/website_blog/models/website_blog.py:212
#, python-format
msgid "View Blog Post"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_blog
#: model:ir.model,name:website_blog.model_website
msgid "Website"
msgstr ""
@@ -1050,51 +649,16 @@ msgid "Website Blogs"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_website_message_ids
#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_message_ids
msgid "Website Messages"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,help:website_blog.field_blog_blog_website_message_ids
#: model:ir.model.fields,help:website_blog.field_blog_post_website_message_ids
msgid "Website communication history"
msgstr ""
#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_website_meta_description
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_meta_description
-#: model:ir.model.fields,field_description:website_blog.field_blog_tag_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_website_meta_keywords
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_meta_keywords
-#: model:ir.model.fields,field_description:website_blog.field_blog_tag_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_blog
-#: model:ir.model.fields,field_description:website_blog.field_blog_blog_website_meta_title
-#: model:ir.model.fields,field_description:website_blog.field_blog_post_website_meta_title
-#: model:ir.model.fields,field_description:website_blog.field_blog_tag_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:26
-#, python-format
-msgid "Write a comment..."
-msgstr ""
-
-#. module: website_blog
#: model:ir.ui.view,arch_db:website_blog.opt_blog_rc_about_us
msgid "Write a small text here for when <b>new visitors</b> find your website\n"
" through your <b>blog entries</b>, referenced in Google."
@@ -1102,7 +666,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 ""
@@ -1119,10 +683,8 @@ msgid "You should <strong>add a banner on the top</strong> as it is a frequent l
msgstr ""
#. module: website_blog
-#. openerp-web
-#: code:addons/website_blog/static/src/xml/website_blog.inline.discussion.xml:14
-#, python-format
-msgid "by"
+#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
+msgid "blog. Click here to access the blog :"
msgstr ""
#. module: website_blog
@@ -1138,13 +700,8 @@ msgid "comments"
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_complete
-msgid "on"
+#: model:ir.ui.view,arch_db:website_blog.blog_post_template_new_post
+msgid "has been published on the"
msgstr ""
#. module: website_blog
@@ -1154,10 +711,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 1b0a0bb3885..7234d5f9cce 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,25 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:38
+#, python-format
+msgid "% Leads"
+msgstr ""
+
+#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_thanks
msgid "&amp;times;"
msgstr ""
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_form
+msgid "<span class=\"btn btn-primary btn-lg o_website_form_send\">Send</span>\n"
+" <span id=\"o_website_form_result\"/>"
+msgstr ""
+
+#. module: website_crm
+#: model:ir.ui.view,arch_db:website_crm.contactus_form
msgid "Email"
msgstr ""
@@ -31,18 +44,34 @@ msgid "If you have an emergency, do not hesitate to contact us by phone:"
msgstr ""
#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:7
+#, python-format
+msgid "Lead Acquisition"
+msgstr ""
+
+#. module: website_crm
#: model:ir.model,name:website_crm.model_crm_lead
msgid "Lead/Opportunity"
msgstr ""
#. module: website_crm
-#: model:ir.ui.view,arch_db:website_crm.contactus_form
-msgid "Phone Number"
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:37
+#, python-format
+msgid "Leads"
+msgstr ""
+
+#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:15
+#, python-format
+msgid "Leads Analysis"
msgstr ""
#. module: website_crm
#: model:ir.ui.view,arch_db:website_crm.contactus_form
-msgid "Send"
+msgid "Phone Number"
msgstr ""
#. module: website_crm
@@ -56,6 +85,13 @@ msgid "Thanks!"
msgstr ""
#. module: website_crm
+#. openerp-web
+#: code:addons/website_crm/static/src/xml/website_crm_dashboard.xml:17
+#, 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."
msgstr ""
@@ -85,8 +121,3 @@ msgstr ""
msgid "Your message has been sent successfully."
msgstr ""
-#. module: website_crm
-#: model:ir.ui.view,arch_db:website_crm.contactus_form
-msgid "e.g. (+32).81.81.37.00"
-msgstr ""
-
diff --git a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot
index fdac74ac390..0037c61c2cf 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
@@ -1,13 +1,13 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * crm_partner_assign
+# * website_crm_partner_assign
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:27+0000\n"
-"PO-Revision-Date: 2015-09-14 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: crm_partner_assign
-#: model:mail.template,body_html:crm_partner_assign.email_template_lead_forward_mail
+#. module: website_crm_partner_assign
+#: model:mail.template,body_html:website_crm_partner_assign.email_template_lead_forward_mail
msgid "\n"
" \n"
"<p>Hello,</p>\n"
@@ -51,837 +51,1103 @@ msgid "\n"
" "
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_nbr
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_opp
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_channel_interested.py:30
+#. 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 "&amp;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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_channel_interested.py:35
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_channel_interested.py:37
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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','&lt;=',0)]}\">N </span>\n"
" <span class=\"oe_grey\" attrs=\"{'invisible':[('partner_latitude','&gt;=',0)]}\">S </span>"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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','&lt;=',0)]}\">E </span>\n"
" <span class=\"oe_grey\" attrs=\"{'invisible':[('partner_longitude','&gt;=',0)]}\">W </span>\n"
" <span class=\"oe_grey\">) </span>"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_activation
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation
-#: model:ir.ui.view,arch_db:crm_partner_assign.res_partner_activation_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.res_partner_activation_tree
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_res_partner_filter_assign
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_active
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_active
msgid "Active"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_date_assign
-msgid "Assign Date"
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/models/crm_lead.py:230
+#, python-format
+msgid "Activity Done"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
-msgid "Assign Month"
+#. 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: crm_partner_assign
-#: model:ir.actions.server,name:crm_partner_assign.action_assign_salesman_according_assigned_partner
-msgid "Assign salesman of assigned partner"
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:88
+#, python-format
+msgid "All"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_date_assign
-msgid "Assignation Date"
+#. 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: crm_partner_assign
-#: model:crm.stage,name:crm_partner_assign.stage_portal_lead_assigned
-msgid "Assigned"
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_partner_assign_form
-msgid "Assigned Opportunities"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_partner_assigned_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_partner_assigned_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_partner_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_partner_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_forward_to_partner_body
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_probability
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_tree
-msgid "Avg. of Probability"
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead_report_assign
msgid "CRM Lead Report"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_partner_report_assign
msgid "CRM Partner Report"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_forward_to_partner_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-msgid "Categorization"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "City"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_date_closed
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_comment
-msgid "Comment"
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-msgid "Communication"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_company_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
-msgid "Company"
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
-msgid "Confirm"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "Contact a reseller"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-msgid "Contact"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_body
-msgid "Contents"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Countries..."
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_country_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_country_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_create_date
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_create_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_create_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_create_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_create_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_create_uid
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_create_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_create_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_create_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_create_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_create_date
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_partner_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_tree
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
msgid "Customer Name"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_delay_open
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_delay_close
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-msgid "Details"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "Details Next Activity"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_contacted
-msgid "Did you contact the lead?"
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_display_name
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_display_name
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_forward_to_partner_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_tree
-msgid "Expected Revenues"
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_partner_id
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_forward_type
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+#. 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: crm_partner_assign
-#: model:mail.template,subject:crm_partner_assign.email_template_lead_forward_mail
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_partner_latitude
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_partner_longitude
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_res_partner_grade_partner_weight
-#: model:ir.model.fields,help:crm_partner_assign.field_res_partner_partner_weight
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_grade_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_grade_id
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
msgid "High"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_tree
-msgid "I'm interested"
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_tree
-msgid "I'm not interested"
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_id
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_implemented_partner_ids
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_assigned_partner_id
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_interested
-msgid "Interested by this lead"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_date
-msgid "Invoice Account Date"
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_account_invoice_report
+msgid "Invoices Statistics"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation___last_update
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade___last_update
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_write_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_write_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_write_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_write_uid
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_write_uid
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_write_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_channel_interested_write_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_write_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_write_date
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_write_date
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_date_assign
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_date_review
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_date_review
+#. 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: crm_partner_assign
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,type:0
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_lead_id
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation_lead_id
msgid "Lead"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_lead_link
-msgid "Lead Single Links"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
+msgid "Lead -"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_graph
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_pivot
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_channel_interested_act
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_lead
msgid "Lead Feedback"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_lead_location
+#. 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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead
-msgid "Lead/Opportunity"
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_portal_leads
-#: model:ir.ui.menu,name:crm_partner_assign.openerp_portal_menu_sales_leads_current
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_tree
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_tree
-msgid "Leads"
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead
+msgid "Lead/Opportunity"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.portal_leads
-msgid "Leads & Opportunities"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
+msgid "Leads"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_id_9621
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_partner_grade_form
+#. module: website_crm_partner_assign
+#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_10377
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form
msgid "Level"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_name
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_partner_weight
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_partner_weight
+#. 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: crm_partner_assign
+#. 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 "Lost"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
msgid "Low"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_probability_max
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_partner_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_partner_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_name
+#. 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: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 "Name"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_date_review_next
+#. module: website_crm_partner_assign
+#: 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.portal_my_opportunity
+msgid "Next Activity"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: 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.model.fields,field_description:website_crm_partner_assign.field_res_partner_date_review_next
msgid "Next Partner Review"
msgstr ""
-#. module: crm_partner_assign
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+msgid "No result found"
+msgstr ""
+
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
msgid "Normal"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_report_assign_delay_close
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_report_assign_delay_open
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
-msgid "Once the lead is processed, it will be in your \"Opportunities\" menu."
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_opening_date
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_portal_opportunities
-#: model:ir.ui.menu,name:crm_partner_assign.openerp_portal_menu_sales_leads_current1
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_home_menu_lead
msgid "Opportunities"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_graph
+#. 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: crm_partner_assign
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,type:0
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_tree
msgid "Opportunity"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_delay_expected
+#. 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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_partner_assigned_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_partner_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_partner_assign_form
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
-#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_forward_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_forward_to_partner_assignation_lines
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
-#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_partner_grade_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_partner_grade_tree
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_assignation_partner_location
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_form
-msgid "Partner Name"
-msgstr ""
-
-#. module: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_partner_assign_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_partner_assigned_id
+#. 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: crm_partner_assign
-#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_date_partnership
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_date_partnership
+#. 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: crm_partner_assign
-#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+#. module: website_crm_partner_assign
+#: model:ir.ui.menu,name:website_crm_partner_assign.menu_report_crm_partner_assign_tree
msgid "Partnerships"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_planned_revenue
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_priority
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_opportunity_portal_form
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_probable_revenue
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_team_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_team_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.footer_custom
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.layout
+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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_partner_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_forward_to_partner_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_lead_geo_assign_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_crm_opportunity_geo_assign_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_forward_to_partner_form
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_activation_sequence
-#: model:ir.model.fields,field_description:crm_partner_assign.field_res_partner_grade_sequence
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:84
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:82
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_stage_id
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_report_crm_lead_assign_filter
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_portal_tree
-msgid "Subject"
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_opportunity
+msgid "States..."
msgstr ""
-#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/crm_lead.py:17
-#, python-format
-msgid "The CRM Channel Interested Action is missing"
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:69
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:73
-#, python-format
-msgid "The Portal group cannot be found"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_channel_interested_contacted
-msgid "The lead has been contacted"
+#. 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: crm_partner_assign
-#: model:crm.stage,name:crm_partner_assign.stage_portal_lead_recycle
-msgid "To Recycle"
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_turnover
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_type
+#. 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: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_report_assign_type
+#. 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: crm_partner_assign
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_lead_report_assign_user_id
-#: model:ir.model.fields,field_description:crm_partner_assign.field_crm_partner_report_assign_user_id
+#. 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: crm_partner_assign
+#. module: website_crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
msgid "Very High"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model.fields,help:crm_partner_assign.field_crm_lead_channel_interested_comment
-msgid "What are the elements that have led to this decision?"
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.crm_lead_channel_interested_form
+#. 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: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_channel_interested.py:26
+#. module: website_crm_partner_assign
+#: code:addons/website_crm_partner_assign/controllers/main.py:93
#, python-format
-msgid "You must contact the lead before saying that you are interested"
+msgid "Won"
msgstr ""
-#. module: crm_partner_assign
+#. 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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_assignation
-msgid "crm.lead.assignation"
+#. 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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_channel_interested
-msgid "crm.lead.channel.interested"
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_crm_lead_assignation
+msgid "crm.lead.assignation"
msgstr ""
-#. module: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+#. 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: crm_partner_assign
-#: model:ir.ui.view,arch_db:crm_partner_assign.view_partner_grade_form
+#. 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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+#. 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"
+msgstr ""
+
+#. module: website_crm_partner_assign
+#: model:ir.ui.view,arch_db:website_crm_partner_assign.index
+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: crm_partner_assign
-#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+#. module: website_crm_partner_assign
+#: model:ir.model,name:website_crm_partner_assign.model_res_partner_grade
msgid "res.partner.grade"
msgstr ""
-#. module: crm_partner_assign
+#. 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 9803f58a02f..230de0c0249 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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 ""
@@ -120,12 +120,6 @@ msgid "Partner Tag"
msgstr ""
#. module: website_customer
-#: model:ir.actions.act_window,name:website_customer.action_partner_tag_form
-#: model:ir.ui.view,arch_db:website_customer.view_partner_tag_list
-msgid "Partner Tags"
-msgstr ""
-
-#. module: website_customer
#: model:ir.model,name:website_customer.model_res_partner_tag
msgid "Partner Tags - These tags can be used on website to find customers by sector, or ... "
msgstr ""
@@ -156,16 +150,6 @@ msgid "Search"
msgstr ""
#. module: website_customer
-#: model:ir.ui.menu,name:website_customer.menu_partner_tag_form
-msgid "Tags"
-msgstr ""
-
-#. module: website_customer
-#: model:ir.model.fields,help:website_customer.field_res_partner_tag_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_customer
#: model:ir.ui.view,arch_db:website_customer.index
msgid "Trusted by millions worldwide"
msgstr ""
@@ -176,16 +160,14 @@ 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
+#: model:ir.ui.view,arch_db:website_customer.view_partner_tag_list
#: model:ir.ui.view,arch_db:website_customer.view_partners_form_website
msgid "Website Tags"
msgstr ""
#. module: website_customer
-#: model:ir.model.fields,field_description:website_customer.field_res_partner_tag_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_customer
#: model:ir.model.fields,field_description:website_customer.field_res_partner_website_tag_ids
msgid "Website tags"
msgstr ""
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index 5eff9091643..2a72c0bec91 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:27+0000\n"
-"PO-Revision-Date: 2015-09-29 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,12 +16,6 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_event
-#: code:addons/website_event/controllers/main.py:210
-#, 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>"
msgstr ""
@@ -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:105
+#: code:addons/website_event/controllers/main.py:96
#, python-format
msgid "All Categories"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:116
+#: 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:89
+#: 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:82
+#: 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
@@ -204,37 +160,15 @@ msgid "Creates menus Introduction, Location and Register on the page of the eve
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:88
-#, 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"
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:66
-#, 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."
-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:28
#, python-format
-msgid "Drag the 'Text Block' in your event page."
+msgid "Drag this block and drop it in your page."
msgstr ""
#. module: website_event
@@ -249,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
@@ -279,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
@@ -295,6 +229,11 @@ 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."
msgstr ""
@@ -338,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 ""
@@ -368,8 +305,7 @@ msgstr ""
#. module: website_event
#. openerp-web
-#: code:addons/website_event/controllers/main.py:192
-#: 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
@@ -377,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:37
+#: code:addons/website_event/controllers/main.py:34
#, python-format
msgid "Next Events"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:46
+#: code:addons/website_event/controllers/main.py:43
#, python-format
msgid "Next Week"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:54
+#: code:addons/website_event/controllers/main.py:51
#, python-format
msgid "Next month"
msgstr ""
@@ -407,14 +336,14 @@ msgid "No event found"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:58
+#: 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:74
+#: 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 ""
@@ -445,6 +374,12 @@ 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"
msgstr ""
@@ -460,13 +395,6 @@ msgid "Price"
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:81
-#, python-format
-msgid "Publish your event"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.registration_template
msgid "Quantity"
msgstr ""
@@ -477,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 ""
@@ -493,13 +421,6 @@ msgid "Return to the event list."
msgstr ""
#. module: website_event
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:73
-#, 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"
msgstr ""
@@ -510,13 +431,6 @@ 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"
msgstr ""
@@ -532,39 +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
-#. openerp-web
-#: code:addons/website_event/static/src/js/website.tour.event.js:26
-#, python-format
-msgid "The <em>Content</em> menu allows you to create new pages, events, menus, etc."
-msgstr ""
-
-#. module: website_event
-#: model:ir.model.fields,help:website_event.field_event_event_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_event
-#: code:addons/website_event/controllers/main.py:42
+#: 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: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:50
+#: code:addons/website_event/controllers/main.py:47
#, python-format
msgid "This month"
msgstr ""
@@ -580,7 +468,7 @@ msgid "Ticket Type #"
msgstr ""
#. module: website_event
-#: code:addons/website_event/controllers/main.py:38
+#: code:addons/website_event/controllers/main.py:35
#, python-format
msgid "Today"
msgstr ""
@@ -607,7 +495,7 @@ 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
@@ -621,31 +509,11 @@ msgid "Website Messages"
msgstr ""
#. module: website_event
-#: model:ir.model.fields,field_description:website_event.field_event_event_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_event
#: model:ir.model.fields,help:website_event.field_event_event_website_message_ids
msgid "Website communication history"
msgstr ""
#. module: website_event
-#: model:ir.model.fields,field_description:website_event.field_event_event_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_event
-#: model:ir.model.fields,field_description:website_event.field_event_event_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_event
-#: model:ir.model.fields,field_description:website_event.field_event_event_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_event
#: model:ir.ui.view,arch_db:website_event.event_description_full
msgid "When"
msgstr ""
@@ -664,12 +532,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
@@ -687,3 +550,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 58285911e9b..46612abd806 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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
@@ -50,11 +45,6 @@ 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
#: model:ir.model.fields,field_description:website_event_questions.field_event_registration_answer_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
@@ -122,16 +112,6 @@ msgid "If True, this question will be asked for every attendee of a reservation.
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
#: model:ir.model.fields,field_description:website_event_questions.field_event_question_report___last_update
@@ -154,16 +134,6 @@ 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
#: model:ir.ui.view,arch_db:website_event_questions.view_event_question_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
@@ -216,16 +184,6 @@ 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"
msgstr ""
diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot
index 644ddcc2aa8..4e0dca6a20a 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,6 +51,12 @@ 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"
msgstr ""
@@ -67,25 +73,19 @@ msgid "Sold Out"
msgstr ""
#. module: website_event_sale
-#: code:addons/website_event_sale/models/sale_order.py:70
+#: 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:76
+#: 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:35
+#: code:addons/website_event_sale/models/sale_order.py:36
#, python-format
msgid "The ticket doesn't match with this product."
msgstr ""
diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot
index 08c1350a70c..e536f296dc2 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,6 +26,36 @@ msgid "<b>Date</b><br/>"
msgstr ""
#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Mail</b>:"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Phone</b>:"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Proposed By</b>:"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Speakers Biography</b>:"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Talk Introduction</b>:"
+msgstr ""
+
+#. module: website_event_track
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "<b>Title</b>:"
+msgstr ""
+
+#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.track_view
msgid "<br/>\n"
" <b>Duration</b><br/>"
@@ -60,32 +90,17 @@ msgid "<strong>Regular Talks</strong>. These are standard talks with slides,\n"
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:ir.model.fields,field_description:website_event_track.field_event_track_message_needaction
-msgid "Action Needed"
-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"
-msgstr ""
-
-#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track13
-msgid "Advanced reporting with Google Spreadsheets integration."
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_active
+msgid "Active"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:182
+#: code:addons/website_event_track/models/event.py:26
#, python-format
msgid "Agenda"
msgstr ""
@@ -112,6 +127,11 @@ 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"
msgstr ""
@@ -139,6 +159,7 @@ msgstr ""
#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_color
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_color
msgid "Color Index"
msgstr ""
@@ -171,31 +192,11 @@ msgid "Date"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
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
#: model:ir.model.fields,field_description:website_event_track.field_event_track_display_name
@@ -228,11 +229,6 @@ msgid "Event"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_event_blog_id
-msgid "Event Blog"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.view_event_location_form
#: model:ir.ui.view,arch_db:website_event_track.view_event_location_tree
msgid "Event Location"
@@ -293,26 +289,11 @@ 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 ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: website_event_track
#: model:event.sponsor.type,name:website_event_track.event_sponsor_type3
msgid "Gold"
msgstr ""
@@ -333,36 +314,6 @@ 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
#: model:ir.model.fields,field_description:website_event_track.field_event_track_id
@@ -372,16 +323,6 @@ msgid "ID"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_image
msgid "Image"
msgstr ""
@@ -392,21 +333,6 @@ msgid "Introduction"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: website_event_track
-#: model: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_track_message_last_post
-msgid "Last Message Date"
-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
#: model:ir.model.fields,field_description:website_event_track.field_event_track___last_update
@@ -449,77 +375,22 @@ msgid "Low"
msgstr ""
#. module: website_event_track
-#: model:event.track,name:website_event_track.event_track31
-msgid "Lunch"
-msgstr ""
-
-#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:81
-#, python-format
-msgid "Mail"
-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"
msgstr ""
#. module: website_event_track
#: model:ir.model.fields,help:website_event_track.field_event_sponsor_image_medium
+#: model:ir.model.fields,help:website_event_track.field_event_track_image
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.model.fields,field_description:website_event_track.field_event_track_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_ids
-msgid "Messages and communication history"
-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"
msgstr ""
@@ -530,16 +401,8 @@ msgid "New Track Created"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:79
-#, python-format
-msgid "New Track Proposal"
-msgstr ""
-
-#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:184
-#: model:ir.model.fields,field_description:website_event_track.field_event_event_show_blog
-#, python-format
-msgid "News"
+#: model:ir.ui.view,arch_db:website_event_track.event_track_template_new
+msgid "New track proposal"
msgstr ""
#. module: website_event_track
@@ -548,41 +411,6 @@ msgid "No tracks found!"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_message_unread_counter
-msgid "Number of unread messages"
-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"
msgstr ""
@@ -608,12 +436,6 @@ msgid "Partner Phone"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:82
-#, python-format
-msgid "Phone"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.track_view
msgid "Practical Info"
msgstr ""
@@ -634,12 +456,6 @@ msgid "Proposals are closed!"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:80
-#, python-format
-msgid "Proposed By"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_id
#: model:ir.ui.view,arch_db:website_event_track.track_view
msgid "Proposed by"
@@ -658,16 +474,6 @@ msgid "Put here the list of documents, like slides of\n"
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"
msgstr ""
@@ -679,7 +485,7 @@ msgid "Responsible"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_8532
+#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_8966
#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_name
msgid "Room"
msgstr ""
@@ -711,19 +517,13 @@ msgid "Speaker Biography"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:136
+#: 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"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:84
-#, python-format
-msgid "Speakers Biography"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_name
msgid "Sponsor Type"
msgstr ""
@@ -772,11 +572,6 @@ 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"
msgstr ""
@@ -793,14 +588,12 @@ msgid "Tags"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:85
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
-#, python-format
msgid "Talk Introduction"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:186
+#: code:addons/website_event_track/models/event.py:28
#, python-format
msgid "Talk Proposals"
msgstr ""
@@ -811,7 +604,7 @@ msgid "Talk Title"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:181
+#: code:addons/website_event_track/models/event.py:25
#, python-format
msgid "Talks"
msgstr ""
@@ -827,26 +620,6 @@ 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:ir.model.fields,help:website_event_track.field_event_track_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_event_track
-#: model: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."
msgstr ""
@@ -858,9 +631,7 @@ msgid "Timely release of presentation material (slides),\n"
msgstr ""
#. module: website_event_track
-#: code:addons/website_event_track/models/event.py:83
#: model:ir.model.fields,field_description:website_event_track.field_event_track_name
-#, python-format
msgid "Title"
msgstr ""
@@ -920,17 +691,11 @@ msgid "Tracks define the agenda of your event. These can bea talk, a round table
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_unread
#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search
msgid "Unread Messages"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_social
msgid "Use this tag:"
msgstr ""
@@ -941,11 +706,6 @@ msgid "View Track"
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "We require speakers to accept an agreement in which they commit to:"
msgstr ""
@@ -967,36 +727,6 @@ msgid "We will evaluate your proposition and get back to you shortly."
msgstr ""
#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,help:website_event_track.field_event_track_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_event_track
-#: model:ir.model.fields,field_description:website_event_track.field_event_track_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_event_track
#: model:ir.ui.view,arch_db:website_event_track.event_track_proposal
msgid "Your Email"
msgstr ""
@@ -1033,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_form/i18n/website_form.pot b/addons/website_form/i18n/website_form.pot
index 3730145ef31..0ac417a9fbe 100644
--- a/addons/website_form/i18n/website_form.pot
+++ b/addons/website_form/i18n/website_form.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 08:12+0000\n"
-"PO-Revision-Date: 2015-09-18 08:12+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,20 +17,20 @@ msgstr ""
#. module: website_form
#. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:208
+#: code:addons/website_form/static/src/js/website_form.js:209
#, python-format
msgid "'%s' is not a correct date"
msgstr ""
#. module: website_form
#. openerp-web
-#: code:addons/website_form/static/src/js/website_form.js:203
+#: code:addons/website_form/static/src/js/website_form.js:204
#, python-format
msgid "'%s' is not a correct datetime"
msgstr ""
#. module: website_form
-#: code:addons/website_form/controllers/main.py:205
+#: code:addons/website_form/controllers/main.py:225
#, python-format
msgid "<p>Attached files : </p>"
msgstr ""
@@ -58,7 +58,7 @@ msgid "Blacklisted in web forms"
msgstr ""
#. module: website_form
-#: code:addons/website_form/controllers/main.py:48
+#: code:addons/website_form/controllers/main.py:53
#, python-format
msgid "Custom infos"
msgstr ""
@@ -94,7 +94,7 @@ msgid "Label for form action"
msgstr ""
#. module: website_form
-#: code:addons/website_form/controllers/main.py:49
+#: code:addons/website_form/controllers/main.py:54
#, python-format
msgid "Metadata"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
#. module: website_form
#: model:ir.model.fields,help:website_form.field_ir_model_website_form_default_field_id
-msgid "Specify the field wich will contain meta and custom form fields datas."
+msgid "Specify the field which will contain meta and custom form fields datas."
msgstr ""
#. module: website_form
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index 85a5822230e..45df7dd98bc 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-26 14:10+0000\n"
-"PO-Revision-Date: 2015-11-26 14:10+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,42 +18,67 @@ msgstr ""
#. module: website_forum
#: model:mail.template,body_html:website_forum.validation_email
msgid "\n"
-"<p>\n"
-" Hello ${object.name},\n"
-"</p>\n"
-"<p>\n"
-" You have been invited to validate your email in order to get access to \"${object.company_id.name}\" Q/A Forums.\n"
-"</p>\n"
-"<p>\n"
-" To validate your email, please click on the following link:\n"
-"</p>\n"
-"<ul>\n"
-" <li><a href=\"${ctx.get('token_url')}\">Validate my account for \"${object.company_id.name}\" Q/A Forums</a></li>\n"
-"</ul>\n"
-"<p>\n"
-" Thanks,\n"
-"</p>\n"
-"<pre>\n"
-"--\n"
-"${object.company_id.name or ''}\n"
-"${object.company_id.email or ''}\n"
-"${object.company_id.phone or ''}\n"
-"</pre>"
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px; font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding:0px 10px 5px 5px;\">\n"
+" <div>\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:0px auto;padding:0\">\n"
+" </div>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>\n"
+"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:0px 10px 5px 5px;font-size: 14px;\">\n"
+" <p>Dear ${object.name},</p>\n"
+" <p>You have been invited to validate your email in order to get access to\n"
+" \"${object.company_id.name}\" Q/A Forums.</p>\n"
+" <p>To validate your email, please click on the following link:</p>\n"
+" <a style=\"margin-left: 15px; padding:5px 10px; border-radius: 3px; background-color:#a24689; text-align:center; text-decoration:none; color:#F7FBFD;\" href=\"${ctx.get('token_url')}\">\n"
+" Validate my account for \"${object.company_id.name}\" Q/A Forums\n"
+" </a>\n"
+" <p>Thanks for your participation!</p>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>"
msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js: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"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.tag
+msgid "&amp;nbsp;&amp;nbsp;<i class=\"fa fa-times\"/>&amp;nbsp;&amp;nbsp;"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "&amp;times;"
msgstr ""
@@ -65,6 +90,16 @@ 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) **"
msgstr ""
@@ -120,7 +155,7 @@ msgstr ""
#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
-msgid "<b>Answers should not add or expand questions</b>. Instead either edit the question edit or add a question comment."
+msgid "<b>Answers should not add or expand questions</b>. Instead either edit the question or add a question comment."
msgstr ""
#. module: website_forum
@@ -161,13 +196,13 @@ msgstr ""
msgid "<b>Answers shouldn't just provide a\n"
" link a solution</b>. Instead provide the solution\n"
" description text in your answer, even if it's just a\n"
-" copy/paste. Links are welcome, but should complementary to\n"
+" copy/paste. Links are welcome, but should be complementary to\n"
" answer, referring sources or additional reading."
msgstr ""
#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
-msgid "<b>Answers shouldn't just provide a link a solution</b>. Instead provide the solution description text in your answer, even if it's just a copy/paste. Links are welcome, but should complementary to answer, referring sources or additional reading."
+msgid "<b>Answers shouldn't just provide a link a solution</b>. Instead provide the solution description text in your answer, even if it's just a copy/paste. Links are welcome, but should be complementary to answer, referring sources or additional reading."
msgstr ""
#. module: website_forum
@@ -222,24 +257,6 @@ msgid "<i class=\"text-muted\">awarded users</i>"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:483
-#, python-format
-msgid "<p>A new answer for <i>%s</i> has been posted. <a href=\"%s/forum/%s/question/%s\">Click here to access the post.</a></p>"
-msgstr ""
-
-#. module: website_forum
-#: code:addons/website_forum/models/forum.py:499
-#, python-format
-msgid "<p>A new question <i>%s</i> has been asked on %s and require your validation. <a href=\"%s/forum/%s/question/%s\">Click here to access the question.</a></p>"
-msgstr ""
-
-#. module: website_forum
-#: code:addons/website_forum/models/forum.py:489
-#, python-format
-msgid "<p>A new question <i>%s</i> has been asked on %s. <a href=\"%s/forum/%s/question/%s\">Click here to access the question.</a></p>"
-msgstr ""
-
-#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.moderation_display_post_answer
msgid "<small class=\"text-muted\">\n"
" Flagged\n"
@@ -302,10 +319,21 @@ msgid "<span>By </span>"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
+msgid "A new answer on"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
+msgid "A new question"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.tag
msgid "A tag is a label that categorizes your question with other,\n"
" similar questions. Using the right tags makes it easier for\n"
-" others to find and answer your question."
+" others to find and answer your question. (Hover the mouse to follow/unfollow tag(s))"
msgstr ""
#. module: website_forum
@@ -319,13 +347,6 @@ 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"
msgstr ""
@@ -346,13 +367,8 @@ msgid "Accepting an answer"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_needaction
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_needaction
-msgid "Action Needed"
-msgstr ""
-
-#. module: website_forum
#: selection:forum.post,state:0
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum_active
#: model:ir.model.fields,field_description:website_forum.field_forum_post_active
msgid "Active"
msgstr ""
@@ -363,13 +379,6 @@ 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"
msgstr ""
@@ -387,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"
@@ -399,15 +408,12 @@ 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:478
+#: 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
@@ -415,13 +421,6 @@ 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"
msgstr ""
@@ -500,6 +499,12 @@ 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"
msgstr ""
@@ -510,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 ""
@@ -529,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 ""
@@ -596,18 +598,12 @@ msgstr ""
#. module: website_forum
#: code:addons/website_forum/controllers/main.py:323
-#: code:addons/website_forum/controllers/main.py:386
+#: code:addons/website_forum/controllers/main.py:387
#, 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
@@ -640,7 +636,7 @@ msgstr ""
#. openerp-web
#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:34
#, python-format
-msgid "By sharing you answer, you will get additionnal"
+msgid "By sharing you answer, you will get additional"
msgstr ""
#. module: website_forum
@@ -714,7 +710,7 @@ msgid "Can View"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_retag
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_edit_retag
msgid "Change question tags"
msgstr ""
@@ -741,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 ""
@@ -770,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 ""
@@ -791,13 +787,6 @@ 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"
msgstr ""
@@ -849,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 ""
@@ -871,25 +862,12 @@ 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."
msgstr ""
@@ -901,15 +879,6 @@ 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"
msgstr ""
@@ -950,24 +919,8 @@ 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"
+#: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_tag_create
+msgid "Create new tags"
msgstr ""
#. module: website_forum
@@ -1000,17 +953,12 @@ 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 ""
#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_last_post
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_default_order
msgid "Default Order"
msgstr ""
@@ -1053,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 ""
@@ -1135,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 ""
@@ -1150,17 +1100,28 @@ msgid "Email"
msgstr ""
#. module: website_forum
+#: model:ir.model,name:website_forum.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.model,name:website_forum.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
+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 then click 'Continue'."
+msgid "Enter a name for your new forum."
msgstr ""
#. module: website_forum
@@ -1186,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 ""
@@ -1258,24 +1222,6 @@ msgid "Followed Questions"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_follower_ids
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_channel_ids
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_partner_ids
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: website_forum
#: model:forum.forum,faq:website_forum.forum_help
msgid "For example, if you ask an interesting question or give a helpful answer, your\n"
" input will be upvoted. On the other hand if the answer is misleading - it will\n"
@@ -1292,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
@@ -1310,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 ""
@@ -1364,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 ""
@@ -1388,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 ""
@@ -1410,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 ""
@@ -1438,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 ""
@@ -1462,18 +1402,6 @@ msgid "ID"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_unread
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_needaction
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,help:website_forum.field_forum_forum_karma_dofollow
msgid "If the author has not enough karma, a nofollow attribute is added to links"
msgstr ""
@@ -1509,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 ""
@@ -1520,12 +1448,6 @@ msgid "Is Favourite"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_is_follower
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_post_has_validated_answer
msgid "Is answered"
msgstr ""
@@ -1587,12 +1509,6 @@ msgid "Keep Informed"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_last_post
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum___last_update
#: model:ir.model.fields,field_description:website_forum.field_forum_post___last_update
#: model:ir.model.fields,field_description:website_forum.field_forum_post_reason___last_update
@@ -1638,13 +1554,6 @@ 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"
msgstr ""
@@ -1656,15 +1565,8 @@ msgid "Links"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_ids
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_ids
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_ids
-msgid "Messages and communication history"
+#: model:ir.model,name:website_forum.model_mail_message
+msgid "Message"
msgstr ""
#. module: website_forum
@@ -1698,6 +1600,13 @@ 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"
msgstr ""
@@ -1723,20 +1632,12 @@ 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
#: model:mail.message.subtype,name:website_forum.mt_question_new
@@ -1744,13 +1645,6 @@ 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"
msgstr ""
@@ -1769,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 ""
@@ -1785,22 +1680,28 @@ msgid "Nofollow links"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:781
-#: code:addons/website_forum/models/forum.py:801
+#: code:addons/website_forum/models/forum.py:835
+#: code:addons/website_forum/models/forum.py:855
#, python-format
msgid "Not allowed to vote for its own post"
msgstr ""
#. module: website_forum
-#: model:gamification.badge,name:website_forum.badge_q_2
-#: model:gamification.challenge,name:website_forum.challenge_notable_question
-msgid "Notable Question"
+#: code:addons/website_forum/models/forum.py:899
+#, python-format
+msgid "Not enough karma to create a new Tag"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_needaction_counter
-msgid "Number of Actions"
+#: code:addons/website_forum/models/forum.py:494
+#, python-format
+msgid "Not enough karma to retag."
+msgstr ""
+
+#. module: website_forum
+#: model:gamification.badge,name:website_forum.badge_q_2
+#: model:gamification.challenge,name:website_forum.challenge_notable_question
+msgid "Notable Question"
msgstr ""
#. module: website_forum
@@ -1824,23 +1725,11 @@ msgid "Number of flagged posts"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_needaction_counter
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_count_posts_waiting_validation
msgid "Number of posts waiting for validation"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,help:website_forum.field_forum_post_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: website_forum
#: selection:forum.post,state:0
#: model:ir.ui.view,arch_db:website_forum.moderation_queue
msgid "Offensive"
@@ -1876,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 ""
@@ -1912,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 ""
@@ -1936,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 ""
@@ -1959,13 +1849,6 @@ 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"
msgstr ""
@@ -1986,12 +1869,6 @@ msgid "Post Your Topic"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:146
-#, python-format
-msgid "Post type in \"Default post\" must be activated"
-msgstr ""
-
-#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.close_post
msgid "Post:"
msgstr ""
@@ -2007,7 +1884,7 @@ msgid "Posted 100 comments"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:406
+#: code:addons/website_forum/models/forum.py:438
#, python-format
msgid "Posting answer on a [Deleted] or [Closed] question is not possible"
msgstr ""
@@ -2032,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 ""
@@ -2063,17 +1934,14 @@ msgid "Q&amp;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:481
+#: 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
@@ -2081,13 +1949,6 @@ 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"
msgstr ""
@@ -2151,7 +2012,7 @@ msgid "Questions"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:421
+#: code:addons/website_forum/models/forum.py:525
#, python-format
msgid "Re: %s"
msgstr ""
@@ -2238,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 ""
@@ -2253,13 +2115,23 @@ msgid "Second Relevance Parameter"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
+msgid "See post"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
+msgid "See question"
+msgstr ""
+
+#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.header
msgid "Seen:"
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 ""
@@ -2267,17 +2139,12 @@ 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 ""
#. module: website_forum
-#: model:ir.ui.view,arch_db:website_forum.view_forum_forum_form
-#: model:ir.ui.view,arch_db:website_forum.view_forum_post_form
-msgid "Send a message to the group"
-msgstr ""
-
-#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.new_question
msgid "Set a clear, explicit and concise question title\n"
" (check"
@@ -2314,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:58
+#: 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:106
+#: 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:137
+#: code:addons/website_forum/static/src/js/website_forum.js:149
#, python-format
msgid "Sorry, anonymous users cannot choose correct answer."
msgstr ""
@@ -2347,7 +2214,7 @@ msgstr ""
#. module: website_forum
#. openerp-web
-#: code:addons/website_forum/static/src/js/website_forum.js:101
+#: code:addons/website_forum/static/src/js/website_forum.js:113
#, python-format
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
@@ -2358,13 +2225,6 @@ 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"
msgstr ""
@@ -2395,11 +2255,16 @@ 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 ""
#. module: website_forum
+#: model:ir.actions.act_window,name:website_forum.forum_tag_action
+#: model:ir.ui.menu,name:website_forum.menu_forum_tag
+#: model:ir.ui.view,arch_db:website_forum.forum_tag_view_form
+#: model:ir.ui.view,arch_db:website_forum.forum_tag_view_list
#: model:ir.ui.view,arch_db:website_forum.view_forum_post_search
msgid "Tag"
msgstr ""
@@ -2422,8 +2287,14 @@ 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 ""
@@ -2431,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 ""
@@ -2498,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:383
+#: 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:110
-#, python-format
-msgid "This page contain new created question and its answer."
-msgstr ""
-
-#. module: website_forum
-#. openerp-web
-#: code:addons/website_forum/static/src/js/website_tour_forum.js:90
-#, python-format
-msgid "This page contain new created question."
-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_forum.js:68
+#: 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:63
+#: code:addons/website_forum/static/src/js/website_forum.js:75
#, python-format
msgid "This post is already flagged"
msgstr ""
@@ -2561,7 +2412,7 @@ msgstr ""
#. module: website_forum
#: code:addons/website_forum/controllers/main.py:323
-#: code:addons/website_forum/controllers/main.py:386
+#: code:addons/website_forum/controllers/main.py:387
#, python-format
msgid "Title should not be empty."
msgstr ""
@@ -2583,6 +2434,11 @@ msgid "To prevent your question from being flagged and possibly removed, avoid a
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"
msgstr ""
@@ -2623,18 +2479,6 @@ msgid "Unlink own comments"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_unread
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_message_unread_counter
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
-#. module: website_forum
#: model:ir.ui.view,arch_db:website_forum.edit_profile
msgid "Update"
msgstr ""
@@ -2655,33 +2499,30 @@ 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 <em>'Content'</em> menu 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"
msgstr ""
@@ -2697,7 +2538,12 @@ msgid "Users can answer only once per question. Contributors can edit answers an
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:726
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
+msgid "Validate question"
+msgstr ""
+
+#. module: website_forum
+#: code:addons/website_forum/models/forum.py:788
#: model:ir.ui.view,arch_db:website_forum.display_post_question_block
#, python-format
msgid "View"
@@ -2715,7 +2561,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"
@@ -2743,37 +2588,6 @@ msgid "Website"
msgstr ""
#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,help:website_forum.field_forum_forum_website_message_ids
-msgid "Website communication history"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_website_meta_description
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_website_meta_description
-#: model:ir.model.fields,field_description:website_forum.field_forum_tag_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_website_meta_keywords
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_website_meta_keywords
-#: model:ir.model.fields,field_description:website_forum.field_forum_tag_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_forum
-#: model:ir.model.fields,field_description:website_forum.field_forum_forum_website_meta_title
-#: model:ir.model.fields,field_description:website_forum.field_forum_post_website_meta_title
-#: model:ir.model.fields,field_description:website_forum.field_forum_tag_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_forum
#: model:ir.model.fields,field_description:website_forum.field_forum_forum_welcome_message
msgid "Welcome Message"
msgstr ""
@@ -2812,7 +2626,7 @@ msgid "Why can other people edit my questions/answers?"
msgstr ""
#. module: website_forum
-#: code:addons/website_forum/models/forum.py:140
+#: 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 ""
@@ -2986,6 +2800,21 @@ msgid "has been closed"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
+msgid "has been posted and require your validation. Click here to access the question :"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
+msgid "has been posted. Click here to access the post :"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
+msgid "has been posted. Click here to access the question :"
+msgstr ""
+
+#. module: website_forum
#. openerp-web
#: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:36
#, python-format
@@ -3078,6 +2907,8 @@ msgid "off-topic or not relevant"
msgstr ""
#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_new_question
+#: model:ir.ui.view,arch_db:website_forum.forum_post_template_validation
#: model:ir.ui.view,arch_db:website_forum.post_comment
#: model:ir.ui.view,arch_db:website_forum.post_description_full
msgid "on"
@@ -3102,11 +2933,6 @@ 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"
msgstr ""
@@ -3157,16 +2983,6 @@ 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"
msgstr ""
diff --git a/addons/website_forum_doc/i18n/website_forum_doc.pot b/addons/website_forum_doc/i18n/website_forum_doc.pot
index d9e6cc4a0b2..f8a1cfdac99 100644
--- a/addons/website_forum_doc/i18n/website_forum_doc.pot
+++ b/addons/website_forum_doc/i18n/website_forum_doc.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,6 @@ msgid "<span class=\"text-muted\">or</span>"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_crm_after_sale
-msgid "After-sale communication"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "Bad answer structure"
msgstr ""
@@ -52,21 +47,11 @@ msgid "Benefits of having done this setup"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_cms_ecommerce
-msgid "CMS & eCommerce"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_child_ids
msgid "Children Table Of Content"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_crm_claim
-msgid "Claims"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_post_color
msgid "Color Index"
msgstr ""
@@ -84,16 +69,6 @@ msgid "Created on"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_crm
-msgid "Customer Relationship Management"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_sale_customer
-msgid "Customers"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.view_forum_post_kanban
msgid "Delete"
msgstr ""
@@ -151,18 +126,14 @@ msgid "Edit Post"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_hrm_contract
-msgid "Employee Contract"
-msgstr ""
-
-#. module: website_forum_doc
-#: constraint:forum.documentation.toc:0
+#: code:addons/website_forum_doc/models/forum_documentation_toc.py:38
+#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
-msgid "Explain how to configure in Odoo"
+msgid "Explain how to configure Odoo"
msgstr ""
#. module: website_forum_doc
@@ -181,11 +152,6 @@ msgid "Forum Post"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_functional_doc
-msgid "Functional Documentation"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "Good answer structure"
msgstr ""
@@ -206,11 +172,6 @@ msgid "How to forecast sales revenues?"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_hrm
-msgid "Human Resources Management"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_stage_id
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_id
msgid "ID"
@@ -245,11 +206,6 @@ msgid "Last Updated on"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_crm_lead
-msgid "Lead & Opportunity"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_parent_left
msgid "Left Parent"
msgstr ""
@@ -335,21 +291,6 @@ msgid "Right Parent"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_0
-msgid "Sales & Warehouse"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_sale
-msgid "Sales Management"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_sale_so
-msgid "Sales orders"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "Samples"
msgstr ""
@@ -393,11 +334,6 @@ msgid "The question title is short and descriptive"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,introduction:website_forum_doc.toc_functional_doc
-msgid "This documentation is produced using the best posts from the"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.documentation_post
msgid "This documentation page has been extracted\n"
" from the Q&amp;A section where you can\n"
@@ -416,32 +352,6 @@ msgid "To be promoted in the official documentation the question\n"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,introduction:website_forum_doc.toc_sale
-msgid "Tracks leads, boost opportunities and close deals.\n"
-" This serie of how-to will help you develop your business."
-msgstr ""
-
-#. module: website_forum_doc
-#: model:forum.documentation.toc,name:website_forum_doc.toc_website
-msgid "Website"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_forum_doc
-#: model:ir.model.fields,field_description:website_forum_doc.field_forum_documentation_toc_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.promote_question
msgid "What report should I use to compute probabilities per stage?"
msgstr ""
@@ -457,11 +367,6 @@ msgid "cancel"
msgstr ""
#. module: website_forum_doc
-#: model:forum.documentation.toc,introduction:website_forum_doc.toc_functional_doc
-msgid "community forum"
-msgstr ""
-
-#. module: website_forum_doc
#: model:ir.ui.view,arch_db:website_forum_doc.toc
msgid "essay"
msgstr ""
diff --git a/addons/website_gengo/i18n/website_gengo.pot b/addons/website_gengo/i18n/website_gengo.pot
index 20561dd2a32..df63836de32 100644
--- a/addons/website_gengo/i18n/website_gengo.pot
+++ b/addons/website_gengo/i18n/website_gengo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/website_google_map/i18n/website_google_map.pot b/addons/website_google_map/i18n/website_google_map.pot
index dd6c4e57276..303b5418d25 100644
--- a/addons/website_google_map/i18n/website_google_map.pot
+++ b/addons/website_google_map/i18n/website_google_map.pot
@@ -1,13 +1,12 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
-# * website_google_map
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,13 +14,3 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: website_google_map
-#: model:ir.ui.view,arch_db:website_google_map.google_map
-msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
-
-#. module: website_google_map
-#: model:ir.ui.view,arch_db:website_google_map.google_map
-msgid "World Map"
-msgstr ""
-
diff --git a/addons/website_hr/i18n/website_hr.pot b/addons/website_hr/i18n/website_hr.pot
index a1a81e26844..d05c74a9746 100644
--- a/addons/website_hr/i18n/website_hr.pot
+++ b/addons/website_hr/i18n/website_hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,22 +31,7 @@ msgid "Public Info"
msgstr ""
#. module: website_hr
-#: model:ir.model.fields,help:website_hr.field_hr_employee_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_hr
-#: model:ir.model.fields,field_description:website_hr.field_hr_employee_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_hr
#: model:ir.actions.act_url,name:website_hr.action_open_website
msgid "Website About"
msgstr ""
-#. module: website_hr
-#: model:ir.model.fields,field_description:website_hr.field_hr_employee_website_url
-msgid "Website URL"
-msgstr ""
-
diff --git a/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot b/addons/website_hr_recruitment/i18n/website_hr_recruitment.pot
index 4f73e2464af..aa661560a4f 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,12 @@ msgstr ""
"Plural-Forms: \n"
#. 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.job_countries
msgid "All Countries"
msgstr ""
@@ -89,7 +95,7 @@ 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:69
+#: code:addons/website_hr_recruitment/controllers/main.py:72
#: model:ir.ui.view,arch_db:website_hr_recruitment.content_new_job_offer
#, python-format
msgid "New Job Offer"
@@ -126,21 +132,11 @@ msgid "Source of Applicants"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.ui.view,arch_db:website_hr_recruitment.apply
-msgid "Submit"
-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.model.fields,help:website_hr_recruitment.field_hr_job_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
msgid "There isn't job offer published now, click"
msgstr ""
@@ -151,41 +147,16 @@ msgid "Url Parameters"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.actions.act_url,name:website_hr_recruitment.action_open_website
msgid "Website Recruitment Form"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_description
msgid "Website description"
msgstr ""
#. module: website_hr_recruitment
-#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_hr_recruitment
-#: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
msgid "With a small team of smart people, we released the most\n"
" disruptive enterprise management software in the world.\n"
@@ -222,16 +193,16 @@ msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "not published"
+msgid "open positions"
msgstr ""
#. module: website_hr_recruitment
#: model:ir.ui.view,arch_db:website_hr_recruitment.index
-msgid "open positions"
+msgid "to contact us"
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_issue/i18n/website_issue.pot b/addons/website_issue/i18n/website_issue.pot
index 43dab069227..303b5418d25 100644
--- a/addons/website_issue/i18n/website_issue.pot
+++ b/addons/website_issue/i18n/website_issue.pot
@@ -3,10 +3,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/website_links/i18n/website_links.pot b/addons/website_links/i18n/website_links.pot
index 86721fd11dc..4f15078ad66 100644
--- a/addons/website_links/i18n/website_links.pot
+++ b/addons/website_links/i18n/website_links.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -139,7 +139,7 @@ msgstr ""
#. module: website_links
#: model:ir.ui.view,arch_db:website_links.create_shorten_url
-msgid "Thoses trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues."
+msgid "Those trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues."
msgstr ""
#. module: website_links
diff --git a/addons/website_livechat/i18n/website_livechat.pot b/addons/website_livechat/i18n/website_livechat.pot
index 4fbfa7dc6b0..6cc54e32ec5 100644
--- a/addons/website_livechat/i18n/website_livechat.pot
+++ b/addons/website_livechat/i18n/website_livechat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-14 10:28+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,11 +56,6 @@ msgid "The Team"
msgstr ""
#. module: website_livechat
-#: model:ir.model.fields,help:website_livechat.field_im_livechat_channel_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_livechat
#: model:ir.ui.view,arch_db:website_livechat.channel_list_page
msgid "There is no public livechat channel to show."
msgstr ""
@@ -71,11 +66,6 @@ msgid "This is no rating for this channel for now."
msgstr ""
#. module: website_livechat
-#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_livechat
#: model:ir.model,name:website_livechat.model_website
msgid "Website"
msgstr ""
@@ -87,11 +77,6 @@ msgid "Website Live Chat Channel"
msgstr ""
#. module: website_livechat
-#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_livechat
#: model:ir.model.fields,field_description:website_livechat.field_im_livechat_channel_website_description
msgid "Website description"
msgstr ""
diff --git a/addons/website_mail/i18n/website_mail.pot b/addons/website_mail/i18n/website_mail.pot
index d5a6805179f..325bad68c88 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-09-29 10:26+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,123 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_mail
+#: model:mail.template,body_html:website_mail.mail_template_data_module_install_website_mail
+msgid "\n"
+" <div style=\"margin: 10px auto;\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%;\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:2px;width:30%;\">\n"
+" <img src=\"web/static/src/img/logo.png\"/>\n"
+" </td>\n"
+" <td style=\"vertical-align: top; padding: 8px 10px;text-align: left;font-size: 14px;\">\n"
+" <a href=\"web/login\" style=\"float:right ;margin:15px auto;background: #a24689;border-radius: 5px;color: #ffffff;font-size: 16px;padding: 10px 20px 10px 20px;text-decoration: none;\">Auto Login</a>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <table style=\"width:100%;text-align:justify;margin:0 auto;border-collapse:collapse;border-top:1px solid lightgray\"\">\n"
+" <tbody>\n"
+" <tr>\n"
+" <td style=\"padding:15px 10px;font-size:20px\">\n"
+" <p style=\"color:#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"
+" <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"
+" <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>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 the Customize menu.</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul> <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Discover the </span>\n"
+" <span><a href=\"/web#view_type=kanban&model=project.project&action=project.open_view_project_all\">\n"
+" <span style=\"font-weight:bold; text-decoration:underline;\">Website planner</span></a></span>\n"
+" <span> to activate extra features</span>\n"
+" <span style=\"color:#a24689;margin:0;font-weight:bold\">(${user.env['web.planner'].get_planner_progress('planner_website')}% done)</span>\n"
+" </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>Grow your traffic by optimizing your referencing with our SEO tool,</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 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 customization with our advanced HTML editor,</span>\n"
+" </p>\n"
+" </li>\n"
+" <li dir=\"ltr\">\n"
+" <p dir=\"ltr\" style=\"margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>And much more...</span>\n"
+" </p>\n"
+" </li>\n"
+" </ul>\n"
+" <br>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;line-height:1.3;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span style=\"font-weight:bold;\">Need Help?</span>\n"
+" <span style=\"font-style:italic;\">You’re not alone</span>\n"
+" </p>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\">\n"
+" <span>We would be delighted to assist you along the way. Contact us 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"
+" how to get the best out of Odoo with our </span>\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\">\n"
+" <span style=\"text-decoration:underline;\">API Documentation</span></a>\n"
+" </p>\n"
+" <p dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;\"><span>Enjoy your Odoo experience,</span></p>\n"
+" </td>\n"
+" </tr>\n"
+" </tbody>\n"
+" </table>\n"
+" <div dir=\"ltr\" style=\"font-size:13px;margin-top:0pt;margin-bottom:8pt;color:grey\">\n"
+" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n"
+" </div>\n"
+" </div>"
+msgstr ""
+
+#. module: 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 "Description"
+msgstr ""
+
+#. module: website_mail
#: model:mail.channel,name:website_mail.channel_public
msgid "Discussion Group"
msgstr ""
#. module: website_mail
-#: model:ir.model,name:website_mail.model_mail_thread
-msgid "Email Thread"
+#: model:ir.model,name:website_mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: website_mail
+#: model:ir.model,name:website_mail.model_survey_mail_compose_message
+msgid "Email composition wizard for Survey"
msgstr ""
#. module: website_mail
@@ -36,7 +146,9 @@ msgid "Message"
msgstr ""
#. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_mail_compose_message_description
#: model:ir.model.fields,help:website_mail.field_mail_message_description
+#: model:ir.model.fields,help:website_mail.field_survey_mail_compose_message_description
msgid "Message description: either the subject, or the beginning of the body"
msgstr ""
@@ -46,7 +158,9 @@ msgid "Oops! Something went wrong. Try to reload the page and to log in."
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
+#: model:ir.model.fields,field_description:website_mail.field_survey_mail_compose_message_website_published
msgid "Published"
msgstr ""
@@ -61,7 +175,7 @@ msgid "Subscribe"
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"
@@ -74,21 +188,13 @@ msgid "Unsubscribe"
msgstr ""
#. module: website_mail
+#: model:ir.model.fields,help:website_mail.field_mail_compose_message_website_published
#: model:ir.model.fields,help:website_mail.field_mail_message_website_published
+#: model:ir.model.fields,help:website_mail.field_survey_mail_compose_message_website_published
msgid "Visible on the website as a comment"
msgstr ""
#. module: website_mail
-#: model:ir.model.fields,field_description:website_mail.field_mail_thread_website_message_ids
-msgid "Website Messages"
-msgstr ""
-
-#. module: website_mail
-#: model:ir.model.fields,help:website_mail.field_mail_thread_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..."
msgstr ""
@@ -99,6 +205,11 @@ msgid "You must be"
msgstr ""
#. module: website_mail
+#: model:mail.template,subject:website_mail.mail_template_data_module_install_website_mail
+msgid "Your business is reachable from anywhere, anytime !"
+msgstr ""
+
+#. module: website_mail
#. openerp-web
#: code:addons/website_mail/static/src/xml/chatter_message.xml:8
#, python-format
@@ -126,11 +237,6 @@ msgid "to post a comment."
msgstr ""
#. module: website_mail
-#: model:ir.model.fields,field_description:website_mail.field_mail_message_description
-msgid "unknown"
-msgstr ""
-
-#. module: website_mail
#: model:ir.ui.view,arch_db:website_mail.follow
msgid "your email..."
msgstr ""
diff --git a/addons/website_mail_channel/i18n/website_mail_channel.pot b/addons/website_mail_channel/i18n/website_mail_channel.pot
index 0f0541a618f..ed8a11059bb 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,35 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_mail_channel
+#: model:mail.template,body_html:website_mail_channel.mail_template_list_subscribe
+msgid "<?xml version=\"1.0\"?>\n"
+"<data><p>Hello,</p>\n"
+"<p>You have requested to be subscribed to the mailing list <strong>${object.name}</strong></p>\n"
+"<p>To confirm, please visit the following link:</p>\n"
+"<p><strong><a href=\"${ctx['token_url']}\">${ctx['token_url']}</a></strong></p>\n"
+"<p>If this was a mistake or you did not requested this action, please ignore this message.</p>\n"
+"</data>"
+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>"
msgstr ""
#. module: website_mail_channel
#. openerp-web
-#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:18
#, python-format
msgid "Add a Subscribe Button"
msgstr ""
@@ -60,8 +82,13 @@ 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:20
+#: code:addons/website_mail_channel/static/src/js/website_mail_channel.editor.js:19
#, python-format
msgid "Discussion List"
msgstr ""
@@ -82,6 +109,11 @@ 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"
msgstr ""
@@ -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 ""
@@ -135,12 +177,14 @@ msgid "Stay in touch with our Community"
msgstr ""
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "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 +200,17 @@ 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
msgid "archives"
msgstr ""
@@ -199,6 +254,7 @@ msgid "replies"
msgstr ""
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "send mail"
msgstr ""
@@ -209,16 +265,28 @@ 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
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "unsubscribe"
msgstr ""
#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.confirmation_subscription
+msgid "unsubscribed"
+msgstr ""
+
+#. module: website_mail_channel
+#: model:ir.ui.view,arch_db:website_mail_channel.mail_channels
#: model:ir.ui.view,arch_db:website_mail_channel.subscribe
msgid "your email..."
msgstr ""
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
index e1c85a0ab7f..dc5d9607e3a 100644
--- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot
+++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr ""
#. module: website_mass_mailing
#. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:17
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:15
#, python-format
msgid "Add a Newsletter Subscribe Button"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
#. module: website_mass_mailing
#. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:24
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:22
#, python-format
msgid "Newsletter"
msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
#. module: website_mass_mailing
#. openerp-web
-#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:78
+#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:80
#, python-format
msgid "Type Here ..."
msgstr ""
diff --git a/addons/website_membership/i18n/website_membership.pot b/addons/website_membership/i18n/website_membership.pot
index 8292615b358..ad429177ea7 100644
--- a/addons/website_membership/i18n/website_membership.pot
+++ b/addons/website_membership/i18n/website_membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "All"
msgstr ""
#. module: website_membership
-#: code:addons/website_membership/controllers/main.py:80
+#: code:addons/website_membership/controllers/main.py:85
#, python-format
msgid "All Countries"
msgstr ""
@@ -37,7 +37,7 @@ msgid "Find a business partner"
msgstr ""
#. module: website_membership
-#: code:addons/website_membership/controllers/main.py:122
+#: code:addons/website_membership/controllers/main.py:130
#, python-format
msgid "Free Members"
msgstr ""
diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot
index 1c0279aeaa8..e50b57ae9cf 100644
--- a/addons/website_partner/i18n/website_partner.pot
+++ b/addons/website_partner/i18n/website_partner.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,26 +21,11 @@ msgid "Partner"
msgstr ""
#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_private
-msgid "Private Profile"
-msgstr ""
-
-#. module: website_partner
#: model:ir.ui.view,arch_db:website_partner.partner_detail
msgid "Short Description for List View"
msgstr ""
#. module: website_partner
-#: model:ir.model.fields,help:website_partner.field_res_partner_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_partner
#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_description
msgid "Website Partner Full Description"
msgstr ""
@@ -50,28 +35,3 @@ msgstr ""
msgid "Website Partner Short Description"
msgstr ""
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_partner
-#: model:ir.model.fields,field_description:website_partner.field_res_partner_self
-msgid "unknown"
-msgstr ""
-
diff --git a/addons/website_payment/i18n/website_payment.pot b/addons/website_payment/i18n/website_payment.pot
index 029b043abb9..78c2da97672 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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:42
+#: code:addons/website_payment/controllers/main.py:44
#, python-format
msgid "Pay Now"
msgstr ""
@@ -109,6 +104,11 @@ 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"
msgstr ""
@@ -120,8 +120,13 @@ msgid "Reference"
msgstr ""
#. module: website_payment
-#: model:ir.model.fields,help:website_payment.field_payment_acquirer_website_url
-msgid "The full URL to access the document through the website."
+#: 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
@@ -135,11 +140,6 @@ msgid "Website"
msgstr ""
#. module: website_payment
-#: model:ir.model.fields,field_description:website_payment.field_payment_acquirer_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_payment
#: model:ir.model,name:website_payment.model_account_config_settings
msgid "account.config.settings"
msgstr ""
diff --git a/addons/website_portal/i18n/website_portal.pot b/addons/website_portal/i18n/website_portal.pot
index 1d7bef4534a..d8b0f9192c7 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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:72
+#: 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:87
+#: 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 c7b0ac55308..1ac4773683b 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-29 10:27+0000\n"
-"PO-Revision-Date: 2015-09-29 10:27+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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 ""
@@ -67,13 +67,6 @@ msgid "<span class=\"label label-success orders_label_text_align\"><i class=\"fa
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>"
msgstr ""
@@ -129,7 +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
+#: 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 ""
@@ -139,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
@@ -159,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 ""
@@ -174,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 ""
@@ -194,24 +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.invoices
-#: 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 ""
@@ -221,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/i18n/website_project.pot b/addons/website_project/i18n/website_project.pot
new file mode 100644
index 00000000000..1e2f9ecce0c
--- /dev/null
+++ b/addons/website_project/i18n/website_project.pot
@@ -0,0 +1,169 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_project
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Assigned to</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_project
+msgid "<strong>Customer</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Message and communication history</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_project
+msgid "<strong>Project Manager</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Project:</strong>"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "<strong>Reported by</strong>"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:84
+#, python-format
+msgid "All"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+msgid "Current stage of the task"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "Current stage of this task"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "Edit Task"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:78
+#, python-format
+msgid "Last Stage Update"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_project
+msgid "My Projects"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "My Tasks"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:31
+#: code:addons/website_project/controllers/main.py:76
+#: model:ir.ui.view,arch_db:website_project.my_projects
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:30
+#: code:addons/website_project/controllers/main.py:75
+#, python-format
+msgid "Newest"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_project
+msgid "Project -"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.portal_layout
+msgid "Projects"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+msgid "Projects:"
+msgstr ""
+
+#. module: website_project
+#: code:addons/website_project/controllers/main.py:77
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+msgid "Task"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_task
+msgid "Task -"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.portal_layout
+msgid "Tasks"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_projects
+msgid "There are no projects."
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+msgid "There are no tasks."
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_projects
+#: model:ir.ui.view,arch_db:website_project.portal_my_home
+msgid "Your Projects"
+msgstr ""
+
+#. module: website_project
+#: model:ir.ui.view,arch_db:website_project.my_tasks
+#: model:ir.ui.view,arch_db:website_project.portal_my_home
+msgid "Your Tasks"
+msgstr ""
+
diff --git a/addons/website_project_issue/i18n/website_project_issue.pot b/addons/website_project_issue/i18n/website_project_issue.pot
index 9a5cc8300f2..cc0ab2e2f57 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,49 +16,83 @@ 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>"
-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>Assigned to</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>Date:</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.portal_project_issue
+#: 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.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
+#: 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.my_issues_issue
+msgid "My Issues"
+msgstr ""
+
+#. module: website_project_issue
+#: 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
@@ -67,23 +101,30 @@ msgid "Project Issue"
msgstr ""
#. module: website_project_issue
-#: model:ir.ui.view,arch_db:website_project_issue.portal_project_issue
-msgid "Status"
+#: 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_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
-#: code:addons/website_project_issue/models/project_issue.py:30
-#, python-format
-msgid "View 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.portal_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_project_issue_sheet/i18n/website_project_issue_sheet.pot b/addons/website_project_issue_sheet/i18n/website_project_issue_sheet.pot
index c1e8c1b1e2b..2a37ecf9841 100644
--- a/addons/website_project_issue_sheet/i18n/website_project_issue_sheet.pot
+++ b/addons/website_project_issue_sheet/i18n/website_project_issue_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,22 +16,22 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_project_issue_sheet
-#: model:ir.ui.view,arch_db:website_project_issue_sheet.issues_followup_sheet
+#: model:ir.ui.view,arch_db:website_project_issue_sheet.my_issues_issue
msgid "Date"
msgstr ""
#. module: website_project_issue_sheet
-#: model:ir.ui.view,arch_db:website_project_issue_sheet.issues_followup_sheet
+#: model:ir.ui.view,arch_db:website_project_issue_sheet.my_issues_issue
msgid "Description"
msgstr ""
#. module: website_project_issue_sheet
-#: model:ir.ui.view,arch_db:website_project_issue_sheet.issues_followup_sheet
+#: model:ir.ui.view,arch_db:website_project_issue_sheet.my_issues_issue
msgid "Duration"
msgstr ""
#. module: website_project_issue_sheet
-#: model:ir.ui.view,arch_db:website_project_issue_sheet.issues_followup_sheet
+#: model:ir.ui.view,arch_db:website_project_issue_sheet.my_issues_issue
msgid "Responsible"
msgstr ""
diff --git a/addons/website_project_timesheet/i18n/website_project_timesheet.pot b/addons/website_project_timesheet/i18n/website_project_timesheet.pot
new file mode 100644
index 00000000000..9b5cc1d7e9f
--- /dev/null
+++ b/addons/website_project_timesheet/i18n/website_project_timesheet.pot
@@ -0,0 +1,37 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_project_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_project_timesheet
+#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
+msgid "Date"
+msgstr ""
+
+#. module: website_project_timesheet
+#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
+msgid "Description"
+msgstr ""
+
+#. module: website_project_timesheet
+#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
+msgid "Duration"
+msgstr ""
+
+#. module: website_project_timesheet
+#: model:ir.ui.view,arch_db:website_project_timesheet.my_task
+msgid "Responsible"
+msgstr ""
+
diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot
index bc9bbba8f3c..d06244d3c92 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.0c\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-18 12:33+0000\n"
-"PO-Revision-Date: 2016-04-18 12:33+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,70 +16,55 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_quote
-#: model:mail.template,body_html:website_quote.email_template_edi_sale
+#: model:mail.template,body_html:website_quote.confirmation_mail
msgid "\n"
-"<div style=\"font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello ${object.partner_id.name},</p>\n"
-"\n"
-" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-" &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-" &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.client_order_ref:\n"
-" &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p>\n"
-" <p>\n"
-" You can view your quotation online:\n"
-" </p>\n"
-" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"/quote/${object.id}/${object.access_token}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
-"\n"
-" % if object.paypal_url and object.amount_total:\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"/sale/static/img/btn_paynowcc_lg.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone:&nbsp; ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" % endif\n"
-" <p></p>\n"
-" </div>\n"
+"<div summary=\"o_mail_template\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"center\" width=\"200\" style=\"padding:0px 10px 5px 5px;font-size: 12px\">\n"
+" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${user.company_id.name}\">\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding: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:15px auto;padding:0\">\n"
+" </div>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
"</div>\n"
-" "
+"<div style=\"padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:0px 10px 5px 5px;font-size: 14px;\">\n"
+" <p>Dear ${object.partner_id.name},</p><br/>\n"
+" <p>Your order <a href=\"/quote/${object.id}/${object.access_token}\">${object.name}</a> has been validated!</p><br/>\n"
+" \n"
+" % if object.partner_id.user_ids\n"
+" <p>You can view your quotes, sales orders and invoices online by going to our <a style=\"text-decoration:none; color: #a24689;\" href=\"/my/home\">Online Portal</a>.</p><br/>\n"
+" % endif\n"
+"\n"
+" <p>If you have any question, do not hesitate to contact us.</p><br/>\n"
+" <p>Thank you for choosing ${object.company_id.name or \"us\"}!</p>\n"
+" </td>\n"
+" </tr><tr>\n"
+" <td style=\"padding:0px 10px 5px 5px;font-size: 14px;\">\n"
+" % if user.signature\n"
+" <p style=\"font-size: 14px;\">${user.signature | safe}\n"
+" </p>\n"
+" % endif\n"
+" <p style=\"font-size: 11px;\"><strong>Sent by\n"
+" <a href=\"${user.company_id.website}\" style=\"text-decoration:none; color: #a24689;\">\n"
+" <strong>${user.company_id.name}</strong>\n"
+" </a> using <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n"
+" </strong></p>\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
+"</div>"
msgstr ""
#. module: website_quote
@@ -88,16 +73,6 @@ msgid "! You can"
msgstr ""
#. module: website_quote
-#: model:mail.template,report_name:website_quote.email_template_edi_sale
-msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
-msgstr ""
-
-#. module: website_quote
-#: model:mail.template,subject:website_quote.email_template_edi_sale
-msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.optional_products
#: model:ir.ui.view,arch_db:website_quote.pricing
#: model:ir.ui.view,arch_db:website_quote.report_saleorder_validity_date
@@ -105,8 +80,8 @@ msgid "% discount"
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "&amp;nbsp;"
+#: model:ir.ui.view,arch_db:website_quote.pricing
+msgid "&amp;bull;"
msgstr ""
#. module: website_quote
@@ -130,13 +105,13 @@ msgid ":\n"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "<b> To write a quotation description, edit your product, go the sales tab and add a text in \"Description for quotations\"</b>"
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+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"
+msgid "<i class=\"fa fa-check\"/> Accept &amp; Pay"
msgstr ""
#. module: website_quote
@@ -160,21 +135,6 @@ msgid "<i class=\"fa fa-times\"/> Reject"
msgstr ""
#. module: website_quote
-#: 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: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: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>"
msgstr ""
@@ -185,16 +145,6 @@ msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/> Can
msgstr ""
#. module: website_quote
-#: 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>"
msgstr ""
@@ -232,38 +182,6 @@ 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: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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Objectives:</strong>"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "<strong>Our prices include:</strong>"
-msgstr ""
-
-#. module: website_quote
-#: 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>"
msgstr ""
@@ -276,11 +194,6 @@ msgid "<strong>Template Header:</strong> this content\n"
msgstr ""
#. module: website_quote
-#: 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"
" Contact us for new quote."
@@ -302,37 +215,13 @@ 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_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"
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "About us"
msgstr ""
#. module: website_quote
-#: 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
@@ -346,8 +235,10 @@ msgid "An administrator can set up default Terms and conditions in your Company
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Arrays"
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "As a leading professional services firm,\n"
+" we know that success is all about the\n"
+" commitment we put on strong services."
msgstr ""
#. module: website_quote
@@ -356,29 +247,13 @@ msgid "Ask Changes"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
-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."
+#: model:ir.ui.view,arch_db:website_quote.so_template
+msgid "Back"
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Better comfort to facilitate your learning process"
+#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
+msgid "Back to Sale Order"
msgstr ""
#. module: website_quote
@@ -387,37 +262,11 @@ msgid "Bill To:"
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Bootstrap CSS"
-msgstr ""
-
-#. module: website_quote
-#: 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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Building a Full Application"
-msgstr ""
-
-#. module: website_quote
-#: 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 aneed of technical knowledge."
-msgstr ""
-
-#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.opt_quotation_signature
msgid "Clear"
msgstr ""
@@ -428,13 +277,8 @@ 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."
+#: model:ir.model.fields,field_description:website_quote.field_sale_quote_template_mail_template_id
+msgid "Confirmation Mail"
msgstr ""
#. module: website_quote
@@ -443,21 +287,6 @@ msgid "Contact us"
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Controlers and Views"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Convert Lead to Opportunity &amp; Customer management"
-msgstr ""
-
-#. module: website_quote
-#: 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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_create_uid
@@ -479,41 +308,6 @@ 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: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: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: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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_name
@@ -536,11 +330,6 @@ msgid "Description for the website"
msgstr ""
#. module: website_quote
-#: 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"
msgstr ""
@@ -561,16 +350,6 @@ msgid "Display Name"
msgstr ""
#. module: website_quote
-#: 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"
msgstr ""
@@ -581,98 +360,27 @@ 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: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 &amp; direct mail to customer"
-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."
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:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Hands-on exercises and their solutions"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Hello World"
+#: 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
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "High Margins"
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "Great quotation templates will significantly\n"
+" <strong>boost your success rate</strong>. The\n"
+" first section is usually about your company,\n"
+" your references, your methodology or\n"
+" guarantees, your team, SLA, terms and conditions, etc."
msgstr ""
#. module: website_quote
@@ -681,11 +389,6 @@ msgid "History"
msgstr ""
#. module: website_quote
-#: 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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_id
@@ -694,7 +397,16 @@ msgid "ID"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:74
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "If edit a quotation from the 'Preview' of a quotation, you will\n"
+" update the quotation for this customer only. If you edit the quotation\n"
+" template (from the Configuration menu), all future quotations will\n"
+" use this modified template."
+msgstr ""
+
+#. module: website_quote
+#: 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 ""
@@ -706,64 +418,22 @@ 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: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: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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Introduction to JQuery"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Introduction to Javascript"
-msgstr ""
-
-#. module: website_quote
-#: 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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option___last_update
@@ -788,23 +458,6 @@ 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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_line_website_description
@@ -812,58 +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:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Live Q&amp;A sessions with a trainer"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Loops"
-msgstr ""
-
-#. module: website_quote
-#: 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: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: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:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "New interactive learning experience"
+msgid "My Quotations"
msgstr ""
#. module: website_quote
@@ -878,57 +491,6 @@ 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: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: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:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Online Training + Certification"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.actions.client,name:website_quote.open_quotation_menu
-msgid "Open Quotations"
-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"
msgstr ""
@@ -946,71 +508,40 @@ msgid "Optional Products Lines"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/models/order.py:291
+#: 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:90
+#: code:addons/website_quote/controllers/main.py:92
#, python-format
msgid "Order signed by %s"
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_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."
+#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
+msgid "Other Settings"
msgstr ""
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Our offer"
+msgid "Our Offer"
msgstr ""
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Our offer is based on 3 commitments, which drive our business and our partners:"
-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."
+msgid "Our Quality"
msgstr ""
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Our prices are the lowest in the region, if you find cheaper elsewhere, we will refund the difference"
+msgid "Our Service"
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: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: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:64
+#: code:addons/website_quote/controllers/main.py:67
+#: code:addons/website_quote/controllers/main.py:206
#, python-format
msgid "Pay & Confirm"
msgstr ""
@@ -1027,13 +558,8 @@ msgid "Payment Method:"
msgstr ""
#. module: website_quote
-#: model:ir.model,name:website_quote.model_payment_transaction
-msgid "Payment Transaction"
-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."
+#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
+msgid "Preview"
msgstr ""
#. module: website_quote
@@ -1044,17 +570,11 @@ 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"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
msgid "Print"
msgstr ""
@@ -1068,18 +588,15 @@ msgid "Product"
msgstr ""
#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Product Category &amp; 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"
+#: model:ir.model,name:website_quote.model_product_template
+msgid "Product Template"
msgstr ""
#. module: website_quote
-#: model:ir.model,name:website_quote.model_product_template
-msgid "Product Template"
+#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
+msgid "Product quality is the foundation we\n"
+" stand on; we build it with a relentless\n"
+" focus on fabric, performance and craftsmanship."
msgstr ""
#. module: website_quote
@@ -1094,26 +611,6 @@ 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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Python Objects"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Quality"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Quality in many ways, our reputation was built on the first value."
-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
#: model:ir.model.fields,field_description:website_quote.field_sale_quote_option_quantity
@@ -1167,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 ""
@@ -1188,33 +685,17 @@ msgid "Reject This Quote"
msgstr ""
#. module: website_quote
-#: 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: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"
msgstr ""
@@ -1243,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
@@ -1263,41 +736,22 @@ msgid "Security Token"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
-msgid "Send by Email"
-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 ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Service"
-msgstr ""
-
-#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation_content
msgid "Ship To:"
msgstr ""
#. module: website_quote
-#: model:sale.quote.option,website_description:website_quote.website_sale_option_line_1
-msgid "Shop, Location &amp; Warehouse Configuration"
-msgstr ""
-
-#. module: website_quote
#: model:ir.ui.view,arch_db:website_quote.so_quotation
msgid "Sign &amp; Confirm"
msgstr ""
#. module: website_quote
-#: 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
#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form
@@ -1315,15 +769,6 @@ msgid "Taxes:"
msgstr ""
#. module: website_quote
-#: model:product.product,name: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: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."
msgstr ""
@@ -1340,18 +785,16 @@ msgid "Terms and conditions"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_1
-msgid "Test developments automatically"
+#: 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."
msgstr ""
#. module: website_quote
#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "The description of products/services from your quotation will be displayed below"
-msgstr ""
-
-#. module: website_quote
-#: 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. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+ Pearson VUE test centers worldwide."
+msgid "This is a <strong>sample quotation template</strong>. You should\n"
+" customize it to fit your own needs from the <i>Sale</i>\n"
+" application, using the menu: Configuration /\n"
+" Quotation Templates."
msgstr ""
#. module: website_quote
@@ -1378,29 +821,8 @@ msgid "Titles with style <i>Heading 1</i> and\n"
msgstr ""
#. module: website_quote
-#: 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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Training Center Module"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Underscore"
-msgstr ""
-
-#. module: website_quote
-#: 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
@@ -1432,38 +854,10 @@ msgid "Validate Order"
msgstr ""
#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Variables &amp; Operators"
-msgstr ""
-
-#. module: website_quote
-#: model:sale.quote.line,website_description:website_quote.website_sale_order_line_1
-msgid "Videos with detailed demos"
-msgstr ""
-
-#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote
-msgid "View Online Quotation"
-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 are always reachable to help you, do not hesitate to contact us at any time."
-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."
+msgid "We always ensure that our products are\n"
+" set at a fair price so that you will be\n"
+" happy to buy them."
msgstr ""
#. module: website_quote
@@ -1477,18 +871,16 @@ msgid "Website Description"
msgstr ""
#. module: website_quote
-#: 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:sale.quote.line,website_description:website_quote.website_sale_order_line_2
-msgid "Workflows"
+#: 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"
+" automatically create a quotation using the descriptions\n"
+" of all products in the proposal. The table of content\n"
+" on the left is generated automatically using the styles you\n"
+" used in your description (heading 1, heading 2, ...)"
msgstr ""
#. module: website_quote
-#: code:addons/website_quote/controllers/main.py:137
+#: code:addons/website_quote/controllers/main.py:136
#, python-format
msgid "You cannot add options to a confirmed order."
msgstr ""
@@ -1524,11 +916,6 @@ msgid "Your advantage:"
msgstr ""
#. module: website_quote
-#: 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....."
msgstr ""
@@ -1539,13 +926,13 @@ msgid "Your message has been successfully sent!"
msgstr ""
#. module: website_quote
-#: model:ir.ui.view,arch_db:website_quote.so_quotation
-msgid "Your payment has been received, thank you for your trust."
+#: model:mail.template,subject:website_quote.confirmation_mail
+msgid "Your order ${object.name} is confirmed"
msgstr ""
#. module: website_quote
-#: model:sale.quote.template,website_description:website_quote.website_quote_template_default
-msgid "Your products/services"
+#: model:ir.ui.view,arch_db:website_quote.so_quotation
+msgid "Your payment has been received, thank you for your trust."
msgstr ""
#. module: website_quote
@@ -1570,11 +957,6 @@ msgid "days"
msgstr ""
#. module: website_quote
-#: 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"
" any question."
@@ -1606,13 +988,3 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: website_quote
-#: 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 0bd56e2b31c..bb48c9d3394 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,45 +32,45 @@ 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"
msgstr ""
@@ -90,18 +90,3 @@ msgstr ""
msgid "Projects"
msgstr ""
-#. module: website_rating_project_issue
-#: model:ir.model.fields,help:website_rating_project_issue.field_project_project_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_rating_project_issue
-#: model:ir.model.fields,field_description:website_rating_project_issue.field_project_project_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_rating_project_issue
-#: model:ir.model.fields,field_description:website_rating_project_issue.field_project_project_website_url
-msgid "Website URL"
-msgstr ""
-
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index 647a7e74bf0..f987ab66f88 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-09 09:18+0000\n"
+"POT-Creation-Date: 2016-08-18 08:36+0000\n"
+"PO-Revision-Date: 2016-08-18 08:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,18 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.payment
msgid "(extra fees apply)"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid ", go in the 'Sales' tab"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid ", go the 'Sales' tab"
+msgid ", go to the 'Sales' tab"
msgstr ""
#. module: website_sale
@@ -35,15 +31,10 @@ 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
@@ -65,6 +56,11 @@ msgid "<br/>\n"
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"
msgstr ""
@@ -80,6 +76,11 @@ 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"
msgstr ""
@@ -87,42 +88,44 @@ 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.total
-msgid "<span class=\"col-xs-6 text-right h4\">Total:</span>"
+#: model:ir.ui.view,arch_db:website_sale.cart_lines
+msgid "<small><i class=\"fa fa-trash-o\"/> Remove</small>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.total
-msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Taxes may be updated after providing shipping address\"> Taxes:</span>"
+#: 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
#: model:ir.ui.view,arch_db:website_sale.total
-msgid "<span class=\"col-xs-6 text-right text-muted\">Subtotal:</span>"
+msgid "<span class=\"col-xs-6 text-right h4\">Total:</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.payment
-msgid "<span class=\"fa fa-arrow-right\"/> Change Address"
+#: model:ir.ui.view,arch_db:website_sale.total
+msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Taxes may be updated after providing shipping address\"> Taxes:</span>"
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.total
+msgid "<span class=\"col-xs-6 text-right text-muted\">Subtotal:</span>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "<span class=\"fa fa-comment-o\"/> Website Live Chat on"
+#: model:ir.ui.view,arch_db:website_sale.product
+msgid "<span class=\"fa fa-check\"/>\n"
+" <span>In Stock</span>"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "<span class=\"fa fa-envelope-o\"/> Email Our Website Expert"
+msgid "<span class=\"fa fa-comment-o\"/> Website Live Chat on"
msgstr ""
#. module: website_sale
@@ -145,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
@@ -155,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
@@ -209,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
@@ -223,8 +235,8 @@ 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
@@ -403,6 +415,21 @@ 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
msgid "Accessory Products"
@@ -424,6 +451,11 @@ 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."
msgstr ""
@@ -445,6 +477,13 @@ 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:34
+#, 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
msgid "Appear on the product page"
@@ -462,13 +501,27 @@ msgid "Apply"
msgstr ""
#. module: website_sale
+#: 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
#: model:ir.model.fields,field_description:website_sale.field_product_product_available_in_pos
msgid "Available in the Point of Sale"
msgstr ""
#. module: website_sale
-#: model:product.pricelist,name:website_sale.list_benelux
-msgid "Benelux Pricelist"
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:24
+#, python-format
+msgid "Best Sellers"
msgstr ""
#. module: website_sale
@@ -479,7 +532,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.checkout
-msgid "Billing Information"
+msgid "Billing Address"
msgstr ""
#. module: website_sale
@@ -498,16 +551,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
@@ -521,79 +572,48 @@ msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_product_purchase_requisition
-msgid "Check this box to generate Call for Tenders instead of generating requests for quotation from procurement."
-msgstr ""
-
-#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_public_category_child_id
msgid "Children Categories"
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
@@ -602,19 +622,12 @@ 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 ""
@@ -635,6 +648,11 @@ 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\"/>"
msgstr ""
@@ -649,29 +667,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 ""
@@ -686,7 +683,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 ""
@@ -696,34 +693,6 @@ 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
#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_create_uid
@@ -801,15 +770,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 ""
@@ -821,24 +788,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 ""
@@ -854,7 +826,17 @@ msgid "Enter your existing products into this CSV file, respecting its structure
msgstr ""
#. module: website_sale
-#: constraint:product.public.category:0
+#: model:ir.model.fields,help:website_sale.field_product_product_split_method
+msgid "Equal : Cost will be equally divided.\n"
+"By Quantity : Cost will be divided according to product's quantity.\n"
+"By Current cost : Cost will be divided according to product's current cost.\n"
+"By Weight : Cost will be divided depending on its weight.\n"
+"By Volume : Cost will be divided depending on its volume."
+msgstr ""
+
+#. module: website_sale
+#: code:addons/website_sale/models/product.py:57
+#, python-format
msgid "Error ! You cannot create recursive categories."
msgstr ""
@@ -880,12 +862,12 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
-msgid "Export the 3 products you have already created by checking them and choosing 'Export' from the 'More' menu"
+msgid "Export the 3 products you have already created by checking them and choosing 'Export' from the 'Action' menu"
msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.extra_info_option
-msgid "Extra Info"
+msgid "Extra Info<span class=\"chevron\"/>"
msgstr ""
#. module: website_sale
@@ -899,31 +881,6 @@ 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"
-msgstr ""
-
-#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info
-msgid "Field required"
-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!"
msgstr ""
@@ -934,6 +891,11 @@ msgid "Free and easy to setup"
msgstr ""
#. module: website_sale
+#: 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 "From a"
msgstr ""
@@ -949,12 +911,17 @@ 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"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_attribute_value_color
+#: model:ir.model.fields,field_description:website_sale.field_product_attribute_value_html_color
msgid "HTML Color Index"
msgstr ""
@@ -974,7 +941,7 @@ msgid "Here are <strong>some pros and cons</strong> to help you decide:"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,help:website_sale.field_product_attribute_value_color
+#: model:ir.model.fields,help:website_sale.field_product_attribute_value_html_color
msgid "Here you can set a specific HTML color index (e.g. #ff0000) to display the color on the website if the attibute type is 'Color'."
msgstr ""
@@ -986,7 +953,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_11237
+#: model:ir.model.fields,field_description:website_sale.field_website_pricelist_id_11497
msgid "ID"
msgstr ""
@@ -1015,6 +982,11 @@ 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"
" That's what a payment gateway is for: it helps you make money, but that does cost money.<br/>\n"
@@ -1032,13 +1004,19 @@ msgid "Increase your chances to make a sale by displaying suggested products."
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:559
+#: code:addons/website_sale/controllers/main.py:462
#, python-format
msgid "Invalid Email! Please enter a valid email address."
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:73
+#: 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:86
#, python-format
msgid "It is forbidden to modify a sale order which is not in draft status"
msgstr ""
@@ -1080,6 +1058,16 @@ msgid "Last Updated on"
msgstr ""
#. module: website_sale
+#: model:ir.ui.view,arch_db:website_sale.extra_info
+msgid "Let us your remark..."
+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"
msgstr ""
@@ -1095,36 +1083,26 @@ 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
#. openerp-web
-#: code:addons/website_sale/static/src/js/website_sale.js:14
+#: code:addons/website_sale/static/src/js/website_sale.js:15
#, python-format
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:957
+#: code:addons/website_sale/controllers/main.py:899
#: 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
@@ -1132,13 +1110,6 @@ 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"
msgstr ""
@@ -1162,7 +1133,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
@@ -1177,9 +1148,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
@@ -1203,6 +1174,12 @@ msgid "Order Lines to be displayed on the website. They should not be used for c
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"
msgstr ""
@@ -1213,7 +1190,8 @@ msgid "Partner"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:769
+#: code:addons/website_sale/controllers/main.py:711
+#: code:addons/website_sale/controllers/main.py:770
#, python-format
msgid "Pay Now"
msgstr ""
@@ -1224,13 +1202,13 @@ msgid "Pay Now <span class=\"fa fa-long-arrow-right\"/>"
msgstr ""
#. module: website_sale
-#: model:ir.ui.view,arch_db:website_sale.extra_info_option
-msgid "Payment"
+#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_acquirer_id
+msgid "Payment Acquirer"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_sale_order_payment_acquirer_id
-msgid "Payment Acquirer"
+#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers
+msgid "Payment Acquirers"
msgstr ""
#. module: website_sale
@@ -1249,17 +1227,13 @@ 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
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 ""
@@ -1296,14 +1270,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:32
#: 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 ""
@@ -1324,7 +1306,7 @@ msgstr ""
#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.product_public_category_tree_view
-msgid "Product Product Categories"
+msgid "Product Public Categories"
msgstr ""
#. module: website_sale
@@ -1349,6 +1331,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"
@@ -1365,33 +1349,17 @@ msgid "Products list view"
msgstr ""
#. module: website_sale
-#: model:ir.model.fields,field_description:website_sale.field_product_product_project_id
-msgid "Project"
-msgstr ""
-
-#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_sale
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"
msgstr ""
@@ -1417,6 +1385,13 @@ msgid "Put the practical details (shipping, payment options,...) as links in the
msgstr ""
#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:33
+#, python-format
+msgid "Qty Sold"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.cart_popover
msgid "Qty:"
msgstr ""
@@ -1441,11 +1416,25 @@ msgstr ""
#. module: website_sale
#: model:ir.model,name:website_sale.model_rating_rating
#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_ids
-#: model:ir.model.fields,field_description:website_sale.field_product_template_rating_ids
msgid "Rating"
msgstr ""
#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_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"
msgstr ""
@@ -1466,6 +1455,13 @@ msgid "Sale"
msgstr ""
#. module: website_sale
+#. openerp-web
+#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:8
+#, python-format
+msgid "Sales"
+msgstr ""
+
+#. module: website_sale
#: model:ir.ui.view,arch_db:website_sale.website_planner
msgid "Sales / Settings"
msgstr ""
@@ -1476,11 +1472,7 @@ msgid "Sales Order"
msgstr ""
#. module: website_sale
-#: 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"
@@ -1493,25 +1485,11 @@ 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"
msgstr ""
@@ -1523,9 +1501,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
@@ -1534,14 +1512,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
@@ -1555,9 +1532,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 ""
@@ -1568,20 +1543,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 &amp;"
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 &amp;"
+msgid "Shipping Address"
msgstr ""
#. module: website_sale
@@ -1590,11 +1559,6 @@ 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
msgid "Shop"
@@ -1621,8 +1585,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
@@ -1653,13 +1617,6 @@ 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"
msgstr ""
@@ -1675,7 +1632,7 @@ msgid "Some customers prefer to pay this way"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/controllers/main.py:581
+#: code:addons/website_sale/controllers/main.py:473
#, python-format
msgid "Some required fields are empty."
msgstr ""
@@ -1691,25 +1648,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
@@ -1730,6 +1685,16 @@ 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
msgid "Suggested Products"
@@ -1737,12 +1702,22 @@ 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:"
+msgstr ""
+
+#. module: website_sale
+#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_delivery_temando
+msgid "Temando integration"
msgstr ""
#. module: website_sale
@@ -1758,7 +1733,6 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,help:website_sale.field_product_product_website_url
-#: model:ir.model.fields,help:website_sale.field_product_template_website_url
msgid "The full URL to access the document through the website."
msgstr ""
@@ -1768,6 +1742,13 @@ 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:26
+#, 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."
msgstr ""
@@ -1778,10 +1759,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
@@ -1846,30 +1826,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"
-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.ui.menu,name:website_sale.menu_orders_unpaid_orders
+msgid "Unpaid 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."
+#: 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.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
@@ -1879,7 +1852,6 @@ msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_published
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_published
msgid "Visible in Website"
msgstr ""
@@ -1889,6 +1861,11 @@ 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."
msgstr ""
@@ -1930,13 +1907,14 @@ msgid "Website Pricelist"
msgstr ""
#. module: website_sale
-#: code:addons/website_sale/models/sale_order.py:344
+#: code:addons/website_sale/models/sale_order.py:409
#, 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 ""
@@ -1954,42 +1932,44 @@ 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"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_url
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_url
msgid "Website URL"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_description
-#: model:ir.model.fields,field_description:website_sale.field_product_public_category_website_meta_description
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_meta_description
msgid "Website meta description"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_keywords
-#: model:ir.model.fields,field_description:website_sale.field_product_public_category_website_meta_keywords
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_meta_keywords
msgid "Website meta keywords"
msgstr ""
#. module: website_sale
#: model:ir.model.fields,field_description:website_sale.field_product_product_website_meta_title
-#: model:ir.model.fields,field_description:website_sale.field_product_public_category_website_meta_title
-#: model:ir.model.fields,field_description:website_sale.field_product_template_website_meta_title
msgid "Website meta title"
msgstr ""
#. 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
@@ -2003,33 +1983,48 @@ 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
msgid "Your cart is empty!"
@@ -2056,8 +2051,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
@@ -2086,11 +2081,17 @@ 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.cart_popover
msgid "items)"
msgstr ""
@@ -2101,11 +2102,6 @@ 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"
msgstr ""
@@ -2121,11 +2117,6 @@ 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"
msgstr ""
diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot
index a0a4e938ab2..55cb067ed97 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,11 @@ msgid "<span class=\"col-xs-6 text-right text-muted\" title=\"Delivery will be u
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"
msgstr ""
@@ -36,6 +41,16 @@ msgid "Appear on the shopping cart"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_availability
+msgid "Availability"
+msgstr ""
+
+#. module: website_sale_delivery
+#: 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,field_description:website_sale_delivery.field_delivery_carrier_available_in_pos
msgid "Available in the Point of Sale"
msgstr ""
@@ -56,18 +71,13 @@ msgid "Check if you want this product to appear in the Point of Sale"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_purchase_requisition
-msgid "Check this box to generate Call for Tenders instead of generating requests for quotation from procurement."
-msgstr ""
-
-#. module: website_sale_delivery
#: model:ir.ui.view,arch_db:website_sale_delivery.payment_delivery
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
@@ -76,13 +86,18 @@ msgid "Delivery Amount"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form
+#: model:ir.ui.menu,name:website_sale_delivery.menu_ecommerce_delivery
+msgid "Delivery Methods"
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery
msgid "Description"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form
-msgid "Description displayed on the eCommerce and on the Online Quotations."
+#: model:ir.ui.view,arch_db:website_sale_delivery.view_delivery_carrier_form_website_delivery
+msgid "Description displayed on the eCommerce and on online quotations."
msgstr ""
#. module: website_sale_delivery
@@ -101,6 +116,20 @@ msgid "Determine the display order in the Website E-commerce"
msgstr ""
#. module: website_sale_delivery
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_split_method
+msgid "Equal : Cost will be equally divided.\n"
+"By Quantity : Cost will be divided according to product's quantity.\n"
+"By Current cost : Cost will be divided according to product's current cost.\n"
+"By Weight : Cost will be divided depending on its weight.\n"
+"By Volume : Cost will be divided depending on its volume."
+msgstr ""
+
+#. module: website_sale_delivery
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_attachment_count
+msgid "File"
+msgstr ""
+
+#. module: website_sale_delivery
#: model:ir.model.fields,help:website_sale_delivery.field_sale_order_has_delivery
msgid "Has an order line set for delivery"
msgstr ""
@@ -121,19 +150,14 @@ 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"
+#: 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 ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:127
-#, python-format
-msgid "No shipping method is available for your current order and shipping address. Please contact us for more information."
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_optional_product_ids
+msgid "Optional Products"
msgstr ""
#. module: website_sale_delivery
@@ -147,13 +171,13 @@ msgid "Procurement"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_project_id
-msgid "Project"
+#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_optional_product_ids
+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_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
@@ -162,29 +186,23 @@ msgid "Rating"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model,name:website_sale_delivery.model_sale_order
-msgid "Sales Order"
-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_last_value
+msgid "Rating Last Value"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.ui.view,arch_db:website_sale_delivery.country_state_shipping
-msgid "Select..."
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_count
+msgid "Rating count"
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."
+#: 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,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
@@ -198,7 +216,7 @@ msgid "Size Y"
msgstr ""
#. module: website_sale_delivery
-#: code:addons/website_sale_delivery/models/sale_order.py:126
+#: code:addons/website_sale_delivery/models/sale_order.py:98
#, python-format
msgid "Sorry, we are unable to ship your order"
msgstr ""
@@ -224,8 +242,8 @@ msgid "The amount without tax."
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_website_url
-msgid "The full URL to access the document through the website."
+#: 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
@@ -244,6 +262,11 @@ msgid "To Weigh With Scale"
msgstr ""
#. module: website_sale_delivery
+#: 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_website_published
msgid "Visible in Website"
msgstr ""
@@ -259,8 +282,8 @@ msgid "Website Product Category"
msgstr ""
#. module: website_sale_delivery
-#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_url
-msgid "Website URL"
+#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_website_sequence
+msgid "Website Sequence"
msgstr ""
#. module: website_sale_delivery
diff --git a/addons/website_sale_digital/i18n/website_sale_digital.pot b/addons/website_sale_digital/i18n/website_sale_digital.pot
index 8e2683e9f98..a8b9692e547 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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:31
-#: code:addons/website_sale_digital/product.py:59
+#: 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
@@ -57,11 +46,6 @@ 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"
msgstr ""
@@ -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_sale_options/i18n/website_sale_options.pot b/addons/website_sale_options/i18n/website_sale_options.pot
index 7b487b64b90..ef291ea5cff 100644
--- a/addons/website_sale_options/i18n/website_sale_options.pot
+++ b/addons/website_sale_options/i18n/website_sale_options.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,23 +16,14 @@ msgstr ""
"Plural-Forms: \n"
#. module: website_sale_options
-#: code:addons/website_sale_options/models/sale_order.py:46
+#: code:addons/website_sale_options/models/sale_order.py:45
+#: code:addons/website_sale_options/models/sale_order.py:57
#, python-format
msgid "%s\n"
"Option for: %s"
msgstr ""
#. module: website_sale_options
-#: model:product.attribute.value,name:website_sale_options.product_attribute_value_1
-msgid "1 year"
-msgstr ""
-
-#. module: website_sale_options
-#: model:product.attribute.value,name:website_sale_options.product_attribute_value_2
-msgid "2 year"
-msgstr ""
-
-#. module: website_sale_options
#: model:ir.ui.view,arch_db:website_sale_options.modal
msgid "<i class=\"fa fa-chevron-left\"/> <span class=\"hidden-xs\">Continue Shopping</span><span class=\"visible-xs-inline\">Continue</span>"
msgstr ""
@@ -58,11 +49,6 @@ msgid "<strong>Add to Cart</strong>"
msgstr ""
#. module: website_sale_options
-#: model:product.attribute,name:website_sale_options.product_attribute_1
-msgid "Duration"
-msgstr ""
-
-#. module: website_sale_options
#: model:ir.model.fields,field_description:website_sale_options.field_sale_order_line_linked_line_id
msgid "Linked Order Line"
msgstr ""
@@ -128,22 +114,6 @@ msgid "Select Your Options:"
msgstr ""
#. module: website_sale_options
-#: model:product.product,name:website_sale_options.product_product_1
-#: model:product.product,name:website_sale_options.product_product_1b
-#: model:product.template,name:website_sale_options.product_product_1_product_template
-#: model:product.template,name:website_sale_options.product_product_1b_product_template
-msgid "Warranty"
-msgstr ""
-
-#. module: website_sale_options
-#: model:product.product,description_sale:website_sale_options.product_product_1
-#: model:product.product,description_sale:website_sale_options.product_product_1b
-#: model:product.template,description_sale:website_sale_options.product_product_1_product_template
-#: model:product.template,description_sale:website_sale_options.product_product_1b_product_template
-msgid "Warranty, issued to the purchaser of an article by its manufacturer, promising to repair or replace it if necessary within a specified period of time."
-msgstr ""
-
-#. module: website_sale_options
#. openerp-web
#: code:addons/website_sale_options/static/src/js/website_sale.test.js:13
#, python-format
diff --git a/addons/website_sale_stock/i18n/website_sale_stock.pot b/addons/website_sale_stock/i18n/website_sale_stock.pot
index 573a23d8e52..dd526abc63c 100644
--- a/addons/website_sale_stock/i18n/website_sale_stock.pot
+++ b/addons/website_sale_stock/i18n/website_sale_stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 9.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/website_slides/i18n/website_slides.pot b/addons/website_slides/i18n/website_slides.pot
index 91d90c0df3e..bde0d077ef0 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-21 09:20+0000\n"
-"PO-Revision-Date: 2015-09-21 09:20+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -18,94 +18,41 @@ msgstr ""
#. module: website_slides
#: model:mail.template,body_html:website_slides.slide_template_shared
msgid "\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"width: 600px; margin: 10px 0px 0px 0px; vertical-align: top; padding: 0px; font-family:arial; font-size:12px; background-color:#ffffff\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; text-align:center\" valign=\"center\">\n"
-" <a href=\"${user.company_id.website}\" style=\"text-decoration:none\">\n"
-" <img alt=\"Odoo\" src=\"${ctx['base_url']}/logo.png\" style=\"display:block; border:none; min-height:60px; margin:0 auto;\">\n"
-" </a>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"width: 600px; margin: 10px 0px 0px 0px; vertical-align: top; padding: 0px; font-family:arial; font-size:12px;\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; text-align:center; color: #ffffff; background-color:#a24689;\" valign=\"center\">\n"
-" <h2 style=\"margin:0px;\">\n"
-" ${user.name} shared the ${object.slide_type} ${object.name} with you!\n"
-" </h2>\n"
-" </td>\n"
-" </tr><tr>\n"
-" <td style=\"width: 600px; vertical-align:top; text-align:center; background-color:#FFFFF; color:#414141\">\n"
-" <a href=\"${object.website_url}\" style=\"color: #a24689;\">\n"
-" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\"\n"
-" style=\"height:auto; width:500px; background-color: #cccccc; margin: 16px;\">\n"
-" </a>\n"
-" <p style=\"font-size:24px; font-weight:bold\"><a href=\"${object.website_url}\">${object.name}</a></p>\n"
-" <p style=\"color: #ccc;\">Published on ${object.write_date}</p>\n"
-" <p><a href=\"${object.website_url}\">Click here to open the ${object.slide_type}</a></p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"margin: 10px 0px 0px 0px; vertical-align: top;padding: 0px; font-family:arial; font-size:12px; color: #ffffff; background-color:#8f8f8f;\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; font-size:12px; text-align:center; padding-top:10px; color:#a24689; padding-bottom:5px\">\n"
-" <a href=\"${object.website_url}\" style=\"color:#a24689\">View in browser</a> |\n"
-" <a href=\"/page/contactus\" style=\"color:#a24689\">Contact</a>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>"
+"<p>Hello,</p>\n"
+"<p>\n"
+" ${user.name} shared the ${object.slide_type} <strong>${object.name}</strong> with you!\n"
+"</p>\n"
+"<p style=\"text-align: center; margin-top: 10px;\">\n"
+" <a href=\"${object.website_url}\">\n"
+" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; background-color: #cccccc; margin: 16px;\">\n"
+" </a>\n"
+"</p>\n"
+"<p style=\"text-align: center; margin-top: 10px;\">\n"
+" <a style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\" href=\"${object.website_url}\">\n"
+" View <strong>${object.name}</strong>\n"
+" </a>\n"
+"</p>\n"
+""
msgstr ""
#. module: website_slides
#: model:mail.template,body_html:website_slides.slide_template_published
msgid "\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"width: 600px; margin: 10px 0px 0px 0px; vertical-align: top; padding: 0px; font-family:arial; font-size:12px; background-color:#ffffff\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; text-align:center\" valign=\"center\">\n"
-" <a href=\"${user.company_id.website}\" style=\"text-decoration:none\">\n"
-" <img alt=\"Odoo\" src=\"${ctx['base_url']}/logo.png\" style=\"display:block; border:none; min-height:60px; margin:0 auto;\">\n"
-" </a>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"width: 600px; margin: 10px 0px 0px 0px; vertical-align: top; padding: 0px; font-family:arial; font-size:12px;\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; text-align:center; color: #ffffff; background-color:#a24689;\" valign=\"center\">\n"
-" <h2 style=\"margin:0px;\">\n"
-" New ${object.slide_type} published on ${object.channel_id.name}\n"
-" </h2>\n"
-" </td>\n"
-" </tr><tr>\n"
-" <td style=\"width: 600px; vertical-align:top; text-align:center; background-color:#FFFFF; color:#414141\">\n"
-" <a href=\"${object.website_url}\" style=\"color: #a24689;\">\n"
-" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:500px; background-color: #cccccc; margin: 16px;\">\n"
-" </a>\n"
-" <p style=\"font-size:24px; font-weight:bold\"><a href=\"${object.website_url}\">${object.name}</a></p>\n"
-" <p style=\"color: #ccc;\">Published on ${object.write_date}</p>\n"
-" <p><a href=\"${object.website_url}\">Click here to open the ${object.slide_type}</a></p>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>\n"
-"<div style=\"padding:0px; margin:0px;\">\n"
-"<table cellpadding=\"0\" cellspacing=\"0\" style=\"margin: 10px 0px 0px 0px; vertical-align: top;padding: 0px; font-family:arial; font-size:12px; color: #ffffff; background-color:#8f8f8f;\">\n"
-" <tbody><tr>\n"
-" <td style=\"width: 600px; font-size:12px; text-align:center; padding-top:10px; color:#a24689; padding-bottom:5px\">\n"
-" <a href=\"${object.website_url}\" style=\"color:#a24689\">View in browser</a> |\n"
-" <a href=\"/page/contactus\" style=\"color:#a24689\">Contact</a>\n"
-" </td>\n"
-" </tr></tbody>\n"
-"</table>\n"
-"</div>"
+"<p>Hello,</p>\n"
+"<p>\n"
+" A new ${object.slide_type} <strong>${object.name}</strong> has been published on ${object.channel_id.name} at ${format_tz(object.write_date, tz=user.tz)}\n"
+"</p>\n"
+"<p style=\"text-align: center; margin-top: 10px;\">\n"
+" <a href=\"${object.website_url}\">\n"
+" <img alt=\"${object.name}\" src=\"${ctx['base_url']}/web/image/slide.slide/${object.id}/image\" style=\"height:auto; width:150px; background-color: #cccccc; margin: 16px;\">\n"
+" </a>\n"
+"</p>\n"
+"<p style=\"text-align: center; margin-top: 10px;\">\n"
+" <a style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#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\" href=\"${object.website_url}\">\n"
+" View <strong>${object.name}</strong>\n"
+" </a>\n"
+"</p>\n"
+""
msgstr ""
#. module: website_slides
@@ -129,6 +76,11 @@ 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."
msgstr ""
@@ -299,14 +251,20 @@ msgid "A tag must be unique!"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_needaction
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_needaction
-msgid "Action Needed"
+#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
+msgid "Actions"
msgstr ""
#. module: website_slides
-#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
-msgid "Actions"
+#: 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
@@ -347,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"
@@ -400,29 +359,20 @@ 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: %serror"
+"Here is the received response: %s"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:269
+#: code:addons/website_slides/models/slides.py:306
#, 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 enterprise grade website with our super easy builder. Use finely designed building blocks and edit everything inline. Benefit from out-of-the-box business features; e-Commerce, events, blogs, jobs announces, customer references, call-to-actions, etc.\n"
-"\n"
-"This is a new open source application in Python/Javascript based on Bootstrap and OpenERP.\n"
-"\n"
-"Download or use online on http://openerp.com"
-msgstr ""
-
-#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/js/slides_upload.js:220
#, python-format
@@ -448,12 +398,6 @@ msgid "Created on"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_last_post
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_last_post
-msgid "Date of the last message posted on the record."
-msgstr ""
-
-#. module: website_slides
#: model:slide.channel,description:website_slides.channel_public
msgid "Default channel for slides, all public users can access content of this channel."
msgstr ""
@@ -513,11 +457,6 @@ msgid "Document URL"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_slide_slide_type
-msgid "Document type will be set automatically depending on file type, height and width."
-msgstr ""
-
-#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slides_channel_header
msgid "Documents"
msgstr ""
@@ -594,11 +533,6 @@ 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"
msgstr ""
@@ -610,31 +544,13 @@ 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"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_follower_ids
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_follower_ids
-msgid "Followers"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_channel_ids
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_partner_ids
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_partner_ids
-msgid "Followers (Partners)"
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_channel_can_see_full
msgid "Full Access"
msgstr ""
@@ -679,18 +595,6 @@ msgid "ID"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_unread
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_needaction
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_needaction
-msgid "If checked, new messages require your attention."
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_image
msgid "Image"
msgstr ""
@@ -706,19 +610,13 @@ 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"
msgstr ""
#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_3
-msgid "Interview with Guy Christiaens, Finance Manager at Alpinter, about their use of Odoo.\n"
-"Discover more about Odoo at www.odoo.com"
-msgstr ""
-
-#. module: website_slides
#. openerp-web
#: code:addons/website_slides/static/src/js/slides_upload.js:85
#, python-format
@@ -726,18 +624,6 @@ msgid "Invalid file type. Please select pdf or image file"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_is_follower
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_is_follower
-msgid "Is Follower"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_last_post
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_last_post
-msgid "Last Message Date"
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category___last_update
#: model:ir.model.fields,field_description:website_slides.field_slide_channel___last_update
#: model:ir.model.fields,field_description:website_slides.field_slide_embed___last_update
@@ -786,18 +672,6 @@ msgid "Message to display when not accessible due to access rights"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_ids
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_ids
-msgid "Messages"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_ids
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_ids
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_mime_type
msgid "Mime-type"
msgstr ""
@@ -860,17 +734,6 @@ 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_channel_message_needaction_counter
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_needaction_counter
-msgid "Number of Actions"
-msgstr ""
-
-#. module: website_slides
#: model:ir.model.fields,field_description:website_slides.field_slide_category_nbr_documents
#: model:ir.model.fields,field_description:website_slides.field_slide_channel_nbr_documents
msgid "Number of Documents"
@@ -895,97 +758,6 @@ msgid "Number of Videos"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_needaction_counter
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,help:website_slides.field_slide_slide_message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_3
-msgid "Odoo - The Voice of the Customer: Alpinter"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.category,name:website_slides.category_2
-msgid "Odoo Days"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_2
-msgid "Odoo Experience - Register now https://www.odoo.com/event/304/"
-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_2
-msgid "Odoo Open Days 2014"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,name:website_slides.slide_5
-msgid "Odoo POS Indiegogo Campaign"
-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_4
-msgid "Odoo SEO - Boost Your Website Trafic"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_6
-#: 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_1
-msgid "Open Source Website Builder and eCommerce: Odoo"
-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
#, python-format
@@ -1004,19 +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:272
+#: code:addons/website_slides/models/slides.py:309
+#: code:addons/website_slides/models/slides.py:533
#, 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 ""
@@ -1101,13 +874,6 @@ msgid "Review your channel settings to promote your most viewed or recent publis
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
#, python-format
@@ -1241,23 +1007,8 @@ msgid "The"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_website_url
-#: model:ir.model.fields,help:website_slides.field_slide_slide_website_url
-msgid "The full URL to access the document through the website."
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_4
-msgid "The open source OpenERP Promote tool suggests keywords according to Google most searched terms. Search Engine Optimization tools are ready to use, with no configuration required.\n"
-"\n"
-"Online demo and download: http://openerp.com"
-msgstr ""
-
-#. module: website_slides
-#: model:slide.slide,description:website_slides.slide_5
-msgid "The presentation video for our OpenSource Pos Hardware campaign at indiegogo: \n"
-"\n"
-"https://www.indiegogo.com/projects/opensource-your-shop/"
+#: model:ir.model.fields,help:website_slides.field_slide_slide_slide_type
+msgid "The document type will be set automatically based on the document URL and properties (e.g. height and width for presentation and document)."
msgstr ""
#. module: website_slides
@@ -1278,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 ""
@@ -1320,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 ""
@@ -1331,21 +1082,14 @@ msgid "Uncategorized presentation"
msgstr ""
#. module: website_slides
-#: code:addons/website_slides/models/slides.py:453
+#: code:addons/website_slides/models/slides.py:522
#, python-format
msgid "Unknown document"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_unread
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_message_unread_counter
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_message_unread_counter
-msgid "Unread Messages Counter"
+#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
+msgid "Unpublished"
msgstr ""
#. module: website_slides
@@ -1394,6 +1138,12 @@ msgid "Videos"
msgstr ""
#. module: website_slides
+#: code:addons/website_slides/models/slides.py:447
+#, python-format
+msgid "View Slide"
+msgstr ""
+
+#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
#: model:ir.ui.view,arch_db:website_slides.slides_grid_view
msgid "Views"
@@ -1410,12 +1160,6 @@ msgid "Visibility"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_published
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_published
-msgid "Visible in Website"
-msgstr ""
-
-#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.view_slide_slide_search
msgid "Waiting for validation"
msgstr ""
@@ -1426,7 +1170,6 @@ msgid "Website"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_message_ids
#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_message_ids
msgid "Website Messages"
msgstr ""
@@ -1437,36 +1180,11 @@ msgid "Website Slides"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_url
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_url
-msgid "Website URL"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,help:website_slides.field_slide_channel_website_message_ids
#: model:ir.model.fields,help:website_slides.field_slide_slide_website_message_ids
msgid "Website communication history"
msgstr ""
#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_meta_description
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_meta_description
-msgid "Website meta description"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_meta_keywords
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_meta_keywords
-msgid "Website meta keywords"
-msgstr ""
-
-#. module: website_slides
-#: model:ir.model.fields,field_description:website_slides.field_slide_channel_website_meta_title
-#: model:ir.model.fields,field_description:website_slides.field_slide_slide_website_meta_title
-msgid "Website meta title"
-msgstr ""
-
-#. module: website_slides
#: model:ir.ui.view,arch_db:website_slides.slide_detail_view
msgid "Write a comment..."
msgstr ""
@@ -1480,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 aba5aa7f024..939b3c0cc0c 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.0\n"
+"Project-Id-Version: Odoo Server 10.0alpha1e\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-07 14:41+0000\n"
-"PO-Revision-Date: 2015-09-07 14:41+0000\n"
+"POT-Creation-Date: 2016-08-18 08:38+0000\n"
+"PO-Revision-Date: 2016-08-18 08:38+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 ""
@@ -324,6 +319,11 @@ 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:"
msgstr ""