diff options
Diffstat (limited to 'addons')
67 files changed, 5015 insertions, 3209 deletions
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 94bab447b68..974411fb254 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,10 +31,10 @@ msgid "\n" "% if object.number:\n" "invoice <strong>${object.number}</strong>\n" "% else:\n" -"pro-forma invoice\n" +"invoice\n" "% endif\n" "% if object.origin:\n" -"(with reference: ${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" @@ -74,7 +74,7 @@ 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:1501 #, python-format msgid " seconds" msgstr "" @@ -106,11 +106,21 @@ msgid "# of digits" msgstr "" #. module: account +#: model:mail.template,report_name:account.mail_template_data_payment_receipt +msgid "${(object.name or '').replace('/','-')}" +msgstr "" + +#. module: account #: model:mail.template,subject:account.email_template_edi_invoice msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})" msgstr "" #. module: account +#: model:mail.template,subject:account.mail_template_data_payment_receipt +msgid "${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })" +msgstr "" + +#. module: account #: model:mail.template,subject:account.mail_template_data_notification_email_account_invoice msgid "${object.subject}" msgstr "" @@ -122,7 +132,7 @@ msgid "%d transactions were automatically reconciled." msgstr "" #. module: account -#: code:addons/account/models/account.py:576 +#: code:addons/account/models/account.py:585 #, python-format msgid "%s (Copy)" msgstr "" @@ -182,14 +192,36 @@ msgid ": General ledger" msgstr "" #. module: account +#: code:addons/account/models/account.py:354 +#, python-format +msgid ": Refund" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.report_trialbalance msgid ": Trial Balance" msgstr "" #. module: account +#: model:mail.template,body_html:account.mail_template_data_payment_receipt +msgid "<?xml version=\"1.0\"?>\n" +"<data><p>Dear ${object.partner_id.name},</p>\n" +"<p>Thank you for your payment.<br/>Here is your payment receipt <strong>${(object.name or '').replace('/','-')}</strong> amounting to <strong>${object.amount} ${object.currency_id.name}</strong> from ${object.company_id.name}.</p>\n" +"<p>If you have any questions, please do not hesitate to contact us.</p>\n" +"<p>Best regards,\n" +"% if user and user.signature:\n" +"${user.signature | safe}\n" +"% endif\n" +"</p>\n" +"</data>" +msgstr "" + +#. module: account #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice msgid "<html>\n" " <head></head>\n" +" % set record = ctx.get('record')\n" +" % set company = record and record.company_id or user.company_id\n" " <body style=\"margin: 0; padding: 0;\">\n" " <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n" " <tbody>\n" @@ -205,7 +237,7 @@ msgid "<html>\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" +" <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${company.name}\">\n" " </td>\n" " </tr>\n" " </table>\n" @@ -231,16 +263,16 @@ msgid "<html>\n" " <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); 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" +" ${company.name}<br/>\n" +" ${company.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" +" % if company.email:\n" +" <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: white;\">${company.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" +" % if company.website:\n" +" <a href=\"${company.website}\" style=\"text-decoration:none; color: white;\">\n" +" ${company.website}\n" " </a>\n" " % endif\n" " </td>\n" @@ -250,7 +282,7 @@ msgid "<html>\n" " </tr>\n" " <tr>\n" " <td align=\"center\">\n" -" Powered by <a href=\"https://www.odoo.com\">Odoo</a>.\n" +" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n" " </td>\n" " </tr>\n" " </tbody>\n" @@ -271,11 +303,6 @@ msgid "<span class=\"fa\"/> Invite Your Users" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.partner_view_buttons -msgid "<span class=\"o_stat_text\">Invoiced</span>" -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "<span class=\"panel-title\">\n" " <span class=\"fa\" data-icon=\"\"/>\n" @@ -528,6 +555,11 @@ msgid "<strong>Customer Code:</strong>" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Customer: </strong>" +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 @@ -600,6 +632,11 @@ msgid "<strong>Mark the bills to pay</strong><br/>\n" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Memo: </strong>" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "<strong>Next action:</strong><br/>" msgstr "" @@ -621,6 +658,21 @@ msgid "<strong>Partner's:</strong>" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Payment Amount: </strong>" +msgstr "" + +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Payment Date: </strong>" +msgstr "" + +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Payment Method: </strong>" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance msgid "<strong>Period Length (days)</strong>" msgstr "" @@ -751,6 +803,11 @@ msgid "<strong>Validate the bill</strong><br/> after encoding the products and t msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "<strong>Vendor: </strong>" +msgstr "" + +#. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree msgid "A Cash Register allows you to manage cash entries in your cash\n" " journals. This feature provides an easy way to follow up cash\n" @@ -760,19 +817,19 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1412 +#: code:addons/account/models/account_invoice.py:1425 #, python-format msgid "A Payment Terms should have its last line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1415 +#: code:addons/account/models/account_invoice.py:1428 #, python-format msgid "A Payment Terms should have only one line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account.py:492 +#: code:addons/account/models/account.py:501 #, python-format msgid "A bank account can only belong to one journal." msgstr "" @@ -819,7 +876,7 @@ msgid "A product in Odoo is something you sell or buy \n" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:782 +#: code:addons/account/models/account_move.py:800 #, python-format msgid "A reconciliation must involve at least 2 move lines." msgstr "" @@ -830,8 +887,8 @@ msgid "A rounding per line is advised if your prices are tax-included. That way, msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:859 -#: code:addons/account/models/account_bank_statement.py:862 +#: code:addons/account/models/account_bank_statement.py:863 +#: code:addons/account/models/account_bank_statement.py:866 #, python-format msgid "A selected move line was already reconciled." msgstr "" @@ -869,8 +926,8 @@ msgstr "" #. openerp-web #: code:addons/account/static/src/js/account_reconciliation_widgets.js:98 #: code:addons/account/static/src/js/account_reconciliation_widgets.js:103 -#: code:addons/account/static/src/xml/account_reconciliation.xml:141 -#: code:addons/account/static/src/xml/account_reconciliation.xml:267 +#: code:addons/account/static/src/xml/account_reconciliation.xml:144 +#: code:addons/account/static/src/xml/account_reconciliation.xml:273 #: model:ir.model,name:account.model_account_account #: model:ir.model.fields,field_description:account.field_account_invoice_account_id #: model:ir.model.fields,field_description:account.field_account_invoice_line_account_id @@ -1370,7 +1427,7 @@ msgstr "" #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:298 +#: code:addons/account/static/src/xml/account_reconciliation.xml:310 #, python-format msgid "All" msgstr "" @@ -1396,6 +1453,11 @@ msgid "All Entries" msgstr "" #. module: account +#: model:ir.actions.act_window,name:account.action_all_partner_invoices +msgid "All Invoices" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_all_lines_reconciled msgid "All Lines Reconciled" msgstr "" @@ -1432,8 +1494,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:310 -#: code:addons/account/static/src/xml/account_reconciliation.xml:317 +#: code:addons/account/static/src/xml/account_reconciliation.xml:322 +#: code:addons/account/static/src/xml/account_reconciliation.xml:329 #, python-format msgid "All invoices and payments have been matched, your accounts' balances are clean." msgstr "" @@ -1490,16 +1552,6 @@ msgid "Allow multi currencies" msgstr "" #. module: account -#: model:ir.model.fields,field_description:account.field_account_config_settings_group_proforma_invoices -msgid "Allow pro-forma invoices" -msgstr "" - -#. module: account -#: model:ir.model.fields,help:account.field_account_config_settings_group_proforma_invoices -msgid "Allows you to put invoices in pro-forma state." -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.account_config_settings_view_form msgid "Allows you to use the analytic accounting." msgstr "" @@ -1508,8 +1560,8 @@ msgstr "" #. openerp-web #: code:addons/account/static/src/js/account_reconciliation_widgets.js:138 #: code:addons/account/static/src/js/account_reconciliation_widgets.js:142 -#: code:addons/account/static/src/xml/account_reconciliation.xml:150 -#: code:addons/account/static/src/xml/account_reconciliation.xml:266 +#: code:addons/account/static/src/xml/account_reconciliation.xml:153 +#: code:addons/account/static/src/xml/account_reconciliation.xml:272 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount @@ -1556,6 +1608,11 @@ msgid "Amount Due in Invoice Currency" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Amount Paid" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal_signed msgid "Amount Signed" msgstr "" @@ -1838,6 +1895,7 @@ msgstr "" #: model:ir.ui.view,arch_db:account.report_financial #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_partnerledger +#: model:ir.ui.view,arch_db:account.report_payment_receipt #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "Balance" msgstr "" @@ -1863,7 +1921,7 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:704 +#: code:addons/account/models/chart_template.py:705 #: 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 @@ -1925,7 +1983,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1119 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1120 #, python-format msgid "Bank Reconciliation" msgstr "" @@ -1985,13 +2043,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:205 +#: code:addons/account/static/src/xml/account_reconciliation.xml:208 #, python-format msgid "Bank statements are fully reconciled." msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_tax_base +#: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Base" msgstr "" @@ -2215,32 +2274,32 @@ msgid "Cancelled Invoice" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:188 +#: code:addons/account/models/account_move.py:189 #, python-format msgid "Cannot create moves for different companies." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:220 +#: code:addons/account/models/account_move.py:221 #, python-format msgid "Cannot create unbalanced journal entry." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:477 +#: code:addons/account/models/account_invoice.py:492 #, python-format msgid "Cannot find a chart of accounts for this company, You should configure it. \n" "Please go to Account Configuration." msgstr "" #. module: account -#: code:addons/account/models/account.py:382 +#: code:addons/account/models/account.py:391 #, python-format msgid "Cannot generate an unused account code." msgstr "" #. module: account -#: code:addons/account/models/account.py:412 +#: code:addons/account/models/account.py:421 #, python-format msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field." msgstr "" @@ -2248,7 +2307,7 @@ msgstr "" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:54 #, python-format -msgid "Cannot refund draft/proforma/cancelled invoice." +msgid "Cannot refund draft/cancelled invoice." msgstr "" #. module: account @@ -2260,7 +2319,7 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:704 +#: code:addons/account/models/chart_template.py:705 #, python-format msgid "Cash" msgstr "" @@ -2334,6 +2393,11 @@ msgid "Change" msgstr "" #. module: account +#: model:ir.model.fields,help:account.field_account_payment_writeoff_label +msgid "Change label of the counterpart that will hold the payment difference" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_account_template_chart_template_id #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_chart_template_id #: model:ir.model.fields,field_description:account.field_account_tax_template_chart_template_id @@ -2434,7 +2498,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1869 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1879 #, python-format msgid "Choose counterpart" msgstr "" @@ -2514,14 +2578,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:229 +#: code:addons/account/static/src/xml/account_reconciliation.xml:232 #, python-format msgid "Close the statement" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:228 +#: code:addons/account/static/src/xml/account_reconciliation.xml:231 #, python-format msgid "Close the statements" msgstr "" @@ -2669,7 +2733,7 @@ msgid "Complete Set of Taxes" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:414 +#: code:addons/account/models/account_invoice.py:429 #, python-format msgid "Compose Email" msgstr "" @@ -2690,14 +2754,14 @@ msgid "Configuration" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:473 -#: code:addons/account/models/account_payment.py:475 +#: code:addons/account/models/account_payment.py:477 +#: code:addons/account/models/account_payment.py:479 #, python-format msgid "Configuration Error !" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:343 +#: code:addons/account/models/account_invoice.py:341 #, 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?" @@ -2768,7 +2832,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:1505 #, python-format msgid "Congrats, you're all done !" msgstr "" @@ -2779,6 +2843,11 @@ msgid "Congratulations, you're done!" msgstr "" #. module: account +#: model:ir.model,name:account.model_res_partner +msgid "Contact" +msgstr "" + +#. module: account #: model:ir.model,name:account.model_account_abstract_payment msgid "Contains the logic shared between models which allows to register payments" msgstr "" @@ -2800,9 +2869,7 @@ msgid "Cost of Revenue" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:411 #: model:ir.model.fields,field_description:account.field_account_move_line_counterpart -#, python-format msgid "Counterpart" msgstr "" @@ -2843,7 +2910,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:1876 #, python-format msgid "Create Write-off" msgstr "" @@ -2872,14 +2939,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:81 +#: code:addons/account/static/src/xml/account_reconciliation.xml:84 #, python-format msgid "Create model" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2472 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2482 #, python-format msgid "Create writeoff" msgstr "" @@ -3108,8 +3175,8 @@ msgid "Currency as per company's country." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1439 -#: code:addons/account/models/account_move.py:1449 +#: code:addons/account/models/account_move.py:1462 +#: code:addons/account/models/account_move.py:1472 #, python-format msgid "Currency exchange rate difference" msgstr "" @@ -3162,7 +3229,7 @@ msgid "Customer Invoices" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:504 +#: code:addons/account/models/account_payment.py:508 #, python-format msgid "Customer Payment" msgstr "" @@ -3180,7 +3247,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_payment.py:506 +#: code:addons/account/models/account_payment.py:510 #, python-format msgid "Customer Refund" msgstr "" @@ -3197,7 +3264,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:295 +#: code:addons/account/static/src/xml/account_reconciliation.xml:307 #: model:ir.ui.menu,name:account.menu_account_customer #, python-format msgid "Customers" @@ -3213,8 +3280,8 @@ msgstr "" #: selection:account.print.journal,sort_selection:0 #: selection:account.report.general.ledger,sortby:0 #: selection:accounting.report,filter_cmp:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:143 -#: code:addons/account/static/src/xml/account_reconciliation.xml:262 +#: code:addons/account/static/src/xml/account_reconciliation.xml:146 +#: code:addons/account/static/src/xml/account_reconciliation.xml:268 #: model:ir.model.fields,field_description:account.field_account_bank_statement_date #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_date #: model:ir.model.fields,field_description:account.field_account_invoice_report_date @@ -3376,7 +3443,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:265 +#: code:addons/account/static/src/xml/account_reconciliation.xml:271 #: model:ir.model.fields,field_description:account.field_account_account_type_note #: model:ir.model.fields,field_description:account.field_account_invoice_line_name #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -3617,7 +3684,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:144 +#: code:addons/account/static/src/xml/account_reconciliation.xml:147 #: model:ir.model.fields,field_description:account.field_account_invoice_date_due #: model:ir.model.fields,field_description:account.field_account_invoice_report_date_due #: model:ir.ui.view,arch_db:account.report_overdue_document @@ -3652,7 +3719,7 @@ msgid "Due date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:917 +#: code:addons/account/models/account_invoice.py:930 #, python-format msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund." msgstr "" @@ -3682,13 +3749,13 @@ 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:1509 #, python-format msgid "Efficiency at its finest" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:935 +#: code:addons/account/models/account_move.py:958 #, python-format msgid "Either pass both debit and credit or none." msgstr "" @@ -3754,7 +3821,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:900 +#: code:addons/account/models/account_move.py:923 #, python-format msgid "Entries are not of the same account!" msgstr "" @@ -3868,7 +3935,7 @@ 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:1516 #, python-format msgid "Fast reconciler" msgstr "" @@ -4059,6 +4126,10 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_account_currency_id +msgid "Forces all moves for this account to have this account currency." +msgstr "" + +#. module: account #: model:ir.model.fields,help:account.field_account_account_template_currency_id #: model:ir.model.fields,help:account.field_account_bank_accounts_wizard_currency_id msgid "Forces all moves for this account to have this secondary currency." @@ -4131,11 +4202,6 @@ msgid "General Ledger Report" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.account_config_settings_view_form -msgid "Get a pro forma status for invoices" -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Get started" msgstr "" @@ -4172,13 +4238,13 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:226 +#: code:addons/account/static/src/xml/account_reconciliation.xml:229 #, python-format msgid "Go to bank statements" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:478 +#: code:addons/account/models/account_invoice.py:493 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -4190,9 +4256,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:205 -#: code:addons/account/static/src/xml/account_reconciliation.xml:309 -#: code:addons/account/static/src/xml/account_reconciliation.xml:316 +#: code:addons/account/static/src/xml/account_reconciliation.xml:208 +#: code:addons/account/static/src/xml/account_reconciliation.xml:321 +#: code:addons/account/static/src/xml/account_reconciliation.xml:328 #, python-format msgid "Good Job!" msgstr "" @@ -4570,7 +4636,7 @@ 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:1798 #, python-format msgid "Incorrect Operation" msgstr "" @@ -4652,7 +4718,7 @@ msgid "Invite Users" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:967 +#: code:addons/account/models/account_invoice.py:980 #: model:ir.model,name:account.model_account_invoice #: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id #: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id @@ -4677,6 +4743,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_date_invoice +#: model:ir.ui.view,arch_db:account.report_payment_receipt #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Invoice Date" msgstr "" @@ -4695,6 +4762,11 @@ msgid "Invoice Lines" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Invoice Number" +msgstr "" + +#. module: account #: sql_constraint:account.invoice:0 msgid "Invoice Number must be unique per Company!" msgstr "" @@ -4725,37 +4797,31 @@ msgid "Invoice for which this invoice is the refund" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:558 -#, python-format -msgid "Invoice must be a draft in order to set it to Pro-forma." -msgstr "" - -#. module: account -#: code:addons/account/models/account_invoice.py:538 +#: code:addons/account/models/account_invoice.py:557 #, python-format msgid "Invoice must be cancelled in order to reset it to draft." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:566 +#: code:addons/account/models/account_invoice.py:603 #, python-format -msgid "Invoice must be in draft or Pro-forma state in order to validate it." +msgid "Invoice must be in draft or open state in order to be cancelled." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:590 +#: code:addons/account/models/account_invoice.py:579 #, python-format -msgid "Invoice must be in draft, Pro-forma or open state in order to be cancelled." +msgid "Invoice must be in draft state in order to validate it." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:584 +#: code:addons/account/models/account_invoice.py:597 #, python-format msgid "Invoice must be paid in order to set it to register payment." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:576 +#: code:addons/account/models/account_invoice.py:589 #, python-format msgid "Invoice must be validated in order to set it to register payment." msgstr "" @@ -4766,13 +4832,13 @@ msgid "Invoice paid" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:114 +#: code:addons/account/wizard/account_invoice_refund.py:113 #, python-format msgid "Invoice refund" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1501 +#: code:addons/account/models/account_invoice.py:1514 #, python-format msgid "Invoice sent" msgstr "" @@ -4811,7 +4877,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2105 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2115 #, python-format msgid "Invoices & Payments Matching" msgstr "" @@ -4882,7 +4948,7 @@ msgid "It indicates that the invoice has been sent." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:933 +#: code:addons/account/models/account_move.py:956 #, python-format msgid "It is mandatory to specify an account and a journal to create a write-off." msgstr "" @@ -4894,14 +4960,14 @@ msgid "It is not allowed to delete a bank statement line that already created a msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:325 +#: code:addons/account/models/account_payment.py:329 #, python-format msgid "It is not allowed to delete a payment that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:213 +#: code:addons/account/static/src/xml/account_reconciliation.xml:216 #, python-format msgid "It took you" msgstr "" @@ -4943,9 +5009,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2141 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2146 -#: code:addons/account/static/src/xml/account_reconciliation.xml:142 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2151 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2156 +#: code:addons/account/static/src/xml/account_reconciliation.xml:145 #: model:ir.model,name:account.model_account_journal #: model:ir.model.fields,field_description:account.field_account_bank_statement_journal_id #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_id @@ -5017,6 +5083,7 @@ msgid "Journal Item" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_payment_writeoff_label #: model:ir.model.fields,field_description:account.field_account_reconcile_model_label #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_label #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form @@ -5024,7 +5091,7 @@ msgid "Journal Item Label" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:274 +#: code:addons/account/models/account_payment.py:278 #: 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 @@ -5052,7 +5119,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2104 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2114 #: model:ir.actions.client,name:account.action_manual_reconcile #, python-format msgid "Journal Items to Reconcile" @@ -5146,6 +5213,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_name #: model:ir.model.fields,field_description:account.field_account_move_line_name #: model:ir.ui.view,arch_db:account.report_journal +#: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form #, python-format msgid "Label" msgstr "" @@ -5234,7 +5302,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:330 +#: code:addons/account/static/src/xml/account_reconciliation.xml:342 #, python-format msgid "Last Reconciliation :" msgstr "" @@ -5696,7 +5764,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:82 +#: code:addons/account/static/src/xml/account_reconciliation.xml:85 #, python-format msgid "Modify models" msgstr "" @@ -5718,7 +5786,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:105 +#: code:addons/account/static/src/xml/account_reconciliation.xml:108 #, python-format msgid "More" msgstr "" @@ -5750,7 +5818,7 @@ msgid "Move Line" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1226 +#: code:addons/account/models/account_move.py:1249 #, python-format msgid "Move name (id): %s (%s)" msgstr "" @@ -5839,7 +5907,7 @@ msgid "New Transactions" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1203 +#: code:addons/account/models/account_move.py:1226 #, python-format msgid "New expected payment date: " msgstr "" @@ -5870,7 +5938,7 @@ msgid "No Message" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1091 +#: code:addons/account/models/account_invoice.py:1104 #, python-format msgid "No appropriate payment method enabled on journal %s" msgstr "" @@ -5882,7 +5950,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:124 +#: code:addons/account/static/src/xml/account_reconciliation.xml:127 #, python-format msgid "No result matching '" msgstr "" @@ -5942,7 +6010,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:268 +#: code:addons/account/static/src/xml/account_reconciliation.xml:274 #: model:ir.model.fields,field_description:account.field_account_account_template_note #, python-format msgid "Note" @@ -6000,7 +6068,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:193 +#: code:addons/account/static/src/xml/account_reconciliation.xml:196 #, python-format msgid "OK" msgstr "" @@ -6099,20 +6167,20 @@ msgid "Only One Chart Template Available" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:339 +#: code:addons/account/models/account_payment.py:343 #, 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:807 +#: code:addons/account/models/chart_template.py:808 #, 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:1510 #, python-format msgid "Only use the ctrl-enter shortcut to validate reconciliations." msgstr "" @@ -6137,9 +6205,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1872 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1904 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2039 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1882 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1914 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2049 #, python-format msgid "Open balance" msgstr "" @@ -6155,7 +6223,7 @@ msgid "Operation Templates" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:991 +#: code:addons/account/models/account_bank_statement.py:994 #, python-format msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it." msgstr "" @@ -6192,6 +6260,11 @@ msgid "Options" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Original Amount" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_payment_id msgid "Originator Payment" msgstr "" @@ -6214,7 +6287,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:297 +#: code:addons/account/static/src/xml/account_reconciliation.xml:309 #, python-format msgid "OtherAccounts" msgstr "" @@ -6278,12 +6351,6 @@ 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" -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.account_config_settings_view_form msgid "Package" msgstr "" @@ -6297,7 +6364,7 @@ msgid "Paid" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:286 +#: code:addons/account/models/account_payment.py:290 #, python-format msgid "Paid Invoices" msgstr "" @@ -6337,9 +6404,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1729 -#: code:addons/account/static/src/xml/account_reconciliation.xml:263 -#: model:ir.model,name:account.model_res_partner +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1739 +#: code:addons/account/static/src/xml/account_reconciliation.xml:269 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_id #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_id #: model:ir.model.fields,field_description:account.field_account_invoice_line_partner_id @@ -6375,16 +6441,6 @@ 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 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_name msgid "Partner Name" msgstr "" @@ -6505,6 +6561,11 @@ msgid "Payment Move Lines" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Payment Receipt:" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_reference_type #: model:ir.model.fields,field_description:account.field_account_payment_payment_reference msgid "Payment Reference" @@ -6638,7 +6699,7 @@ msgid "Percentage of balance" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1483 +#: code:addons/account/models/account_invoice.py:1496 #, python-format msgid "Percentages for Payment Terms Line must be between 0 and 100." msgstr "" @@ -6676,25 +6737,25 @@ msgid "Please check that the field 'Transfer Account' is set on the company." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:816 +#: code:addons/account/models/account_invoice.py:829 #, python-format msgid "Please create some invoice lines." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:150 +#: code:addons/account/models/account_move.py:151 #, python-format msgid "Please define a sequence for the refunds" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:155 +#: code:addons/account/models/account_move.py:156 #, python-format msgid "Please define a sequence on the journal." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:814 +#: code:addons/account/models/account_invoice.py:827 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" @@ -6808,6 +6869,11 @@ msgid "Print Invoice" msgstr "" #. module: account +#: model:ir.actions.report.xml,name:account.action_report_payment_receipt +msgid "Print Receipt" +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." @@ -6819,28 +6885,6 @@ msgid "Print checks to pay your vendors" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.account_config_settings_view_form -msgid "Pro Forma" -msgstr "" - -#. module: account -#: model:ir.ui.view,arch_db:account.invoice_form -msgid "Pro Forma Invoice" -msgstr "" - -#. module: account -#: selection:account.invoice,state:0 -#: selection:account.invoice.report,state:0 -#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search -msgid "Pro-forma" -msgstr "" - -#. module: account -#: model:res.groups,name:account.group_proforma_invoices -msgid "Pro-forma Invoices" -msgstr "" - -#. module: account #: model:ir.model.fields,field_description:account.field_account_analytic_line_product_id #: model:ir.model.fields,field_description:account.field_account_invoice_line_product_id #: model:ir.model.fields,field_description:account.field_account_invoice_report_product_id @@ -6902,11 +6946,6 @@ msgid "Profit and Loss" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter -msgid "Proforma" -msgstr "" - -#. module: account #: 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'." @@ -7029,9 +7068,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1850 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2456 -#: code:addons/account/static/src/xml/account_reconciliation.xml:323 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1860 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2466 +#: code:addons/account/static/src/xml/account_reconciliation.xml:335 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full @@ -7109,7 +7148,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2169 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2179 #, python-format msgid "Reconciling " msgstr "" @@ -7181,7 +7220,7 @@ msgid "Reference/Description" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:969 +#: code:addons/account/models/account_invoice.py:982 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_form @@ -7320,7 +7359,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:150 +#: code:addons/account/static/src/xml/account_reconciliation.xml:153 #, python-format msgid "Residual" msgstr "" @@ -7468,7 +7507,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:89 +#: code:addons/account/static/src/xml/account_reconciliation.xml:92 #, python-format msgid "Save and New" msgstr "" @@ -7583,14 +7622,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1757 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1767 #, python-format msgid "Select Partner" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:235 +#: code:addons/account/static/src/xml/account_reconciliation.xml:241 #, python-format msgid "Select a partner or choose a counterpart" msgstr "" @@ -7615,7 +7654,7 @@ msgstr "" #. module: account #: code:addons/account/wizard/account_invoice_state.py:21 #, python-format -msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state." +msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' state." msgstr "" #. module: account @@ -7637,6 +7676,11 @@ msgid "Send Money" msgstr "" #. module: account +#: model:ir.actions.act_window,name:account.account_send_payment_receipt_by_email_action +msgid "Send Receipt By Email" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.invoice_form msgid "Send by Email" msgstr "" @@ -7713,13 +7757,8 @@ msgid "Short Code" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_tax_tree -msgid "Short Name" -msgstr "" - -#. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:290 +#: code:addons/account/static/src/xml/account_reconciliation.xml:302 #, python-format msgid "Show" msgstr "" @@ -7753,7 +7792,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2459 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2469 #, python-format msgid "Skip" msgstr "" @@ -7835,7 +7874,6 @@ msgid "Statements" msgstr "" #. module: account -#: model:ir.ui.view,arch_db:account.view_account_move_filter #: model:ir.ui.view,arch_db:account.view_move_line_form msgid "States" msgstr "" @@ -7853,6 +7891,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_payment_state #: model:ir.ui.view,arch_db:account.view_account_invoice_filter #: 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_bank_statement_search #: model:ir.ui.view,arch_db:account.view_move_line_form2 msgid "Status" @@ -7860,7 +7899,6 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_cashbox_line_subtotal -#: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Subtotal" msgstr "" @@ -7894,7 +7932,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:1517 #, python-format msgid "Take on average less than 5 seconds to reconcile a transaction." msgstr "" @@ -7930,8 +7968,8 @@ msgid "Tax" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:788 -#: code:addons/account/models/chart_template.py:791 +#: code:addons/account/models/chart_template.py:789 +#: code:addons/account/models/chart_template.py:792 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -8240,7 +8278,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:213 +#: code:addons/account/static/src/xml/account_reconciliation.xml:216 #, python-format msgid "That's on average" msgstr "" @@ -8263,7 +8301,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:902 +#: code:addons/account/models/account_move.py:925 #, python-format msgid "The account %s (%s) is not marked as reconciliable !" msgstr "" @@ -8286,13 +8324,13 @@ msgid "The amount expressed in the related account currency if not equal to the msgstr "" #. module: account -#: code:addons/account/models/account_move.py:458 +#: code:addons/account/models/account_move.py:476 #, python-format msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited." msgstr "" #. module: account -#: code:addons/account/models/account.py:571 +#: code:addons/account/models/account.py:580 #, python-format msgid "The application scope of taxes in a group must be either the same as the group or \"None\"." msgstr "" @@ -8373,7 +8411,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:473 +#: code:addons/account/models/account_payment.py:477 #, python-format msgid "The journal %s does not have a sequence, please specify one." msgstr "" @@ -8427,7 +8465,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:904 +#: code:addons/account/models/account_move.py:927 #, python-format msgid "The partner has to be the same on all lines for receivable and payable accounts!" msgstr "" @@ -8438,7 +8476,7 @@ msgid "The partner reference of this invoice." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:342 +#: code:addons/account/models/account_payment.py:346 #, python-format msgid "The payment cannot be processed because the invoice is not open!" msgstr "" @@ -8454,13 +8492,13 @@ msgid "The residual amount on a journal item expressed in the company currency." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:443 +#: code:addons/account/models/account_move.py:461 #, python-format -msgid "The selected account of your Journal Entry force to provide a secondary currency. You should either remove the secondary currency on the account or match the currency of your journal with your account currency." +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:1337 +#: code:addons/account/models/account_invoice.py:1350 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -8472,12 +8510,18 @@ 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:475 +#: code:addons/account/models/account_payment.py:479 #, python-format msgid "The sequence of journal %s is deactivated." msgstr "" #. module: account +#: code:addons/account/models/company.py:90 +#, python-format +msgid "There are still unposted entries in the period you want to lock. You should either post or delete them." +msgstr "" + +#. module: account #: code:addons/account/models/account_bank_statement.py:172 #, python-format msgid "There is no account defined on the journal %s for %s involved in a cash difference." @@ -8490,7 +8534,7 @@ msgid "There is no journal items in draft state to post." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1560 +#: code:addons/account/models/account_move.py:1585 #, python-format msgid "There is no tax cash basis journal defined for this company: \"%s\" \n" "Configure it in Accounting/Configuration/Settings" @@ -8498,15 +8542,15 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:309 -#: code:addons/account/static/src/xml/account_reconciliation.xml:316 +#: code:addons/account/static/src/xml/account_reconciliation.xml:321 +#: code:addons/account/static/src/xml/account_reconciliation.xml:328 #, python-format msgid "There is nothing to reconcile." 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:1493 #, python-format msgid "There you go, it's all done !" msgstr "" @@ -8527,7 +8571,7 @@ msgid "These users handle billing specifically." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1068 +#: code:addons/account/models/account_invoice.py:1081 #, python-format msgid "This %s has been created from: <a href=# data-oe-model=account.invoice data-oe-id=%d>%s</a>" msgstr "" @@ -8660,6 +8704,13 @@ msgid "This label will be displayed on report to show the balance computed for t msgstr "" #. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:279 +#, python-format +msgid "This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open." +msgstr "" + +#. module: account #: model:ir.model.fields,help:account.field_accounting_report_debit_credit msgid "This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison." msgstr "" @@ -8671,14 +8722,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:206 +#: code:addons/account/static/src/xml/account_reconciliation.xml:209 #, python-format msgid "This page displays all the bank transactions that are to be reconciled and provides with a neat interface to do so." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:154 +#: code:addons/account/static/src/xml/account_reconciliation.xml:157 #, python-format msgid "This payment is registered but not reconciled." msgstr "" @@ -8752,7 +8803,7 @@ msgid "To pay" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:898 +#: code:addons/account/models/account_move.py:921 #, python-format msgid "To reconcile the entries company should be the same for all entries!" msgstr "" @@ -8769,7 +8820,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:146 +#: code:addons/account/static/src/xml/account_reconciliation.xml:149 #: model:ir.model.fields,field_description:account.field_account_invoice_amount_total #: model:ir.ui.view,arch_db:account.invoice_supplier_tree #: model:ir.ui.view,arch_db:account.invoice_tree @@ -8865,7 +8916,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:264 +#: code:addons/account/static/src/xml/account_reconciliation.xml:270 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #, python-format msgid "Transaction" @@ -8893,19 +8944,19 @@ msgid "Transfer To" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:224 +#: code:addons/account/models/account_payment.py:228 #, python-format msgid "Transfer account not defined on the company." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:446 +#: code:addons/account/models/account_payment.py:450 #, python-format msgid "Transfer from %s" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:529 +#: code:addons/account/models/account_payment.py:533 #, python-format msgid "Transfer to %s" msgstr "" @@ -8942,12 +8993,19 @@ msgid "Type" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:849 +#: code:addons/account/models/chart_template.py:850 #, python-format msgid "Undistributed Profits/Losses" msgstr "" #. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:284 +#, python-format +msgid "Undo the partial reconciliation." +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_unit #: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Unit Price" @@ -9153,7 +9211,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1871 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1881 #: 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 @@ -9198,7 +9256,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:968 +#: code:addons/account/models/account_invoice.py:981 #: model:ir.ui.view,arch_db:account.invoice_supplier_form #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format @@ -9220,7 +9278,7 @@ msgid "Vendor Flow" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:511 +#: code:addons/account/models/account_payment.py:515 #, python-format msgid "Vendor Payment" msgstr "" @@ -9239,8 +9297,8 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:970 -#: code:addons/account/models/account_payment.py:509 +#: code:addons/account/models/account_invoice.py:983 +#: code:addons/account/models/account_payment.py:513 #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format msgid "Vendor Refund" @@ -9253,7 +9311,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:296 +#: code:addons/account/static/src/xml/account_reconciliation.xml:308 #: model:ir.ui.menu,name:account.menu_account_supplier #, python-format msgid "Vendors" @@ -9270,7 +9328,7 @@ msgid "Warning" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:498 +#: code:addons/account/models/account_invoice.py:513 #, python-format msgid "Warning for %s" msgstr "" @@ -9281,8 +9339,8 @@ msgid "Warning on the Invoice" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1277 -#: code:addons/account/models/account_invoice.py:1336 +#: code:addons/account/models/account_invoice.py:1290 +#: code:addons/account/models/account_invoice.py:1349 #, python-format msgid "Warning!" msgstr "" @@ -9331,7 +9389,7 @@ 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:1504 #, python-format msgid "Whew, that was fast !" msgstr "" @@ -9376,7 +9434,7 @@ msgid "Wizard for Tax Adjustments" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:939 +#: code:addons/account/models/account_move.py:962 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full #, python-format msgid "Write-Off" @@ -9408,7 +9466,7 @@ msgid "Wrong credit or debit value in accounting entry !" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:896 +#: code:addons/account/models/account_move.py:919 #, python-format msgid "You are trying to reconcile some entries that are already reconciled!" msgstr "" @@ -9425,7 +9483,7 @@ msgid "You can control the invoice from your vendor according to\n" msgstr "" #. module: account -#: code:addons/account/models/res_config.py:82 +#: code:addons/account/models/res_config.py:88 #, python-format msgid "You can not change a company chart of account once it has been installed" msgstr "" @@ -9437,7 +9495,7 @@ msgid "You can not change the unit of measure of a product that has been already msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:323 +#: code:addons/account/models/account_payment.py:327 #, python-format msgid "You can not delete a payment that is already posted" msgstr "" @@ -9454,19 +9512,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:200 +#: code:addons/account/models/account_move.py:201 #, python-format msgid "You cannot add/modify entries prior to and inclusive of the lock date %s" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:202 +#: code:addons/account/models/account_move.py:203 #, 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:949 +#: code:addons/account/models/account_invoice.py:962 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -9484,19 +9542,19 @@ msgid "You cannot change the value of the reconciliation on this account as it a msgstr "" #. module: account -#: code:addons/account/models/account_move.py:450 +#: code:addons/account/models/account_move.py:468 #, 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:451 +#: code:addons/account/models/account_invoice.py:466 #, 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:449 +#: code:addons/account/models/account_invoice.py:464 #, python-format msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." msgstr "" @@ -9508,14 +9566,14 @@ msgid "You cannot do that on an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1228 +#: code:addons/account/models/account_move.py:1251 #, 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:1230 +#: code:addons/account/models/account_move.py:1253 #, 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." @@ -9542,20 +9600,20 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1789 +#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1799 #, python-format msgid "You cannot mix items from receivable and payable accounts." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:165 +#: code:addons/account/models/account_move.py:166 #, python-format msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:578 +#: code:addons/account/models/account_invoice.py:591 #, python-format msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first." msgstr "" @@ -9573,19 +9631,26 @@ 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:1073 -#: code:addons/account/models/account_move.py:1194 +#: code:addons/account/models/account_move.py:1096 +#: code:addons/account/models/account_move.py:1217 #, python-format msgid "You cannot use deprecated account." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1114 +#: code:addons/account/models/account_move.py:1137 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" #. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:77 +#, python-format +msgid "You did not configure any reconcile model yet, you can do it" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "You have" @@ -9598,7 +9663,7 @@ msgid "You must define a Start Date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1278 +#: code:addons/account/models/account_invoice.py:1291 #, python-format msgid "You must first select a partner!" msgstr "" @@ -9616,19 +9681,19 @@ msgid "You must set a start date." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1423 +#: code:addons/account/models/account_move.py:1446 #, 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:1425 +#: code:addons/account/models/account_move.py:1448 #, 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:1427 +#: code:addons/account/models/account_move.py:1450 #, 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 "" @@ -9642,7 +9707,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:215 +#: code:addons/account/static/src/xml/account_reconciliation.xml:218 #, python-format msgid "You validated" msgstr "" @@ -9737,13 +9802,6 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:298 -#, python-format -msgid "all" -msgstr "" - -#. module: account -#. openerp-web #: code:addons/account/static/src/xml/account_payment.xml:17 #, python-format msgid "assign to invoice" @@ -9770,13 +9828,6 @@ msgid "create a journal entry" msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:295 -#, python-format -msgid "customers" -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.view_payment_term_line_form msgid "days" msgstr "" @@ -9807,10 +9858,8 @@ msgid "for this supplier. You can allocate them to mark this bill as paid." msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:297 -#, python-format -msgid "others" +#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate +msgid "invoice" msgstr "" #. module: account @@ -9825,12 +9874,17 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:215 +#: code:addons/account/static/src/xml/account_reconciliation.xml:218 #, python-format msgid "reconciliations with the ctrl-enter shortcut." msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate +msgid "refund" +msgstr "" + +#. module: account #. openerp-web #: code:addons/account/static/src/xml/account_reconciliation.xml:20 #, python-format @@ -9873,14 +9927,14 @@ msgid "report.account.report_trialbalance" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:229 +#: code:addons/account/models/account_move.py:230 #, python-format msgid "reversal of: " msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:213 +#: code:addons/account/static/src/xml/account_reconciliation.xml:216 #, python-format msgid "seconds per transaction." msgstr "" @@ -9901,13 +9955,6 @@ msgid "setup your bank accounts." msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:296 -#, python-format -msgid "suppliers" -msgstr "" - -#. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "the customer list" msgstr "" @@ -9923,13 +9970,20 @@ msgid "the product list" msgstr "" #. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:77 +#, python-format +msgid "there" +msgstr "" + +#. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "to describe<br/> your experience or to suggest improvements !" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:213 +#: code:addons/account/static/src/xml/account_reconciliation.xml:216 #, python-format msgid "to reconcile" msgstr "" @@ -9941,7 +9995,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:213 +#: code:addons/account/static/src/xml/account_reconciliation.xml:216 #, python-format msgid "transactions." msgstr "" diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot index 14a16a2389e..585daa0570f 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -95,6 +95,7 @@ msgstr "" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_uninvited +#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_uninvited msgid "Allow external users to sign up" msgstr "" @@ -116,7 +117,7 @@ msgid "Another user is already registered using this email address." msgstr "" #. module: auth_signup -#: code:addons/auth_signup/controllers/main.py:110 +#: code:addons/auth_signup/controllers/main.py:112 #, python-format msgid "Authentication Failed." msgstr "" @@ -149,6 +150,11 @@ msgid "Confirmed" msgstr "" #. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Contact" +msgstr "" + +#. module: auth_signup #: code:addons/auth_signup/controllers/main.py:41 #, python-format msgid "Could not create a new account." @@ -167,6 +173,7 @@ msgstr "" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_reset_password +#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_reset_password #: model:ir.ui.view,arch_db:auth_signup.base_config_settings_view_form_inherit_auth_signup msgid "Enable password reset from Login page" msgstr "" @@ -177,7 +184,7 @@ msgid "If unchecked, only invited users may sign up." msgstr "" #. module: auth_signup -#: code:addons/auth_signup/controllers/main.py:90 +#: code:addons/auth_signup/controllers/main.py:92 #, python-format msgid "Invalid signup token" msgstr "" @@ -188,11 +195,6 @@ msgid "Never Connected" msgstr "" #. module: auth_signup -#: model:ir.model,name:auth_signup.model_res_partner -msgid "Partner" -msgstr "" - -#. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.fields msgid "Password" msgstr "" @@ -271,6 +273,7 @@ msgstr "" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_template_user_id +#: model:ir.model.fields,field_description:auth_signup.field_hr_timesheet_config_settings_auth_signup_template_user_id msgid "Template user for new users created through signup" msgstr "" diff --git a/addons/base_address_city/i18n/base_address_city.pot b/addons/base_address_city/i18n/base_address_city.pot index ce081f85e4a..395017b547b 100644 --- a/addons/base_address_city/i18n/base_address_city.pot +++ b/addons/base_address_city/i18n/base_address_city.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -40,6 +40,11 @@ msgid "Company" msgstr "" #. module: base_address_city +#: model:ir.model,name:base_address_city.model_res_partner +msgid "Contact" +msgstr "" + +#. module: base_address_city #: model:ir.model,name:base_address_city.model_res_country #: model:ir.model.fields,field_description:base_address_city.field_res_city_country_id msgid "Country" @@ -99,11 +104,6 @@ msgid "Name" msgstr "" #. module: base_address_city -#: model:ir.model,name:base_address_city.model_res_partner -msgid "Partner" -msgstr "" - -#. module: base_address_city #: model:ir.ui.view,arch_db:base_address_city.view_city_filter msgid "Search City" msgstr "" diff --git a/addons/base_address_extended/i18n/base_address_extended.pot b/addons/base_address_extended/i18n/base_address_extended.pot index 310b456be00..518eeb3fb53 100644 --- a/addons/base_address_extended/i18n/base_address_extended.pot +++ b/addons/base_address_extended/i18n/base_address_extended.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,6 +21,11 @@ msgid "Change how the system computes the full street field based on the differe msgstr "" #. module: base_address_extended +#: model:ir.model,name:base_address_extended.model_res_partner +msgid "Contact" +msgstr "" + +#. module: base_address_extended #: model:ir.model,name:base_address_extended.model_res_country msgid "Country" msgstr "" @@ -46,11 +51,6 @@ msgid "House Number" msgstr "" #. module: base_address_extended -#: model:ir.model,name:base_address_extended.model_res_partner -msgid "Partner" -msgstr "" - -#. module: base_address_extended #: model:ir.model.fields,field_description:base_address_extended.field_res_country_street_format msgid "Street Format" msgstr "" diff --git a/addons/base_automation/i18n/base_automation.pot b/addons/base_automation/i18n/base_automation.pot index be82173b71c..01358b3f0bc 100644 --- a/addons/base_automation/i18n/base_automation.pot +++ b/addons/base_automation/i18n/base_automation.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -72,6 +72,11 @@ msgid "Add Followers" msgstr "" #. module: base_automation +#: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_is_assigned_to_admin +msgid "Assigned to admin user" +msgstr "" + +#. module: base_automation #: model:ir.model,name:base_automation.model_base_automation msgid "Automated Action" msgstr "" @@ -125,11 +130,6 @@ msgid "Before Update Domain" msgstr "" #. module: base_automation -#: model:ir.model.fields,field_description:base_automation.field_base_automation_filter_pre_id -msgid "Before Update Filter" -msgstr "" - -#. module: base_automation #: selection:base.automation.lead.test,state:0 msgid "Cancelled" msgstr "" @@ -189,6 +189,11 @@ msgid "Days" msgstr "" #. module: base_automation +#: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_deadline +msgid "Deadline" +msgstr "" + +#. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation_trg_date_range msgid "Delay after the trigger date.\n" " You can put a negative number if you need a delay before the\n" @@ -228,11 +233,6 @@ msgid "External ID" msgstr "" #. module: base_automation -#: model:ir.model.fields,field_description:base_automation.field_base_automation_filter_id -msgid "Filter" -msgstr "" - -#. module: base_automation #: selection:base.automation,trg_date_range_type:0 msgid "Hours" msgstr "" @@ -251,13 +251,11 @@ msgstr "" #. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation_filter_domain -#: model:ir.model.fields,help:base_automation.field_base_automation_filter_id msgid "If present, this condition must be satisfied before executing the action rule." msgstr "" #. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation_filter_pre_domain -#: model:ir.model.fields,help:base_automation.field_base_automation_filter_pre_id msgid "If present, this condition must be satisfied before the update of the record." msgstr "" @@ -398,6 +396,11 @@ msgid "Pending" msgstr "" #. module: base_automation +#: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_priority +msgid "Priority" +msgstr "" + +#. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation_link_field_id msgid "Provide the field used to link the newly created recordon the record on used by the server action." msgstr "" @@ -433,11 +436,6 @@ msgid "Server Actions" msgstr "" #. module: base_automation -#: model:ir.ui.view,arch_db:base_automation.view_base_automation_form -msgid "Set selection based on a search filter:" -msgstr "" - -#. module: base_automation #: model:ir.model.fields,field_description:base_automation.field_base_automation_lead_test_state msgid "Status" msgstr "" diff --git a/addons/base_geolocalize/i18n/base_geolocalize.pot b/addons/base_geolocalize/i18n/base_geolocalize.pot index 6839b25a51f..9c58dde0c45 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -37,6 +37,11 @@ msgid "Cannot contact geolocation servers. Please make sure that your Internet c msgstr "" #. module: base_geolocalize +#: model:ir.model,name:base_geolocalize.model_res_partner +msgid "Contact" +msgstr "" + +#. module: base_geolocalize #: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_latitude msgid "Geo Latitude" msgstr "" @@ -62,11 +67,6 @@ msgid "Geolocation Date" msgstr "" #. module: base_geolocalize -#: model:ir.model,name:base_geolocalize.model_res_partner -msgid "Partner" -msgstr "" - -#. module: base_geolocalize #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form msgid "Partner Assignation" msgstr "" diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot index 9eac69ceaae..0436b0d1657 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner -msgid "Partner" +msgid "Contact" msgstr "" #. module: base_vat diff --git a/addons/bus/i18n/bus.pot b/addons/bus/i18n/bus.pot index 428ed1bbf99..58502d70a1f 100644 --- a/addons/bus/i18n/bus.pot +++ b/addons/bus/i18n/bus.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,13 +31,8 @@ msgid "Channel" msgstr "" #. module: bus -#: model:ir.model.fields,help:bus.field_res_users_country_enforce_cities -msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities." -msgstr "" - -#. module: bus -#: model:ir.model.fields,field_description:bus.field_res_users_city_id -msgid "Company" +#: model:ir.model,name:bus.model_res_partner +msgid "Contact" msgstr "" #. module: bus @@ -57,36 +52,6 @@ msgid "Display Name" msgstr "" #. module: bus -#: model:ir.model.fields,field_description:bus.field_res_users_street_number2 -msgid "Door Number" -msgstr "" - -#. module: bus -#: model:ir.model.fields,field_description:bus.field_res_users_country_enforce_cities -msgid "Enforce Cities" -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_res_users_street_number -msgid "House Number" -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" @@ -141,16 +106,6 @@ msgid "Online" msgstr "" #. module: bus -#: model:ir.model,name:bus.model_res_partner -msgid "Partner" -msgstr "" - -#. module: bus -#: model:ir.model.fields,field_description:bus.field_res_users_street_name -msgid "Street Name" -msgstr "" - -#. module: bus #: model:ir.model,name:bus.model_bus_presence msgid "User Presence" msgstr "" diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index cfe60e9841d..8ffc467d4c3 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgid "\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" +" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n" " </li>\n" " % endif\n" " % if object.event_id.description :\n" @@ -155,7 +155,7 @@ msgid "\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" +" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n" " </li>\n" " % endif\n" " % if object.event_id.description :\n" @@ -241,7 +241,7 @@ msgid "\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" +" (<a target=\"_blank\" href=\"http://maps.google.com/maps?oi=map&q=${object.event_id.location}\">View Map</a>)\n" " </li>\n" " % endif\n" " % if object.event_id.description :\n" @@ -274,7 +274,7 @@ msgstr "" #. module: calendar #. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:95 +#: code:addons/calendar/static/src/js/base_calendar.js:98 #, python-format msgid " [Me]" msgstr "" @@ -300,14 +300,14 @@ msgid "${object.event_id.name}: Date updated" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:644 +#: code:addons/calendar/models/calendar.py:658 #, python-format msgid "%s at %s To\n" " %s at %s (%s)" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:642 +#: code:addons/calendar/models/calendar.py:656 #, python-format msgid "%s at (%s To %s) (%s)" msgstr "" @@ -349,7 +349,7 @@ msgstr "" #. module: calendar #. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:75 +#: code:addons/calendar/static/src/js/base_calendar.js:78 #, python-format msgid "Add Favorite Calendar" msgstr "" @@ -360,7 +360,7 @@ msgid "All Day" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:639 +#: code:addons/calendar/models/calendar.py:653 #, python-format msgid "AllDay , %s" msgstr "" @@ -399,7 +399,7 @@ msgid "Availability" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:1481 +#: code:addons/calendar/models/calendar.py:1506 #: selection:calendar.attendee,availability:0 #: selection:calendar.event,show_as:0 #, python-format @@ -463,6 +463,7 @@ msgid "Confirmed" msgstr "" #. module: calendar +#: model:ir.model,name:calendar.model_res_partner #: model:ir.model.fields,field_description:calendar.field_calendar_attendee_partner_id msgid "Contact" msgstr "" @@ -548,7 +549,7 @@ msgstr "" #. module: calendar #. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:156 +#: code:addons/calendar/static/src/js/base_calendar.js:159 #, python-format msgid "Do you really want to delete this filter from favorites ?" msgstr "" @@ -603,13 +604,13 @@ msgid "Ending at" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:834 +#: code:addons/calendar/models/calendar.py:848 #, python-format msgid "Ending date cannot be set before starting date." msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:832 +#: code:addons/calendar/models/calendar.py:846 #, python-format msgid "Ending datetime cannot be set before starting datetime." msgstr "" @@ -630,14 +631,14 @@ msgid "Event alarm" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:1072 +#: code:addons/calendar/models/calendar.py:1097 #, python-format msgid "Event recurrence interval cannot be negative." msgstr "" #. module: calendar #. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:96 +#: code:addons/calendar/static/src/js/base_calendar.js:99 #, python-format msgid "Everybody's calendars" msgstr "" @@ -658,7 +659,7 @@ msgid "First" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:874 +#: code:addons/calendar/models/calendar.py:888 #, python-format msgid "First you have to specify the date of the invitation." msgstr "" @@ -695,7 +696,7 @@ msgid "Group By" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:1428 +#: code:addons/calendar/models/calendar.py:1453 #, python-format msgid "Group by date is not supported, use the calendar view instead." msgstr "" @@ -961,12 +962,7 @@ msgid "Participant" msgstr "" #. module: calendar -#: model:ir.model,name:calendar.model_res_partner -msgid "Partner" -msgstr "" - -#. module: calendar -#: code:addons/calendar/models/calendar.py:1085 +#: code:addons/calendar/models/calendar.py:1110 #, python-format msgid "Please select a proper day of the month." msgstr "" @@ -1306,7 +1302,7 @@ msgid "e.g. Business Lunch" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:1070 +#: code:addons/calendar/models/calendar.py:1095 #, python-format msgid "interval cannot be negative." msgstr "" diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 7fba35ea401..d2aa494e98c 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -100,10 +100,10 @@ msgid "\n" " <span>We would be delighted to assist you along the way. Contact us through our\n" " <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n" " You can also discover how to get the best out of Odoo CRM with our </span>\n" -" <a href=\"https://www.odoo.com/documentation/user/10.0/crm.html\">\n" +" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/10.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" +" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n" " <span style=\"text-decoration:underline;\">API Documentation</span></a>\n" " </p>\n" " <br>\n" @@ -113,7 +113,7 @@ msgid "\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" +" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a target=\"_blank\" href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n" " </div>\n" " </div>" msgstr "" @@ -751,7 +751,7 @@ msgid "All contacts must have the same email. Only the Administrator can merge c msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:848 +#: code:addons/crm/models/crm_lead.py:844 #, python-format msgid "All email incoming to %s will automatically\n" " create new opportunity. Update your business card, phone book, social media,...\n" @@ -991,7 +991,7 @@ msgid "Click on an opportunity to zoom to it." msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:851 +#: code:addons/crm/models/crm_lead.py:847 #, python-format msgid "Click to add a new opportunity" msgstr "" @@ -1103,6 +1103,11 @@ msgid "Consumers, Retailers" msgstr "" #. module: crm +#: model:ir.model,name:crm.model_res_partner +msgid "Contact" +msgstr "" + +#. module: crm #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor msgid "Contact Information" msgstr "" @@ -1163,7 +1168,7 @@ msgid "Convert to opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1022 +#: code:addons/crm/models/crm_lead.py:1018 #: selection:crm.lead2opportunity.partner,name:0 #: selection:crm.lead2opportunity.partner.mass,name:0 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner @@ -1339,7 +1344,7 @@ msgid "Current Line" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1057 +#: code:addons/crm/models/crm_lead.py:1062 #: 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 @@ -1355,7 +1360,7 @@ msgid "Customer" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1059 +#: code:addons/crm/models/crm_lead.py:1064 #, python-format msgid "Customer Email" msgstr "" @@ -1378,7 +1383,7 @@ msgid "Customizations" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:84 +#: code:addons/crm/models/crm_team.py:83 #, python-format msgid "Dashboard graph content cannot be Pipeline if the sales channel doesn't use it. (Pipeline is unchecked.)" msgstr "" @@ -1414,11 +1419,6 @@ msgid "Default Alias Name for Leads" msgstr "" #. module: crm -#: model:ir.model.fields,field_description:crm.field_sale_config_settings_default_generate_lead_from_alias -msgid "Default Generate Lead From Alias" -msgstr "" - -#. module: crm #: model:ir.model.fields,field_description:crm.field_crm_team_alias_defaults msgid "Default Values" msgstr "" @@ -1557,11 +1557,6 @@ msgstr "" #. module: crm #: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm -msgid "Emails" -msgstr "" - -#. module: crm -#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm msgid "Emails received to that address generate new leads not assigned to any sales channel yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific sales channels. To do so, set an email alias on the sales channel." msgstr "" @@ -1643,7 +1638,7 @@ msgid "Expected Closing Date" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:191 +#: code:addons/crm/models/crm_team.py:190 #: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue #, python-format msgid "Expected Revenue" @@ -1719,7 +1714,7 @@ msgid "Force assignation" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:519 +#: code:addons/crm/models/crm_lead.py:515 #, python-format msgid "From %s : %s" msgstr "" @@ -1743,7 +1738,8 @@ msgstr "" #. module: crm #: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm -msgid "Generate leads from incoming emails" +msgid "Generate unassigned leads from incoming emails. Leads coming from\n" +" that email will be assigned manually." msgstr "" #. module: crm @@ -2025,7 +2021,7 @@ msgid "Last Updated on" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:825 +#: code:addons/crm/models/crm_lead.py:821 #: selection:crm.activity.report,lead_type:0 #: selection:crm.lead,type:0 #: selection:crm.opportunity.report,type:0 @@ -2096,7 +2092,7 @@ msgid "Leads & Opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:57 +#: code:addons/crm/models/crm_lead.py:56 #, python-format msgid "Leads / Opportunities" msgstr "" @@ -2196,7 +2192,7 @@ msgstr "" #. module: crm #. openerp-web -#: code:addons/crm/models/crm_lead.py:1028 +#: code:addons/crm/models/crm_lead.py:1024 #: code:addons/crm/static/src/js/web_planner_crm.js:33 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search @@ -2229,6 +2225,16 @@ msgid "Low" msgstr "" #. module: crm +#: model:ir.model.fields,field_description:crm.field_sale_config_settings_default_generate_lead_from_alias +msgid "Manual Assignation of Emails" +msgstr "" + +#. module: crm +#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm +msgid "Manually Assignation of Incoming Emails" +msgstr "" + +#. module: crm #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor msgid "Mark Lost" msgstr "" @@ -2261,7 +2267,7 @@ msgid "Medium" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:867 +#: code:addons/crm/models/crm_lead.py:863 #, python-format msgid "Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)" msgstr "" @@ -2345,25 +2351,25 @@ msgid "Merge with existing opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:467 +#: code:addons/crm/models/crm_lead.py:466 #, python-format msgid "Merged lead" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:501 +#: code:addons/crm/models/crm_lead.py:497 #, python-format msgid "Merged leads" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:501 +#: code:addons/crm/models/crm_lead.py:497 #, python-format msgid "Merged opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:467 +#: code:addons/crm/models/crm_lead.py:466 #, python-format msgid "Merged opportunity" msgstr "" @@ -2489,7 +2495,7 @@ msgid "Next activity late" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1079 +#: code:addons/crm/models/crm_lead.py:1084 #, python-format msgid "No Subject" msgstr "" @@ -2661,7 +2667,7 @@ msgid "Opportunities that are assigned to me" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:800 +#: code:addons/crm/models/crm_lead.py:796 #: selection:crm.activity.report,lead_type:0 #: selection:crm.lead,type:0 #: selection:crm.opportunity.report,type:0 @@ -2785,7 +2791,6 @@ msgid "Parent model holding the alias. The model holding the alias reference is msgstr "" #. module: crm -#: model:ir.model,name:crm.model_res_partner #: 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" @@ -2829,7 +2834,7 @@ msgid "Phone scripts" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:135 +#: code:addons/crm/models/crm_team.py:134 #: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities #: model:ir.ui.menu,name:crm.crm_opportunity_report_menu #: model:ir.ui.view,arch_db:crm.crm_planner @@ -2875,7 +2880,7 @@ msgid "Planner" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:573 +#: code:addons/crm/models/crm_lead.py:569 #, python-format msgid "Please select more than one element (lead or opportunity) from the list view." msgstr "" @@ -3008,7 +3013,7 @@ msgstr "" #. 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." +msgid "Ready to boost your sales? Your <b>sales pipeline</b> can be found here, under this app." msgstr "" #. module: crm @@ -3565,7 +3570,7 @@ msgid "This stage is folded in the kanban view when there are no records in that msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:994 +#: code:addons/crm/models/crm_lead.py:990 #, python-format msgid "This target does not exist." msgstr "" @@ -3740,11 +3745,6 @@ 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 "" @@ -3890,7 +3890,7 @@ msgstr "" #. module: crm #. openerp-web -#: code:addons/crm/models/crm_lead.py:1027 +#: code:addons/crm/models/crm_lead.py:1023 #: code:addons/crm/static/src/js/web_planner_crm.js:15 #: code:addons/crm/static/src/js/web_planner_crm.js:22 #: code:addons/crm/static/src/js/web_planner_crm.js:27 @@ -3916,11 +3916,6 @@ msgid "Won in Opportunities Target" msgstr "" #. module: crm -#: model:ir.model.fields,field_description:crm.field_crm_team_resource_calendar_id -msgid "Working Time" -msgstr "" - -#. module: crm #. openerp-web #: code:addons/crm/static/src/js/web_planner_crm.js:18 #, python-format @@ -4072,7 +4067,7 @@ msgid "e.g. www.odoo.com" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:855 +#: code:addons/crm/models/crm_lead.py:851 #, python-format msgid "opportunities" msgstr "" @@ -4134,7 +4129,7 @@ msgid "to setup your own domain\n" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:861 +#: code:addons/crm/models/crm_lead.py:857 #, python-format msgid "unknown" msgstr "" diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 072f672ebb4..929dee54f01 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -288,6 +288,11 @@ msgid "Condition" msgstr "" #. module: delivery +#: model:ir.model,name:delivery.model_res_partner +msgid "Contact" +msgstr "" + +#. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_purchase_method msgid "Control Purchase Bills" msgstr "" @@ -403,7 +408,6 @@ msgstr "" #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_delivery_count #: model:ir.ui.menu,name:delivery.menu_delivery -#: model:ir.ui.menu,name:delivery.sale_menu_delivery msgid "Delivery" msgstr "" @@ -735,7 +739,6 @@ msgid "Internal Category" msgstr "" #. module: delivery -#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_code #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_default_code msgid "Internal Reference" msgstr "" @@ -1058,11 +1061,6 @@ msgid "Packing Operation" msgstr "" #. module: delivery -#: model:ir.model,name:delivery.model_res_partner -msgid "Partner" -msgstr "" - -#. module: delivery #: model:ir.model,name:delivery.model_stock_quant_package msgid "Physical Packages" msgstr "" @@ -1248,6 +1246,11 @@ msgid "Receipt" msgstr "" #. module: delivery +#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_code +msgid "Reference" +msgstr "" + +#. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_reordering_max_qty msgid "Reordering Max Qty" msgstr "" diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 86c22b15a07..b8de719c216 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -356,32 +356,12 @@ msgid "\n" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_cancel_state -msgid " # No of Cancelled Registrations" -msgstr "" - -#. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_confirm_state -msgid " # No of Confirmed Registrations" -msgstr "" - -#. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_draft_state -msgid " # No of Draft Registrations" -msgstr "" - -#. module: event #: model:mail.template,subject:event.event_reminder msgid "${object.event_id.name}: ${object.get_date_range_str()}" msgstr "" #. module: event #: model:ir.ui.view,arch_db:event.view_event_kanban -msgid "(stats)" -msgstr "" - -#. module: event -#: model:ir.ui.view,arch_db:event.view_event_kanban msgid "<i class=\"fa fa-clock-o\"/>\n" " <b>To</b>" msgstr "" @@ -395,8 +375,8 @@ msgstr "" #. module: event #: model:ir.ui.view,arch_db:event.view_event_form msgid "<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" class=\"oe_read_only\">\n" -" to \n" -" </span>" +" to \n" +" </span>" msgstr "" #. module: event @@ -405,49 +385,40 @@ msgid "Active" msgstr "" #. module: event -#: selection:event.mail,interval_type:0 -msgid "After each registration" +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Add a navigation menu to your event web pages with schedule, tracks, a track proposal form, etc." msgstr "" #. module: event -#: selection:event.mail,interval_type:0 -msgid "After the event" +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Advertising" msgstr "" #. module: event -#: selection:event.config.settings,module_event_sale:0 -msgid "All events are free" -msgstr "" - -#. module: event -#: selection:event.config.settings,module_website_event_questions:0 -msgid "Allow adding extra questions on registrations" -msgstr "" - -#. module: event -#: selection:event.config.settings,module_event_sale:0 -msgid "Allow selling tickets" +#: selection:event.mail,interval_type:0 +#: selection:event.type.mail,interval_type:0 +msgid "After each registration" msgstr "" #. module: event -#: selection:event.config.settings,module_website_event_track:0 -msgid "Allow tracks, agenda and dedicated menus/website per event" +#: selection:event.mail,interval_type:0 +#: selection:event.type.mail,interval_type:0 +msgid "After the event" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_configuration -msgid "Apply" +#: model:ir.ui.view,arch_db:event.view_event_search +msgid "Archived" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_search -msgid "Archived" +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Attendance" 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 msgid "Attended" msgstr "" @@ -469,11 +440,6 @@ msgid "Attendee" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Attendee / Contact" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_registration_name #: model:ir.ui.view,arch_db:event.event_event_report_template_badge msgid "Attendee Name" @@ -485,12 +451,23 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_event_registration_ids #: model:ir.ui.menu,name:event.menu_action_registration #: model:ir.ui.view,arch_db:event.view_event_form +#: model:ir.ui.view,arch_db:event.view_event_type_form msgid "Attendees" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_config_settings_auto_confirmation -msgid "Auto Confirmation" +#: model:ir.model.fields,field_description:event.field_event_event_auto_confirm +msgid "Autoconfirm Registrations" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_type_auto_confirm +msgid "Automatically Confirm Registrations" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_type_use_mail_schedule +msgid "Automatically Send Emails" msgstr "" #. module: event @@ -519,17 +496,18 @@ msgid "Badge Inner Right" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_configuration -msgid "Barcode Interface" +#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_barcode +msgid "Barcode" msgstr "" #. module: event #: selection:event.mail,interval_type:0 +#: selection:event.type.mail,interval_type:0 msgid "Before the event" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_configuration +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form #: model:ir.ui.view,arch_db:event.view_event_confirm msgid "Cancel" msgstr "" @@ -548,8 +526,6 @@ msgstr "" #. module: event #: selection:event.event,state:0 #: selection:event.registration,state:0 -#: selection:report.event.registration,event_state:0 -#: selection:report.event.registration,registration_state:0 msgid "Cancelled" msgstr "" @@ -559,26 +535,34 @@ msgid "Category" msgstr "" #. module: event +#: model:ir.actions.act_window,help:event.act_event_registration_from_event +msgid "Click to add a new attendee." +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:216 +#: code:addons/event/models/event.py:272 #, python-format msgid "Closing Date cannot be set before Beginning Date." msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.view_event_type_form +msgid "Communication" +msgstr "" + +#. module: event #: model:ir.model.fields,field_description:event.field_event_event_company_id #: model:ir.model.fields,field_description:event.field_event_registration_company_id -#: model:ir.model.fields,field_description:event.field_report_event_registration_company_id -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search msgid "Company" msgstr "" #. module: event -#: code:addons/event/models/event.py:412 +#: code:addons/event/models/event.py:467 #, python-format msgid "Compose Email" msgstr "" @@ -595,7 +579,6 @@ msgstr "" #. module: event #: model:ir.ui.view,arch_db:event.view_event_registration_form -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search msgid "Confirm" msgstr "" @@ -615,16 +598,9 @@ msgid "Confirm Registration" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_event_auto_confirm -msgid "Confirmation not required" -msgstr "" - -#. module: event #: selection:event.event,state:0 #: selection:event.registration,state:0 #: model:ir.ui.view,arch_db:event.view_event_search -#: selection:report.event.registration,event_state:0 -#: selection:report.event.registration,registration_state:0 msgid "Confirmed" msgstr "" @@ -639,11 +615,17 @@ msgid "Confirmed events" msgstr "" #. module: event +#: model:ir.model,name:event.model_res_partner #: model:ir.model.fields,field_description:event.field_event_registration_partner_id msgid "Contact" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.view_event_form +msgid "Contact Email" +msgstr "" + +#. module: event #: model:ir.model.fields,field_description:event.field_event_event_country_id msgid "Country" msgstr "" @@ -656,6 +638,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_create_uid #: model:ir.model.fields,field_description:event.field_event_registration_create_uid #: model:ir.model.fields,field_description:event.field_event_type_create_uid +#: model:ir.model.fields,field_description:event.field_event_type_mail_create_uid msgid "Created by" msgstr "" @@ -667,42 +650,29 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_create_date #: model:ir.model.fields,field_description:event.field_event_registration_create_date #: model:ir.model.fields,field_description:event.field_event_type_create_date +#: model:ir.model.fields,field_description:event.field_event_type_mail_create_date msgid "Created on" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_create_date -msgid "Creation Date" -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:389 +#: code:addons/event/models/event.py:444 #, python-format msgid "Customer" msgstr "" #. module: event -#: code:addons/event/models/event.py:391 +#: code:addons/event/models/event.py:446 #, python-format msgid "Customer Email" msgstr "" #. module: event #: selection:event.mail,interval_unit:0 +#: selection:event.type.mail,interval_unit:0 msgid "Day(s)" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_type_default_registration_max -msgid "Default Maximum Registration" -msgstr "" - -#. module: event -#: model:ir.model.fields,field_description:event.field_event_type_default_registration_min -msgid "Default Minimum Registration" -msgstr "" - -#. module: event #: model:ir.ui.view,arch_db:event.view_event_kanban msgid "Delete" msgstr "" @@ -720,7 +690,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_display_name #: model:ir.model.fields,field_description:event.field_event_registration_display_name #: model:ir.model.fields,field_description:event.field_event_type_display_name -#: model:ir.model.fields,field_description:event.field_report_event_registration_display_name +#: model:ir.model.fields,field_description:event.field_event_type_mail_display_name msgid "Display Name" msgstr "" @@ -731,29 +701,24 @@ msgstr "" #. module: event #: selection:event.event,state:0 -#: selection:report.event.registration,event_state:0 msgid "Done" msgstr "" #. module: event -#: selection:report.event.registration,event_state:0 -#: selection:report.event.registration,registration_state:0 -msgid "Draft" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_registration_email msgid "Email" msgstr "" #. module: event #: model:ir.ui.view,arch_db:event.view_event_form +#: model:ir.ui.view,arch_db:event.view_event_type_form msgid "Email Schedule" msgstr "" #. module: event #: model:ir.model.fields,field_description:event.field_event_mail_template_id -msgid "Email to Send" +#: model:ir.model.fields,field_description:event.field_event_type_mail_template_id +msgid "Email Template" msgstr "" #. module: event @@ -770,29 +735,39 @@ msgstr "" #: model:ir.model,name:event.model_event_event #: model:ir.model.fields,field_description:event.field_event_mail_event_id #: model:ir.model.fields,field_description:event.field_event_registration_event_id -#: model:ir.model.fields,field_description:event.field_report_event_registration_event_id +#: model:ir.ui.view,arch_db:event.event_event_view_pivot #: model:ir.ui.view,arch_db:event.view_registration_search -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search msgid "Event" msgstr "" #. module: event -#: model:ir.actions.report.xml,name:event.report_event_event_badge -msgid "Event Badge" +#: code:addons/event/models/event.py:333 +#, python-format +msgid "Event Attendees" +msgstr "" + +#. module: event +#: model:ir.model,name:event.model_event_mail +msgid "Event Automated Mailing" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Event Beginning Date" +#: model:ir.actions.report.xml,name:event.report_event_event_badge +msgid "Event Badge" msgstr "" #. module: event +#: model:ir.actions.act_window,name:event.action_event_type #: model:ir.ui.menu,name:event.menu_event_type msgid "Event Categories" msgstr "" #. module: event +#: model:ir.model,name:event.model_event_type +#: model:ir.model.fields,field_description:event.field_event_type_name #: 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 msgid "Event Category" msgstr "" @@ -803,11 +778,6 @@ msgid "Event Confirmation" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_event_date -msgid "Event Date" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_registration_event_end_date msgid "Event End Date" msgstr "" @@ -833,11 +803,6 @@ msgid "Event Mail Schedulers" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Event Month" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_event_name #: model:ir.ui.view,arch_db:event.view_event_form msgid "Event Name" @@ -856,44 +821,16 @@ msgid "Event Registration" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_user_id -msgid "Event Responsible" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_registration_event_begin_date msgid "Event Start Date" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_event_state -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Event State" -msgstr "" - -#. module: event -#: 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_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 +#: model:ir.model.fields,field_description:event.field_event_type_mail_event_type_id 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 -msgid "Event on Registration" -msgstr "" - -#. module: event #: model:ir.actions.server,name:event.event_mail_scheduler_ir_actions_server #: model:ir.cron,cron_name:event.event_mail_scheduler #: model:ir.cron,name:event.event_mail_scheduler @@ -903,11 +840,10 @@ msgstr "" #. module: event #: model:ir.actions.act_window,name:event.action_event_view #: model:ir.model.fields,field_description:event.field_res_partner_event_count +#: model:ir.ui.menu,name:event.event_event_menu_pivot_report #: model:ir.ui.menu,name:event.event_main_menu #: model:ir.ui.menu,name:event.menu_event_event -#: model:ir.ui.menu,name:event.menu_report_event_registration #: model:ir.ui.view,arch_db:event.res_partner_view_tree -#: model:ir.ui.view,arch_db:event.view_event_configuration #: model:ir.ui.view,arch_db:event.view_event_form #: model:ir.ui.view,arch_db:event.view_event_search #: model:ir.ui.view,arch_db:event.view_event_tree @@ -915,7 +851,7 @@ msgid "Events" msgstr "" #. module: event -#: model:ir.actions.act_window,name:event.action_report_event_registration +#: model:ir.actions.act_window,name:event.event_event_action_pivot msgid "Events Analysis" msgstr "" @@ -925,18 +861,19 @@ msgid "Events Mail Schedulers" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_search -msgid "Events in New state" +#: model:ir.ui.view,arch_db:event.view_event_type_form +msgid "Events and registrations will automatically be confirmed\n" +" upon creation, easing the flow for simple events." msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Events which are in New state" +#: model:ir.model.fields,help:event.field_event_type_auto_confirm +msgid "Events and registrations will automatically be confirmedupon creation, easing the flow for simple events." msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Events which are in confirm state" +#: model:ir.ui.view,arch_db:event.view_event_search +msgid "Events in New state" msgstr "" #. module: event @@ -950,11 +887,6 @@ msgid "Expected attendees" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Extended Filters..." -msgstr "" - -#. module: event #: model:ir.ui.view,arch_db:event.view_event_form msgid "Finish Event" msgstr "" @@ -972,12 +904,12 @@ 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 msgid "Group By" msgstr "" #. module: event #: selection:event.mail,interval_unit:0 +#: selection:event.type.mail,interval_unit:0 msgid "Hour(s)" msgstr "" @@ -989,7 +921,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_id #: model:ir.model.fields,field_description:event.field_event_registration_id #: model:ir.model.fields,field_description:event.field_event_type_id -#: model:ir.model.fields,field_description:event.field_report_event_registration_id +#: model:ir.model.fields,field_description:event.field_event_type_mail_id msgid "ID" msgstr "" @@ -1000,31 +932,13 @@ msgstr "" #. module: event #: selection:event.mail,interval_unit:0 +#: selection:event.type.mail,interval_unit:0 msgid "Immediately" msgstr "" #. module: event -#: model:ir.model.fields,help:event.field_event_config_settings_module_event_barcode -msgid "Install the event_barcode module" -msgstr "" - -#. module: event -#: model:ir.model.fields,help:event.field_event_config_settings_module_event_sale -msgid "Install the event_sale module" -msgstr "" - -#. module: event -#: model:ir.model.fields,help:event.field_event_config_settings_module_website_event_track -msgid "Install the module website_event_track" -msgstr "" - -#. module: event -#: model:ir.model.fields,help:event.field_event_config_settings_module_website_event_questions -msgid "Install the website_event_questions module" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_mail_interval_nbr +#: model:ir.model.fields,field_description:event.field_event_type_mail_interval_nbr msgid "Interval" msgstr "" @@ -1051,7 +965,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration___last_update #: model:ir.model.fields,field_description:event.field_event_registration___last_update #: model:ir.model.fields,field_description:event.field_event_type___last_update -#: model:ir.model.fields,field_description:event.field_report_event_registration___last_update +#: model:ir.model.fields,field_description:event.field_event_type_mail___last_update msgid "Last Modified on" msgstr "" @@ -1062,6 +976,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_write_uid #: model:ir.model.fields,field_description:event.field_event_mail_write_uid #: model:ir.model.fields,field_description:event.field_event_registration_write_uid +#: model:ir.model.fields,field_description:event.field_event_type_mail_write_uid #: model:ir.model.fields,field_description:event.field_event_type_write_uid msgid "Last Updated by" msgstr "" @@ -1073,6 +988,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_mail_registration_write_date #: model:ir.model.fields,field_description:event.field_event_mail_write_date #: model:ir.model.fields,field_description:event.field_event_registration_write_date +#: model:ir.model.fields,field_description:event.field_event_type_mail_write_date #: model:ir.model.fields,field_description:event.field_event_type_write_date msgid "Last Updated on" msgstr "" @@ -1083,7 +999,13 @@ msgid "Limited" msgstr "" #. module: event +#: model:ir.model.fields,field_description:event.field_event_type_has_seats_limitation +msgid "Limited Seats" +msgstr "" + +#. module: event #: model:ir.model.fields,field_description:event.field_event_event_address_id +#: model:ir.ui.view,arch_db:event.view_event_type_form msgid "Location" msgstr "" @@ -1094,6 +1016,7 @@ msgstr "" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_event_mail_ids +#: model:ir.model.fields,field_description:event.field_event_type_event_type_mail_ids msgid "Mail Schedule" msgstr "" @@ -1108,6 +1031,11 @@ msgid "Mail Schedulers" msgstr "" #. module: event +#: model:ir.model,name:event.model_event_type_mail +msgid "Mail Scheduling on Event Type" +msgstr "" + +#. module: event #: model:ir.model.fields,field_description:event.field_event_mail_registration_mail_sent msgid "Mail Sent" msgstr "" @@ -1118,28 +1046,34 @@ msgid "Mail Sent on Event" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Manage & publish a schedule with tracks" +msgstr "" + +#. module: event #: model:res.groups,name:event.group_event_manager msgid "Manager" msgstr "" #. module: event -#: selection:event.config.settings,auto_confirmation:0 -msgid "Manually confirm every registration" +#: model:ir.model.fields,field_description:event.field_event_event_seats_availability +msgid "Maximum Attendees" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_seats_max -msgid "Max Seats" +#: model:ir.model.fields,field_description:event.field_event_event_seats_max +msgid "Maximum Attendees Number" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_event_seats_availability -msgid "Maximum Attendees" +#: model:ir.model.fields,field_description:event.field_event_type_default_registration_max +msgid "Maximum Registrations" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_event_seats_max -msgid "Maximum Attendees Number" +#: code:addons/event/models/event.py:261 +#, python-format +msgid "Maximum attendees number should be greater than minimum attendees number." msgstr "" #. module: event @@ -1148,7 +1082,13 @@ msgid "Minimum Attendees" msgstr "" #. module: event +#: model:ir.model.fields,field_description:event.field_event_type_default_registration_min +msgid "Minimum Registrations" +msgstr "" + +#. module: event #: selection:event.mail,interval_unit:0 +#: selection:event.type.mail,interval_unit:0 msgid "Month(s)" msgstr "" @@ -1158,67 +1098,70 @@ msgid "My Events" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "New" +#: code:addons/event/models/event.py:266 +#, python-format +msgid "No more available seats." msgstr "" #. module: event -#: selection:event.config.settings,module_website_event_questions:0 -msgid "No extra questions on registrations" +#: code:addons/event/models/event.py:363 +#, python-format +msgid "No more seats available for this event." msgstr "" #. module: event -#: selection:event.config.settings,module_website_event_track:0 -msgid "No mini website per event" +#: model:ir.model.fields,field_description:event.field_event_event_seats_expected +msgid "Number of Expected Attendees" msgstr "" #. module: event -#: code:addons/event/models/event.py:210 -#, python-format -msgid "No more available seats." +#: model:ir.model.fields,field_description:event.field_event_event_seats_used +msgid "Number of Participants" msgstr "" #. module: event -#: code:addons/event/models/event.py:310 -#, python-format -msgid "No more seats available for this event." +#: model:ir.model.fields,help:event.field_res_partner_event_count +msgid "Number of events the partner has participated." msgstr "" #. module: event -#: selection:event.config.settings,auto_confirmation:0 -msgid "No validation step on registration" +#: model:ir.actions.act_window,help:event.action_event_view +msgid "Odoo helps you schedule and efficiently organize your events:\n" +" track registrations and participations, automate the confirmation emails,\n" +" sell tickets, etc." msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_nbevent -msgid "Number of Events" +#: model:event.type,name:event.event_type_data_online +#: model:ir.ui.view,arch_db:event.view_event_form +msgid "Online" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_event_seats_expected -msgid "Number of Expected Attendees" +#: model:ir.model.fields,field_description:event.field_event_event_is_online +#: model:ir.model.fields,field_description:event.field_event_type_is_online +msgid "Online Event" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_event_seats_used -msgid "Number of Participants" +#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event +msgid "Online Events" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_nbregistration -msgid "Number of Registrations" +#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_sale +msgid "Online Ticketing" msgstr "" #. module: event -#: model:ir.model.fields,help:event.field_res_partner_event_count -msgid "Number of events the partner has participated." +#: model:ir.ui.view,arch_db:event.view_event_type_form +msgid "Online events like webinars do not require a specific location\n" +" and are hosted online." 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 registrations and participations, automate the confirmation emails,\n" -" sell tickets, etc." +#: model:ir.model.fields,help:event.field_event_type_is_online +msgid "Online events like webinars do not require a specific location and are hosted online." msgstr "" #. module: event @@ -1232,12 +1175,6 @@ msgid "Participant" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_name_registration -msgid "Participant / Contact Name" -msgstr "" - -#. module: event -#: model:ir.model,name:event.model_res_partner #: model:ir.ui.view,arch_db:event.view_registration_search msgid "Partner" msgstr "" @@ -1248,6 +1185,16 @@ msgid "Phone" msgstr "" #. module: event +#: model:event.type,name:event.event_type_data_physical +msgid "Physical Event" +msgstr "" + +#. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Publish events on your website" +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 sales order" msgstr "" @@ -1258,6 +1205,7 @@ msgid "Register with this event" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form #: model:ir.ui.view,arch_db:event.view_event_registration_form #: model:ir.ui.view,arch_db:event.view_event_registration_graph #: model:ir.ui.view,arch_db:event.view_event_registration_pivot @@ -1301,31 +1249,16 @@ msgid "Registration Month" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_registration_state -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 "" - -#. module: event #: model:ir.ui.view,arch_db:event.view_event_mail_form msgid "Registration mail" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_event_form -msgid "Registrations" -msgstr "" - -#. module: event #: model:ir.model.fields,field_description:event.field_event_type_default_reply_to msgid "Reply To" msgstr "" @@ -1352,11 +1285,21 @@ msgid "Responsible" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_config_settings_module_event_barcode +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Save" +msgstr "" + +#. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form msgid "Scan badges to confirm attendances" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Schedule & Tracks" +msgstr "" + +#. module: event #: model:ir.model.fields,field_description:event.field_event_mail_scheduled_date msgid "Scheduled Sent Mail" msgstr "" @@ -1367,6 +1310,16 @@ msgid "Scheduled Time" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Sell tickets on your website" +msgstr "" + +#. module: event +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Sell tickets with sales orders" +msgstr "" + +#. module: event #: model:ir.ui.view,arch_db:event.view_event_registration_form msgid "Send by Email" msgstr "" @@ -1431,6 +1384,7 @@ msgstr "" #. module: event #: model:ir.model.fields,help:event.field_event_mail_template_id +#: model:ir.model.fields,help:event.field_event_type_mail_template_id msgid "This field contains the template of the mail that will be automatically sent" msgstr "" @@ -1441,6 +1395,7 @@ msgstr "" #. module: event #: model:ir.model.fields,field_description:event.field_event_event_date_tz +#: model:ir.model.fields,field_description:event.field_event_type_default_timezone msgid "Timezone" msgstr "" @@ -1450,6 +1405,22 @@ msgid "Tracks and Agenda" msgstr "" #. module: event +#: model:ir.model.fields,field_description:event.field_event_type_mail_interval_type +msgid "Trigger" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_mail_interval_type +msgid "Trigger " +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_event_twitter_hashtag +#: model:ir.model.fields,field_description:event.field_event_type_default_hashtag +msgid "Twitter Hashtag" +msgstr "" + +#. module: event #: selection:event.event,state:0 #: selection:event.registration,state:0 #: model:ir.ui.view,arch_db:event.view_event_search @@ -1463,6 +1434,7 @@ msgstr "" #. module: event #: model:ir.model.fields,field_description:event.field_event_mail_interval_unit +#: model:ir.model.fields,field_description:event.field_event_type_mail_interval_unit msgid "Unit" msgstr "" @@ -1478,11 +1450,6 @@ msgid "Unread Messages" 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 registration" -msgstr "" - -#. module: event #: model:ir.ui.view,arch_db:event.view_event_search msgid "Upcoming" msgstr "" @@ -1493,35 +1460,57 @@ msgid "Upcoming events from today" msgstr "" #. module: event +#: model:ir.model.fields,field_description:event.field_event_type_use_hashtag +msgid "Use Default Hashtag" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_type_use_reply_to +msgid "Use Default Reply-To" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_type_use_timezone +msgid "Use Default Timezone" +msgstr "" + +#. module: event #: model:res.groups,name:event.group_event_user msgid "User" msgstr "" #. module: event +#: model:ir.ui.view,arch_db:event.view_event_type_form +msgid "Visibility" +msgstr "" + +#. module: event #: model:ir.ui.view,arch_db:event.view_event_confirm msgid "Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?" msgstr "" #. module: event #: selection:event.mail,interval_unit:0 +#: selection:event.type.mail,interval_unit:0 msgid "Week(s)" msgstr "" #. module: event -#: model:ir.model.fields,field_description:event.field_event_mail_interval_type -msgid "When to Run " +#: code:addons/event/models/event.py:310 +#, python-format +msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event." msgstr "" #. module: event -#: code:addons/event/models/event.py:242 +#: code:addons/event/models/event.py:420 #, 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." +msgid "You must wait the event confirmation before doing this action." msgstr "" #. module: event -#: code:addons/event/models/event.py:367 +#: code:addons/event/models/event.py:422 #, python-format -msgid "You must wait for the starting day of the event to do this action." +msgid "You must wait the event starting day before doing this action." msgstr "" #. module: event @@ -1550,47 +1539,37 @@ msgid "event.confirm" msgstr "" #. module: event -#: model:ir.model,name:event.model_event_mail -msgid "event.mail" -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:434 +#: code:addons/event/models/event.py:489 #, python-format msgid "in %d days" msgstr "" #. module: event -#: code:addons/event/models/event.py:438 +#: code:addons/event/models/event.py:493 #, python-format msgid "next month" msgstr "" #. module: event -#: code:addons/event/models/event.py:436 +#: code:addons/event/models/event.py:491 #, python-format msgid "next week" msgstr "" #. module: event -#: code:addons/event/models/event.py:440 +#: code:addons/event/models/event.py:495 #, python-format msgid "on " msgstr "" #. module: event -#: model:ir.model,name:event.model_report_event_registration -msgid "report.event.registration" -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:430 +#: code:addons/event/models/event.py:485 #, python-format msgid "today" msgstr "" #. module: event -#: code:addons/event/models/event.py:432 +#: code:addons/event/models/event.py:487 #, python-format msgid "tomorrow" msgstr "" diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot index dac7debdfe7..92dfcc47006 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -112,6 +112,12 @@ msgid "Event" msgstr "" #. module: event_sale +#: model:ir.model,name:event_sale.model_event_type +#: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_event_type_id +msgid "Event Category" +msgstr "" + +#. module: event_sale #: model:ir.ui.view,arch_db:event_sale.event_ticket_form_view msgid "Event Name" msgstr "" @@ -150,11 +156,6 @@ msgid "Event's Ticket" msgstr "" #. module: event_sale -#: model:event.type,name:event_sale.event_type -msgid "Generic Events" -msgstr "" - -#. module: event_sale #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_id #: model:ir.model.fields,field_description:event_sale.field_registration_editor_id #: model:ir.model.fields,field_description:event_sale.field_registration_editor_line_id @@ -162,6 +163,11 @@ msgid "ID" msgstr "" #. module: event_sale +#: model:ir.model,name:event_sale.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: event_sale #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_is_expired msgid "Is Expired" msgstr "" @@ -204,13 +210,13 @@ msgid "Name" msgstr "" #. module: event_sale -#: code:addons/event_sale/models/event.py:116 +#: code:addons/event_sale/models/event.py:145 #, python-format msgid "No more available seats for the ticket" msgstr "" #. module: event_sale -#: code:addons/event_sale/models/event.py:138 +#: code:addons/event_sale/models/event.py:172 #, python-format msgid "No more available seats for this ticket" msgstr "" @@ -258,12 +264,20 @@ msgstr "" #. module: event_sale #: code:addons/event_sale/models/event.py:19 +#: code:addons/event_sale/models/event.py:32 #: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form #, python-format msgid "Registration" msgstr "" #. module: event_sale +#: code:addons/event_sale/models/event.py:33 +#: code:addons/event_sale/models/event.py:50 +#, python-format +msgid "Registration for %s" +msgstr "" + +#. module: event_sale #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket_registration_ids msgid "Registrations" msgstr "" @@ -302,6 +316,11 @@ msgid "Seats Used" msgstr "" #. module: event_sale +#: model:event.type,name:event_sale.event_type_data_sale +msgid "Sell Online" +msgstr "" + +#. module: event_sale #: model:ir.ui.view,arch_db:event_sale.view_event_registration_editor_form msgid "Skip" msgstr "" @@ -318,6 +337,19 @@ msgid "Ticket Type" msgstr "" #. module: event_sale +#: code:addons/event_sale/models/event.py:150 +#, python-format +msgid "Ticket should belong to either event category or event but not both" +msgstr "" + +#. module: event_sale +#: model:ir.model.fields,field_description:event_sale.field_event_type_use_ticketing +msgid "Ticketing" +msgstr "" + +#. module: event_sale +#: model:ir.model.fields,field_description:event_sale.field_event_type_event_ticket_ids +#: model:ir.ui.view,arch_db:event_sale.event_type_view_form_inherit_sale #: model:ir.ui.view,arch_db:event_sale.view_event_form_inherit_ticket msgid "Tickets" msgstr "" diff --git a/addons/google_calendar/i18n/google_calendar.pot b/addons/google_calendar/i18n/google_calendar.pot index f52eeafbf8e..8ad93638d72 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,11 +21,6 @@ msgid "<i class=\"fa fa-fw fa-arrow-right\"/>Tutorial" msgstr "" #. module: google_calendar -#: model:ir.actions.act_window,name:google_calendar.action_config_settings_google_calendar -msgid "API Configuration" -msgstr "" - -#. module: google_calendar #: model:ir.ui.menu,name:google_calendar.menu_calendar_google_tech_config msgid "API Credentials" msgstr "" @@ -85,11 +80,13 @@ msgstr "" #. module: google_calendar #: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_cal_client_id +#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_cal_client_id msgid "Client_id" msgstr "" #. module: google_calendar #: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_cal_client_secret +#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_cal_client_secret msgid "Client_key" msgstr "" @@ -133,6 +130,11 @@ msgid "Event disconnection success" msgstr "" #. module: google_calendar +#: model:ir.actions.act_window,name:google_calendar.action_config_settings_google_calendar +msgid "General Settings" +msgstr "" + +#. module: google_calendar #: model:ir.model.fields,field_description:google_calendar.field_calendar_attendee_google_internal_event_id msgid "Google Calendar Event Id" msgstr "" @@ -234,6 +236,7 @@ msgstr "" #. module: google_calendar #: model:ir.model.fields,field_description:google_calendar.field_base_config_settings_server_uri +#: model:ir.model.fields,field_description:google_calendar.field_hr_timesheet_config_settings_server_uri msgid "URI for tuto" msgstr "" diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 30d903d0da1..6438af674df 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,6 +65,11 @@ msgid "Birth" msgstr "" #. module: hr +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Cancel" +msgstr "" + +#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_department_child_ids msgid "Child Departments" msgstr "" @@ -102,11 +107,6 @@ msgid "Coach" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_code -msgid "Code" -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_department_color #: model:ir.model.fields,field_description:hr.field_hr_employee_category_color #: model:ir.model.fields,field_description:hr.field_hr_employee_color @@ -119,8 +119,8 @@ msgid "Companies" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_company_id #: model:ir.model.fields,field_description:hr.field_hr_department_company_id -#: model:ir.model.fields,field_description:hr.field_hr_employee_company_id #: model:ir.model.fields,field_description:hr.field_hr_job_company_id #: model:ir.ui.view,arch_db:hr.view_employee_filter #: model:ir.ui.view,arch_db:hr.view_job_filter @@ -128,16 +128,32 @@ msgid "Company" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_resource_calendar_id +msgid "Company Working Hours" +msgstr "" + +#. module: hr #: model:ir.ui.menu,name:hr.menu_human_resources_configuration msgid "Configuration" msgstr "" #. module: hr +#: model:ir.actions.act_window,name:hr.hr_config_settings_action +msgid "Configure HR" +msgstr "" + +#. module: hr +#: model:ir.model,name:hr.model_res_partner +msgid "Contact" +msgstr "" + +#. module: hr #: model:ir.ui.view,arch_db:hr.view_employee_form msgid "Contact Information" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_create_uid #: 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 @@ -146,6 +162,7 @@ msgid "Created by" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_create_date #: model:ir.model.fields,field_description:hr.field_hr_department_create_date #: model:ir.model.fields,field_description:hr.field_hr_employee_category_create_date #: model:ir.model.fields,field_description:hr.field_hr_employee_create_date @@ -164,11 +181,6 @@ msgid "Date of Birth" msgstr "" #. module: hr -#: model:ir.model.fields,help:hr.field_hr_employee_calendar_id -msgid "Define the schedule of resource" -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_department_id #: model:ir.model.fields,field_description:hr.field_hr_job_department_id #: model:ir.ui.view,arch_db:hr.view_department_filter @@ -190,6 +202,7 @@ msgid "Departments" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_display_name #: model:ir.model.fields,field_description:hr.field_hr_department_display_name #: model:ir.model.fields,field_description:hr.field_hr_employee_category_display_name #: model:ir.model.fields,field_description:hr.field_hr_employee_display_name @@ -203,11 +216,6 @@ msgid "Divorced" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_time_efficiency -msgid "Efficiency Factor" -msgstr "" - -#. module: hr #: model:ir.model,name:hr.model_mail_alias msgid "Email Aliases" msgstr "" @@ -276,13 +284,13 @@ msgid "Employees Tags" msgstr "" #. module: hr -#: code:addons/hr/models/hr.py:263 +#: code:addons/hr/models/hr.py:260 #, python-format msgid "Error! You cannot create recursive departments." msgstr "" #. module: hr -#: code:addons/hr/models/hr.py:167 +#: code:addons/hr/models/hr.py:164 #, python-format msgid "Error! You cannot create recursive hierarchy of Employee(s)." msgstr "" @@ -354,6 +362,7 @@ msgid "Human Resources" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_id #: model:ir.model.fields,field_description:hr.field_hr_department_id #: model:ir.model.fields,field_description:hr.field_hr_employee_category_id #: model:ir.model.fields,field_description:hr.field_hr_employee_id @@ -425,6 +434,7 @@ msgid "Jobs" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings___last_update #: 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 @@ -433,6 +443,7 @@ msgid "Last Modified on" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_write_uid #: 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 @@ -441,6 +452,7 @@ msgid "Last Updated by" msgstr "" #. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_write_date #: 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 @@ -454,21 +466,11 @@ msgid "Last notification marked as read from base Calendar" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_last_login -msgid "Latest Connection" -msgstr "" - -#. module: hr #: model:ir.ui.view,arch_db:hr.view_hr_job_form msgid "Launch Recruitment" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_login -msgid "Login" -msgstr "" - -#. module: hr #: selection:hr.employee,gender:0 msgid "Male" msgstr "" @@ -482,11 +484,6 @@ msgid "Manager" msgstr "" #. module: hr -#: model:res.groups,name:hr.group_hr_attendance -msgid "Manual Attendance" -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_marital msgid "Marital Status" msgstr "" @@ -594,11 +591,6 @@ msgid "Parent Department" msgstr "" #. module: hr -#: model:ir.model,name:hr.model_res_partner -msgid "Partner" -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_passport_id msgid "Passport No" msgstr "" @@ -619,6 +611,11 @@ msgid "Position" msgstr "" #. module: hr +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Prout prout prout" +msgstr "" + +#. module: hr #: model:ir.ui.view,arch_db:hr.view_employee_form msgid "Public Information" msgstr "" @@ -654,28 +651,23 @@ msgid "Requirements" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_resource_id -msgid "Resource" -msgstr "" - -#. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_name_related -msgid "Resource Name" +#: model:ir.model.fields,field_description:hr.field_hr_employee_sinid +msgid "SIN No" 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_ssnid +msgid "SSN No" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_sinid -msgid "SIN No" +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Save" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_ssnid -msgid "SSN No" +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Set default calendar used to compute time allocation for leaves, timesheets, ..." msgstr "" #. module: hr @@ -684,6 +676,7 @@ msgid "Set whether the recruitment process is open or closed for this job positi msgstr "" #. module: hr +#: model:ir.ui.menu,name:hr.hr_menu_configuration #: model:ir.ui.view,arch_db:hr.hr_department_view_kanban msgid "Settings" msgstr "" @@ -751,21 +744,11 @@ msgid "The name of the job position must be unique per department in company!" msgstr "" #. module: hr -#: model:res.groups,comment:hr.group_hr_attendance -msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance." -msgstr "" - -#. module: hr #: model:ir.model.fields,help:hr.field_hr_employee_image msgid "This field holds the image used as photo for the employee, limited to 1024x1024px." msgstr "" #. module: hr -#: model:ir.model.fields,help:hr.field_hr_employee_time_efficiency -msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes." -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_job_expected_employees msgid "Total Forecasted Employees" msgstr "" @@ -779,11 +762,6 @@ msgid "Unread Messages" msgstr "" #. module: hr -#: model:ir.model.fields,help:hr.field_hr_employee_login -msgid "Used to log into the system" -msgstr "" - -#. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_user_id msgid "User" msgstr "" @@ -827,13 +805,13 @@ msgid "Work Mobile" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_work_phone -msgid "Work Phone" +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Work Organization" msgstr "" #. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_calendar_id -msgid "Working Time" +#: model:ir.model.fields,field_description:hr.field_hr_employee_work_phone +msgid "Work Phone" msgstr "" #. module: hr @@ -875,6 +853,11 @@ msgid "e.g. Sales Manager" msgstr "" #. module: hr +#: model:ir.model,name:hr.model_hr_config_settings +msgid "hr.config.settings" +msgstr "" + +#. module: hr #: code:addons/hr/models/mail_thread.py:41 #, python-format msgid "skipping" diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot index aee6a29d63e..fb503278773 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -53,11 +53,6 @@ msgid "Another good day's work! See you soon!" msgstr "" #. module: hr_attendance -#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config -msgid "Apply" -msgstr "" - -#. module: hr_attendance #: model:ir.actions.client,name:hr_attendance.hr_attendance_action_my_attendances #: model:ir.model,name:hr_attendance.model_hr_attendance #: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_attendance_ids @@ -113,13 +108,13 @@ msgid "Cannot create new attendance record for %(empl_name)s, the employee was a msgstr "" #. module: hr_attendance -#: code:addons/hr_attendance/models/hr_employee.py:111 +#: code:addons/hr_attendance/models/hr_employee.py:108 #, python-format msgid "Cannot perform check in or check out on multiple employees." msgstr "" #. module: hr_attendance -#: code:addons/hr_attendance/models/hr_employee.py:125 +#: code:addons/hr_attendance/models/hr_employee.py:122 #, 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 "" @@ -154,6 +149,11 @@ msgid "Check out" msgstr "" #. module: hr_attendance +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Check-In/Out" +msgstr "" + +#. module: hr_attendance #: selection:hr.employee,attendance_state:0 msgid "Checked in" msgstr "" @@ -211,11 +211,13 @@ msgid "Create a few employees to be able to select an employee here and perform msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_create_uid #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid msgid "Created by" msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_create_date #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_date msgid "Created on" msgstr "" @@ -231,6 +233,7 @@ msgid "Department" msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_display_name #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_display_name msgid "Display Name" msgstr "" @@ -262,7 +265,8 @@ msgid "Employee Image" msgstr "" #. module: hr_attendance -#: model:ir.model.fields,field_description:hr_attendance.field_base_config_settings_group_attendance_use_pin +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_group_attendance_use_pin +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config msgid "Employee PIN" msgstr "" @@ -284,26 +288,11 @@ 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 \"Kiosk Mode\"." -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 \"Kiosk Mode\"." -msgstr "" - -#. module: hr_attendance #: model:res.groups,name:hr_attendance.group_hr_attendance_use_pin msgid "Enable PIN use" 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_attendances.js:29 #, python-format @@ -413,6 +402,7 @@ msgid "Hr Attendance Search" msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_id #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_id msgid "ID" msgstr "" @@ -447,32 +437,47 @@ msgid "Last Attendance" msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings___last_update #: 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_attendance_config_settings_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_attendance_config_settings_write_date #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_write_date msgid "Last Updated on" msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_module_hr_holidays +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Leave Management" +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.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Manage leave allocations and requests" +msgstr "" + +#. module: hr_attendance #: model:res.groups,name:hr_attendance.group_hr_attendance_manager msgid "Manager" msgstr "" #. module: hr_attendance #: model:ir.model.fields,field_description:hr_attendance.field_hr_employee_manual_attendance +#: model:res.groups,name:hr_attendance.group_hr_attendance msgid "Manual Attendance" msgstr "" @@ -554,11 +559,21 @@ msgid "Print Badge" msgstr "" #. module: hr_attendance +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Recommended Apps" +msgstr "" + +#. module: hr_attendance #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_report msgid "Reporting" msgstr "" #. module: hr_attendance +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Save" +msgstr "" + +#. module: hr_attendance #. openerp-web #: code:addons/hr_attendance/static/src/xml/attendance.xml:13 #, python-format @@ -574,7 +589,7 @@ msgstr "" #. module: hr_attendance #: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config -msgid "Settings" +msgid "Set PIN codes in the employee detail form (in HR Settings tab)." msgstr "" #. module: hr_attendance @@ -606,11 +621,22 @@ msgid "The employee will have access to the \"My Attendances\" menu to check in msgstr "" #. module: hr_attendance +#: model:res.groups,comment:hr_attendance.group_hr_attendance +msgid "The user will gain access to the human resources attendance menu, enabling him to manage his own attendance." +msgstr "" + +#. module: hr_attendance #: model:res.groups,comment:hr_attendance.group_hr_attendance_use_pin msgid "The user will have to enter his PIN to check in and out manually at the company screen." msgstr "" #. module: hr_attendance +#: model:ir.model.fields,field_description:hr_attendance.field_attendance_config_settings_module_hr_timesheet +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Timesheets" +msgstr "" + +#. module: hr_attendance #: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban msgid "To create employees go to the Employees menu." msgstr "" @@ -621,6 +647,16 @@ msgid "Today" msgstr "" #. module: hr_attendance +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Track time spent by employees and compare with attendances" +msgstr "" + +#. module: hr_attendance +#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_config +msgid "Use PIN codes to check in in Kiosk Mode" +msgstr "" + +#. module: hr_attendance #. openerp-web #: code:addons/hr_attendance/static/src/js/greeting_message.js:102 #, python-format @@ -661,8 +697,8 @@ msgid "You cannot duplicate an attendance." msgstr "" #. module: hr_attendance -#: model:ir.model,name:hr_attendance.model_base_config_settings -msgid "base.config.settings" +#: model:ir.model,name:hr_attendance.model_attendance_config_settings +msgid "attendance.config.settings" msgstr "" #. module: hr_attendance diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index dbb22a5d4b6..8f5b56a537e 100644 --- a/addons/hr_expense/i18n/hr_expense.pot +++ b/addons/hr_expense/i18n/hr_expense.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -189,7 +189,7 @@ msgid "<strong>Validated By:</strong>" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:79 +#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:83 #, python-format msgid "A payment of %s %s with the reference <a href='/mail/view?%s'>%s</a> related to your expense %s has been made." msgstr "" @@ -258,8 +258,8 @@ msgid "Analytic Account" msgstr "" #. module: hr_expense -#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration -msgid "Apply" +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_group_analytic_accounting +msgid "Analytic Accounting" msgstr "" #. module: hr_expense @@ -299,6 +299,11 @@ msgid "Bill Reference" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Billing" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Business trip" msgstr "" @@ -309,9 +314,9 @@ msgid "Can be Expensed" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form #: 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 "" @@ -337,7 +342,7 @@ msgid "Click here to create new expenses." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:305 +#: code:addons/hr_expense/models/hr_expense.py:318 #, python-format msgid "Click to add a new expense," msgstr "" @@ -431,6 +436,11 @@ msgid "Currency" msgstr "" #. module: hr_expense +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_module_sale +msgid "Customer Billing" +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_sheet msgid "Date" @@ -483,6 +493,16 @@ msgid "Draft Payment" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Email Alias" +msgstr "" + +#. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Emails" +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 @@ -523,11 +543,6 @@ msgid "Expense Description" msgstr "" #. module: hr_expense -#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration -msgid "Expense Email Alias" -msgstr "" - -#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Expense Flow" msgstr "" @@ -645,7 +660,6 @@ msgstr "" #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_root #: model:ir.ui.view,arch_db:hr_expense.hr_expense_form_view #: 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 @@ -697,19 +711,19 @@ msgid "Expenses follow this flow:" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:400 +#: code:addons/hr_expense/models/hr_expense.py:413 #, python-format msgid "Expenses must belong to the same Employee." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:512 +#: code:addons/hr_expense/models/hr_expense.py:525 #, python-format msgid "Expenses must have an expense journal specified to generate accounting entries." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:404 +#: code:addons/hr_expense/models/hr_expense.py:417 #, python-format msgid "Expenses must have been paid by the same entity (Company or employee)" msgstr "" @@ -813,7 +827,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id -#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9286 +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9374 msgid "ID" msgstr "" @@ -880,6 +894,12 @@ msgid "Last Updated on" msgstr "" #. module: hr_expense +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_default_alias_email +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Let your employees record expenses by email" +msgstr "" + +#. module: hr_expense #: model:res.groups,name:hr_expense.group_hr_expense_manager msgid "Manager" msgstr "" @@ -940,19 +960,19 @@ msgid "New Mail" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:252 +#: code:addons/hr_expense/models/hr_expense.py:258 #, python-format -msgid "No Expense account found for the product %s (or for it's category), please configure one." +msgid "No Expense account found for the product %s (or for its category), please configure one." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:219 +#: code:addons/hr_expense/models/hr_expense.py:224 #, 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:198 +#: code:addons/hr_expense/models/hr_expense.py:203 #, python-format msgid "No credit account found for the %s journal, please configure one." msgstr "" @@ -1071,7 +1091,7 @@ msgid "Planner" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:256 +#: code:addons/hr_expense/models/hr_expense.py:263 #, python-format msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`." msgstr "" @@ -1114,6 +1134,11 @@ msgid "Product Template" msgstr "" #. module: hr_expense +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_module_project +msgid "Project" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Provide your customer with detailed reports (along with copies of receipts)" msgstr "" @@ -1144,11 +1169,21 @@ msgid "Reason to refuse expense." msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Recommended Apps" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Record a first expense" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Recording" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Recording Mode" msgstr "" @@ -1238,6 +1273,11 @@ msgid "Review expenses to approve" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Save" +msgstr "" + +#. module: hr_expense #. openerp-web #: code:addons/hr_expense/static/src/js/tour.js:25 #, python-format @@ -1245,6 +1285,11 @@ msgid "Save the report, your manager will receive a notification by email to app msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Schedule the tasks of your employees" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "See how to invoice expenses" msgstr "" @@ -1261,6 +1306,11 @@ msgid "Selected Unit of Measure does not belong to the same category as the prod msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Sell services and invoice expenses to customer" +msgstr "" + +#. module: hr_expense #: model:ir.ui.view,arch_db:hr_expense.hr_expense_planner msgid "Send an expense by email" msgstr "" @@ -1291,12 +1341,17 @@ msgid "Set invoicing method on expense products" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Set units of measure on expense types (unit, distance, etc.)" +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.view_hr_expense_configuration +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form msgid "Setup your domain alias" msgstr "" @@ -1404,6 +1459,11 @@ msgid "This guide helps you start with Odoo Expenses." msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "This installs the Sales Management app. Expenses can be invoiced to customers from sales orders." +msgstr "" + +#. module: hr_expense #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_to_approve #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter msgid "To Approve" @@ -1444,6 +1504,11 @@ msgid "Total Amount" msgstr "" #. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Track costs & revenues by project, department, etc." +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_sheet msgid "Unit Price" @@ -1455,6 +1520,12 @@ msgid "Unit of Measure" msgstr "" #. module: hr_expense +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_config_settings_group_uom +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "Units of Measure" +msgstr "" + +#. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.action_approved_expense msgid "Unreported Expenses" msgstr "" @@ -1517,23 +1588,18 @@ msgid "When you charge" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:509 +#: code:addons/hr_expense/models/hr_expense.py:522 #, python-format msgid "You can only generate accounting entry for approved expense(s)." msgstr "" #. module: hr_expense -#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_configuration -msgid "You can setup a generic email alias to create\n" -" incoming expenses easily. Write an email with the receipt\n" -" in attachment to create an expense line in one click. If the mail\n" -" subject contains the product's internal reference between brackets,\n" -" the product will be set automatically. Type the expense amount\n" -" in the mail subject to set it on the expense too." +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_config_setting_view_form +msgid "You can setup a generic email alias to create incoming expenses easily. Write an email with the receipt in attachment to create an expense line in one click. If the mail subject contains the product's internal reference between brackets, the product will be set automatically. Type the expense amount in the mail subject to set it on the expense too." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:426 +#: code:addons/hr_expense/models/hr_expense.py:439 #, python-format msgid "You cannot delete a posted expense." msgstr "" @@ -1562,7 +1628,7 @@ msgid "You record expenses," msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:491 +#: code:addons/hr_expense/models/hr_expense.py:504 #, 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 "" @@ -1613,7 +1679,7 @@ msgid "hr.expense.config.settings" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:306 +#: code:addons/hr_expense/models/hr_expense.py:319 #, python-format msgid "or send receipts by email to %s." msgstr "" diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 116d2704733..bd46713702e 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ msgid "%g remaining out of %g" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/models/hr_holidays.py:336 +#: code:addons/hr_holidays/models/hr_holidays.py:334 #, python-format msgid "%s on %s : %.2f day(s)" msgstr "" @@ -186,6 +186,12 @@ msgid "Allocation for %s" msgstr "" #. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:336 +#, python-format +msgid "Allocation of %s : %.2f day(s) To %s" +msgstr "" + +#. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_department_allocation_to_approve_count msgid "Allocation to Approve" msgstr "" @@ -243,15 +249,6 @@ msgid "Assign Leaves" msgstr "" #. module: hr_holidays -#: model:ir.model.fields,help:hr_holidays.field_resource_calendar_uom_id -msgid "Average hours of work per day.\n" -" It is used in an employee leave request to compute the number of days consumed based on the resource calendar.\n" -" It can be used to handle various contract types, e.g.:\n" -" - 38 Hours/Week, 5 Days/Week: 1 Day = 7.6 Hours\n" -" - 45 Hours/Week, 5 Days/Week: 1 Day = 9.0 Hours" -msgstr "" - -#. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Black" msgstr "" @@ -542,11 +539,6 @@ msgid "HR Leaves Summary Report By Employee" msgstr "" #. module: hr_holidays -#: model:ir.model.fields,field_description:hr_holidays.field_resource_calendar_uom_id -msgid "Hours per Day" -msgstr "" - -#. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_id #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_remaining_leaves_user_id #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_status_id @@ -929,6 +921,11 @@ msgid "Number of Leaves" msgstr "" #. module: hr_holidays +#: model:ir.model.fields,help:hr_holidays.field_hr_holidays_number_of_days_temp +msgid "Number of days of the leave request according to your working schedule." +msgstr "" + +#. module: hr_holidays #: model:res.groups,name:hr_holidays.group_hr_holidays_user msgid "Officer" msgstr "" @@ -1083,11 +1080,6 @@ msgid "Reset to Draft" msgstr "" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_resource_calendar -msgid "Resource Calendar" -msgstr "" - -#. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter msgid "Search Leave" msgstr "" @@ -1104,6 +1096,18 @@ msgid "Second Approval" msgstr "" #. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:570 +#, python-format +msgid "See Allocation" +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/models/hr_holidays.py:570 +#, python-format +msgid "See Leave" +msgstr "" + +#. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_summary_employee_holiday_type msgid "Select Leave Type" msgstr "" @@ -1151,7 +1155,7 @@ msgid "The number of days must be greater than 0." msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/models/hr_holidays.py:258 +#: code:addons/hr_holidays/models/hr_holidays.py:261 #, python-format msgid "The number of remaining leaves is not sufficient for this leave type.\n" "Please verify also the leaves waiting for validation." @@ -1305,7 +1309,7 @@ msgid "You can assign remaining Legal Leaves for each employee, Odoo\n" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/models/hr_holidays.py:248 +#: code:addons/hr_holidays/models/hr_holidays.py:251 #, python-format msgid "You can not have 2 leaves that overlaps on same day!" msgstr "" diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot index f7d3535eb71..1be7749212f 100644 --- a/addons/hr_payroll/i18n/hr_payroll.pot +++ b/addons/hr_payroll/i18n/hr_payroll.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:48 +#: code:addons/hr_payroll/models/hr_payroll.py:49 #, python-format msgid "%s (copy)" msgstr "" @@ -120,6 +120,12 @@ msgid "A contribution register is a third party involved in the salary\n" msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_account_accountant +msgid "Account Accountant" +msgstr "" + +#. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form msgid "Accounting" msgstr "" @@ -190,6 +196,11 @@ msgid "Apply" msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_be_hr_payroll +msgid "Belgium Payroll" +msgstr "" + +#. module: hr_payroll #: selection:hr.contract,schedule_pay:0 msgid "Bi-monthly" msgstr "" @@ -216,14 +227,14 @@ msgid "Cancel Payslip" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:240 +#: code:addons/hr_payroll/models/hr_payroll.py:241 #, python-format msgid "Cannot cancel a payslip that is done." msgstr "" #. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_category_id -#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7480 +#: model:ir.model.fields,field_description:hr_payroll.field_hr_salary_rule_category_id_7569 #: model:ir.ui.view,arch_db:hr_payroll.view_hr_rule_filter msgid "Category" msgstr "" @@ -251,6 +262,11 @@ msgid "Children Definition" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Choose a Payroll Localization" +msgstr "" + +#. module: hr_payroll #: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form msgid "Click to add a new contribution register." msgstr "" @@ -366,11 +382,6 @@ msgid "Contribution Registers" msgstr "" #. module: hr_payroll -#: model:ir.model.fields,help:hr_payroll.field_hr_payroll_config_settings_module_hr_payroll_account -msgid "Create journal entries from payslips" -msgstr "" - -#. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_contribution_register_create_uid #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_create_uid #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_create_uid @@ -542,7 +553,7 @@ msgid "Employees" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:43 +#: code:addons/hr_payroll/models/hr_payroll.py:44 #, python-format msgid "Error ! You cannot create a recursive Salary Structure." msgstr "" @@ -568,6 +579,11 @@ msgid "For example, enter 50.0 to apply a percentage of 50%" msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_fr_hr_payroll +msgid "French Payroll" +msgstr "" + +#. module: hr_payroll #: model:ir.ui.view,arch_db:hr_payroll.hr_salary_rule_form msgid "General" msgstr "" @@ -626,6 +642,11 @@ msgid "If the active field is set to false, it will allow you to hide the salary msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_l10n_in_hr_payroll +msgid "Indian Payroll" +msgstr "" + +#. module: hr_payroll #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_credit_note msgid "Indicates this payslip has a refund of another" msgstr "" @@ -644,11 +665,6 @@ msgid "Inputs" msgstr "" #. module: hr_payroll -#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration -msgid "Install your country's payroll" -msgstr "" - -#. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_note msgid "Internal Note" msgstr "" @@ -717,11 +733,6 @@ msgid "Last Updated on" msgstr "" #. module: hr_payroll -#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_hr_payroll_account -msgid "Link your payroll to accounting system" -msgstr "" - -#. module: hr_payroll #: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_category_parent_id msgid "Linking a salary category to its parent is used only for the reporting purpose." msgstr "" @@ -772,7 +783,7 @@ msgid "Name" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:325 +#: code:addons/hr_payroll/models/hr_payroll.py:340 #, python-format msgid "Normal Working Days paid at 100%" msgstr "" @@ -798,6 +809,11 @@ msgid "Officer" msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_website_sign +msgid "Online Signatures" +msgstr "" + +#. module: hr_payroll #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form msgid "Other Inputs" msgstr "" @@ -872,18 +888,33 @@ msgid "Payroll" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Payroll Entries" +msgstr "" + +#. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Payroll Rules" +msgstr "" + +#. module: hr_payroll #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_structure_filter msgid "Payroll Structures" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Payroll rules that apply to your country" +msgstr "" + +#. module: hr_payroll #: model:ir.actions.report.xml,name:hr_payroll.action_report_payslip #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_form msgid "Payslip" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:226 +#: code:addons/hr_payroll/models/hr_payroll.py:227 #, python-format msgid "Payslip 'Date From' must be before 'Date To'." msgstr "" @@ -993,6 +1024,11 @@ msgid "Period" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Post payroll slips in accounting" +msgstr "" + +#. module: hr_payroll #: model:ir.ui.view,arch_db:hr_payroll.view_payslip_lines_contribution_register msgid "Print" msgstr "" @@ -1057,6 +1093,11 @@ msgid "Rate (%)" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Recommended Apps" +msgstr "" + +#. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_structure_code #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_number msgid "Reference" @@ -1068,7 +1109,7 @@ msgid "Refund" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:246 +#: code:addons/hr_payroll/models/hr_payroll.py:247 #, python-format msgid "Refund: " msgstr "" @@ -1139,8 +1180,8 @@ msgid "Salary Rules" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:552 -#: code:addons/hr_payroll/models/hr_payroll.py:600 +#: code:addons/hr_payroll/models/hr_payroll.py:542 +#: code:addons/hr_payroll/models/hr_payroll.py:590 #, python-format msgid "Salary Slip of %s for %s" msgstr "" @@ -1212,11 +1253,15 @@ msgstr "" #. module: hr_payroll #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_global_settings -#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration msgid "Settings" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Sign documents and contracts online" +msgstr "" + +#. module: hr_payroll #: model:ir.ui.view,arch_db:hr_payroll.view_hr_payslip_filter msgid "States" msgstr "" @@ -1281,6 +1326,11 @@ msgid "This wizard will generate payslips for all selected employee(s) based on msgstr "" #. module: hr_payroll +#: model:ir.model.fields,field_description:hr_payroll.field_hr_payroll_config_settings_module_hr_timesheet +msgid "Timesheets" +msgstr "" + +#. module: hr_payroll #: model:ir.model.fields,field_description:hr_payroll.field_hr_payslip_line_total #: model:ir.ui.view,arch_db:hr_payroll.report_contributionregister #: model:ir.ui.view,arch_db:hr_payroll.report_payslip @@ -1294,6 +1344,11 @@ msgid "Total Working Days" msgstr "" #. module: hr_payroll +#: model:ir.ui.view,arch_db:hr_payroll.view_hr_payroll_configuration +msgid "Track time spent by employees" +msgstr "" + +#. module: hr_payroll #: model:ir.model.fields,help:hr_payroll.field_hr_payslip_line_sequence #: model:ir.model.fields,help:hr_payroll.field_hr_salary_rule_sequence msgid "Use to arrange calculation sequence" @@ -1331,37 +1386,37 @@ msgid "Worked Days & Inputs" msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:775 +#: code:addons/hr_payroll/models/hr_payroll.py:765 #, python-format msgid "Wrong percentage base or quantity defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:781 +#: code:addons/hr_payroll/models/hr_payroll.py:771 #, python-format msgid "Wrong python code defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:804 +#: code:addons/hr_payroll/models/hr_payroll.py:794 #, python-format msgid "Wrong python condition defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:768 +#: code:addons/hr_payroll/models/hr_payroll.py:758 #, python-format msgid "Wrong quantity defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:798 +#: code:addons/hr_payroll/models/hr_payroll.py:788 #, python-format msgid "Wrong range condition defined for salary rule %s (%s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:270 +#: code:addons/hr_payroll/models/hr_payroll.py:271 #, python-format msgid "You cannot delete a payslip which is not draft or cancelled!" msgstr "" @@ -1373,7 +1428,7 @@ msgid "You must select employee(s) to generate payslip(s)." msgstr "" #. module: hr_payroll -#: code:addons/hr_payroll/models/hr_payroll.py:843 +#: code:addons/hr_payroll/models/hr_payroll.py:833 #, python-format msgid "You must set a contract to create a payslip line." msgstr "" diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index ddff3b6507a..e24a6ab5827 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -54,16 +54,41 @@ msgid "Analytic Line" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Apple App Store" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_timesheet_attendance +msgid "Attendances" +msgstr "" + +#. module: hr_timesheet #: model:ir.model.fields,field_description:hr_timesheet.field_report_project_task_user_hours_delay msgid "Avg. Plan.-Eff." msgstr "" #. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_timesheet_synchro +msgid "Awesome Timesheet" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Billing" +msgstr "" + +#. module: hr_timesheet #: model:ir.model.fields,field_description:hr_timesheet.field_project_project_crossovered_budget_line msgid "Budget Lines" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Cancel" +msgstr "" + +#. 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)" @@ -102,6 +127,21 @@ msgid "Computed using the sum of the task work done." msgstr "" #. module: hr_timesheet +#: model:ir.ui.menu,name:hr_timesheet.hr_timesheet_menu_configuration +msgid "Configuration" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_create_uid +msgid "Created by" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_create_date +msgid "Created on" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.report_timesheet msgid "Date" msgstr "" @@ -132,6 +172,11 @@ msgid "Detailed Activities" msgstr "" #. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_display_name +msgid "Display Name" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_tree #: model:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited msgid "Duration" @@ -143,6 +188,26 @@ msgid "Effective Hours" msgstr "" #. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_expense +msgid "Expenses" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_project_forecast +msgid "Forecasts" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Google Chrome Store" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Google Play Store" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search msgid "Group By" msgstr "" @@ -153,6 +218,36 @@ msgid "Hours Spent" msgstr "" #. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_id +msgid "ID" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings___last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_write_date +msgid "Last Updated on" +msgstr "" + +#. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_hr_holidays +msgid "Leave Management" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Manage your resources with Gantt charts" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking msgid "My Timesheet" msgstr "" @@ -195,6 +290,16 @@ msgid "Project -" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Recommended Apps" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Reimburse employee expenses and invoice customers" +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" @@ -216,6 +321,22 @@ msgid "Responsible" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Save" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Sell services and invoice time spent" +msgstr "" + +#. module: hr_timesheet +#: model:ir.actions.act_window,name:hr_timesheet.hr_timesheet_config_settings_action +#: model:ir.ui.menu,name:hr_timesheet.hr_timesheet_config_settings_menu_action +msgid "Settings" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.view_task_tree2_inherited msgid "Spent Hours" msgstr "" @@ -249,6 +370,11 @@ msgid "Sum of the planned hours of all sub-tasks (when a sub-task is closed or i msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Synchronize time spent with web/mobile app" +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 @@ -267,6 +393,11 @@ msgid "Time" msgstr "" #. module: hr_timesheet +#: model:ir.model.fields,field_description:hr_timesheet.field_hr_timesheet_config_settings_module_sale_timesheet +msgid "Time Billing" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search #: model:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot msgid "Timesheet" @@ -279,6 +410,11 @@ msgid "Timesheet Activities" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Timesheet Apps" +msgstr "" + +#. module: hr_timesheet #: 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" @@ -321,6 +457,16 @@ msgid "Total time" msgstr "" #. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Track attendances and compare with timesheets" +msgstr "" + +#. module: hr_timesheet +#: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_config_settings_view_form +msgid "Track leaves to optimize your scheduling" +msgstr "" + +#. module: hr_timesheet #: model:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search msgid "Users" msgstr "" @@ -340,7 +486,7 @@ msgid "You can register and track your workings hours by project every\n" msgstr "" #. module: hr_timesheet -#: code:addons/hr_timesheet/project_timesheet.py:67 +#: code:addons/hr_timesheet/project_timesheet.py:69 #, python-format msgid "You can't define a parent task if its project is not correctly configured. The sub-task's project of the parent task's project should be this task's project" msgstr "" @@ -350,3 +496,8 @@ msgstr "" msgid "You should create an analytic account structure depending on your needs to analyse costs and revenues. In Odoo, analytic accounts are also used to track customer contracts." msgstr "" +#. module: hr_timesheet +#: model:ir.model,name:hr_timesheet.model_hr_timesheet_config_settings +msgid "hr.timesheet.config.settings" +msgstr "" + diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot index 3fa0ea49d9f..4d92d03e025 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "" #. module: im_livechat #. openerp-web -#: code:addons/im_livechat/static/src/js/im_livechat.js:27 +#: code:addons/im_livechat/static/src/js/im_livechat.js:48 #, python-format msgid "Ask something ..." msgstr "" @@ -157,7 +157,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:50 #, python-format msgid "Chat with one of our collaborators" msgstr "" @@ -324,11 +324,6 @@ 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 "" @@ -347,7 +342,7 @@ msgstr "" #. module: im_livechat #. openerp-web -#: code:addons/im_livechat/static/src/js/im_livechat.js:30 +#: code:addons/im_livechat/static/src/js/im_livechat.js:51 #, python-format msgid "How may I help you?" msgstr "" @@ -513,8 +508,14 @@ msgid "Name" msgstr "" #. module: im_livechat +#: code:addons/im_livechat/models/mail_channel.py:126 +#, python-format +msgid "No history found" +msgstr "" + +#. module: im_livechat #. openerp-web -#: code:addons/im_livechat/static/src/js/im_livechat.js:117 +#: code:addons/im_livechat/static/src/js/im_livechat.js:150 #, python-format msgid "None of our collaborators seems to be available, please try again later." msgstr "" @@ -585,12 +586,14 @@ msgstr "" #. module: im_livechat #: model:ir.model,name:im_livechat.model_rating_rating +#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_form +#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree msgid "Rating" msgstr "" #. module: im_livechat #. openerp-web -#: code:addons/im_livechat/static/src/js/im_livechat.js:311 +#: code:addons/im_livechat/static/src/js/im_livechat.js:344 #, python-format msgid "Rating: :rating_%d" msgstr "" @@ -628,6 +631,12 @@ msgid "Search report" msgstr "" #. module: im_livechat +#: code:addons/im_livechat/models/mail_channel.py:114 +#, python-format +msgid "See 15 last visited pages" +msgstr "" + +#. module: im_livechat #: 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 "Session Date" @@ -751,7 +760,7 @@ msgstr "" #. module: im_livechat #. openerp-web #: code:addons/im_livechat/controllers/main.py:37 -#: code:addons/im_livechat/static/src/js/im_livechat.js:28 +#: code:addons/im_livechat/static/src/js/im_livechat.js:49 #, python-format msgid "Visitor" msgstr "" diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index b6e05f70bba..bd6e0be0ab2 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgid "\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" +" <img src=\"/logo.png\" style=\"padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;\" alt=\"${user.company_id.name}\">\n" " </td>\n" "</tr>\n" "<tr>\n" @@ -65,16 +65,18 @@ msgid "\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" +" <p style=\"background-color: #f2dede; padding: 5px; margin-bottom: 16px;\">\n" +" <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification.\n" +" </p>\n" " % endif\n" " </td>\n" "</tr>\n" "</tbody></table>\n" "</div>\n" "% endif\n" -"${object.body | safe}\n" +"<div>\n" +" ${object.body | safe}\n" +"</div>\n" "% if ctx.get('tracking'):\n" " <ul>\n" " % for tracking in ctx['tracking']\n" @@ -97,7 +99,7 @@ msgid "\n" " </a>\n" " % endif\n" " using\n" -" <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n" +" <a target=\"_blank\" href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #875A7B;\">Odoo</a>.\n" "</p>\n" "</div>" msgstr "" @@ -127,13 +129,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/activity.js:32 +#: code:addons/mail/static/src/js/activity.js:33 #, python-format msgid "%d days overdue" msgstr "" #. module: mail -#: code:addons/mail/models/mail_template.py:241 +#: code:addons/mail/models/mail_template.py:236 #, python-format msgid "%s (copy)" msgstr "" @@ -145,7 +147,7 @@ msgid "%s created" msgstr "" #. module: mail -#: code:addons/mail/models/res_users.py:69 +#: code:addons/mail/models/res_users.py:76 #, python-format msgid "%s has joined the %s network." msgstr "" @@ -283,6 +285,7 @@ msgstr "" #: 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_mail_test_alias_defaults msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias." msgstr "" @@ -302,6 +305,7 @@ msgstr "" #: 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_move_message_needaction +#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction #: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction #: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction #: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction @@ -378,9 +382,9 @@ msgid "Active domain" msgstr "" #. module: mail -#: model:ir.actions.act_window,name:mail.mail_activity_type_action #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_ids #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_ids +#: model:ir.model.fields,field_description:mail.field_event_track_activity_ids #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_ids #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_ids #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_ids @@ -397,6 +401,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_sale_order_activity_ids #: model:ir.model.fields,field_description:mail.field_stock_picking_activity_ids #: model:ir.model.fields,field_description:mail.field_survey_survey_activity_ids +#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form #: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree #: model:mail.message.subtype,name:mail.mt_activities @@ -424,6 +429,13 @@ msgid "Activity Type" msgstr "" #. module: mail +#: model:ir.actions.act_window,name:mail.mail_activity_type_action +#: model:ir.ui.menu,name:mail.menu_mail_activity_type +#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail +msgid "Activity Types" +msgstr "" + +#. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:80 #, python-format @@ -501,12 +513,14 @@ msgstr "" #: 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_mail_test_alias_contact #: model:ir.model.fields,field_description:mail.field_res_users_alias_contact msgid "Alias Contact Security" msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_base_config_settings_alias_domain +#: model:ir.model.fields,field_description:mail.field_hr_timesheet_config_settings_alias_domain msgid "Alias Domain" msgstr "" @@ -514,6 +528,7 @@ msgstr "" #: 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_mail_test_alias_name msgid "Alias Name" msgstr "" @@ -521,6 +536,7 @@ msgstr "" #: 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_mail_test_alias_domain msgid "Alias domain" msgstr "" @@ -528,6 +544,7 @@ msgstr "" #: 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_mail_test_alias_model_id msgid "Aliased Model" msgstr "" @@ -545,8 +562,8 @@ msgid "All" msgstr "" #. module: mail -#: selection:res.partner,notify_email:0 -msgid "All Messages" +#: selection:ir.model.fields,track_visibility:0 +msgid "Always" msgstr "" #. module: mail @@ -583,11 +600,6 @@ msgid "Assigned to" msgstr "" #. module: mail -#: model:ir.ui.view,arch_db:mail.message_activity_assigned -msgid "Assigned to:" -msgstr "" - -#. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form msgid "Attach a file" msgstr "" @@ -785,7 +797,7 @@ msgstr "" #. module: mail #. openerp-web #: 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/client_action.xml:126 #: 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 @@ -907,6 +919,11 @@ msgid "Composition mode" msgstr "" #. module: mail +#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail +msgid "Configure your activity types" +msgstr "" + +#. module: mail #. openerp-web #: code:addons/mail/static/src/xml/thread.xml:24 #, python-format @@ -914,6 +931,11 @@ msgid "Congratulations, your inbox is empty" msgstr "" #. module: mail +#: model:ir.model,name:mail.model_res_partner +msgid "Contact" +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" @@ -952,7 +974,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:334 +#: code:addons/mail/static/src/js/client_action.js:315 #, python-format msgid "Create %s" msgstr "" @@ -1039,6 +1061,7 @@ msgstr "" #: 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_move_message_last_post +#: model:ir.model.fields,help:mail.field_account_payment_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 @@ -1124,6 +1147,7 @@ msgstr "" #: 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_mail_test_alias_defaults msgid "Default Values" msgstr "" @@ -1175,6 +1199,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_channel_description #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_description #: model:ir.model.fields,field_description:mail.field_mail_shortcode_description +#: model:ir.model.fields,field_description:mail.field_mail_test_description #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form msgid "Description" msgstr "" @@ -1198,6 +1223,7 @@ msgstr "" #. module: mail #: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat +#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail msgid "Discuss" msgstr "" @@ -1264,7 +1290,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/activity.js:38 +#: code:addons/mail/static/src/js/activity.js:39 #, python-format msgid "Due in %d days" msgstr "" @@ -1276,7 +1302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/activity.xml:23 +#: code:addons/mail/static/src/xml/activity.xml:30 #, python-format msgid "Edit" msgstr "" @@ -1320,12 +1346,6 @@ msgid "Email Configuration" msgstr "" #. module: mail -#: model:ir.model.fields,field_description:mail.field_res_partner_notify_email -#: model:ir.model.fields,field_description:mail.field_res_users_notify_email -msgid "Email Messages and Notifications" -msgstr "" - -#. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "Email Preview" msgstr "" @@ -1392,7 +1412,6 @@ msgstr "" #. module: mail #: model:ir.actions.act_window,name:mail.action_view_mail_mail #: model:ir.ui.menu,name:mail.menu_mail_mail -#: model:ir.ui.view,arch_db:mail.base_config_settings_view_form_inherit_mail #: model:ir.ui.view,arch_db:mail.view_mail_tree msgid "Emails" msgstr "" @@ -1404,7 +1423,7 @@ msgid "Error during communication with the publisher warranty server." msgstr "" #. module: mail -#: code:addons/mail/models/mail_mail.py:255 +#: code:addons/mail/models/mail_mail.py:304 #, python-format msgid "Error without exception. Probably due do sending an email without computed recipients." msgstr "" @@ -1442,6 +1461,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_base_config_settings_fail_counter +#: model:ir.model.fields,field_description:mail.field_hr_timesheet_config_settings_fail_counter msgid "Fail Mail" msgstr "" @@ -1451,7 +1471,7 @@ msgid "Failed" msgstr "" #. module: mail -#: code:addons/mail/models/mail_template.py:379 +#: code:addons/mail/models/mail_template.py:374 #, python-format msgid "Failed to render template %r using values %r" msgstr "" @@ -1482,6 +1502,12 @@ msgid "Field" msgstr "" #. module: mail +#: code:addons/mail/models/ir_model.py:23 +#, python-format +msgid "Field \"Mail Thread\" cannot be changed to \"False\"." +msgstr "" + +#. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field_desc msgid "Field Description" msgstr "" @@ -1497,6 +1523,11 @@ msgid "Field used to link the related model to the subtype model when using auto msgstr "" #. module: mail +#: model:ir.model,name:mail.model_ir_model_fields +msgid "Fields" +msgstr "" + +#. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_copyvalue #: model:ir.model.fields,help:mail.field_mail_template_copyvalue msgid "Final placeholder expression, to be copy-pasted in the desired template field." @@ -1522,6 +1553,7 @@ msgstr "" #: 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_move_message_follower_ids +#: model:ir.model.fields,field_description:mail.field_account_payment_message_follower_ids #: model:ir.model.fields,field_description:mail.field_account_voucher_message_follower_ids #: model:ir.model.fields,field_description:mail.field_blog_blog_message_follower_ids #: model:ir.model.fields,field_description:mail.field_blog_post_message_follower_ids @@ -1589,6 +1621,7 @@ msgstr "" #: 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_move_message_channel_ids +#: model:ir.model.fields,field_description:mail.field_account_payment_message_channel_ids #: model:ir.model.fields,field_description:mail.field_account_voucher_message_channel_ids #: model:ir.model.fields,field_description:mail.field_blog_blog_message_channel_ids #: model:ir.model.fields,field_description:mail.field_blog_post_message_channel_ids @@ -1654,6 +1687,7 @@ msgstr "" #: 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_move_message_partner_ids +#: model:ir.model.fields,field_description:mail.field_account_payment_message_partner_ids #: model:ir.model.fields,field_description:mail.field_account_voucher_message_partner_ids #: model:ir.model.fields,field_description:mail.field_blog_blog_message_partner_ids #: model:ir.model.fields,field_description:mail.field_blog_post_message_partner_ids @@ -1752,7 +1786,7 @@ msgid "Gateway" msgstr "" #. module: mail -#: code:addons/mail/models/res_users.py:46 +#: code:addons/mail/models/res_users.py:53 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -1775,9 +1809,17 @@ msgid "Groups" msgstr "" #. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:212 -#, python-format +#: selection:res.users,notification_type:0 +msgid "Handle by Emails" +msgstr "" + +#. module: mail +#: selection:res.users,notification_type:0 +msgid "Handle in Odoo" +msgstr "" + +#. module: mail +#: model:ir.ui.view,arch_db:mail.view_message_search msgid "Has Mentions" msgstr "" @@ -1831,6 +1873,7 @@ msgstr "" #: 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_mail_test_alias_parent_thread_id msgid "ID of the parent record holding the alias (example: project holding the task creation alias)" msgstr "" @@ -1859,6 +1902,7 @@ msgstr "" #: 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_move_message_unread +#: model:ir.model.fields,help:mail.field_account_payment_message_unread #: model:ir.model.fields,help:mail.field_account_voucher_message_unread #: model:ir.model.fields,help:mail.field_blog_blog_message_unread #: model:ir.model.fields,help:mail.field_blog_post_message_unread @@ -1924,6 +1968,7 @@ msgstr "" #: 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_move_message_needaction +#: model:ir.model.fields,help:mail.field_account_payment_message_needaction #: model:ir.model.fields,help:mail.field_account_voucher_message_needaction #: model:ir.model.fields,help:mail.field_blog_blog_message_needaction #: model:ir.model.fields,help:mail.field_blog_post_message_needaction @@ -2013,6 +2058,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_base_config_settings_alias_domain +#: model:ir.model.fields,help:mail.field_hr_timesheet_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 "" @@ -2024,7 +2070,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:1036 +#: code:addons/mail/static/src/js/chat_manager.js:1038 #: code:addons/mail/static/src/xml/client_action.xml:22 #: code:addons/mail/static/src/xml/systray.xml:6 #, python-format @@ -2057,7 +2103,7 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1774 +#: code:addons/mail/models/mail_thread.py:1787 #, python-format msgid "Invalid record set: should be called as model (without records) or on single-record recordset" msgstr "" @@ -2070,7 +2116,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:621 +#: code:addons/mail/static/src/js/chat_manager.js:623 #, python-format msgid "Invitation" msgstr "" @@ -2083,8 +2129,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:42 -#: code:addons/mail/static/src/xml/client_action.xml:134 +#: code:addons/mail/static/src/js/client_action.js:41 +#: code:addons/mail/static/src/xml/client_action.xml:127 #, python-format msgid "Invite" msgstr "" @@ -2098,15 +2144,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:33 -#: code:addons/mail/static/src/xml/client_action.xml:134 +#: code:addons/mail/static/src/js/client_action.js:32 +#: code:addons/mail/static/src/xml/client_action.xml:127 #, python-format msgid "Invite people" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:671 +#: code:addons/mail/static/src/js/client_action.js:644 #, python-format msgid "Invite people to #%s" msgstr "" @@ -2127,6 +2173,7 @@ msgstr "" #: 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_move_message_is_follower +#: model:ir.model.fields,field_description:mail.field_account_payment_message_is_follower #: model:ir.model.fields,field_description:mail.field_account_voucher_message_is_follower #: model:ir.model.fields,field_description:mail.field_blog_blog_message_is_follower #: model:ir.model.fields,field_description:mail.field_blog_post_message_is_follower @@ -2233,6 +2280,7 @@ msgstr "" #: 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_move_message_last_post +#: model:ir.model.fields,field_description:mail.field_account_payment_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 @@ -2414,7 +2462,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:40 +#: code:addons/mail/static/src/js/chatter.js:41 #, python-format msgid "Log" msgstr "" @@ -2471,12 +2519,18 @@ msgid "Mail Channel Form" msgstr "" #. module: mail -#: code:addons/mail/models/mail_mail.py:321 +#: code:addons/mail/models/mail_mail.py:371 #, python-format msgid "Mail Delivery Failed" msgstr "" #. module: mail +#: model:ir.model.fields,field_description:mail.field_ir_model_is_mail_thread +#: model:ir.ui.view,arch_db:mail.model_search_view +msgid "Mail Thread" +msgstr "" + +#. module: mail #: model:ir.model,name:mail.model_mail_tracking_value msgid "Mail Tracking Value" msgstr "" @@ -2505,14 +2559,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:135 +#: code:addons/mail/static/src/xml/client_action.xml:128 #, python-format msgid "Mark all as read" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:135 +#: code:addons/mail/static/src/xml/client_action.xml:128 #, python-format msgid "Mark all read" msgstr "" @@ -2613,7 +2667,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:124 +#: code:addons/mail/static/src/xml/client_action.xml:117 #, python-format msgid "Message sent in \"" msgstr "" @@ -2664,6 +2718,7 @@ msgstr "" #: 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_move_message_ids +#: model:ir.model.fields,field_description:mail.field_account_payment_message_ids #: model:ir.model.fields,field_description:mail.field_account_voucher_message_ids #: model:ir.model.fields,field_description:mail.field_blog_blog_message_ids #: model:ir.model.fields,field_description:mail.field_blog_post_message_ids @@ -2762,6 +2817,11 @@ msgid "Model the subtype applies to. If False, this subtype applies to all model msgstr "" #. module: mail +#: model:ir.model,name:mail.model_ir_model +msgid "Models" +msgstr "" + +#. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search msgid "Month" msgstr "" @@ -2816,11 +2876,6 @@ msgid "Needaction Recipient" msgstr "" #. module: mail -#: selection:res.partner,notify_email:0 -msgid "Never" -msgstr "" - -#. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char msgid "New Value Char" msgstr "" @@ -2876,7 +2931,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:80 +#: code:addons/mail/static/src/js/client_action.js:79 #, python-format msgid "New people" msgstr "" @@ -2889,6 +2944,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_date_deadline #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_date_deadline +#: model:ir.model.fields,field_description:mail.field_event_track_activity_date_deadline #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_date_deadline #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_date_deadline #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_date_deadline @@ -2911,6 +2967,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_summary #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_summary +#: model:ir.model.fields,field_description:mail.field_event_track_activity_summary #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_summary #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_summary #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_summary @@ -2933,6 +2990,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_type_id #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_type_id +#: model:ir.model.fields,field_description:mail.field_event_track_activity_type_id #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_type_id #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_type_id #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_type_id @@ -3014,6 +3072,11 @@ msgid "Notification" msgstr "" #. module: mail +#: model:ir.model.fields,field_description:mail.field_res_users_notification_type +msgid "Notification Management" +msgstr "" + +#. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_notification_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_notification_ids #: model:ir.model.fields,field_description:mail.field_mail_message_notification_ids @@ -3039,6 +3102,7 @@ msgstr "" #: 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_move_message_needaction_counter +#: model:ir.model.fields,field_description:mail.field_account_payment_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_account_voucher_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_blog_blog_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_blog_post_message_needaction_counter @@ -3109,6 +3173,7 @@ msgstr "" #: 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_move_message_needaction_counter +#: model:ir.model.fields,help:mail.field_account_payment_message_needaction_counter #: model:ir.model.fields,help:mail.field_account_voucher_message_needaction_counter #: model:ir.model.fields,help:mail.field_blog_blog_message_needaction_counter #: model:ir.model.fields,help:mail.field_blog_post_message_needaction_counter @@ -3174,6 +3239,7 @@ msgstr "" #: 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_move_message_unread_counter +#: model:ir.model.fields,help:mail.field_account_payment_message_unread_counter #: model:ir.model.fields,help:mail.field_account_voucher_message_unread_counter #: model:ir.model.fields,help:mail.field_blog_blog_message_unread_counter #: model:ir.model.fields,help:mail.field_blog_post_message_unread_counter @@ -3240,7 +3306,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:134 +#: code:addons/mail/static/src/js/client_action.js:125 #, python-format msgid "Odoo has now the permission to send you native notifications on this device." msgstr "" @@ -3254,7 +3320,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:132 +#: code:addons/mail/static/src/js/client_action.js:123 #, python-format msgid "Odoo will not have the permission to send native notifications on this device." msgstr "" @@ -3297,6 +3363,11 @@ msgid "Old Value Text" msgstr "" #. module: mail +#: selection:ir.model.fields,track_visibility:0 +msgid "On Change" +msgstr "" + +#. module: mail #. openerp-web #: code:addons/mail/static/src/js/tour.js:24 #, python-format @@ -3318,6 +3389,12 @@ msgid "Online" msgstr "" #. module: mail +#: code:addons/mail/models/ir_model.py:21 +#, python-format +msgid "Only custom models can be modified." +msgstr "" + +#. module: mail #: selection:mail.channel.partner,fold_state:0 msgid "Open" msgstr "" @@ -3334,7 +3411,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:138 +#: code:addons/mail/static/src/xml/client_action.xml:131 #, python-format msgid "Open channel settings" msgstr "" @@ -3363,6 +3440,7 @@ msgstr "" #: 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_mail_test_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 "" @@ -3418,6 +3496,7 @@ msgstr "" #. module: mail #: selection:account.invoice,activity_state:0 #: selection:crm.lead,activity_state:0 +#: selection:event.track,activity_state:0 #: selection:hr.applicant,activity_state:0 #: selection:mail.activity,state:0 #: selection:mail.activity.mixin,activity_state:0 @@ -3452,6 +3531,7 @@ msgstr "" #: 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_mail_test_alias_user_id msgid "Owner" msgstr "" @@ -3472,6 +3552,7 @@ msgstr "" #: 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_mail_test_alias_parent_model_id msgid "Parent Model" msgstr "" @@ -3479,6 +3560,7 @@ msgstr "" #: 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_mail_test_alias_parent_thread_id msgid "Parent Record Thread ID" msgstr "" @@ -3486,6 +3568,7 @@ msgstr "" #: 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_mail_test_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 "" @@ -3495,17 +3578,12 @@ msgid "Parent subtype, used for automatic subscription. This field is not correc msgstr "" #. module: mail -#: model:ir.model,name:mail.model_res_partner -msgid "Partner" -msgstr "" - -#. module: mail #: model:ir.actions.act_window,name:mail.action_partner_mass_mail msgid "Partner Mass Mailing" msgstr "" #. module: mail -#: code:addons/mail/models/res_partner.py:39 +#: code:addons/mail/models/res_partner.py:31 #, python-format msgid "Partner Profile" msgstr "" @@ -3532,14 +3610,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:132 +#: code:addons/mail/static/src/js/client_action.js:123 #, python-format msgid "Permission denied" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:134 +#: code:addons/mail/static/src/js/client_action.js:125 #, python-format msgid "Permission granted" msgstr "" @@ -3560,8 +3638,8 @@ msgstr "" #: selection:account.invoice,activity_state:0 #: code:addons/mail/static/src/xml/activity.xml:5 #: selection:crm.lead,activity_state:0 +#: selection:event.track,activity_state:0 #: selection:hr.applicant,activity_state:0 -#: model:ir.ui.view,arch_db:mail.message_activity_assigned #: selection:mail.activity,state:0 #: selection:mail.activity.mixin,activity_state:0 #: selection:maintenance.equipment,activity_state:0 @@ -3583,29 +3661,37 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:193 +#: code:addons/mail/static/src/js/chatter.js:194 #, python-format msgid "Please complete partner's informations" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/many2many_tags_email.js:68 +#: code:addons/mail/static/src/js/many2many_tags_email.js:66 #, python-format msgid "Please complete partner's informations and Email" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:654 +#: code:addons/mail/static/src/js/composer.js:655 #, python-format msgid "Please, wait while the file is uploading." msgstr "" #. module: mail +#: model:ir.model.fields,help:mail.field_res_users_notification_type +msgid "Policy on how to handle Chatter notifications:\n" +"- Emails: notifications are sent to your email\n" +"- Odoo: notifications appear in your Odoo Inbox" +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_mail_test_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" "- everyone: everyone can post\n" @@ -3615,14 +3701,6 @@ msgid "Policy to post a message on the document using the mailgateway.\n" msgstr "" #. module: mail -#: model:ir.model.fields,help:mail.field_res_partner_notify_email -#: model:ir.model.fields,help:mail.field_res_users_notify_email -msgid "Policy to receive emails for new messages pushed to your personal Inbox:\n" -"- Never: no emails are sent\n" -"- All Messages: for every notification you receive in your Inbox" -msgstr "" - -#. module: mail #: model:ir.ui.view,arch_db:mail.message_user_assigned msgid "Powered by" msgstr "" @@ -3663,7 +3741,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:146 +#: code:addons/mail/static/src/js/client_action.js:137 #, python-format msgid "Public Channels" msgstr "" @@ -3711,6 +3789,7 @@ msgstr "" #: 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_mail_test_alias_force_thread_id msgid "Record Thread ID" msgstr "" @@ -3771,7 +3850,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/activity.xml:24 +#: code:addons/mail/static/src/xml/activity.xml:31 #, python-format msgid "Remove" msgstr "" @@ -3823,6 +3902,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_user_id #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_user_id +#: model:ir.model.fields,field_description:mail.field_event_track_activity_user_id #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_user_id #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_user_id #: model:ir.model.fields,field_description:mail.field_maintenance_equipment_activity_user_id @@ -3859,7 +3939,7 @@ msgid "Rich-text/HTML message" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:829 +#: code:addons/mail/models/mail_thread.py:831 #, python-format msgid "Routing mail with Message-Id %s: route %s: %s" msgstr "" @@ -3924,11 +4004,6 @@ msgid "Scheduled Send Date" msgstr "" #. module: mail -#: model:ir.ui.view,arch_db:mail.message_activity_assigned -msgid "Scheduled for:" -msgstr "" - -#. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_alias_search msgid "Search Alias" msgstr "" @@ -3964,7 +4039,7 @@ msgid "Send Email" msgstr "" #. module: mail -#: code:addons/mail/models/mail_template.py:262 +#: code:addons/mail/models/mail_template.py:257 #, python-format msgid "Send Mail (%s)" msgstr "" @@ -4000,7 +4075,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:395 +#: code:addons/mail/static/src/js/chatter.js:396 #, python-format msgid "Sending Error" msgstr "" @@ -4032,7 +4107,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:138 +#: code:addons/mail/static/src/xml/client_action.xml:131 #, python-format msgid "Settings" msgstr "" @@ -4119,7 +4194,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:1042 +#: code:addons/mail/static/src/js/chat_manager.js:1044 #: 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 @@ -4132,6 +4207,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_account_invoice_activity_state #: model:ir.model.fields,field_description:mail.field_crm_lead_activity_state +#: model:ir.model.fields,field_description:mail.field_event_track_activity_state #: model:ir.model.fields,field_description:mail.field_hr_applicant_activity_state #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin_activity_state #: model:ir.model.fields,field_description:mail.field_mail_activity_state @@ -4162,6 +4238,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_account_invoice_activity_state #: model:ir.model.fields,help:mail.field_crm_lead_activity_state +#: model:ir.model.fields,help:mail.field_event_track_activity_state #: model:ir.model.fields,help:mail.field_hr_applicant_activity_state #: model:ir.model.fields,help:mail.field_mail_activity_mixin_activity_state #: model:ir.model.fields,help:mail.field_maintenance_equipment_activity_state @@ -4237,7 +4314,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id #: model:ir.model.fields,field_description:mail.field_mail_followers_subtype_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_subtype_id -#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2012 +#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_id_2047 #: 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" @@ -4300,6 +4377,7 @@ msgstr "" #: 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_mail_test_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 "" @@ -4307,6 +4385,7 @@ msgstr "" #: 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_mail_test_alias_name msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>" msgstr "" @@ -4314,6 +4393,7 @@ msgstr "" #: 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_mail_test_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 "" @@ -4392,9 +4472,10 @@ msgstr "" #. module: mail #. openerp-web #: selection:account.invoice,activity_state:0 -#: code:addons/mail/static/src/js/activity.js:26 +#: code:addons/mail/static/src/js/activity.js:27 #: code:addons/mail/static/src/js/thread.js:231 #: selection:crm.lead,activity_state:0 +#: selection:event.track,activity_state:0 #: selection:hr.applicant,activity_state:0 #: selection:mail.activity,state:0 #: selection:mail.activity.mixin,activity_state:0 @@ -4428,14 +4509,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:133 +#: code:addons/mail/static/src/xml/client_action.xml:126 #, python-format msgid "Toggle Channels" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/activity.js:36 +#: code:addons/mail/static/src/js/activity.js:37 #, python-format msgid "Tomorrow" msgstr "" @@ -4454,6 +4535,7 @@ msgid "Tracked values are stored in a separate model. This field allow to recons msgstr "" #. module: mail +#: model:ir.model.fields,field_description:mail.field_ir_model_fields_track_visibility #: model:ir.ui.view,arch_db:mail.view_message_form msgid "Tracking" msgstr "" @@ -4492,16 +4574,15 @@ msgid "UUID" msgstr "" #. module: mail -#: code:addons/mail/models/mail_message.py:30 +#: code:addons/mail/models/mail_mail.py:237 #, python-format -msgid "Unable to send email, please configure the sender's email address." +msgid "Unable to connect to SMTP Server" msgstr "" #. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:119 +#: code:addons/mail/models/mail_message.py:30 #, python-format -msgid "Undo" +msgid "Unable to send email, please configure the sender's email address." msgstr "" #. module: mail @@ -4523,6 +4604,7 @@ msgstr "" #: 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_move_message_unread +#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread #: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread #: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread #: model:ir.model.fields,field_description:mail.field_blog_post_message_unread @@ -4588,6 +4670,7 @@ msgstr "" #: 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_move_message_unread_counter +#: model:ir.model.fields,field_description:mail.field_account_payment_message_unread_counter #: model:ir.model.fields,field_description:mail.field_account_voucher_message_unread_counter #: model:ir.model.fields,field_description:mail.field_blog_blog_message_unread_counter #: model:ir.model.fields,field_description:mail.field_blog_post_message_unread_counter @@ -4654,28 +4737,28 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:136 +#: code:addons/mail/static/src/xml/client_action.xml:129 #, python-format msgid "Unstar all" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:136 +#: code:addons/mail/static/src/xml/client_action.xml:129 #, python-format msgid "Unstar all messages" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:137 +#: code:addons/mail/static/src/xml/client_action.xml:130 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:137 +#: code:addons/mail/static/src/xml/client_action.xml:130 #, python-format msgid "Unsubscribe from channel" msgstr "" @@ -4695,7 +4778,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:654 +#: code:addons/mail/static/src/js/composer.js:655 #, python-format msgid "Uploading error" msgstr "" @@ -4774,12 +4857,22 @@ msgid "When a relationship field is selected as first field, this field shows th msgstr "" #. module: mail +#: model:ir.model.fields,help:mail.field_ir_model_fields_track_visibility +msgid "When set, every modification to this field will be tracked in the chatter." +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 "" #. module: mail +#: model:ir.model.fields,help:mail.field_ir_model_is_mail_thread +msgid "Whether this model supports messages and notifications." +msgstr "" + +#. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Who can follow the group's activities?" msgstr "" @@ -4793,7 +4886,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/activity.js:30 +#: code:addons/mail/static/src/js/activity.js:31 #: code:addons/mail/static/src/js/thread.js:233 #, python-format msgid "Yesterday" @@ -4801,7 +4894,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:79 +#: code:addons/mail/static/src/js/client_action.js:78 #, python-format msgid "You added <b>%s</b> to the conversation." msgstr "" @@ -4832,7 +4925,7 @@ 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:45 +#: code:addons/mail/models/res_users.py:52 #, python-format msgid "You cannot create a new user from here.\n" " To create new user please go to configuration panel." @@ -4857,7 +4950,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:621 +#: code:addons/mail/static/src/js/chat_manager.js:623 #, python-format msgid "You have been invited to: " msgstr "" @@ -4870,21 +4963,21 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:517 +#: code:addons/mail/static/src/js/chat_manager.js:519 #, 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:515 +#: code:addons/mail/static/src/js/chat_manager.js:517 #, python-format msgid "You unsubscribed from <b>%s</b>." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:395 +#: code:addons/mail/static/src/js/chatter.js:396 #, python-format msgid "Your message has not been sent." msgstr "" @@ -4896,13 +4989,13 @@ msgid "Your template should define email_from" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:963 +#: code:addons/mail/models/mail_thread.py:965 #, python-format msgid "alias %s does not accept unknown author" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:959 +#: code:addons/mail/models/mail_thread.py:961 #, python-format msgid "alias %s restricted to internal followers" msgstr "" @@ -4954,6 +5047,13 @@ msgid "followers" msgstr "" #. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/activity.xml:25 +#, python-format +msgid "for" +msgstr "" + +#. module: mail #: model:ir.ui.view,arch_db:mail.message_origin_link msgid "from:" msgstr "" @@ -4989,26 +5089,19 @@ msgid "members" msgstr "" #. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:118 -#, python-format -msgid "mention(s) marked as read." -msgstr "" - -#. module: mail -#: code:addons/mail/models/mail_thread.py:938 +#: code:addons/mail/models/mail_thread.py:940 #, python-format msgid "model %s does not accept document creation" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:933 +#: code:addons/mail/models/mail_thread.py:935 #, python-format msgid "model %s does not accept document update" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:926 +#: code:addons/mail/models/mail_thread.py:928 #, python-format msgid "model %s does not accept document update, fall back on document creation" msgstr "" @@ -5040,19 +5133,19 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/activity.xml:16 +#: code:addons/mail/static/src/xml/activity.xml:21 #, python-format msgid "planned by" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:908 +#: code:addons/mail/models/mail_thread.py:910 #, python-format msgid "posting a message without model should be with a null res_id (private message), received %s" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:912 +#: code:addons/mail/models/mail_thread.py:914 #, python-format msgid "posting a message without model should be with a parent_id (private message)" msgstr "" @@ -5082,35 +5175,30 @@ msgid "record:" msgstr "" #. module: mail -#: model:ir.ui.view,arch_db:mail.message_activity_assigned -msgid "related to" -msgstr "" - -#. module: mail -#: code:addons/mail/models/mail_thread.py:930 +#: code:addons/mail/models/mail_thread.py:932 #, python-format msgid "reply to missing document (%s,%s)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:923 +#: code:addons/mail/models/mail_thread.py:925 #, python-format msgid "reply to missing document (%s,%s), fall back on new document creation" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:908 +#: code:addons/mail/models/mail_thread.py:910 #, python-format msgid "resetting thread_id" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:912 -#: code:addons/mail/models/mail_thread.py:930 -#: code:addons/mail/models/mail_thread.py:933 -#: code:addons/mail/models/mail_thread.py:938 -#: code:addons/mail/models/mail_thread.py:959 -#: code:addons/mail/models/mail_thread.py:963 +#: code:addons/mail/models/mail_thread.py:914 +#: code:addons/mail/models/mail_thread.py:932 +#: code:addons/mail/models/mail_thread.py:935 +#: code:addons/mail/models/mail_thread.py:940 +#: code:addons/mail/models/mail_thread.py:961 +#: code:addons/mail/models/mail_thread.py:965 #, python-format msgid "skipping" msgstr "" @@ -5123,7 +5211,7 @@ msgid "this document" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:901 +#: code:addons/mail/models/mail_thread.py:903 #, python-format msgid "unknown target model %s" msgstr "" diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index 9003964bae1..b0c6f5cad1f 100644 --- a/addons/mass_mailing/i18n/mass_mailing.pot +++ b/addons/mass_mailing/i18n/mass_mailing.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgid "%<br/>\n" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:480 +#: code:addons/mass_mailing/models/mass_mailing.py:482 #, python-format msgid "%s (copy)" msgstr "" @@ -215,16 +215,6 @@ msgid "Active" msgstr "" #. module: mass_mailing -#: selection:mass.mailing.config.settings,group_mass_mailing_campaign:0 -msgid "Allow using marketing campaigns (advanced)" -msgstr "" - -#. module: mass_mailing -#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration -msgid "Apply" -msgstr "" - -#. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line msgid "Apps That Help You Grow Your Business" msgstr "" @@ -284,7 +274,7 @@ msgid "Bounced Ratio" msgstr "" #. module: mass_mailing -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3787 +#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_id_3844 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form msgid "Campaign" msgstr "" @@ -297,6 +287,7 @@ msgstr "" #. module: mass_mailing #: model:ir.ui.menu,name:mass_mailing.menu_view_mass_mailing_stages +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration msgid "Campaign Stages" msgstr "" @@ -308,7 +299,6 @@ 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 msgid "Campaigns" @@ -339,6 +329,11 @@ msgid "Choose" msgstr "" #. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "Choose among multiple email templates and styles" +msgstr "" + +#. module: mass_mailing #: model:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_lists msgid "Click here to create a new mailing list." msgstr "" @@ -546,6 +541,7 @@ msgid "Demo Signature" msgstr "" #. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration #: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_2 msgid "Design" msgstr "" @@ -565,11 +561,6 @@ msgid "Display Name" msgstr "" #. module: mass_mailing -#: selection:mass.mailing.config.settings,group_mass_mailing_campaign:0 -msgid "Do not organize and schedule mail campaigns (easy)" -msgstr "" - -#. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_res_id msgid "Document ID" msgstr "" @@ -585,7 +576,7 @@ msgid "Domain" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:488 +#: code:addons/mass_mailing/models/mass_mailing.py:490 #: selection:mail.mass_mailing,state:0 #: selection:mail.statistics.report,state:0 #, python-format @@ -608,11 +599,21 @@ msgid "Email" msgstr "" #. module: mass_mailing +#: model:ir.ui.menu,name:mass_mailing.mass_mailing_menu_root +msgid "Email Marketing" +msgstr "" + +#. module: mass_mailing #: model:ir.model,name:mass_mailing.model_mail_mail_statistics msgid "Email Statistics" msgstr "" #. module: mass_mailing +#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_mass_mailing_themes +msgid "Email Templates" +msgstr "" + +#. module: mass_mailing #: model:ir.model,name:mass_mailing.model_mail_thread msgid "Email Thread" msgstr "" @@ -634,6 +635,11 @@ msgid "Emails Statistics" msgstr "" #. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "Encourage to subscribe to mailing lists with a call-to-action" +msgstr "" + +#. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps msgid "Enjoy!" msgstr "" @@ -730,7 +736,7 @@ msgid "If checked, recipients will be mailed only once, allowing to send various msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:488 +#: code:addons/mass_mailing/models/mass_mailing.py:490 #: selection:mail.mass_mailing,state:0 #, python-format msgid "In Queue" @@ -802,6 +808,11 @@ msgid "Last state update of the mail" msgstr "" #. module: mass_mailing +#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_crm +msgid "Leads/Opportunities" +msgstr "" + +#. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics_links_click_ids msgid "Links click" msgstr "" @@ -827,7 +838,7 @@ msgid "Mail Body" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:300 +#: code:addons/mass_mailing/models/mass_mailing.py:302 #, python-format msgid "Mail Contacts" msgstr "" @@ -856,7 +867,7 @@ msgid "Mailing" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:301 +#: 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_list_name @@ -868,10 +879,11 @@ msgstr "" #. module: mass_mailing #: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_lists #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids -#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3811 +#: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact_list_ids_3868 #: model:ir.ui.menu,name:mass_mailing.menu_email_mass_mailing_lists #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_search #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_tree +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration msgid "Mailing Lists" msgstr "" @@ -906,8 +918,13 @@ msgid "Manage Mass Mailing Campaigns" msgstr "" #. module: mass_mailing -#: model:ir.model.fields,help:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign -msgid "Manage mass mailign using Campaigns" +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "Manage campaigns of mass emails with process stages" +msgstr "" + +#. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "Manage mailing campaigns with your prospects" msgstr "" #. module: mass_mailing @@ -930,11 +947,9 @@ msgstr "" #: 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 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_graph -#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration msgid "Mass Mailing" msgstr "" @@ -963,6 +978,7 @@ msgstr "" #. module: mass_mailing #: model:ir.actions.act_window,name:mass_mailing.action_view_mass_mailing_campaigns +#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_search #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_tree msgid "Mass Mailing Campaigns" @@ -1026,12 +1042,6 @@ msgid "Mass mailing allows you to to easily design and send mass mailings to you 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 "" - -#. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign_medium_id #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_medium_id msgid "Medium" @@ -1049,7 +1059,6 @@ msgstr "" #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_event -#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration msgid "More Info" msgstr "" @@ -1185,7 +1194,7 @@ msgid "Percentage of the contacts that will be mailed. Recipients will be taken msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:606 +#: code:addons/mass_mailing/models/mass_mailing.py:671 #, python-format msgid "Please select recipients." msgstr "" @@ -1315,6 +1324,11 @@ msgid "Sample Mail Wizard" msgstr "" #. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "Save" +msgstr "" + +#. module: mass_mailing #: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_1 msgid "Schedule" msgstr "" @@ -1387,14 +1401,14 @@ msgid "Send to All" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:488 +#: code:addons/mass_mailing/models/mass_mailing.py:490 #: selection:mail.mass_mailing,state:0 #, python-format msgid "Sending" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:488 +#: code:addons/mass_mailing/models/mass_mailing.py:490 #: 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 @@ -1507,7 +1521,7 @@ msgid "Tags" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/models/mass_mailing.py:543 +#: code:addons/mass_mailing/models/mass_mailing.py:545 #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form #, python-format msgid "Test Mailing" @@ -1545,6 +1559,11 @@ msgid "The open source model of Odoo has allowed us to leverage thousands of dev msgstr "" #. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "This adds a new Newsletter snippet to drag & drop on on your website pages. This call-to-action prompts visitors to enter their email address to join a mailing list." +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 delivery method, e.g. Postcard, Email, or Banner Ad" @@ -1561,17 +1580,32 @@ msgid "This is the link source, e.g. Search Engine, another domain,or name of em msgstr "" #. module: mass_mailing +#: model:ir.model.fields,help:mass_mailing.field_mass_mailing_config_settings_group_mass_mailing_campaign +msgid "This is useful if your marketing campaigns are composed of several emails" +msgstr "" + +#. module: mass_mailing +#: model:ir.ui.view,arch_db:mass_mailing.view_mass_mailing_configuration +msgid "This is useful if your marketing campaigns are composed of several emails." +msgstr "" + +#. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form msgid "This mass mailing is scheduled for" 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_3787 +#: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_campaign_id_3844 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_mass_mailing_configuration +msgid "This tool is advised if your marketing campaign is composed of several emails." +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 "" @@ -1640,6 +1674,11 @@ msgid "We want to take this opportunity to welcome you to our ever-growing commu msgstr "" #. module: mass_mailing +#: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_config_settings_module_website_mass_mailing +msgid "Website Call-to-Action" +msgstr "" + +#. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph msgid "With strong technical foundations, Odoo's framework is unique.\n" " It provides top notch usability that scales across all apps." @@ -1658,7 +1697,7 @@ msgid "Write one paragraph describing your product,\n" msgstr "" #. module: mass_mailing -#: code:addons/mass_mailing/controllers/main.py:31 +#: code:addons/mass_mailing/controllers/main.py:32 #, python-format msgid "You have been unsubscribed successfully" msgstr "" diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot index 36ab98542f0..654afb32f35 100644 --- a/addons/membership/i18n/membership.pot +++ b/addons/membership/i18n/membership.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -127,6 +127,11 @@ msgid "Configuration" msgstr "" #. module: membership +#: model:ir.model,name:membership.model_res_partner +msgid "Contact" +msgstr "" + +#. module: membership #: model:ir.ui.view,arch_db:membership.view_partner_tree msgid "Contacts" msgstr "" @@ -509,7 +514,6 @@ msgid "Paid Member" msgstr "" #. module: membership -#: model:ir.model,name:membership.model_res_partner #: model:ir.model.fields,field_description:membership.field_membership_membership_line_partner msgid "Partner" msgstr "" diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot index be8d2e5b1f0..4c6f4fc40fa 100644 --- a/addons/mrp/i18n/mrp.pot +++ b/addons/mrp/i18n/mrp.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -249,6 +249,11 @@ msgid "Add a description..." msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Add by-products to bills of materials. This can be used to get several finished products as well. Without this option you only do: A + B = C. With the option: A + B = C + D." +msgstr "" + +#. module: mrp #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban msgid "All" msgstr "" @@ -271,11 +276,6 @@ msgid "An unbuild order will do a reverse bill of materials, unbuilding products msgstr "" #. module: mrp -#: model:ir.ui.view,arch_db:mrp.view_mrp_config -msgid "Apply" -msgstr "" - -#. module: mrp #: model:ir.ui.view,arch_db:mrp.view_change_production_qty_wizard msgid "Approve" msgstr "" @@ -294,6 +294,16 @@ msgid "Attachments" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Attributes" +msgstr "" + +#. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_product_variant +msgid "Attributes & Variants" +msgstr "" + +#. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree msgid "Author" msgstr "" @@ -410,11 +420,6 @@ msgid "Bills of Materials allow you to define the list of required raw\n" msgstr "" #. module: mrp -#: selection:mrp.config.settings,module_mrp_byproduct:0 -msgid "Bills of materials may produce residual products (A + B --> C + D)" -msgstr "" - -#. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_production_workcenter_form_view_inherit #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_block_wizard_form msgid "Block" @@ -510,7 +515,7 @@ msgid "Cancelled" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:268 +#: code:addons/mrp/models/mrp_production.py:279 #, python-format msgid "Cannot delete a manufacturing order not in cancel state" msgstr "" @@ -620,7 +625,6 @@ msgstr "" #: model:ir.model.fields,field_description:mrp.field_mrp_production_company_id #: model:ir.model.fields,field_description:mrp.field_mrp_routing_company_id #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter_company_id -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_company_id #: model:ir.ui.view,arch_db:mrp.view_mrp_workcenter_search msgid "Company" msgstr "" @@ -798,14 +802,14 @@ 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" +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_default_use_manufacturing_lead +msgid "Default Manufacturing Lead Time" msgstr "" #. module: mrp -#: model:ir.model.fields,help:mrp.field_mrp_workcenter_calendar_id -msgid "Define the schedule of resource" +#: 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 @@ -938,11 +942,6 @@ msgid "Efficiency" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_efficiency -msgid "Efficiency Factor" -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" @@ -959,11 +958,6 @@ 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.ui.view,arch_db:mrp.mrp_unbuild_search_view msgid "Filters" msgstr "" @@ -1031,6 +1025,11 @@ msgid "Gives the sequence order when displaying." msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Go through a production routing with work orders" +msgstr "" + +#. module: mrp #: model:ir.ui.view,arch_db:mrp.view_mrp_production_workcenter_form_view_filter msgid "Group By" msgstr "" @@ -1146,6 +1145,11 @@ msgid "Inventory Post Visible" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_production_unreserve_visible +msgid "Inventory Unreserve 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 "" @@ -1166,7 +1170,7 @@ msgid "Is a Blocking Reason" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workcenter.py:158 +#: code:addons/mrp/models/mrp_workcenter.py:162 #, python-format msgid "It has been unblocked already. " msgstr "" @@ -1255,7 +1259,7 @@ msgid "Late" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:374 +#: code:addons/mrp/models/mrp_production.py:385 #, python-format msgid "Lines need to be deleted, but can not as you still have some quantities to consume in them. " msgstr "" @@ -1276,12 +1280,7 @@ msgid "Location where the system will stock the finished products." msgstr "" #. module: mrp -#: model:ir.ui.view,arch_db:mrp.view_mrp_config -msgid "Logistics" -msgstr "" - -#. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9551 +#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_productivity_loss_id_9642 #: model:ir.ui.view,arch_db:mrp.oee_search_view msgid "Loss Reason" msgstr "" @@ -1316,22 +1315,7 @@ 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 "" - -#. module: mrp -#: selection:mrp.config.settings,group_mrp_routings:0 -msgid "Manage production by work orders" -msgstr "" - -#. module: mrp -#: selection:mrp.config.settings,module_quality_mrp:0 +#: model:ir.ui.view,arch_db:mrp.view_mrp_config msgid "Manage quality control points, checks and measures" msgstr "" @@ -1379,6 +1363,7 @@ msgid "Manufacturing" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_manufacturing_lead #: 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 @@ -1386,8 +1371,8 @@ msgid "Manufacturing Lead Time" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_manufacturing_lead -msgid "Manufacturing Lead Time *" +#: model:ir.model.fields,field_description:mrp.field_stock_warehouse_manu_type_id +msgid "Manufacturing Operation Type" msgstr "" #. module: mrp @@ -1397,7 +1382,6 @@ msgstr "" #: 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 "" @@ -1430,11 +1414,6 @@ msgid "Manufacturing Orders which are in confirmed state." msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_stock_warehouse_manu_type_id -msgid "Manufacturing Picking Type" -msgstr "" - -#. module: mrp #: 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" @@ -1505,6 +1484,11 @@ msgid "Move Done" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Move forward deadline start dates by" +msgstr "" + +#. module: mrp #: 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" @@ -1544,8 +1528,8 @@ msgstr "" #. module: mrp #: code:addons/mrp/models/mrp_production.py:46 -#: code:addons/mrp/models/mrp_production.py:257 -#: code:addons/mrp/models/mrp_production.py:258 +#: code:addons/mrp/models/mrp_production.py:268 +#: code:addons/mrp/models/mrp_production.py:269 #: code:addons/mrp/models/mrp_routing.py:18 #: code:addons/mrp/models/mrp_routing.py:34 #: code:addons/mrp/models/mrp_routing.py:35 @@ -1577,11 +1561,6 @@ msgid "No Routing" msgstr "" #. module: mrp -#: selection:mrp.config.settings,module_mrp_byproduct:0 -msgid "No by-products in bills of materials (A + B --> C)" -msgstr "" - -#. module: mrp #: model:ir.actions.act_window,help:mrp.action_mrp_routing_time #: model:ir.actions.act_window,help:mrp.mrp_workorder_delta_report msgid "No data to display. You will get here statistics about the\n" @@ -1589,21 +1568,6 @@ msgid "No data to display. You will get here statistics about the\n" msgstr "" #. module: mrp -#: selection:mrp.config.settings,module_mrp_maintenance:0 -msgid "No maintenance machine and work centers" -msgstr "" - -#. module: mrp -#: 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.config.settings,module_mrp_plm:0 -msgid "No product lifecycle management" -msgstr "" - -#. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_workcenter_productivity_loss_action msgid "No productivity loss defined." msgstr "" @@ -1614,16 +1578,6 @@ msgid "No productivity loss for this equipment." msgstr "" #. module: mrp -#: selection:mrp.config.settings,module_quality_mrp:0 -msgid "No quality control" -msgstr "" - -#. module: mrp -#: selection:mrp.config.settings,group_product_variant:0 -msgid "No variants on products" -msgstr "" - -#. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban msgid "No workorder currently in progress. Click to mark work center as blocked." msgstr "" @@ -1711,11 +1665,18 @@ msgid "Operation To Consume" 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 "Operation Type" +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.view_mrp_config #: 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 @@ -1758,11 +1719,6 @@ msgid "Overdue Activities" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_plm -msgid "PLM" -msgstr "" - -#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_bom_id msgid "Parent BoM" msgstr "" @@ -1807,14 +1763,13 @@ 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" +#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban +msgid "Plan Orders" msgstr "" #. module: mrp -#: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban -msgid "Plan Orders" +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Plan procurement orders based on forecasts" msgstr "" #. module: mrp @@ -1830,6 +1785,11 @@ msgid "Planned Date" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Planning" +msgstr "" + +#. module: mrp #: code:addons/mrp/models/mrp_workorder.py:269 #, python-format msgid "Please set the quantity you produced in the Current Qty field. It can not be 0!" @@ -1846,11 +1806,6 @@ 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 #: model:ir.model.fields,field_description:mrp.field_mrp_production_priority msgid "Priority" @@ -1884,6 +1839,11 @@ msgid "Produce Line" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Produce residual products (A + B -> C + D)" +msgstr "" + +#. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_production_form_view msgid "Produced" msgstr "" @@ -1912,6 +1872,11 @@ msgid "Product" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_plm +msgid "Product Lifecycle Management" +msgstr "" + +#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_bom_line_product_qty msgid "Product Quantity" msgstr "" @@ -1936,11 +1901,6 @@ msgid "Product Variant" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_group_product_variant -msgid "Product Variants" -msgstr "" - -#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_consume_line_ids msgid "Product to Track" msgstr "" @@ -2037,26 +1997,26 @@ msgstr "" #. module: mrp #: model:ir.actions.act_window,name:mrp.product_template_action #: model:ir.ui.menu,name:mrp.menu_mrp_product_form +#: model:ir.ui.view,arch_db:mrp.view_mrp_config msgid "Products" msgstr "" #. module: mrp -#: selection:mrp.config.settings,group_product_variant:0 -msgid "Products can have several attributes, defining variants (Example: size, color,...)" -msgstr "" - -#. module: mrp #: 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_config_settings_module_quality_mrp #: selection:mrp.workcenter.productivity.loss,loss_type:0 msgid "Quality" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_quality_mrp +msgid "Quality Control" +msgstr "" + +#. module: mrp #: model:ir.ui.view,arch_db:mrp.oee_search_view msgid "Quality Losses" msgstr "" @@ -2170,6 +2130,7 @@ msgstr "" #: model:ir.model.fields,field_description:mrp.field_mrp_production_name #: model:ir.model.fields,field_description:mrp.field_mrp_routing_code #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_name +#: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report msgid "Reference" msgstr "" @@ -2184,7 +2145,7 @@ msgid "Reference of the document that generated this production order request." msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:299 +#: code:addons/mrp/models/stock_move.py:320 #, python-format msgid "Register Lots" msgstr "" @@ -2200,8 +2161,13 @@ msgid "Related Procurements" msgstr "" #. module: mrp -#: model:ir.model.fields,help:mrp.field_mrp_workcenter_user_id -msgid "Related user name for the resource to manage its access." +#: model:ir.model.fields,field_description:mrp.field_mrp_config_settings_module_mrp_repair +msgid "Repair" +msgstr "" + +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Repair broken or damaged products" msgstr "" #. module: mrp @@ -2215,21 +2181,11 @@ msgid "Requires Serial" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_resource_id -msgid "Resource" -msgstr "" - -#. module: mrp #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp msgid "Resource Leaves" msgstr "" #. module: mrp -#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_resource_type -msgid "Resource Type" -msgstr "" - -#. module: mrp #: model:ir.ui.menu,name:mrp.menu_pm_resources_config msgid "Resources" msgstr "" @@ -2273,15 +2229,11 @@ msgstr "" #: 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 +#: model:ir.ui.view,arch_db:mrp.view_mrp_config 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" @@ -2292,11 +2244,27 @@ 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_mrp_config #: model:ir.ui.view,arch_db:mrp.view_stock_move_lots msgid "Save" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Save this page and come back here to set up the feature." +msgstr "" + +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Schedule maintenance activities" +msgstr "" + +#. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Schedule manufacturing orders earlier to avoid delays" +msgstr "" + +#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_date_planned_finished msgid "Scheduled Date Finished" msgstr "" @@ -2319,7 +2287,7 @@ msgid "Scheduled Month" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:547 +#: code:addons/mrp/models/mrp_production.py:558 #: code:addons/mrp/models/mrp_workorder.py:438 #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_scrap_ids #: model:ir.ui.menu,name:mrp.menu_mrp_scrap @@ -2372,6 +2340,11 @@ msgid "Search for mrp workcenter" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Security Lead Time" +msgstr "" + +#. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_config_settings_manufacturing_lead #: model:ir.model.fields,help:mrp.field_res_company_manufacturing_lead msgid "Security days for each manufacturing operation." @@ -2400,6 +2373,11 @@ msgid "Set duration manually" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Set product attributes (e.g. color, size) to manage variants" +msgstr "" + +#. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_config #: model:ir.ui.view,arch_db:mrp.mrp_workcenter_kanban #: model:ir.ui.view,arch_db:mrp.stock_production_type_kanban @@ -2513,6 +2491,11 @@ msgid "Technical field to check when we can post" msgstr "" #. module: mrp +#: model:ir.model.fields,help:mrp.field_mrp_production_unreserve_visible +msgid "Technical field to check when we can unreserve" +msgstr "" + +#. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_workorder_production_availability msgid "Technical: used in views and domains only." msgstr "" @@ -2538,7 +2521,7 @@ msgid "The Product Unit of Measure you chose has a different category than in th msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_workcenter.py:152 +#: code:addons/mrp/models/mrp_workcenter.py:156 #, python-format msgid "The capacity must be strictly positive." msgstr "" @@ -2564,6 +2547,11 @@ msgid "The number of products already handled by this work order" msgstr "" #. module: mrp +#: model:ir.model,name:mrp.model_stock_picking_type +msgid "The operation type determines the picking view" +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 "" @@ -2574,11 +2562,6 @@ msgid "The operations for producing this BoM. When a routing is specified, the msgstr "" #. module: mrp -#: 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 "" @@ -2611,6 +2594,11 @@ msgid "Time" msgstr "" #. module: mrp +#: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_efficiency +msgid "Time Efficiency" +msgstr "" + +#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_workcenter_time_ids msgid "Time Logs" msgstr "" @@ -2707,7 +2695,7 @@ msgstr "" #. module: mrp #: model:ir.ui.view,arch_db:mrp.mrp_bom_cost_report -msgid "Total Cost of Raw Materials" +msgid "Total Cost of Components" msgstr "" #. module: mrp @@ -2732,6 +2720,11 @@ msgid "Traceability: Lots" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config +msgid "Track changes on products, BoMs and routings" +msgstr "" + +#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_product_produce_product_tracking #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild_has_tracking #: model:ir.model.fields,field_description:mrp.field_mrp_workorder_product_tracking @@ -2828,11 +2821,6 @@ msgid "Urgent" msgstr "" #. module: mrp -#: 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" @@ -2841,13 +2829,17 @@ 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.ui.view,arch_db:mrp.view_mrp_config +msgid "Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts." +msgstr "" + +#. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_message_valid_until #: model:ir.ui.view,arch_db:mrp.mrp_message_view_tree msgid "Validity Date" @@ -2911,7 +2903,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_bom_picking_type_id -msgid "When a procurement has a ‘produce’ route with a 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. " +msgid "When a procurement has a ‘produce’ route with a operation type set, it will try to create a Manufacturing Order for that product using a BoM of the same operation type. That allows to define procurement rules which trigger different manufacturing orders with different BoMs. " msgstr "" #. module: mrp @@ -2977,6 +2969,7 @@ msgstr "" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config msgid "Work Centers" msgstr "" @@ -3010,7 +3003,7 @@ msgid "Work Order" msgstr "" #. module: mrp -#: model:ir.model.fields,help:mrp.field_mrp_config_settings_group_mrp_routings +#: model:ir.ui.view,arch_db:mrp.view_mrp_config msgid "Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials." msgstr "" @@ -3025,6 +3018,7 @@ msgstr "" #: 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_config_settings_group_mrp_routings #: 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 @@ -3068,7 +3062,7 @@ msgid "Work Sheet" msgstr "" #. module: mrp -#: code:addons/mrp/models/mrp_production.py:525 +#: code:addons/mrp/models/mrp_production.py:536 #, python-format msgid "Work order %s is still running" msgstr "" @@ -3079,11 +3073,6 @@ 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 "" @@ -3114,7 +3103,6 @@ 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 "" @@ -3136,15 +3124,7 @@ 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" -"With this module: A + B + C -> D + E.\n" -"-This installs the module mrp_byproduct." -msgstr "" - -#. module: mrp -#: code:addons/mrp/models/mrp_production.py:464 +#: code:addons/mrp/models/mrp_production.py:475 #, python-format msgid "You can not cancel production order, a work order is still in progress." msgstr "" @@ -3163,13 +3143,19 @@ msgid "You can not delete a Bill of Material with running manufacturing orders.\ msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:123 +#: code:addons/mrp/models/stock_move.py:40 +#, python-format +msgid "You can only produce 1.0 %s for products with unique serial number." +msgstr "" + +#. module: mrp +#: code:addons/mrp/models/stock_move.py:144 #, python-format msgid "You cannot cancel a stock move having already consumed material" msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:40 +#: code:addons/mrp/models/stock_move.py:38 #, python-format msgid "You cannot use the same serial number in two different lines." msgstr "" @@ -3205,7 +3191,7 @@ msgid "You need to provide a lot for the finished product" msgstr "" #. module: mrp -#: code:addons/mrp/models/stock_move.py:261 +#: code:addons/mrp/models/stock_move.py:282 #, python-format msgid "You need to supply a lot/serial number." msgstr "" @@ -3229,6 +3215,7 @@ msgid "You should provide a lot for the final product" msgstr "" #. module: mrp +#: model:ir.ui.view,arch_db:mrp.view_mrp_config #: model:ir.ui.view,arch_db:mrp.view_mrp_product_template_form_inherited msgid "days" msgstr "" diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot index c597325f6d3..1035a49a690 100644 --- a/addons/mrp_repair/i18n/mrp_repair.pot +++ b/addons/mrp_repair/i18n/mrp_repair.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -77,7 +77,7 @@ msgstr "" #. module: mrp_repair #: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder -msgid "<strong>Total Without Taxes</strong>" +msgid "<strong>Subtotal</strong>" msgstr "" #. module: mrp_repair @@ -106,6 +106,11 @@ msgid "After Repair" msgstr "" #. module: mrp_repair +#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder +msgid "Amount" +msgstr "" + +#. module: mrp_repair #: selection:mrp.repair,invoice_method:0 msgid "Before Repair" msgstr "" @@ -175,8 +180,8 @@ msgid "Confirmed" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:508 -#: code:addons/mrp_repair/models/mrp_repair.py:570 +#: code:addons/mrp_repair/models/mrp_repair.py:511 +#: code:addons/mrp_repair/models/mrp_repair.py:573 #, 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." @@ -442,8 +447,8 @@ msgid "No Invoice" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:499 -#: code:addons/mrp_repair/models/mrp_repair.py:561 +#: code:addons/mrp_repair/models/mrp_repair.py:502 +#: code:addons/mrp_repair/models/mrp_repair.py:564 #, python-format msgid "No Pricelist!" msgstr "" @@ -468,8 +473,8 @@ msgid "No product defined on Fees!" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:506 -#: code:addons/mrp_repair/models/mrp_repair.py:568 +#: code:addons/mrp_repair/models/mrp_repair.py:509 +#: code:addons/mrp_repair/models/mrp_repair.py:571 #, python-format msgid "No valid pricelist line found !" msgstr "" @@ -501,11 +506,6 @@ msgid "Partner" msgstr "" #. module: mrp_repair -#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder -msgid "Price" -msgstr "" - -#. module: mrp_repair #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_pricelist_id msgid "Pricelist" msgstr "" @@ -744,11 +744,6 @@ msgid "Subtotal" msgstr "" #. module: mrp_repair -#: model:ir.ui.view,arch_db:mrp_repair.report_mrprepairorder -msgid "Tax" -msgstr "" - -#. module: mrp_repair #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_amount_tax #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_fee_tax_id #: model:ir.model.fields,field_description:mrp_repair.field_mrp_repair_line_tax_id @@ -875,8 +870,8 @@ msgid "You have to select a Partner Invoice Address in the repair form!" msgstr "" #. module: mrp_repair -#: code:addons/mrp_repair/models/mrp_repair.py:501 -#: code:addons/mrp_repair/models/mrp_repair.py:563 +#: code:addons/mrp_repair/models/mrp_repair.py:504 +#: code:addons/mrp_repair/models/mrp_repair.py:566 #, python-format msgid "You have to select a pricelist in the Repair form !\n" " Please set one before choosing a product." diff --git a/addons/pad_project/i18n/pad_project.pot b/addons/pad_project/i18n/pad_project.pot index 1657b542c1a..89e46fa15b1 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,26 @@ msgstr "" "Plural-Forms: \n" #. module: pad_project +#: model:ir.model.fields,help:pad_project.field_project_config_settings_pad_key +msgid "Etherpad lite api key." +msgstr "" + +#. module: pad_project +#: model:ir.model.fields,help:pad_project.field_project_config_settings_pad_server +msgid "Etherpad lite server. Example: beta.primarypad.com" +msgstr "" + +#. module: pad_project +#: model:ir.model.fields,field_description:pad_project.field_project_config_settings_pad_key +msgid "Pad Api Key" +msgstr "" + +#. module: pad_project +#: model:ir.model.fields,field_description:pad_project.field_project_config_settings_pad_server +msgid "Pad Server" +msgstr "" + +#. module: pad_project #: model:ir.model.fields,field_description:pad_project.field_project_task_description_pad msgid "Pad URL" msgstr "" @@ -25,3 +45,8 @@ msgstr "" msgid "Task" msgstr "" +#. module: pad_project +#: model:ir.model,name:pad_project.model_project_config_settings +msgid "project.config.settings" +msgstr "" + diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index 72ef6d8fb10..c06c396fcc9 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,12 +16,6 @@ msgstr "" "Plural-Forms: \n" #. 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)" -msgstr "" - -#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction_html_3ds msgid "3D Secure HTML" msgstr "" @@ -189,6 +183,26 @@ msgid "Buckaroo" msgstr "" #. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_res_id +msgid "Callback Document ID" +msgstr "" + +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_model_id +msgid "Callback Document Model" +msgstr "" + +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_hash +msgid "Callback Hash" +msgstr "" + +#. module: payment +#: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_method +msgid "Callback Method" +msgstr "" + +#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_cancel_msg msgid "Cancel Message" msgstr "" @@ -230,6 +244,11 @@ msgid "Configure" msgstr "" #. module: payment +#: model:ir.model,name:payment.model_res_partner +msgid "Contact" +msgstr "" + +#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_module_id msgid "Corresponding Module" msgstr "" @@ -590,7 +609,6 @@ msgid "Order Confirmation" msgstr "" #. module: payment -#: model:ir.model,name:payment.model_res_partner #: 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" @@ -717,11 +735,6 @@ msgid "Required fields not filled" msgstr "" #. module: payment -#: model:ir.model.fields,field_description:payment.field_payment_transaction_callback_eval -msgid "S2S Callback" -msgstr "" - -#. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_registration_view_template_id msgid "S2S Form Template" msgstr "" @@ -805,7 +818,7 @@ msgid "Thanks Message" msgstr "" #. module: payment -#: code:addons/payment/models/payment_acquirer.py:476 +#: code:addons/payment/models/payment_acquirer.py:480 #, python-format msgid "The payment transaction reference must be unique!" msgstr "" diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot index 6ef092d7338..e3be0ce22a9 100644 --- a/addons/point_of_sale/i18n/point_of_sale.pot +++ b/addons/point_of_sale/i18n/point_of_sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,8 @@ msgstr "" "Plural-Forms: \n" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:711 +#: code:addons/point_of_sale/models/pos_order.py:748 +#: code:addons/point_of_sale/models/pos_order.py:757 #, python-format msgid " REFUND" msgstr "" @@ -42,12 +43,6 @@ msgid " " msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:72 -#, python-format -msgid "(RESCUE FOR %(session)s)" -msgstr "" - -#. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "(update)" msgstr "" @@ -160,7 +155,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1915 +#: code:addons/point_of_sale/static/src/js/screens.js:1926 #, python-format msgid "? Clicking \"Confirm\" will validate the payment." msgstr "" @@ -226,6 +221,11 @@ msgid "A short text that will be inserted as a header in the printed receipt" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_sale_price +msgid "A single sale price per product" +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1594 #, python-format @@ -233,6 +233,11 @@ msgid "ABC" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Accept payments with an integrated card reader" +msgstr "" + +#. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_bank_statement_cashbox msgid "Account Bank Statement Cashbox Details" msgstr "" @@ -254,6 +259,11 @@ msgid "Accounting journal used to post sales entries." msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_activation +msgid "Activation" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_active msgid "Active" msgstr "" @@ -265,7 +275,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1761 +#: code:addons/point_of_sale/static/src/js/screens.js:1772 #, python-format msgid "Add Tip" msgstr "" @@ -276,6 +286,11 @@ msgid "Add a Global Discount" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Add table management, tips, bill printing & split, etc." +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:382 #: code:addons/point_of_sale/static/src/xml/pos.xml:470 @@ -284,38 +299,39 @@ msgid "Address" msgstr "" #. module: point_of_sale -#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines -msgid "All sales lines" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Advanced Currencies Setup" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_reprint:0 -msgid "Allow cashier to reprint receipts" +#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines +msgid "All sales lines" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_discount:0 -msgid "Allow discounts on order lines only" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Allow cashier to reprint receipts" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_discount:0 -msgid "Allow global discounts" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Allow global discounts on orders" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_mercury:0 -msgid "Allows customers to pay with credit cards." +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Allows the cashier to quickly give a percentage sale discount for all the sales order to a customer." msgstr "" #. module: point_of_sale -#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_pos_discount -msgid "Allows the cashier to quickly give a percentage sale discount for all the sales order to a customer" +#: model:ir.model.fields,help:point_of_sale.field_pos_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." msgstr "" #. module: point_of_sale -#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_pos_loyalty -msgid "Allows you to define a loyalty program in the point of sale, where the customers earn loyalty points and get rewards" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Allows you to define a loyalty program in the point of sale, where the customers earn loyalty points and get rewards." msgstr "" #. module: point_of_sale @@ -340,11 +356,6 @@ msgid "An internal identification of the point of sale" msgstr "" #. module: point_of_sale -#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos -msgid "Apply" -msgstr "" - -#. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount #: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount msgid "Apply Discount" @@ -352,12 +363,22 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1907 +#: code:addons/point_of_sale/static/src/js/screens.js:1918 #, python-format msgid "Are you sure that the customer wants to pay" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Attributes" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_product_variant +msgid "Attributes & Variants" +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 "" @@ -440,11 +461,6 @@ msgid "Base Amount" msgstr "" #. module: point_of_sale -#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos -msgid "Beverages" -msgstr "" - -#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/js/screens.js:896 #, python-format @@ -472,11 +488,11 @@ msgstr "" #: code:addons/point_of_sale/static/src/xml/pos.xml:1084 #: code:addons/point_of_sale/static/src/xml/pos.xml:1104 #: code:addons/point_of_sale/static/src/xml/pos.xml:1156 +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form #: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard #: model:ir.ui.view,arch_db:point_of_sale.view_pos_discount #: 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 -#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos #, python-format msgid "Cancel" msgstr "" @@ -489,13 +505,13 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1896 +#: code:addons/point_of_sale/static/src/js/screens.js:1907 #, python-format msgid "Cannot return change without a cash payment method" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:292 +#: code:addons/point_of_sale/models/pos_session.py:309 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_cash_control #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_form #, python-format @@ -513,7 +529,7 @@ msgid "Cash Register" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:126 +#: code:addons/point_of_sale/models/pos_session.py:135 #, python-format msgid "Cash control can only be applied to cash journals." msgstr "" @@ -554,7 +570,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:102 +#: code:addons/point_of_sale/static/src/js/chrome.js:103 #, python-format msgid "Change Cashier" msgstr "" @@ -568,7 +584,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1761 +#: code:addons/point_of_sale/static/src/js/screens.js:1772 #, python-format msgid "Change Tip" msgstr "" @@ -608,7 +624,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1954 +#: code:addons/point_of_sale/static/src/js/screens.js:1965 #, python-format msgid "Check your internet connection and try again." msgstr "" @@ -664,8 +680,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:707 -#: code:addons/point_of_sale/static/src/js/chrome.js:715 +#: code:addons/point_of_sale/static/src/js/chrome.js:708 +#: code:addons/point_of_sale/static/src/js/chrome.js:716 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_config_kanban #, python-format msgid "Close" @@ -678,7 +694,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:335 +#: code:addons/point_of_sale/static/src/js/gui.js:346 #, python-format msgid "Closing ..." msgstr "" @@ -718,7 +734,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:712 +#: code:addons/point_of_sale/static/src/js/chrome.js:713 #: code:addons/point_of_sale/static/src/xml/pos.xml:1018 #, python-format msgid "Confirm" @@ -732,6 +748,11 @@ msgid "Connecting to the PosBox" msgstr "" #. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_res_partner +msgid "Contact" +msgstr "" + +#. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_form msgid "Continue Selling" msgstr "" @@ -790,6 +811,11 @@ msgid "Credit Cards" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Currencies" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_currency_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_currency_id msgid "Currency" @@ -807,18 +833,19 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1772 +#: code:addons/point_of_sale/static/src/js/screens.js:1783 #: code:addons/point_of_sale/static/src/xml/pos.xml:124 #: code:addons/point_of_sale/static/src/xml/pos.xml:635 #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_partner_id +#: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_partner_id #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter #, python-format msgid "Customer" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:422 -#: code:addons/point_of_sale/models/pos_order.py:473 +#: code:addons/point_of_sale/models/pos_order.py:457 +#: code:addons/point_of_sale/models/pos_order.py:508 #, python-format msgid "Customer Invoice" msgstr "" @@ -874,7 +901,7 @@ 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 "Delete Paid Orders ?" msgstr "" @@ -888,7 +915,7 @@ 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 "Delete Unpaid Orders ?" msgstr "" @@ -902,7 +929,7 @@ 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 "Destroy Current Order ?" msgstr "" @@ -930,11 +957,6 @@ 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 "" - -#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_discount_discount #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_discount msgid "Discount (%)" @@ -1023,6 +1045,11 @@ msgid "Download Unpaid Orders" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Drinks" +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:509 #, python-format @@ -1047,7 +1074,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1867 +#: code:addons/point_of_sale/static/src/js/screens.js:1878 #, python-format msgid "Empty Order" msgstr "" @@ -1176,11 +1203,31 @@ msgid "General Information" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Get a predefined set of common drinks" +msgstr "" + +#. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Give customer rewards, free samples, etc." +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,help:point_of_sale.field_res_users_partner_weight +msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_category_sequence msgid "Gives the sequence order when displaying a list of product categories." msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_discount +msgid "Global Discounts" +msgstr "" + +#. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_filter #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search #: model:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search @@ -1264,6 +1311,21 @@ msgid "Image" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_implemented_partner_ids +msgid "Implementation References" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_implemented_count +msgid "Implemented Count" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_assigned_partner_id +msgid "Implemented by" +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:1317 #, python-format @@ -1276,17 +1338,12 @@ 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 Sale Data" -msgstr "" - -#. module: point_of_sale #: selection:pos.session,state:0 msgid "In Progress" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:404 +#: code:addons/point_of_sale/models/pos_order.py:439 #, python-format msgid "In order to delete a sale, it must be new or cancelled." msgstr "" @@ -1303,7 +1360,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:266 +#: code:addons/point_of_sale/static/src/js/gui.js:277 #, python-format msgid "Incorrect Password" msgstr "" @@ -1427,13 +1484,28 @@ msgid "Last Updated on" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_review +msgid "Latest Partner Review" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_grade_id +msgid "Level" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_partner_weight +msgid "Level Weight" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_line_name msgid "Line No" msgstr "" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_order_line -msgid "Lines of Point of Sale" +msgid "Lines of Point of Sale Orders" msgstr "" #. module: point_of_sale @@ -1463,7 +1535,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:293 +#: code:addons/point_of_sale/static/src/js/gui.js:304 #, python-format msgid "Login as a Manager" msgstr "" @@ -1475,7 +1547,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/models.js:2024 +#: code:addons/point_of_sale/static/src/js/models.js:2026 #, python-format msgid "Lot/Serial Number(s) Required" msgstr "" @@ -1496,11 +1568,6 @@ msgid "Make Payment" 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" -msgstr "" - -#. module: point_of_sale #: model:res.groups,name:point_of_sale.group_pos_manager msgid "Manager" msgstr "" @@ -1539,8 +1606,13 @@ 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" +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_multi_currency +msgid "Multi-Currencies" +msgstr "" + +#. module: point_of_sale +#: selection:pos.config.settings,default_pricelist_setting:0 +msgid "Multiple prices per product (e.g. quantity, shop-specific)" msgstr "" #. module: point_of_sale @@ -1572,7 +1644,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1877 +#: code:addons/point_of_sale/static/src/js/screens.js:1888 #, python-format msgid "Negative Bank Payment" msgstr "" @@ -1597,14 +1669,14 @@ msgid "Next Order" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:129 -#, python-format -msgid "No cash statement found for this session. Unable to record returned cash." +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_review_next +msgid "Next Partner Review" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_mercury:0 -msgid "No credit card" +#: code:addons/point_of_sale/models/pos_order.py:136 +#, python-format +msgid "No cash statement found for this session. Unable to record returned cash." msgstr "" #. module: point_of_sale @@ -1614,11 +1686,6 @@ msgid "No link to an invoice for %s." msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_reprint:0 -msgid "No reprint" -msgstr "" - -#. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_open_statement.py:24 #, python-format msgid "No sequence defined on the journal" @@ -1626,7 +1693,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:2007 +#: code:addons/point_of_sale/static/src/js/screens.js:2018 #: code:addons/point_of_sale/static/src/xml/pos.xml:340 #, python-format msgid "None" @@ -1655,14 +1722,14 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:394 +#: code:addons/point_of_sale/static/src/js/chrome.js:395 #, python-format msgid "Offline" msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:317 +#: code:addons/point_of_sale/static/src/js/gui.js:328 #, python-format msgid "Offline Orders" msgstr "" @@ -1758,6 +1825,12 @@ msgid "Opening Date" 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 "Operation Type" +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:290 #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_order_id @@ -1767,8 +1840,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/models.js:1666 -#: code:addons/point_of_sale/static/src/js/models.js:1697 +#: code:addons/point_of_sale/static/src/js/models.js:1668 +#: code:addons/point_of_sale/static/src/js/models.js:1699 #, python-format msgid "Order " msgstr "" @@ -1784,6 +1857,11 @@ msgid "Order IDs Sequence" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_sequence_line_id +msgid "Order Line IDs Sequence" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_lines msgid "Order Lines" msgstr "" @@ -1807,7 +1885,7 @@ msgid "Order Sequence Number" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:434 +#: code:addons/point_of_sale/models/pos_order.py:469 #, python-format msgid "Order is not paid." msgstr "" @@ -1839,7 +1917,7 @@ msgid "Orders Analysis" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:212 +#: code:addons/point_of_sale/models/pos_config.py:219 #, python-format msgid "POS Order %s" msgstr "" @@ -1870,7 +1948,7 @@ msgid "POS Sales" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:223 +#: code:addons/point_of_sale/models/pos_config.py:228 #, python-format msgid "POS order line %s" msgstr "" @@ -1898,15 +1976,18 @@ msgid "Parent Category" 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_statement msgid "Partner" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_date_partnership +msgid "Partnership Date" +msgstr "" + +#. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:263 +#: code:addons/point_of_sale/static/src/js/gui.js:274 #, python-format msgid "Password ?" msgstr "" @@ -1920,7 +2001,7 @@ msgstr "" #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:129 #: code:addons/point_of_sale/static/src/xml/pos.xml:608 -#: code:addons/point_of_sale/wizard/pos_payment.py:51 +#: code:addons/point_of_sale/wizard/pos_payment.py:65 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form #, python-format @@ -1963,6 +2044,7 @@ msgstr "" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_statement_ids +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "Payments" @@ -2017,26 +2099,20 @@ 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 #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1906 +#: code:addons/point_of_sale/static/src/js/screens.js:1917 #, python-format msgid "Please Confirm Large Amount" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:262 +#: code:addons/point_of_sale/models/pos_order.py:269 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d)." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:450 +#: code:addons/point_of_sale/models/pos_order.py:485 #, python-format msgid "Please provide a partner for the sale." msgstr "" @@ -2050,7 +2126,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1945 +#: code:addons/point_of_sale/static/src/js/screens.js:1956 #, python-format msgid "Please select the Customer" msgstr "" @@ -2063,18 +2139,17 @@ msgstr "" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_config_kanban #: model:ir.actions.act_window,name:point_of_sale.action_pos_config_pos -#: model:ir.model,name:point_of_sale.model_pos_order #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_config_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_session_config_id #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order_config_id #: model:ir.ui.menu,name:point_of_sale.menu_point_root #: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form #: model:ir.ui.view,arch_db:point_of_sale.product_template_form_view #: model:ir.ui.view,arch_db:point_of_sale.res_users_form_view #: model:ir.ui.view,arch_db:point_of_sale.view_account_journal_pos_user_form #: model:ir.ui.view,arch_db:point_of_sale.view_partner_property_form #: model:ir.ui.view,arch_db:point_of_sale.view_pos_session_search -#: model:ir.ui.view,arch_db:point_of_sale.view_sale_config_settings_form_pos msgid "Point of Sale" msgstr "" @@ -2112,6 +2187,7 @@ msgid "Point of Sale Name" msgstr "" #. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_order #: model:ir.ui.view,arch_db:point_of_sale.view_pos_order_search #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "Point of Sale Orders" @@ -2140,11 +2216,6 @@ msgid "Point of Sale User Group" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_restaurant:0 -msgid "Point of sale for shops" -msgstr "" - -#. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.product_pos_category_form_view msgid "Pos Categories" msgstr "" @@ -2208,6 +2279,11 @@ msgid "Price Unit" msgstr "" #. module: point_of_sale +#: selection:pos.config.settings,default_pricelist_setting:0 +msgid "Price computed from formulas (discounts, margins, rounding)" +msgstr "" + +#. module: point_of_sale #: code:addons/point_of_sale/models/barcode_rule.py:13 #, python-format msgid "Priced Product" @@ -2221,6 +2297,17 @@ msgid "Pricelist" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_default_pricelist_setting +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Pricelists" +msgstr "" + +#. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Pricing" +msgstr "" + +#. module: point_of_sale #: model:ir.ui.view,arch_db:point_of_sale.view_pos_details_wizard msgid "Print" msgstr "" @@ -2240,7 +2327,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:383 +#: code:addons/point_of_sale/static/src/js/chrome.js:384 #, python-format msgid "Printer" msgstr "" @@ -2286,6 +2373,7 @@ msgstr "" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.product_product_action #: model:ir.ui.menu,name:point_of_sale.menu_pos_products +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form #: model:ir.ui.view,arch_db:point_of_sale.report_saledetails #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form msgid "Products" @@ -2366,7 +2454,7 @@ msgstr "" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_reprint -msgid "Reprints" +msgid "Reprint Receipt" msgstr "" #. module: point_of_sale @@ -2383,12 +2471,13 @@ msgstr "" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_module_pos_restaurant +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form msgid "Restaurant" msgstr "" #. module: point_of_sale -#: selection:pos.config.settings,module_pos_restaurant:0 -msgid "Restaurant: activate table management" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Restaurants benefit from additional features. Bill Printing allows you to print a receipt before the order is paid. Bill Splitting allows you to split an order into different orders. Kitchen Order Printing allows you to print order updates to kitchen or bar printers." msgstr "" #. module: point_of_sale @@ -2397,7 +2486,7 @@ msgid "Resume" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:722 +#: code:addons/point_of_sale/models/pos_order.py:764 #: model:ir.ui.view,arch_db:point_of_sale.view_pos_pos_form #, python-format msgid "Return Products" @@ -2448,8 +2537,18 @@ msgid "Salesperson" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Save" +msgstr "" + +#. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Save this page and come back here to set up this feature." +msgstr "" + +#. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:391 +#: code:addons/point_of_sale/static/src/js/chrome.js:392 #, python-format msgid "Scale" msgstr "" @@ -2475,7 +2574,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:374 +#: code:addons/point_of_sale/static/src/js/chrome.js:375 #, python-format msgid "Scanner" msgstr "" @@ -2519,26 +2618,32 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:237 +#: code:addons/point_of_sale/static/src/js/gui.js:248 #, python-format msgid "Select User" msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:2018 +#: code:addons/point_of_sale/static/src/js/screens.js:2029 #, python-format msgid "Select tax" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:197 +#: code:addons/point_of_sale/models/pos_order.py:204 #, python-format msgid "Selected orders do not have the same session!" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Sell in several currencies" +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_category_sequence +#: model:ir.model.fields,field_description:point_of_sale.field_res_users_grade_sequence msgid "Sequence" msgstr "" @@ -2563,14 +2668,15 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1958 +#: code:addons/point_of_sale/static/src/js/screens.js:1969 #, python-format msgid "Server Error" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:270 +#: code:addons/point_of_sale/models/pos_config.py:276 #: model:ir.model.fields,field_description:point_of_sale.field_account_bank_statement_pos_session_id +#: model:ir.model.fields,field_description:point_of_sale.field_pos_make_payment_session_id #: model:ir.model.fields,field_description:point_of_sale.field_pos_order_session_id #: 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 @@ -2620,12 +2726,32 @@ msgid "Set Weight" msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Set product attributes (e.g. color, size) to sell variants" +msgstr "" + +#. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "Set shop-specific prices, seasonal discounts, etc." +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,field_description:point_of_sale.field_pos_config_settings_group_product_pricelist +msgid "Show pricelists On Products" +msgstr "" + +#. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_pricelist_item +msgid "Show pricelists to customers" +msgstr "" + +#. module: point_of_sale #. openerp-web #: code:addons/point_of_sale/static/src/xml/pos.xml:42 #, python-format @@ -2649,7 +2775,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/gui.js:322 +#: code:addons/point_of_sale/static/src/js/gui.js:333 #, python-format msgid "Some orders could not be submitted to" msgstr "" @@ -2779,8 +2905,8 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/models/pos_order.py:290 -#: code:addons/point_of_sale/static/src/js/screens.js:2028 +#: code:addons/point_of_sale/models/pos_order.py:297 +#: code:addons/point_of_sale/static/src/js/screens.js:2039 #, python-format msgid "Tax" msgstr "" @@ -2829,7 +2955,7 @@ msgid "Tendered" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:250 +#: code:addons/point_of_sale/models/pos_order.py:257 #, python-format msgid "The POS order must have lines when calling this method" msgstr "" @@ -2843,25 +2969,25 @@ msgid "The Point of Sale could not find any product, client, employee\n" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:182 +#: code:addons/point_of_sale/models/pos_config.py:189 #, python-format msgid "The company of a payment method is different than the one of point of sale" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:172 +#: code:addons/point_of_sale/models/pos_config.py:179 #, python-format msgid "The company of the sales journal is different than the one of point of sale" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:167 +#: code:addons/point_of_sale/models/pos_config.py:174 #, 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:187 +#: code:addons/point_of_sale/models/pos_config.py:194 #, python-format msgid "The default fiscal position must be included in the available fiscal positions of the point of sale" msgstr "" @@ -2877,13 +3003,13 @@ msgid "The hostname or ip address of the hardware proxy, Will be autodetected if msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:177 +#: code:addons/point_of_sale/models/pos_config.py:184 #, python-format msgid "The invoice journal and the point of sale must belong to the same company" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:98 +#: code:addons/point_of_sale/models/pos_session.py:107 #: sql_constraint:pos.session:0 #, python-format msgid "The name of this POS Session must be unique !" @@ -2897,14 +3023,14 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1953 +#: code:addons/point_of_sale/static/src/js/screens.js:1964 #, 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:1964 +#: code:addons/point_of_sale/static/src/js/screens.js:1975 #, python-format msgid "The order could not be sent to the server due to an unknown error" msgstr "" @@ -2954,7 +3080,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1959 +#: code:addons/point_of_sale/static/src/js/screens.js:1970 #, python-format msgid "The server encountered an error while receiving your order." msgstr "" @@ -2965,12 +3091,12 @@ msgid "The system will open all cash registers, so that you can start recording msgstr "" #. module: point_of_sale -#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_pos_mercury -msgid "The transactions are processed by MercuryPay" +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "The transactions are processed by MercuryPay." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:258 +#: code:addons/point_of_sale/models/pos_session.py:275 #, python-format msgid "The type of the journal for your payment method should be bank or cash " msgstr "" @@ -2988,8 +3114,13 @@ msgid "There are pending operations that could not be saved into the database, a msgstr "" #. module: point_of_sale +#: model:ir.ui.view,arch_db:point_of_sale.pos_config_settings_view_form +msgid "There are two ways to manage pricelists: 1) Multiple prices per product (e.g. quantity, shop-specific) : must be set in the Sales tab of the product detail form. 2) Price computed from formulas (discounts, margins, rounding) : must be set in the pricelist form." +msgstr "" + +#. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1897 +#: code:addons/point_of_sale/static/src/js/screens.js:1908 #, python-format msgid "There is no cash payment method available in this point of sale to handle the change.\n" "\n" @@ -3003,20 +3134,20 @@ msgid "There is no cash register for this PoS Session" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:676 +#: code:addons/point_of_sale/models/pos_order.py:713 #, python-format msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:674 +#: code:addons/point_of_sale/models/pos_order.py:711 #, 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:1868 +#: code:addons/point_of_sale/static/src/js/screens.js:1879 #, python-format msgid "There must be at least one product in your order before it can be validated" msgstr "" @@ -3047,43 +3178,37 @@ msgid "This field is there to pass the id of the pos user group to the point of msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:458 +#: code:addons/point_of_sale/models/pos_order.py:493 #, python-format msgid "This invoice has been created from the point of sale session: <a href=# data-oe-model=pos.order data-oe-id=%d>%s</a>" msgstr "" #. module: point_of_sale -#: model:ir.model.fields,help:point_of_sale.field_pos_config_settings_module_pos_restaurant -msgid "This module adds several restaurant features to the Point of Sale: \n" -"\n" -"- Bill Printing: Allows you to print a receipt before the order is paid \n" -"\n" -"- Bill Splitting: Allows you to split an order into different orders \n" -"\n" -"- Kitchen Order Printing: allows you to print orders updates to kitchen or bar printers" -msgstr "" - -#. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:262 +#: code:addons/point_of_sale/static/src/js/chrome.js:263 #, 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:272 +#: code:addons/point_of_sale/static/src/js/chrome.js:273 #, 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 "" #. module: point_of_sale +#: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_line_id +msgid "This sequence is automatically created by Odoo but you can change it to customize the reference numbers of your orders lines." +msgstr "" + +#. module: point_of_sale #: model:ir.model.fields,help:point_of_sale.field_pos_config_sequence_id msgid "This sequence is automatically created by Odoo but you can change it to customize the reference numbers of your orders." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:560 +#: code:addons/point_of_sale/models/pos_order.py:597 #, 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 "" @@ -3111,7 +3236,7 @@ msgid "To Weigh With Scale" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:707 +#: code:addons/point_of_sale/models/pos_order.py:744 #, python-format msgid "To return product(s), you need to open a session that will be used to register the refund." msgstr "" @@ -3180,13 +3305,13 @@ msgid "Total:" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:310 +#: code:addons/point_of_sale/models/pos_order.py:317 #, python-format msgid "Trade Receivables" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:155 +#: code:addons/point_of_sale/models/pos_session.py:172 #, python-format msgid "Unable to open the session. You have to assign a sales journal to your point of sale." msgstr "" @@ -3205,7 +3330,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1963 +#: code:addons/point_of_sale/static/src/js/screens.js:1974 #, python-format msgid "Unknown Error" msgstr "" @@ -3218,6 +3343,11 @@ msgid "Unsupported File Format" msgstr "" #. module: point_of_sale +#: model:ir.model.fields,field_description:point_of_sale.field_pos_config_settings_group_sale_pricelist +msgid "Use pricelists to adapt your price per customers" +msgstr "" + +#. 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" @@ -3282,11 +3412,6 @@ msgid "Warehouse" 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:1325 #, python-format @@ -3319,25 +3444,26 @@ msgid "You can define another list of available currencies on the\n" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:394 +#: code:addons/point_of_sale/models/pos_order.py:429 #, python-format msgid "You cannot change the partner of a POS order for which an invoice has already been issued." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:30 +#: code:addons/point_of_sale/models/pos_session.py:31 #, python-format -msgid "You cannot confirm all orders of this session, because they don't have the 'paid' status" +msgid "You cannot confirm all orders of this session, because they have not the 'paid' status.\n" +"{reference} is in state {state}, total amount: {total}, paid: {paid}" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:137 +#: code:addons/point_of_sale/models/pos_session.py:154 #, python-format msgid "You cannot create two active sessions related to the same point of sale!" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:132 +#: code:addons/point_of_sale/models/pos_session.py:145 #, python-format msgid "You cannot create two active sessions with the same responsible!" msgstr "" @@ -3350,13 +3476,13 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1878 +#: code:addons/point_of_sale/static/src/js/screens.js:1889 #, python-format msgid "You cannot have a negative amount in a Bank payment. Use a cash payment method to return money to the customer." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:274 +#: code:addons/point_of_sale/models/pos_session.py:291 #, 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 "" @@ -3368,19 +3494,19 @@ msgid "You have to define which payment method must be available in the point of msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:690 +#: code:addons/point_of_sale/models/pos_order.py:727 #, python-format msgid "You have to open at least one cashbox." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:795 +#: code:addons/point_of_sale/models/pos_order.py:871 #, python-format msgid "You have to select a pricelist in the sale form !" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_order.py:783 +#: code:addons/point_of_sale/models/pos_order.py:859 #, python-format msgid "You have to select a pricelist in the sale form !\n" "Please set one before choosing a product." @@ -3394,20 +3520,20 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1946 +#: code:addons/point_of_sale/static/src/js/screens.js:1957 #, python-format msgid "You need to select the customer before you can invoice an order." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:143 +#: code:addons/point_of_sale/models/pos_session.py:160 #, 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:54 +#: code:addons/point_of_sale/static/src/js/chrome.js:55 #, python-format msgid "You will lose any data associated with the current order" msgstr "" @@ -3420,7 +3546,7 @@ msgid "Your Internet connection is probably down." msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_session.py:256 +#: code:addons/point_of_sale/models/pos_session.py:273 #, 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 "" @@ -3507,20 +3633,20 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/screens.js:1911 +#: code:addons/point_of_sale/static/src/js/screens.js:1922 #, python-format msgid "for an order of" msgstr "" #. module: point_of_sale -#: code:addons/point_of_sale/models/pos_config.py:203 +#: code:addons/point_of_sale/models/pos_config.py:210 #, python-format msgid "not used" msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:291 +#: code:addons/point_of_sale/static/src/js/chrome.js:292 #: code:addons/point_of_sale/static/src/xml/pos.xml:1175 #, python-format msgid "paid orders" @@ -3558,7 +3684,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/models/pos_order.py:134 +#: code:addons/point_of_sale/models/pos_order.py:141 #: code:addons/point_of_sale/static/src/xml/pos.xml:1542 #: code:addons/point_of_sale/static/src/xml/pos.xml:1597 #, python-format @@ -3582,7 +3708,7 @@ msgstr "" #. module: point_of_sale #. openerp-web -#: code:addons/point_of_sale/static/src/js/chrome.js:283 +#: code:addons/point_of_sale/static/src/js/chrome.js:284 #: code:addons/point_of_sale/static/src/xml/pos.xml:1176 #, python-format msgid "unpaid orders" diff --git a/addons/pos_mercury/i18n/pos_mercury.pot b/addons/pos_mercury/i18n/pos_mercury.pot index 0cff246f2b4..9848ee5058e 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -554,6 +554,11 @@ msgid "Merchant Password" msgstr "" #. module: pos_mercury +#: model:ir.ui.view,arch_db:pos_mercury.pos_config_settings_view_form_inherit_pos_mercury +msgid "Mercury Configuration" +msgstr "" + +#. module: pos_mercury #: model:ir.actions.act_window,name:pos_mercury.action_configuration_form #: model:ir.ui.menu,name:pos_mercury.menu_pos_pos_mercury_config msgid "Mercury Configurations" @@ -682,7 +687,7 @@ msgstr "" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_pos_order -msgid "Point of Sale" +msgid "Point of Sale Orders" msgstr "" #. module: pos_mercury diff --git a/addons/pos_restaurant/i18n/pos_restaurant.pot b/addons/pos_restaurant/i18n/pos_restaurant.pot index 00de1512bca..301a06d0142 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -356,12 +356,16 @@ msgid "Payment" msgstr "" #. module: pos_restaurant -#: model:ir.model,name:pos_restaurant.model_pos_order #: model:ir.model.fields,field_description:pos_restaurant.field_restaurant_floor_pos_config_id msgid "Point of Sale" msgstr "" #. module: pos_restaurant +#: model:ir.model,name:pos_restaurant.model_pos_order +msgid "Point of Sale Orders" +msgstr "" + +#. module: pos_restaurant #. openerp-web #: code:addons/pos_restaurant/static/src/xml/printbill.xml:20 #, python-format diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 480446679a9..72db98d6569 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -402,6 +402,11 @@ msgid "Consumable" msgstr "" #. module: product +#: model:ir.model,name:product.model_res_partner +msgid "Contact" +msgstr "" + +#. module: product #: model:ir.model.fields,help:product.field_product_uom_category_id msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." msgstr "" @@ -508,6 +513,12 @@ msgid "Day(s)" msgstr "" #. module: product +#: code:addons/product/models/res_company.py:58 +#, python-format +msgid "Default %(currency)s pricelist for %(company)s" +msgstr "" + +#. module: product #: model:ir.model.fields,help:product.field_product_product_uom_id #: model:ir.model.fields,help:product.field_product_template_uom_id msgid "Default Unit of Measure used for all stock operation." @@ -602,7 +613,7 @@ msgid "Error ! You cannot use this attribute with the following value." msgstr "" #. module: product -#: code:addons/product/models/product.py:306 +#: code:addons/product/models/product.py:308 #, python-format msgid "Error! It is not allowed to choose more than one value for a given attribute." msgstr "" @@ -763,7 +774,6 @@ msgid "Internal Category" msgstr "" #. module: product -#: model:ir.model.fields,field_description:product.field_product_product_code #: model:ir.model.fields,field_description:product.field_product_product_default_code #: model:ir.model.fields,field_description:product.field_product_template_default_code msgid "Internal Reference" @@ -987,11 +997,6 @@ msgid "Parent Category" msgstr "" #. module: product -#: model:ir.model,name:product.model_res_partner -msgid "Partner" -msgstr "" - -#. module: product #: selection:product.pricelist.item,compute_price:0 msgid "Percentage (discount)" msgstr "" @@ -1267,7 +1272,7 @@ msgid "Products Price Search" msgstr "" #. module: product -#: code:addons/product/models/product.py:469 +#: code:addons/product/models/product.py:471 #, python-format msgid "Products: " msgstr "" @@ -1331,6 +1336,11 @@ msgid "Ratio" msgstr "" #. module: product +#: model:ir.model.fields,field_description:product.field_product_product_code +msgid "Reference" +msgstr "" + +#. module: product #: selection:product.uom,uom_type:0 msgid "Reference Unit of Measure for this category" msgstr "" @@ -1422,11 +1432,13 @@ msgstr "" #. module: product #: model:ir.model.fields,field_description:product.field_base_config_settings_company_share_product +#: model:ir.model.fields,field_description:product.field_hr_timesheet_config_settings_company_share_product msgid "Share product to all companies" msgstr "" #. module: product #: model:ir.model.fields,help:product.field_base_config_settings_company_share_product +#: model:ir.model.fields,help:product.field_hr_timesheet_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." diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index b9046384fbc..eca69380267 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -102,10 +102,10 @@ msgid "\n" " <span>We would be delighted to assist you along the way. Contact us through our\n" " <a href=\"https://www.odoo.com/help\">support form</a> if you have any question.\n" " You can also discover how to get the best out of Odoo Project with our </span>\n" -" <a href=\"https://www.odoo.com/documentation/user/10.0/project.html\">\n" +" <a target=\"_blank\" href=\"https://www.odoo.com/documentation/user/10.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" +" <a target=\"_blank\" href=\"https://www.odoo.com/documentation\">\n" " <span style=\"text-decoration:underline;\">API Documentation</span></a>\n" " </p>\n" " <br>\n" @@ -115,7 +115,7 @@ msgid "\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" +" <span><br/>-- <br/>The Odoo Team<br/>PS: People love Odoo, check </span><a target=\"_blank\" href=\"https://twitter.com/odoo/favorites\"><span style=\"text-decoration:underline;\">what they say about it.</span></a></span>\n" " </div>\n" " </div>" msgstr "" @@ -151,8 +151,8 @@ msgid "# of Tasks" msgstr "" #. module: project -#: code:addons/project/models/project.py:240 -#: code:addons/project/models/project.py:407 +#: code:addons/project/models/project.py:242 +#: code:addons/project/models/project.py:428 #, python-format msgid "%s (copy)" msgstr "" @@ -369,11 +369,6 @@ msgid "<span class=\"text-muted\">NB: This will archive the selected tasks (Exce msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_config_settings -msgid "<span>(*) This configuration is related to the company you're logged into.</span>" -msgstr "" - -#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "<span><strong>Contact us to customize your application:</strong><br/>\n" " We have special options for unlimited number of customizations !\n" @@ -755,6 +750,12 @@ msgid "Active" msgstr "" #. module: project +#: model:ir.actions.act_window,name:project.mail_activity_type_action_config_project_types +#: model:ir.ui.menu,name:project.project_menu_config_activity_type +msgid "Activity Types" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.task_type_edit msgid "Add a description..." msgstr "" @@ -845,8 +846,8 @@ msgid "Another good way to limit the number of notifications you receive is to o msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_config_settings -msgid "Apply" +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Apple App Store" msgstr "" #. module: project @@ -911,6 +912,11 @@ msgid "Attachments" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_timesheet_attendance +msgid "Attendances" +msgstr "" + +#. module: project #: selection:project.config.settings,generate_project_alias:0 msgid "Automatically generate an email alias at the project creation" msgstr "" @@ -921,6 +927,11 @@ msgid "Available on the Apple Store" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_timesheet_synchro +msgid "Awesome Timesheet" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Back at the office, the manager splits the customer's requests into several tasks and delegates them to several employees." msgstr "" @@ -955,6 +966,11 @@ msgid "Be aware of the team’s productivity and time: try to keep meetings to o msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Billing" +msgstr "" + +#. module: project #: model:project.task,legend_blocked:project.project_task_data_0 #: model:project.task,legend_blocked:project.project_task_data_1 #: model:project.task,legend_blocked:project.project_task_data_11 @@ -988,8 +1004,8 @@ msgid "By Responsible" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form #: model:ir.ui.view,arch_db:project.project_task_merge_wizard_form -#: model:ir.ui.view,arch_db:project.view_config_settings msgid "Cancel" msgstr "" @@ -1069,8 +1085,8 @@ msgid "Click to create a new project.<br>" msgstr "" #. module: project -#: selection:project.config.settings,module_pad:0 -msgid "Collaborative rich text on task description" +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_pad +msgid "Collaborative Pads" msgstr "" #. module: project @@ -1120,7 +1136,7 @@ msgid "Configuration options are available in the Settings app." msgstr "" #. module: project -#: model:ir.actions.act_window,name:project.action_config_settings +#: model:ir.actions.act_window,name:project.project_config_settings_action msgid "Configure Project" msgstr "" @@ -1140,6 +1156,7 @@ msgid "Consulting mission" msgstr "" #. module: project +#: model:ir.model,name:project.model_res_partner #: model:ir.model.fields,field_description:project.field_report_project_task_user_partner_id #: model:ir.ui.view,arch_db:project.view_project #: model:ir.ui.view,arch_db:project.view_project_project_filter @@ -1274,7 +1291,7 @@ msgid "Currently there are not any activity scheduled." msgstr "" #. module: project -#: code:addons/project/models/project.py:638 +#: code:addons/project/models/project.py:658 #: 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 @@ -1283,12 +1300,17 @@ msgid "Customer" msgstr "" #. module: project -#: code:addons/project/models/project.py:638 +#: code:addons/project/models/project.py:658 #, python-format msgid "Customer Email" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Customer Satisfaction" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Customer Service" msgstr "" @@ -1523,7 +1545,7 @@ msgid "Ending Date" msgstr "" #. module: project -#: code:addons/project/models/project.py:415 +#: code:addons/project/models/project.py:436 #, python-format msgid "Error ! Task starting date must be lower than its ending date." msgstr "" @@ -1556,6 +1578,11 @@ msgid "Examples" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_expense +msgid "Expenses" +msgstr "" + +#. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:75 #, python-format @@ -1638,13 +1665,8 @@ msgid "For the same reason, don't create a Project based on weeks or time (examp msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_config_settings -msgid "Forecasts" -msgstr "" - -#. module: project #: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_forecast -msgid "Forecasts, planning and Gantt charts" +msgid "Forecasts" msgstr "" #. module: project @@ -1700,6 +1722,16 @@ msgid "Good luck!" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Google Chrome Store" +msgstr "" + +#. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Google Play Store" +msgstr "" + +#. module: project #: selection:project.task,kanban_state:0 msgid "Green" msgstr "" @@ -1758,7 +1790,7 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec msgstr "" #. module: project -#: code:addons/project/models/project.py:564 +#: code:addons/project/models/project.py:585 #, python-format msgid "I take it" msgstr "" @@ -1908,6 +1940,16 @@ msgid "Internal notes are messages that will appear in the Chatter but will not msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Issue Management" +msgstr "" + +#. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_project_issue +msgid "Issue Tracking" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Issue Tracking app." msgstr "" @@ -2056,6 +2098,11 @@ msgid "Learn how to better organize your company using Projects, Tasks, Issues a msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_holidays +msgid "Leave Management" +msgstr "" + +#. module: project #. openerp-web #: code:addons/project/static/src/js/tour.js:18 #, python-format @@ -2063,9 +2110,8 @@ 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." +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Lets the company customize which Pad installation should be used to link to new pads (for example: http://ietherpad.com/)." msgstr "" #. module: project @@ -2079,6 +2125,11 @@ msgid "List, plan and track things to do" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Manage your resources with Gantt charts" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.view_project_project_filter #: model:res.groups,name:project.group_project_manager msgid "Manager" @@ -2130,11 +2181,6 @@ 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 "" @@ -2196,11 +2242,6 @@ msgid "Next Task Activities" msgstr "" #. module: project -#: selection:project.config.settings,module_rating_project:0 -msgid "No customer rating" -msgstr "" - -#. module: project #: selection:project.task,priority:0 #: selection:report.project.task.user,priority:0 msgid "Non Starred" @@ -2256,7 +2297,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks msgstr "" #. module: project -#: code:addons/project/models/project.py:203 +#: code:addons/project/models/project.py:205 #: selection:project.project,privacy_visibility:0 #, python-format msgid "On invitation only" @@ -2331,11 +2372,6 @@ msgid "Owner" msgstr "" #. module: project -#: model:ir.model.fields,field_description:project.field_project_config_settings_module_pad -msgid "Pads" -msgstr "" - -#. module: project #: model:ir.model.fields,field_description:project.field_project_project_alias_parent_model_id msgid "Parent Model" msgstr "" @@ -2351,11 +2387,6 @@ msgid "Parent model holding the alias. The model holding the alias reference is msgstr "" #. module: project -#: model:ir.model,name:project.model_res_partner -msgid "Partner" -msgstr "" - -#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Plan your activities for the day" msgstr "" @@ -2366,7 +2397,7 @@ msgid "Planner" msgstr "" #. module: project -#: code:addons/project/models/project.py:718 +#: code:addons/project/models/project.py:738 #, python-format msgid "Please remove existing tasks in the project linked to the accounts you want to delete." msgstr "" @@ -2420,11 +2451,6 @@ msgid "Project Count" msgstr "" #. module: project -#: model:ir.ui.view,arch_db:project.view_config_settings -msgid "Project Management" -msgstr "" - -#. module: project #: model:ir.model.fields,field_description:project.field_project_project_user_id #: model:ir.model.fields,field_description:project.field_project_task_manager_id #: model:ir.ui.view,arch_db:project.edit_project @@ -2458,11 +2484,6 @@ msgid "Project Tasks" msgstr "" #. module: project -#: model:ir.model.fields,field_description:project.field_project_config_settings_project_time_mode_id -msgid "Project Time Unit *" -msgstr "" - -#. module: project #: model:res.request.link,name:project.req_link_task msgid "Project task" msgstr "" @@ -2491,7 +2512,7 @@ msgstr "" #. module: project #: model:ir.model.fields,field_description:project.field_project_config_settings_module_rating_project -msgid "Rating on task" +msgid "Rating on Tasks" msgstr "" #. module: project @@ -2561,6 +2582,11 @@ msgid "Record Thread ID" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Record time with mobile Timesheet app" +msgstr "" + +#. module: project #: selection:project.task,kanban_state:0 msgid "Red" msgstr "" @@ -2581,6 +2607,11 @@ msgid "Reference" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Reimburse employee expenses and invoice customers" +msgstr "" + +#. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:52 #, python-format @@ -2647,6 +2678,16 @@ msgid "Runs outside Odoo, always available" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Save" +msgstr "" + +#. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Save this page and come back here to set up the feature." +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Scrum Methodology" msgstr "" @@ -2669,6 +2710,11 @@ msgid "Select" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Sell services and invoice time spent" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Send an alert when a task is stuck in red for more than a few days" msgstr "" @@ -2703,7 +2749,7 @@ msgid "Set a Cover Image" msgstr "" #. module: project -#: model:ir.ui.menu,name:project.menu_project_general_settings +#: model:ir.ui.menu,name:project.project_config_settings_menu_action #: model:ir.ui.view,arch_db:project.edit_project #: model:ir.ui.view,arch_db:project.view_project_kanban msgid "Settings" @@ -2919,11 +2965,6 @@ msgid "Task blocked" msgstr "" #. module: project -#: selection:project.config.settings,module_pad:0 -msgid "Task description is plain text" -msgstr "" - -#. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:25 #, python-format @@ -3015,6 +3056,11 @@ msgid "Tasks to Merge" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Team Collaboration" +msgstr "" + +#. module: project #. openerp-web #: code:addons/project/static/src/js/web_planner_project.js:50 #, python-format @@ -3083,13 +3129,13 @@ msgid "There is no available image to be set as cover. Send a message on the tas msgstr "" #. module: project -#: model:ir.model.fields,help:project.field_project_config_settings_module_rating_project -msgid "This allows customers to give rating on provided services" +#: 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 "" #. 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!" +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "This replaces task's description text field by a collaborative rich text pad. This is advised if tasks involve several people." msgstr "" #. module: project @@ -3121,7 +3167,6 @@ msgstr "" #. module: project #: model:ir.model.fields,help:project.field_account_analytic_account_company_uom_id -#: model:ir.model.fields,help:project.field_project_config_settings_project_time_mode_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 @@ -3130,11 +3175,21 @@ msgid "This will set the unit of measure used in projects and tasks.\n" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_sale_timesheet +msgid "Time Billing" +msgstr "" + +#. module: project #: model:res.groups,name:project.group_time_work_estimation_tasks msgid "Time Estimation on Tasks" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Time Management" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.edit_project msgid "Time Scheduling" msgstr "" @@ -3146,6 +3201,11 @@ msgid "Timesheet UoM" msgstr "" #. module: project +#: model:ir.model.fields,field_description:project.field_project_config_settings_module_hr_timesheet +msgid "Timesheets" +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" @@ -3200,11 +3260,31 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of msgstr "" #. module: project -#: selection:project.config.settings,module_rating_project:0 +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Track and solve issues from a Kanban view" +msgstr "" + +#. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Track attendances and compare with timesheets" +msgstr "" + +#. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form msgid "Track customer satisfaction on tasks" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Track leaves to optimize your scheduling" +msgstr "" + +#. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Track time spent on projects and tasks" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.view_task_project_user_search #: model:ir.ui.view,arch_db:project.view_task_search_form msgid "Unassigned" @@ -3238,6 +3318,11 @@ msgid "Use Timesheets" msgstr "" #. module: project +#: model:ir.ui.view,arch_db:project.project_config_settings_view_form +msgid "Use collaborative rich text pads in tasks" +msgstr "" + +#. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "Use separate meetings to solve big issues or issues that aren’t important for the entire team." msgstr "" @@ -3292,14 +3377,14 @@ msgid "View statistics for the week" msgstr "" #. module: project -#: code:addons/project/models/project.py:204 +#: code:addons/project/models/project.py:206 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by all employees" msgstr "" #. module: project -#: code:addons/project/models/project.py:205 +#: code:addons/project/models/project.py:207 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by following customers" @@ -3532,7 +3617,7 @@ msgid "send us an email" msgstr "" #. module: project -#: code:addons/project/models/project.py:463 +#: code:addons/project/models/project.py:484 #, python-format msgid "tasks" msgstr "" diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot index 861536e4d36..943c6b9c670 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "# of Issues" msgstr "" #. module: project_issue -#: code:addons/project_issue/models/project_issue.py:146 +#: code:addons/project_issue/models/project_issue.py:150 #, python-format msgid "%s (copy)" msgstr "" @@ -47,11 +47,6 @@ msgid "<span attrs=\"{'invisible':[('use_issues', '=', False)]}\">as </span>" msgstr "" #. module: project_issue -#: selection:project.config.settings,module_project_issue_sheet:0 -msgid "Activate timesheets on issues" -msgstr "" - -#. module: project_issue #: model:ir.model.fields,field_description:project_issue.field_project_issue_active msgid "Active" msgstr "" @@ -152,6 +147,7 @@ msgid "Company" msgstr "" #. module: project_issue +#: model:ir.model,name:project_issue.model_res_partner #: model:ir.model.fields,field_description:project_issue.field_project_issue_partner_id #: model:ir.model.fields,field_description:project_issue.field_project_issue_report_partner_id msgid "Contact" @@ -191,13 +187,13 @@ msgid "Currently there are not any activity scheduled." msgstr "" #. module: project_issue -#: code:addons/project_issue/models/project_issue.py:267 +#: code:addons/project_issue/models/project_issue.py:271 #, python-format msgid "Customer" msgstr "" #. module: project_issue -#: code:addons/project_issue/models/project_issue.py:269 +#: code:addons/project_issue/models/project_issue.py:273 #, python-format msgid "Customer Email" msgstr "" @@ -279,11 +275,6 @@ 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 "" @@ -330,18 +321,13 @@ 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/models/project_issue.py:242 +#: code:addons/project_issue/models/project_issue.py:246 #, python-format msgid "I take it" msgstr "" @@ -529,17 +515,12 @@ msgid "Next Issue Activities" msgstr "" #. module: project_issue -#: code:addons/project_issue/models/project_issue.py:293 +#: code:addons/project_issue/models/project_issue.py:297 #, 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,priority:0 #: selection:project.issue.report,priority:0 msgid "Normal" @@ -576,11 +557,6 @@ msgid "Override the default value displayed for the normal state for kanban sele msgstr "" #. module: project_issue -#: model:ir.model,name:project_issue.model_res_partner -msgid "Partner" -msgstr "" - -#. module: project_issue #: 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." @@ -624,14 +600,13 @@ msgid "Project Issues" msgstr "" #. module: project_issue -#: 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." +#: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue +msgid "Provides timesheet support for the issues/bugs management in project." msgstr "" #. module: project_issue #: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_rating_project_issue -msgid "Rating on issue" +msgid "Rating on Issues" msgstr "" #. module: project_issue @@ -640,6 +615,11 @@ msgid "Red" msgstr "" #. module: project_issue +#: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue +msgid "Save this page and come back here to set up the feature." +msgstr "" + +#. module: project_issue #: model:ir.ui.view,arch_db:project_issue.view_project_issue_report_filter msgid "Search" msgstr "" @@ -705,22 +685,12 @@ 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.project_config_settings_view_form_inherit_project_issue -msgid "Timesheets" -msgstr "" - -#. module: project_issue #: model:ir.model.fields,field_description:project_issue.field_project_config_settings_module_project_issue_sheet msgid "Timesheets on Issues" msgstr "" @@ -731,11 +701,16 @@ msgid "Today Activities" msgstr "" #. module: project_issue -#: selection:project.config.settings,module_rating_project_issue:0 +#: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue msgid "Track customer satisfaction on issues" msgstr "" #. module: project_issue +#: model:ir.ui.view,arch_db:project_issue.project_config_settings_view_form_inherit_project_issue +msgid "Track time spent to solve 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" @@ -789,7 +764,7 @@ msgid "You can link this issue to an existing task or directly create a new one msgstr "" #. module: project_issue -#: code:addons/project_issue/models/project_issue.py:181 +#: code:addons/project_issue/models/project_issue.py:185 #, python-format msgid "issues" msgstr "" diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 65317141e08..7d9711ccd49 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -190,6 +190,11 @@ msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document +msgid "<strong>Amount</strong>" +msgstr "" + +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document msgid "<strong>Date Req.</strong>" msgstr "" @@ -206,11 +211,6 @@ msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document -msgid "<strong>Net Price</strong>" -msgstr "" - -#. module: purchase -#: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document msgid "<strong>Order Date:</strong>" msgstr "" @@ -233,12 +233,12 @@ msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document -msgid "<strong>Taxes</strong>" +msgid "<strong>Subtotal</strong>" msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document -msgid "<strong>Total Without Taxes</strong>" +msgid "<strong>Taxes</strong>" msgstr "" #. module: purchase @@ -253,7 +253,7 @@ msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.report_purchaseorder_document -msgid "<strong>Your Order Reference</strong>" +msgid "<strong>Your Order Reference:</strong>" msgstr "" #. module: purchase @@ -262,6 +262,11 @@ msgid "A warning can be set on a product or a customer (Purchase)" msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "Adapt reordering scheduling with vendor's open days calendar" +msgstr "" + +#. module: purchase #: model:ir.model.fields,field_description:purchase.field_account_invoice_purchase_id msgid "Add Purchase Order" msgstr "" @@ -358,6 +363,12 @@ msgid "Billed Qty" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:578 +#, python-format +msgid "Billed Quantity" +msgstr "" + +#. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_invoice_status msgid "Billing Status" msgstr "" @@ -380,7 +391,7 @@ msgid "Blocking Message" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:797 +#: code:addons/purchase/models/purchase.py:835 #: code:addons/purchase/models/stock.py:81 #: model:stock.location.route,name:purchase.route_warehouse0_buy #, python-format @@ -403,17 +414,12 @@ msgid "Calendar View" msgstr "" #. module: purchase -#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_purchase_requisition -msgid "Calls for Tenders" -msgstr "" - -#. module: purchase #: model:ir.ui.view,arch_db:purchase.view_purchase_configuration msgid "Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. 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 -#: code:addons/purchase/models/purchase.py:813 +#: code:addons/purchase/models/purchase.py:851 #, python-format msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first." msgstr "" @@ -437,7 +443,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:663 +#: code:addons/purchase/models/purchase.py:701 #, python-format msgid "Cannot delete a purchase order line which is in state '%s'." msgstr "" @@ -493,7 +499,7 @@ msgid "Company" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:295 +#: code:addons/purchase/models/purchase.py:297 #, python-format msgid "Compose Email" msgstr "" @@ -525,6 +531,11 @@ msgid "Confirmed purchase orders are not editable" msgstr "" #. module: purchase +#: model:ir.model,name:purchase.model_res_partner +msgid "Contact" +msgstr "" + +#. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_control msgid "Control" msgstr "" @@ -671,6 +682,12 @@ msgid "Extended Filters" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:556 +#, python-format +msgid "Extra line with %s " +msgstr "" + +#. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_fiscal_position_id #: model:ir.model.fields,field_description:purchase.field_purchase_report_fiscal_position_id #: model:ir.ui.view,arch_db:purchase.view_purchase_order_search @@ -684,11 +701,6 @@ msgstr "" #. module: purchase #: model:ir.ui.view,arch_db:purchase.view_purchase_configuration -msgid "Get the best offer from several vendors" -msgstr "" - -#. module: purchase -#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration msgid "Get warnings in orders for products or vendors" msgstr "" @@ -728,7 +740,7 @@ msgid "Import vendor pricelists" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:197 +#: code:addons/purchase/models/purchase.py:199 #, python-format msgid "In order to delete a purchase order, you must cancel it first." msgstr "" @@ -841,6 +853,11 @@ msgid "Manage Vendor Price" msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration +msgid "Manage your purchase agreements (call for tenders, blanket orders)" +msgstr "" + +#. module: purchase #: model:res.groups,name:purchase.group_purchase_manager msgid "Manager" msgstr "" @@ -861,14 +878,15 @@ msgid "Manufacturing" msgstr "" #. module: purchase -#: model:ir.ui.view,arch_db:purchase.view_purchase_configuration -msgid "Margin of error for vendor lead times" +#: model:ir.model.fields,help:purchase.field_res_company_po_lead +#: model:ir.model.fields,help:purchase.field_stock_config_settings_po_lead +msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays." msgstr "" #. module: purchase -#: model:ir.model.fields,help:purchase.field_purchase_config_settings_po_lead -#: model:ir.model.fields,help:purchase.field_res_company_po_lead -msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for procuring products, they will be scheduled that many days earlier to cope with unexpected vendor delays." +#: model:ir.model.fields,help:purchase.field_stock_config_settings_default_new_po_lead +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays." msgstr "" #. module: purchase @@ -905,6 +923,11 @@ msgid "Most propositions of purchase orders are created automatically\n" msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "Move forward expected delivery dates by" +msgstr "" + +#. module: purchase #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter msgid "My Activities" msgstr "" @@ -926,7 +949,7 @@ msgid "No longer edit orders once confirmed" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:946 +#: code:addons/purchase/models/purchase.py:996 #, python-format msgid "No vendor associated to product %s. Please set one to fix this procurement." msgstr "" @@ -999,12 +1022,18 @@ msgid "Order of Day" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:575 +#, python-format +msgid "Ordered Quantity" +msgstr "" + +#. module: purchase #: selection:purchase.config.settings,default_purchase_method:0 msgid "Ordered quantities" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:770 +#: code:addons/purchase/models/purchase.py:808 #, python-format msgid "Ordered quantity decreased!" msgstr "" @@ -1026,7 +1055,6 @@ msgid "PO_${(object.name or '').replace('/','_')}" msgstr "" #. module: purchase -#: model:ir.model,name:purchase.model_res_partner #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_partner_id msgid "Partner" msgstr "" @@ -1152,6 +1180,11 @@ msgid "Purchase" msgstr "" #. module: purchase +#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_module_purchase_requisition +msgid "Purchase Agreements" +msgstr "" + +#. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all msgid "Purchase Analysis" msgstr "" @@ -1167,8 +1200,8 @@ msgid "Purchase Analytics" msgstr "" #. module: purchase -#: model:ir.model.fields,field_description:purchase.field_purchase_config_settings_po_lead #: model:ir.model.fields,field_description:purchase.field_res_company_po_lead +#: model:ir.model.fields,field_description:purchase.field_stock_config_settings_po_lead msgid "Purchase Lead Time" msgstr "" @@ -1249,7 +1282,7 @@ msgid "Purchase Orders Statistics" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:665 +#: code:addons/purchase/models/purchase.py:703 #, python-format msgid "Purchase order line deleted." msgstr "" @@ -1361,6 +1394,12 @@ msgid "Received Qty" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:577 +#, python-format +msgid "Received Quantity" +msgstr "" + +#. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_open_picking #: model:ir.model.fields,field_description:purchase.field_purchase_order_picking_count #: model:ir.model.fields,field_description:purchase.field_purchase_order_picking_ids @@ -1449,18 +1488,33 @@ msgid "Save this page and come back here to set up the feature." msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "Schedule receivings earlier to avoid delays" +msgstr "" + +#. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_date_planned #: model:ir.model.fields,field_description:purchase.field_purchase_order_line_date_planned msgid "Scheduled Date" msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products). By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules." +msgstr "" + +#. module: purchase #: model:ir.ui.view,arch_db:purchase.purchase_order_line_search #: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter msgid "Search Purchase Order" msgstr "" #. module: purchase +#: model:ir.model.fields,field_description:purchase.field_stock_config_settings_default_new_po_lead +msgid "Security Lead Time for Purchase" +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 @@ -1583,6 +1637,12 @@ msgid "Terms and Conditions" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:571 +#, python-format +msgid "The ordered quantity has been decreased. Do not forget to take it into account on your bills and receipts." +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" @@ -1648,25 +1708,25 @@ msgid "This note will be displayed for vendors." msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:974 +#: code:addons/purchase/models/purchase.py:1024 #, 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:987 +#: code:addons/purchase/models/purchase.py:1037 #, 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:190 +#: code:addons/purchase/models/account_invoice.py:197 #, python-format msgid "This vendor bill has been created from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/account_invoice.py:204 +#: code:addons/purchase/models/account_invoice.py:211 #, python-format msgid "This vendor bill has been modified from: %s" msgstr "" @@ -1678,7 +1738,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order_picking_type_id -msgid "This will determine picking type of incoming shipment" +msgid "This will determine operation type of incoming shipment" msgstr "" #. module: purchase @@ -1720,13 +1780,13 @@ msgid "Transfer" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:344 +#: code:addons/purchase/models/purchase.py:346 #, python-format msgid "Unable to cancel purchase order %s as some receptions have already been done." msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:347 +#: code:addons/purchase/models/purchase.py:349 #, python-format msgid "Unable to cancel this purchase order. You must first cancel related vendor bills." msgstr "" @@ -1874,8 +1934,8 @@ msgid "Warning" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:251 -#: code:addons/purchase/models/purchase.py:731 +#: code:addons/purchase/models/purchase.py:253 +#: code:addons/purchase/models/purchase.py:769 #, python-format msgid "Warning for %s" msgstr "" @@ -1901,7 +1961,7 @@ msgid "When products are bought, they can be delivered to this warehouse" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:771 +#: code:addons/purchase/models/purchase.py:809 #, python-format msgid "You are decreasing the ordered quantity!\n" "You must update the quantities on the reception and/or bills." @@ -1928,7 +1988,7 @@ msgid "You must define a product for everything you purchase, whether\n" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:384 +#: code:addons/purchase/models/purchase.py:386 #, python-format msgid "You must set a Vendor Location for this partner %s" msgstr "" @@ -1939,7 +1999,17 @@ msgid "account.config.settings" msgstr "" #. module: purchase +#: model:ir.ui.view,arch_db:purchase.stock_config_settings_view_form_inherit_purchase +msgid "days" +msgstr "" + +#. module: purchase #: model:ir.model,name:purchase.model_purchase_config_settings msgid "purchase.config.settings" msgstr "" +#. module: purchase +#: model:ir.model,name:purchase.model_stock_config_settings +msgid "stock.config.settings" +msgstr "" + diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 56e28d4c7ac..fdc9d8f1560 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+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_10955 +#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type_id_11163 #: 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" @@ -310,6 +310,11 @@ msgid "Number of Orders" msgstr "" #. module: purchase_requisition +#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_picking_type_id +msgid "Operation Type" +msgstr "" + +#. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line_qty_ordered msgid "Ordered Quantities" msgstr "" @@ -321,11 +326,6 @@ msgid "Ordering Date" msgstr "" #. module: purchase_requisition -#: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_picking_type_id -msgid "Picking Type" -msgstr "" - -#. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_procurement_order #: model:ir.model.fields,field_description:purchase_requisition.field_product_template_purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_procurement_id diff --git a/addons/rating/i18n/rating.pot b/addons/rating/i18n/rating.pot index 439f9debc02..2361562bcca 100644 --- a/addons/rating/i18n/rating.pot +++ b/addons/rating/i18n/rating.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,22 +18,7 @@ msgstr "" #. 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>" +" on our services on \"" msgstr "" #. module: rating @@ -52,6 +37,11 @@ msgid "Author of the rating" msgstr "" #. module: rating +#: model:ir.model.fields,field_description:rating.field_rating_rating_feedback +msgid "Comment" +msgstr "" + +#. module: rating #: model:ir.model.fields,field_description:rating.field_rating_rating_create_uid msgid "Created by" msgstr "" @@ -63,12 +53,12 @@ msgstr "" #. module: rating #: model:ir.model.fields,field_description:rating.field_rating_rating_partner_id -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Customer" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Day" msgstr "" @@ -94,11 +84,6 @@ 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 "" @@ -109,13 +94,15 @@ msgid "Go to our website" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Group By" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search -msgid "Happy" +#: code:addons/rating/models/rating.py:58 +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search +#, python-format +msgid "Highly dissatisfied" msgstr "" #. module: rating @@ -158,6 +145,11 @@ msgid "Identifier of the rated object" msgstr "" #. module: rating +#: model:ir.model.fields,field_description:rating.field_rating_rating_rating_image +msgid "Image" +msgstr "" + +#. module: rating #. openerp-web #: code:addons/rating/static/src/js/rating_common.js:27 #, python-format @@ -186,23 +178,31 @@ msgid "Linked message" msgstr "" #. module: rating -#: model:ir.model.fields,help:rating.field_rating_rating_res_model -msgid "Model name of the rated object" +#: model:ir.model.fields,help:rating.field_rating_rating_res_model_id +msgid "Model of the followed resource" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Month" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "My Ratings" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search -msgid "Okay" +#: code:addons/rating/models/rating.py:60 +#, python-format +msgid "No rating yet" +msgstr "" + +#. module: rating +#: code:addons/rating/models/rating.py:58 +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search +#, python-format +msgid "Not satisfied" msgstr "" #. module: rating @@ -211,13 +211,13 @@ msgid "Owner of the rated resource" msgstr "" #. module: rating -#: model:ir.model.fields,field_description:rating.field_rating_rating_rated_partner_id -msgid "Rated Partner" +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search +msgid "Rated User" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search -msgid "Rated User" +#: model:ir.model.fields,field_description:rating.field_rating_rating_rated_partner_id +msgid "Rated person" msgstr "" #. module: rating @@ -229,17 +229,38 @@ msgstr "" #: 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 +#: model:ir.model.fields,field_description:rating.field_rating_rating_rating_text +#: model:ir.ui.view,arch_db:rating.rating_rating_view_form +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_tree msgid "Rating" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_graph -#: model:ir.ui.view,arch_db:rating.view_rating_rating_pivot +#: model:ir.ui.view,arch_db:rating.rating_rating_view_graph +#: model:ir.ui.view,arch_db:rating.rating_rating_view_pivot msgid "Rating Average" msgstr "" #. module: rating +#: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_feedback +#: model:ir.model.fields,field_description:rating.field_product_template_rating_last_feedback +#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_feedback +#: model:ir.model.fields,field_description:rating.field_project_task_rating_last_feedback +#: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_feedback +msgid "Rating Last Feedback" +msgstr "" + +#. module: rating +#: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_image +#: model:ir.model.fields,field_description:rating.field_product_template_rating_last_image +#: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_image +#: model:ir.model.fields,field_description:rating.field_project_task_rating_last_image +#: model:ir.model.fields,field_description:rating.field_rating_mixin_rating_last_image +msgid "Rating Last Image" +msgstr "" + +#. module: rating #: model:ir.model.fields,field_description:rating.field_mail_channel_rating_last_value #: model:ir.model.fields,field_description:rating.field_product_template_rating_last_value #: model:ir.model.fields,field_description:rating.field_project_issue_rating_last_value @@ -268,33 +289,45 @@ 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: 0=Unhappy, 10=Happy" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Ratings" msgstr "" #. module: rating +#: model:ir.model.fields,help:rating.field_mail_channel_rating_last_feedback +#: model:ir.model.fields,help:rating.field_product_template_rating_last_feedback +#: model:ir.model.fields,help:rating.field_project_issue_rating_last_feedback +#: model:ir.model.fields,help:rating.field_project_task_rating_last_feedback +#: model:ir.model.fields,help:rating.field_rating_mixin_rating_last_feedback #: model:ir.model.fields,help:rating.field_rating_rating_feedback msgid "Reason of the rating" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.model.fields,field_description:rating.field_rating_rating_res_model_id +msgid "Related Document Model" +msgstr "" + +#. module: rating +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Resource" msgstr "" #. module: rating #: model:ir.model.fields,field_description:rating.field_rating_rating_res_name -msgid "Resource Name" +msgid "Resource name" +msgstr "" + +#. module: rating +#: code:addons/rating/models/rating.py:58 +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search +#, python-format +msgid "Satisfied" msgstr "" #. module: rating @@ -308,6 +341,12 @@ msgid "Send Feedback" msgstr "" #. module: rating +#: model:ir.ui.view,arch_db:rating.rating_rating_view_form +#: model:ir.ui.view,arch_db:rating.rating_rating_view_tree +msgid "Submitted on" +msgstr "" + +#. module: rating #: model:ir.ui.view,arch_db:rating.rating_external_page_submit msgid "Thanks! We appreciate your feedback." msgstr "" @@ -323,11 +362,6 @@ msgid "There is no rating for this object at the moment." msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search -msgid "Unhappy" -msgstr "" - -#. module: rating #: model:ir.ui.view,arch_db:rating.rating_external_page_view msgid "We appreciate your feedback!" msgstr "" @@ -338,7 +372,7 @@ msgid "Would be great if you can provide more information:" msgstr "" #. module: rating -#: model:ir.ui.view,arch_db:rating.view_rating_rating_search +#: model:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "Year" msgstr "" @@ -349,10 +383,16 @@ msgstr "" #. module: rating #: model:ir.ui.view,arch_db:rating.rating_external_page_submit +#: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban msgid "by" msgstr "" #. module: rating +#: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban +msgid "for" +msgstr "" + +#. module: rating #: code:addons/rating/controllers/main.py:21 #, python-format msgid "highly dissatisfied" @@ -365,6 +405,11 @@ msgid "not satisfied" msgstr "" #. module: rating +#: model:ir.ui.view,arch_db:rating.rating_rating_view_kanban +msgid "on" +msgstr "" + +#. module: rating #: code:addons/rating/controllers/main.py:22 #, python-format msgid "satisfied" diff --git a/addons/rating_project/i18n/rating_project.pot b/addons/rating_project/i18n/rating_project.pot index b2b9e3b3d75..ff924f67c17 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgid "\n" " </tr>\n" " </table>\n" " </td></tr>\n" -" <tr><td style=\"padding:15px 20px 10px 20px;\">${object.user_id.signature or ''| safe}</td></tr>\n" +" <tr><td style=\"padding:15px 20px 10px 20px;\">${(object.user_id.signature or '')| safe}</td></tr>\n" " </tbody>\n" " </table>\n" " <table style=\"width:600px;margin:auto;text-align:center;font-size:12px;\">\n" @@ -84,7 +84,7 @@ msgid "\n" " % if object.project_id.rating_status == 'periodic':\n" " <p>This customer survey is sent <b>${object.project_id.rating_status_period}</b> as long as the task is in the <b>${object.stage_id.name}</b> stage.</p>\n" " % endif\n" -" <p>Email automatically sent by <a href=\"https://www.odoo.com/page/project-management\" style=\"color:#875A7B;text-decoration:none;\">Odoo Project</a> for <a href=\"${object.project_id.company_id.website}\" style=\"color:#875A7B;text-decoration:none;\">${object.project_id.company_id.name}</a></p>\n" +" <p>Email automatically sent by <a target=\"_blank\" href=\"https://www.odoo.com/page/project-management\" style=\"color:#875A7B;text-decoration:none;\">Odoo Project</a> for <a href=\"${object.project_id.company_id.website}\" style=\"color:#875A7B;text-decoration:none;\">${object.project_id.company_id.name}</a></p>\n" " </td></tr>\n" " </tbody>\n" " </table>\n" @@ -231,6 +231,11 @@ msgid "Quarterly" msgstr "" #. module: rating_project +#: model:ir.ui.view,arch_db:rating_project.project_task_view_search +msgid "Rated tasks" +msgstr "" + +#. module: rating_project #: model:ir.ui.view,arch_db:rating_project.project_task_view_form_inherit_rating msgid "Rating" msgstr "" @@ -251,6 +256,11 @@ msgid "Rating Request Deadline" msgstr "" #. module: rating_project +#: model:ir.ui.view,arch_db:rating_project.rating_rating_view_search +msgid "Rating for tasks" +msgstr "" + +#. module: rating_project #: selection:project.project,rating_status:0 msgid "Rating when changing stage" msgstr "" @@ -261,6 +271,11 @@ msgid "Ratings" msgstr "" #. module: rating_project +#: model:ir.ui.view,arch_db:rating_project.project_config_settings_view_form_inherit_rating_project +msgid "Set Email Template to Stages" +msgstr "" + +#. module: rating_project #: model:ir.model,name:rating_project.model_project_task msgid "Task" msgstr "" diff --git a/addons/rating_project_issue/i18n/rating_project_issue.pot b/addons/rating_project_issue/i18n/rating_project_issue.pot index 697a8dd7a54..9ff3d3d57f4 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -67,16 +67,31 @@ msgid "Project Issue" msgstr "" #. module: rating_project_issue +#: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_search +msgid "Rated issues" +msgstr "" + +#. module: rating_project_issue #: model:ir.ui.view,arch_db:rating_project_issue.project_issue_view_form_inherit_rating msgid "Rating" msgstr "" #. module: rating_project_issue +#: model:ir.ui.view,arch_db:rating_project_issue.rating_rating_view_search +msgid "Rating for issues" +msgstr "" + +#. module: rating_project_issue #: model:mail.message.subtype,description:rating_project_issue.mt_issue_rating msgid "Ratings" msgstr "" #. module: rating_project_issue +#: model:ir.ui.view,arch_db:rating_project_issue.project_config_settings_view_form_inherit_rating_project_issue +msgid "Set Email Template to Stages" +msgstr "" + +#. module: rating_project_issue #: model:ir.model,name:rating_project_issue.model_project_task_type msgid "Task Stage" msgstr "" diff --git a/addons/report/i18n/report.pot b/addons/report/i18n/report.pot index 092e67d1af8..d31525d6058 100644 --- a/addons/report/i18n/report.pot +++ b/addons/report/i18n/report.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -33,9 +33,9 @@ msgstr "" #. module: report #: model:ir.ui.view,arch_db:report.view_company_report_form msgid "<strong>No logo found!</strong>\n" -" To get a beautiful report, you might review your\n" +" To get a beautiful document, you should review your\n" " company data: upload a logo, set\n" -" bank accounts, phone numbers, etc." +" your address, etc." msgstr "" #. module: report @@ -181,19 +181,19 @@ msgstr "" #. module: report #: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report -msgid "Change Report Template" +msgid "Change Document Template" msgstr "" #. module: report #: code:addons/report/models/base_config_settings.py:30 #: code:addons/report/models/report.py:278 #, python-format -msgid "Choose Your Report Layout" +msgid "Choose Your Document Layout" msgstr "" #. module: report #: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report -msgid "Choose your reports's header and footer layout." +msgid "Choose your document's header and footer layout" msgstr "" #. module: report @@ -269,6 +269,14 @@ msgid "Display a header line" msgstr "" #. module: report +#: model:ir.model.fields,field_description:report.field_base_config_settings_external_report_layout +#: model:ir.model.fields,field_description:report.field_hr_timesheet_config_settings_external_report_layout +#: model:ir.model.fields,field_description:report.field_res_company_external_report_layout +#: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report +msgid "Document Template" +msgstr "" + +#. module: report #. openerp-web #: code:addons/report/static/src/xml/report.xml:14 #, python-format @@ -437,6 +445,7 @@ msgstr "" #. module: report #: model:ir.model.fields,field_description:report.field_base_config_settings_paperformat_id +#: model:ir.model.fields,field_description:report.field_hr_timesheet_config_settings_paperformat_id #: model:ir.model.fields,field_description:report.field_ir_act_report_xml_paperformat_id #: model:ir.model.fields,field_description:report.field_res_company_paperformat_id msgid "Paper format" @@ -479,6 +488,11 @@ msgid "Preview Clean Template" msgstr "" #. module: report +#: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report +msgid "Preview Document" +msgstr "" + +#. module: report #: model:ir.actions.report.xml,name:report.action_report_externalpreview msgid "Preview External Report" msgstr "" @@ -494,11 +508,6 @@ msgid "Preview Minimalist Template" msgstr "" #. module: report -#: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report -msgid "Preview Report" -msgstr "" - -#. module: report #. openerp-web #: code:addons/report/static/src/xml/report.xml:11 #, python-format @@ -524,13 +533,6 @@ msgid "Report" msgstr "" #. module: report -#: model:ir.model.fields,field_description:report.field_base_config_settings_external_report_layout -#: model:ir.model.fields,field_description:report.field_res_company_external_report_layout -#: model:ir.ui.view,arch_db:report.base_config_settings_view_form_inherit_report -msgid "Report Template" -msgstr "" - -#. module: report #: model:ir.ui.menu,name:report.reporting_menuitem #: model:ir.ui.menu,name:report.reports_menuitem msgid "Reporting" @@ -639,7 +641,13 @@ msgid "Web:" msgstr "" #. module: report -#: code:addons/report/models/report.py:464 +#: code:addons/report/models/report.py:485 +#, python-format +msgid "Wkhtmltopdf failed (error code: %s). Memory limit too low or maximum file number of subprocess reached. Message : %s" +msgstr "" + +#. module: report +#: code:addons/report/models/report.py:487 #, python-format msgid "Wkhtmltopdf failed (error code: %s). Message: %s" msgstr "" diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot index f22d184a949..20911c20a82 100644 --- a/addons/report_intrastat/i18n/report_intrastat.pot +++ b/addons/report_intrastat/i18n/report_intrastat.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ msgstr "" #. module: report_intrastat #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document -msgid "<strong>Total Without Taxes</strong>" +msgid "<strong>Subtotal</strong>" msgstr "" #. module: report_intrastat @@ -234,11 +234,6 @@ msgid "October" msgstr "" #. module: report_intrastat -#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document -msgid "PRO-FORMA" -msgstr "" - -#. module: report_intrastat #: model:ir.model,name:report_intrastat.model_product_template msgid "Product Template" msgstr "" diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot index 92a2ee17ecb..30b510ade92 100644 --- a/addons/resource/i18n/resource.pot +++ b/addons/resource/i18n/resource.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: resource -#: code:addons/resource/models/resource.py:692 +#: code:addons/resource/models/resource.py:666 #, python-format msgid "%s (copy)" msgstr "" @@ -27,19 +27,29 @@ msgid "Active" msgstr "" #. module: resource +#: model:ir.model.fields,help:resource.field_res_users_country_enforce_cities +msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities." +msgstr "" + +#. module: resource #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days msgid "Closing Days" msgstr "" #. module: resource -#: model:ir.model.fields,field_description:resource.field_resource_resource_code -msgid "Code" +#: model:ir.model,name:resource.model_res_company +msgid "Companies" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_hr_employee_company_id +#: model:ir.model.fields,field_description:resource.field_mrp_workcenter_company_id +#: model:ir.model.fields,field_description:resource.field_res_users_city_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_company_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_company_id +#: model:ir.model.fields,field_description:resource.field_resource_mixin_company_id #: model:ir.model.fields,field_description:resource.field_resource_resource_company_id +#: model:ir.model.fields,field_description:resource.field_resource_test_company_id #: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search #: model:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Company" @@ -50,6 +60,7 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_create_uid #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_create_uid #: model:ir.model.fields,field_description:resource.field_resource_resource_create_uid +#: model:ir.model.fields,field_description:resource.field_resource_test_create_uid msgid "Created by" msgstr "" @@ -58,6 +69,7 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_create_date #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_create_date #: model:ir.model.fields,field_description:resource.field_resource_resource_create_date +#: model:ir.model.fields,field_description:resource.field_resource_test_create_date msgid "Created on" msgstr "" @@ -67,7 +79,18 @@ msgid "Day of Week" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_res_company_resource_calendar_id +#: model:ir.model.fields,field_description:resource.field_res_users_resource_calendar_id +msgid "Default Working Hours" +msgstr "" + +#. module: resource +#: model:ir.model.fields,help:resource.field_hr_employee_resource_calendar_id +#: model:ir.model.fields,help:resource.field_mrp_workcenter_resource_calendar_id +#: model:ir.model.fields,help:resource.field_res_users_resource_calendar_id +#: model:ir.model.fields,help:resource.field_resource_mixin_resource_calendar_id #: model:ir.model.fields,help:resource.field_resource_resource_calendar_id +#: model:ir.model.fields,help:resource.field_resource_test_resource_calendar_id msgid "Define the schedule of resource" msgstr "" @@ -80,11 +103,18 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_display_name #: model:ir.model.fields,field_description:resource.field_resource_calendar_display_name #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_display_name +#: model:ir.model.fields,field_description:resource.field_resource_mixin_display_name #: model:ir.model.fields,field_description:resource.field_resource_resource_display_name +#: model:ir.model.fields,field_description:resource.field_resource_test_display_name msgid "Display Name" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_street_number2 +msgid "Door Number" +msgstr "" + +#. module: resource #: model:ir.model.fields,field_description:resource.field_resource_resource_time_efficiency msgid "Efficiency Factor" msgstr "" @@ -96,7 +126,12 @@ msgid "End Date" msgstr "" #. module: resource -#: code:addons/resource/models/resource.py:741 +#: model:ir.model.fields,field_description:resource.field_res_users_country_enforce_cities +msgid "Enforce Cities" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:697 #, python-format msgid "Error! leave start-date must be lower then leave end-date." msgstr "" @@ -107,6 +142,39 @@ msgid "Friday" msgstr "" #. module: resource +#: code:addons/resource/models/resource.py:74 +#, python-format +msgid "Friday Evening" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:73 +#, python-format +msgid "Friday Morning" +msgstr "" + +#. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_partner_latitude +msgid "Geo Latitude" +msgstr "" + +#. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_partner_longitude +msgid "Geo Longitude" +msgstr "" + +#. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_date_localization +msgid "Geolocation Date" +msgstr "" + +#. module: resource +#: model:ir.model.fields,field_description:resource.field_resource_calendar_global_leave_ids +#: model:ir.ui.view,arch_db:resource.resource_calendar_form +msgid "Global Leaves" +msgstr "" + +#. module: resource #: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search #: model:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Group By" @@ -118,6 +186,11 @@ msgid "Hours" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_street_number +msgid "House Number" +msgstr "" + +#. module: resource #: selection:resource.resource,resource_type:0 msgid "Human" msgstr "" @@ -126,7 +199,9 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_id +#: model:ir.model.fields,field_description:resource.field_resource_mixin_id #: model:ir.model.fields,field_description:resource.field_resource_resource_id +#: model:ir.model.fields,field_description:resource.field_resource_test_id msgid "ID" msgstr "" @@ -149,7 +224,9 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar___last_update #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance___last_update #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves___last_update +#: model:ir.model.fields,field_description:resource.field_resource_mixin___last_update #: model:ir.model.fields,field_description:resource.field_resource_resource___last_update +#: model:ir.model.fields,field_description:resource.field_resource_test___last_update msgid "Last Modified on" msgstr "" @@ -158,6 +235,7 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_write_uid #: model:ir.model.fields,field_description:resource.field_resource_calendar_write_uid #: model:ir.model.fields,field_description:resource.field_resource_resource_write_uid +#: model:ir.model.fields,field_description:resource.field_resource_test_write_uid msgid "Last Updated by" msgstr "" @@ -166,6 +244,7 @@ msgstr "" #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_write_date #: model:ir.model.fields,field_description:resource.field_resource_calendar_write_date #: model:ir.model.fields,field_description:resource.field_resource_resource_write_date +#: model:ir.model.fields,field_description:resource.field_resource_test_write_date msgid "Last Updated on" msgstr "" @@ -183,6 +262,7 @@ msgstr "" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_leave_ids +#: model:ir.ui.view,arch_db:resource.resource_calendar_form msgid "Leaves" msgstr "" @@ -197,17 +277,29 @@ msgid "Monday" msgstr "" #. module: resource +#: code:addons/resource/models/resource.py:66 +#, python-format +msgid "Monday Evening" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:65 +#, python-format +msgid "Monday Morning" +msgstr "" + +#. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_name -#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_name #: model:ir.model.fields,field_description:resource.field_resource_calendar_name #: model:ir.model.fields,field_description:resource.field_resource_resource_name +#: model:ir.model.fields,field_description:resource.field_resource_test_name msgid "Name" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_name #: model:ir.ui.view,arch_db:resource.resource_calendar_leave_form #: model:ir.ui.view,arch_db:resource.resource_calendar_leave_tree -#: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search msgid "Reason" msgstr "" @@ -217,7 +309,11 @@ msgid "Related user name for the resource to manage its access." msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_hr_employee_resource_id +#: model:ir.model.fields,field_description:resource.field_mrp_workcenter_resource_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_resource_id +#: model:ir.model.fields,field_description:resource.field_resource_mixin_resource_id +#: model:ir.model.fields,field_description:resource.field_resource_test_resource_id #: model:ir.ui.menu,name:resource.menu_resource_config #: model:ir.ui.view,arch_db:resource.resource_resource_form #: model:ir.ui.view,arch_db:resource.view_resource_calendar @@ -238,11 +334,17 @@ msgstr "" #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree +#: model:ir.actions.act_window,name:resource.resource_calendar_leaves_action_from_calendar #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search msgid "Resource Leaves" msgstr "" #. module: resource +#: model:ir.model,name:resource.model_resource_mixin +msgid "Resource Mixin" +msgstr "" + +#. module: resource #: model:ir.model.fields,field_description:resource.field_resource_resource_resource_type msgid "Resource Type" msgstr "" @@ -254,6 +356,8 @@ msgstr "" #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_resource_tree +#: model:ir.actions.act_window,name:resource.resource_resource_action_from_calendar +#: model:ir.model.fields,field_description:resource.field_res_users_resource_ids #: model:ir.ui.menu,name:resource.menu_resource_resource #: model:ir.ui.view,arch_db:resource.resource_resource_tree msgid "Resources" @@ -266,6 +370,7 @@ msgstr "" #. module: resource #: model:ir.actions.act_window,help:resource.action_resource_resource_tree +#: model:ir.actions.act_window,help:resource.resource_resource_action_from_calendar msgid "Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours." msgstr "" @@ -290,6 +395,13 @@ msgid "Search Working Time" msgstr "" #. module: resource +#: code:addons/resource/models/res_company.py:18 +#: code:addons/resource/models/res_company.py:23 +#, python-format +msgid "Standard 40 hours/week" +msgstr "" + +#. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_date_from msgid "Start Date" msgstr "" @@ -310,11 +422,21 @@ msgid "Starting Date of Leave by Month" msgstr "" #. module: resource +#: model:ir.model.fields,field_description:resource.field_res_users_street_name +msgid "Street Name" +msgstr "" + +#. module: resource #: selection:resource.calendar.attendance,dayofweek:0 msgid "Sunday" msgstr "" #. module: resource +#: model:ir.model,name:resource.model_resource_test +msgid "Test Resource Model" +msgstr "" + +#. module: resource #: model:ir.model.fields,help:resource.field_resource_resource_time_efficiency msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes." msgstr "" @@ -325,11 +447,45 @@ msgid "Thursday" msgstr "" #. module: resource +#: code:addons/resource/models/resource.py:72 +#, python-format +msgid "Thursday Evening" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:71 +#, python-format +msgid "Thursday Morning" +msgstr "" + +#. module: resource +#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_tz +msgid "Timezone" +msgstr "" + +#. module: resource +#: model:ir.model.fields,help:resource.field_resource_calendar_leaves_tz +msgid "Timezone used when encoding the leave. It is used to correctlylocalize leave hours when computing time intervals." +msgstr "" + +#. module: resource #: selection:resource.calendar.attendance,dayofweek:0 msgid "Tuesday" msgstr "" #. module: resource +#: code:addons/resource/models/resource.py:68 +#, python-format +msgid "Tuesday Evening" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:67 +#, python-format +msgid "Tuesday Morning" +msgstr "" + +#. module: resource #: model:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Type" msgstr "" @@ -341,16 +497,38 @@ msgid "User" msgstr "" #. module: resource +#: model:ir.model,name:resource.model_res_users +msgid "Users" +msgstr "" + +#. module: resource #: selection:resource.calendar.attendance,dayofweek:0 msgid "Wednesday" msgstr "" #. module: resource +#: code:addons/resource/models/resource.py:70 +#, python-format +msgid "Wednesday Evening" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:69 +#, python-format +msgid "Wednesday Morning" +msgstr "" + +#. module: resource #: model:ir.model,name:resource.model_resource_calendar_attendance msgid "Work Detail" msgstr "" #. module: resource +#: model:ir.ui.view,arch_db:resource.resource_calendar_form +msgid "Work Resources" +msgstr "" + +#. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_hour_from msgid "Work from" msgstr "" @@ -361,12 +539,23 @@ msgid "Work to" msgstr "" #. module: resource -#: model:ir.model.fields,field_description:resource.field_resource_calendar_manager -msgid "Workgroup Manager" +#: model:ir.model.fields,field_description:resource.field_hr_employee_resource_calendar_id +#: model:ir.model.fields,field_description:resource.field_mrp_workcenter_resource_calendar_id +#: model:ir.model.fields,field_description:resource.field_res_company_resource_calendar_ids +#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_calendar_id +#: model:ir.model.fields,field_description:resource.field_resource_mixin_resource_calendar_id +#: model:ir.model.fields,field_description:resource.field_resource_test_resource_calendar_id +#: model:ir.ui.view,arch_db:resource.resource_calendar_form +msgid "Working Hours" +msgstr "" + +#. module: resource +#: code:addons/resource/models/resource.py:60 +#, python-format +msgid "Working Hours of %s" msgstr "" #. module: resource -#: model:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search #: model:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Working Period" msgstr "" @@ -374,7 +563,6 @@ msgstr "" #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_calendar_form #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance_ids -#: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_calendar_id #: model:ir.model.fields,field_description:resource.field_resource_resource_calendar_id #: model:ir.ui.menu,name:resource.menu_resource_calendar #: model:ir.ui.view,arch_db:resource.resource_calendar_form diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 748f8bc3f64..e7bf9142dd4 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -30,7 +30,12 @@ msgid "\n" "% endif\n" ",</p>\n" "<p>\n" -"Here is your ${doc_name} <strong>${object.name}</strong>\n" +"Here is\n" +"% if ctx.get('proforma')\n" +"in attachment, your pro-forma\n" +"% else\n" +"the ${doc_name} <strong>${object.name}</strong>\n" +"% endif\n" "% if object.origin:\n" "(with reference: ${object.origin} )\n" "% endif\n" @@ -38,8 +43,8 @@ msgid "\n" "from ${object.company_id.name}.\n" "</p>\n" "\n" +"% if is_online and not ctx.get('proforma'):\n" " <br/><br/>\n" -"% if is_online:\n" " <center>\n" " <a href=\"${access_url}\" style=\"background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;\" class=\"o_default_snippet_text\">${access_name}</a>\n" " <br/><br/><br/>\n" @@ -122,6 +127,8 @@ msgstr "" #: model:mail.template,body_html:sale.mail_template_data_notification_email_sale_order msgid "<html>\n" " <head></head>\n" +" % set record = ctx.get('record')\n" +" % set company = record and record.company_id or user.company_id\n" " <body style=\"margin: 0; padding: 0;\">\n" " <table border=\"0\" width=\"100%\" cellpadding=\"0\" bgcolor=\"#ededed\" style=\"padding: 20px; background-color: #ededed\" summary=\"o_mail_notification\">\n" " <tbody>\n" @@ -137,7 +144,7 @@ msgid "<html>\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" +" <img src=\"/logo.png?company=${company.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${company.name}\">\n" " </td>\n" " </tr>\n" " </table>\n" @@ -163,16 +170,16 @@ msgid "<html>\n" " <table width=\"590\" border=\"0\" cellpadding=\"0\" bgcolor=\"#875A7B\" style=\"min-width: 590px; background-color: rgb(135,90,123); 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" +" ${company.name}<br/>\n" +" ${company.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" +" % if company.email:\n" +" <a href=\"mailto:${company.email}\" style=\"text-decoration:none; color: white;\">${company.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" +" % if company.website:\n" +" <a href=\"${company.website}\" style=\"text-decoration:none; color: white;\">\n" +" ${company.website}\n" " </a>\n" " % endif\n" " </td>\n" @@ -182,7 +189,7 @@ msgid "<html>\n" " </tr>\n" " <tr>\n" " <td align=\"center\">\n" -" Powered by <a href=\"https://www.odoo.com\">Odoo</a>.\n" +" Powered by <a target=\"_blank\" href=\"https://www.odoo.com\">Odoo</a>.\n" " </td>\n" " </tr>\n" " </tbody>\n" @@ -203,7 +210,12 @@ msgstr "" #. openerp-web #: code:addons/sale/static/src/js/tour.js:64 #, python-format -msgid "<p><b>Confirm the order</b> if the customer purchases.</p>" +msgid "<p><b>Print this quotation.</b> If not yet done, you will be requested to set your company data and to select a document layout.</p>" +msgstr "" + +#. module: sale +#: model:ir.ui.view,arch_db:sale.report_saleorder_document +msgid "<span>Pro-Forma # </span>" msgstr "" #. module: sale @@ -245,7 +257,7 @@ msgstr "" #. module: sale #: model:ir.ui.view,arch_db:sale.report_saleorder_document -msgid "<strong>Total Without Taxes</strong>" +msgid "<strong>Subtotal</strong>" msgstr "" #. module: sale @@ -322,6 +334,21 @@ msgid "Allows to manage different prices based on rules per category of customer msgstr "" #. module: sale +#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale +msgid "Allows you to send Pro-Forma to your customers" +msgstr "" + +#. module: sale +#: model:ir.model.fields,help:sale.field_sale_config_settings_group_proforma_sales +msgid "Allows you to send pro-forma." +msgstr "" + +#. module: sale +#: model:ir.ui.view,arch_db:sale.report_saleorder_document +msgid "Amount" +msgstr "" + +#. module: sale #: model:ir.model.fields,field_description:sale.field_crm_team_quotations_amount msgid "Amount of quotations to invoice" msgstr "" @@ -423,6 +450,11 @@ msgid "Cancelled" msgstr "" #. module: sale +#: model:ir.ui.menu,name:sale.product_menu_catalog +msgid "Catalog" +msgstr "" + +#. module: sale #: model:ir.model.fields,help:sale.field_crm_team_use_quotations msgid "Check this box if you send quotations to your customers rather than confirming orders straight away. This will add specific action buttons to your dashboard." msgstr "" @@ -463,11 +495,6 @@ msgid "Company" msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_web_clearbit -msgid "Company Research" -msgstr "" - -#. module: sale #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Compute shipping costs" msgstr "" @@ -490,6 +517,16 @@ msgid "Confirmation Date" msgstr "" #. module: sale +#: model:ir.model,name:sale.model_res_partner +msgid "Contact" +msgstr "" + +#. module: sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_coupon +msgid "Coupons & Promotions" +msgstr "" + +#. module: sale #: model:ir.ui.view,arch_db:sale.view_order_form msgid "Create Invoice" msgstr "" @@ -568,6 +605,11 @@ msgid "Customer Addresses" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_web_clearbit +msgid "Customer Autocomplete" +msgstr "" + +#. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_client_order_ref msgid "Customer Reference" msgstr "" @@ -598,13 +640,13 @@ msgid "Date on which the sales order is confirmed." msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_res_company_sale_note -msgid "Default Terms and Conditions" +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_default_use_sale_note +msgid "Default Terms & Conditions" msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_default_use_sale_note -msgid "Default Use Sale Note" +#: model:ir.model.fields,field_description:sale.field_res_company_sale_note +msgid "Default Terms and Conditions" msgstr "" #. module: sale @@ -618,7 +660,9 @@ msgid "Delivered" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:724 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Delivered Quantity" msgstr "" @@ -644,11 +688,6 @@ msgid "Delivery Lead Time" msgstr "" #. module: sale -#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale -msgid "Delivery Orders" -msgstr "" - -#. module: sale #: model:ir.model.fields,help:sale.field_account_invoice_partner_shipping_id msgid "Delivery address for current invoice." msgstr "" @@ -687,11 +726,6 @@ msgid "Discount Policy" msgstr "" #. module: sale -#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale -msgid "Discount Programs" -msgstr "" - -#. module: sale #: selection:product.pricelist,discount_policy:0 msgid "Discount included in the price" msgstr "" @@ -707,6 +741,7 @@ msgid "Discounts" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma_display_name #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_display_name #: model:ir.model.fields,field_description:sale.field_sale_layout_category_display_name #: model:ir.model.fields,field_description:sale.field_sale_order_display_name @@ -784,6 +819,12 @@ msgid "Extended Filters" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:697 +#, python-format +msgid "Extra line with %s " +msgstr "" + +#. module: sale #: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_delivery_fedex msgid "FedEx" msgstr "" @@ -827,6 +868,7 @@ msgid "Group By Name" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma_id #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_id #: model:ir.model.fields,field_description:sale.field_sale_layout_category_id #: model:ir.model.fields,field_description:sale.field_sale_order_id @@ -851,8 +893,13 @@ msgid "Insert your terms & conditions here..." msgstr "" #. module: sale +#: model:ir.ui.menu,name:sale.menu_product_category_action_form +msgid "Internal Categories" +msgstr "" + +#. module: sale #: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_stock -msgid "Inventory" +msgid "Inventory Management" msgstr "" #. module: sale @@ -933,7 +980,9 @@ msgid "Invoiced" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:725 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Invoiced Quantity" msgstr "" @@ -988,13 +1037,11 @@ msgid "Invoicing Target" 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 "" @@ -1005,6 +1052,7 @@ msgid "Is a down payment" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_report_sale_report_saleproforma___last_update #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv___last_update #: model:ir.model.fields,field_description:sale.field_sale_layout_category___last_update #: model:ir.model.fields,field_description:sale.field_sale_order___last_update @@ -1044,7 +1092,7 @@ msgstr "" #. openerp-web #: code:addons/sale/static/src/js/tour.js:24 #, python-format -msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually points to the next logical actions in any screen.</i>" +msgid "Let's create a new quotation.<br/><i>Note that colored buttons usually point to the next logical actions.</i>" msgstr "" #. module: sale @@ -1085,11 +1133,6 @@ msgid "Mail your quotations & invoices in one-click using" msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_coupon -msgid "Manage coupons and promotional offers" -msgstr "" - -#. module: sale #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Manage picking and deliveries" msgstr "" @@ -1144,6 +1187,11 @@ msgid "Multi-Currencies" msgstr "" #. module: sale +#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale +msgid "Multiple Prices per Product" +msgstr "" + +#. module: sale #: selection:sale.config.settings,multi_sales_price_method:0 #: selection:sale.config.settings,sale_pricelist_setting:0 msgid "Multiple prices per product (e.g. customer segments, currencies)" @@ -1176,7 +1224,9 @@ msgid "Name" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:102 +#: code:addons/sale/models/sale.py:104 +#: code:addons/sale/models/sale.py:255 +#: code:addons/sale/models/sale.py:256 #, python-format msgid "New" msgstr "" @@ -1329,7 +1379,9 @@ msgid "Ordered Qty" msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:722 #: model:ir.ui.view,arch_db:sale.view_order_form +#, python-format msgid "Ordered Quantity" msgstr "" @@ -1352,6 +1404,8 @@ msgid "Ordered quantities" msgstr "" #. module: sale +#: model:ir.actions.act_window,name:sale.action_orders_to_invoice +#: model:ir.ui.menu,name:sale.menu_sale_order_invoice #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban msgid "Orders to Invoice" msgstr "" @@ -1392,7 +1446,6 @@ msgid "Packaging" msgstr "" #. module: sale -#: model:ir.model,name:sale.model_res_partner #: model:ir.model.fields,field_description:sale.field_sale_report_partner_id msgid "Partner" msgstr "" @@ -1418,20 +1471,19 @@ msgid "Personalize sales order and invoice report" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:284 +#: code:addons/sale/models/sale.py:286 #, python-format msgid "Please define an accounting sales journal for this company." msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:780 +#: code:addons/sale/models/sale.py:807 #, 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 "" @@ -1471,7 +1523,6 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_config_settings_multi_sales_price_method #: model:ir.model.fields,field_description:sale.field_sale_config_settings_sale_pricelist_setting -#: model:ir.ui.menu,name:sale.menu_product_pricelist_action2 #: model:ir.ui.menu,name:sale.menu_product_pricelist_main #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Pricelists" @@ -1488,6 +1539,17 @@ msgid "Print" msgstr "" #. module: sale +#: model:ir.actions.report.xml,name:sale.report_proforma_quotation +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_proforma_sales +msgid "Pro-Forma" +msgstr "" + +#. module: sale +#: model:res.groups,name:sale.group_proforma_sales +msgid "Pro-forma Invoices" +msgstr "" + +#. module: sale #: model:ir.model,name:sale.model_procurement_order msgid "Procurement" msgstr "" @@ -1512,8 +1574,8 @@ msgid "Product" msgstr "" #. module: sale -#: model:ir.ui.menu,name:sale.menu_product_category_action_form -msgid "Product Categories" +#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale +msgid "Product Catalog" msgstr "" #. module: sale @@ -1542,7 +1604,6 @@ msgstr "" #. module: sale #: model:ir.ui.menu,name:sale.menu_product_template_action #: model:ir.ui.menu,name:sale.prod_config_main -#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Products" msgstr "" @@ -1815,17 +1876,6 @@ msgid "Sales Orders Statistics" msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout -msgid "Sales Reports Layout" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_orders_to_invoice -#: model:ir.ui.menu,name:sale.menu_sale_order_invoice -msgid "Sales to Invoice" -msgstr "" - -#. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line_salesman_id #: model:ir.model.fields,field_description:sale.field_sale_order_user_id #: model:ir.model.fields,field_description:sale.field_sale_report_user_id @@ -1858,10 +1908,15 @@ msgid "Section" msgstr "" #. module: sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_sale_layout +msgid "Sections on Sales Orders" +msgstr "" + +#. module: sale #. openerp-web #: code:addons/sale/static/src/js/tour.js:44 #, python-format -msgid "Select a product, or create a new one on the fly. The product will define the default sale price (that you can change), taxes and description automatically." +msgid "Select a product, or create a new one on the fly. The product will define the default sales price (that you can change), taxes and description automatically." msgstr "" #. module: sale @@ -1897,6 +1952,11 @@ msgid "Sell your products on eBay" msgstr "" #. module: sale +#: model:ir.ui.view,arch_db:sale.view_order_form +msgid "Send PRO-FORMA" +msgstr "" + +#. module: sale #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Send a product-specific email once the invoice is paid" msgstr "" @@ -2082,11 +2142,6 @@ 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 channel estimates to be able to invoice this month." msgstr "" @@ -2141,7 +2196,7 @@ msgid "Terms and conditions" msgstr "" #. module: sale -#: code:addons/sale/models/sale_analytic.py:95 +#: code:addons/sale/models/sale_analytic.py:119 #, python-format msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses." msgstr "" @@ -2163,6 +2218,12 @@ msgid "The margin is computed as the sum of product sales prices minus the cost msgstr "" #. module: sale +#: code:addons/sale/models/sale.py:718 +#, python-format +msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders." +msgstr "" + +#. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:147 #, python-format msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product." @@ -2192,8 +2253,8 @@ msgid "There is no income account defined for this product: \"%s\". You may have msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:361 -#: code:addons/sale/models/sale.py:365 +#: code:addons/sale/models/sale.py:363 +#: code:addons/sale/models/sale.py:367 #, python-format msgid "There is no invoicable line." msgstr "" @@ -2317,6 +2378,11 @@ msgid "Units of Measure" msgstr "" #. module: sale +#: model:ir.ui.view,arch_db:sale.view_order_form +msgid "Unlock" +msgstr "" + +#. module: sale #: model:ir.ui.view,arch_db:sale.view_sales_order_filter msgid "Unread Messages" msgstr "" @@ -2370,6 +2436,7 @@ msgid "Use this menu to access quotations, sales orders and customers." 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 "VAT:" msgstr "" @@ -2386,7 +2453,7 @@ msgid "Warning" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:864 +#: code:addons/sale/models/sale.py:898 #, python-format msgid "Warning for %s" msgstr "" @@ -2431,13 +2498,13 @@ msgid "Wrong value entered!" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:165 +#: code:addons/sale/models/sale.py:167 #, 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:893 +#: code:addons/sale/models/sale.py:927 #, python-format msgid "You can not remove a sales order line.\n" "Discard changes and try setting the quantity to 0." @@ -2483,6 +2550,11 @@ msgid "eBay" msgstr "" #. module: sale +#: model:ir.model,name:sale.model_report_sale_report_saleproforma +msgid "report.sale.report_saleproforma" +msgstr "" + +#. module: sale #: model:ir.model,name:sale.model_sale_config_settings msgid "sale.config.settings" msgstr "" diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot index 1b1d9770d4b..1c4a98b770b 100644 --- a/addons/sale_stock/i18n/sale_stock.pot +++ b/addons/sale_stock/i18n/sale_stock.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -127,10 +127,18 @@ msgstr "" #. module: sale_stock #: model:ir.model.fields,help:sale_stock.field_res_company_security_lead #: model:ir.model.fields,help:sale_stock.field_sale_config_settings_security_lead +#: model:ir.model.fields,help:sale_stock.field_stock_config_settings_default_new_security_lead +#: model:ir.model.fields,help:sale_stock.field_stock_config_settings_security_lead +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock msgid "Margin of error for dates promised to customers. Products will be scheduled for procurement and delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain." msgstr "" #. module: sale_stock +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "Move forward expected delivery dates by" +msgstr "" + +#. module: sale_stock #: code:addons/sale_stock/models/sale_order.py:145 #, python-format msgid "Not enough inventory!" @@ -173,8 +181,8 @@ msgid "Product" msgstr "" #. module: sale_stock -#: model:ir.model.fields,field_description:sale_stock.field_sale_order_line_product_tmpl_id -msgid "Product Template" +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs. By default, the scheduler runs automatically every 24 hours." msgstr "" #. module: sale_stock @@ -220,15 +228,26 @@ msgstr "" #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_res_company_security_lead +#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_security_lead msgid "Sales Safety Days" msgstr "" #. module: sale_stock +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "Schedule deliveries earlier to avoid delays" +msgstr "" + +#. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_sale_config_settings_security_lead msgid "Security Lead Time" msgstr "" #. module: sale_stock +#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_default_new_security_lead +msgid "Security Lead Time for Sales" +msgstr "" + +#. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_stock_location_route_sale_selectable msgid "Selectable on Sales Order Line" msgstr "" @@ -239,11 +258,26 @@ msgid "Set a delivery date on orders" msgstr "" #. module: sale_stock +#: selection:stock.config.settings,default_picking_policy:0 +msgid "Ship all products at once" +msgstr "" + +#. module: sale_stock +#: selection:stock.config.settings,default_picking_policy:0 +msgid "Ship products as soon as available, with back orders" +msgstr "" + +#. module: sale_stock #: model:ir.ui.view,arch_db:sale_stock.view_order_form_inherit_sale_stock msgid "Shipping Information" msgstr "" #. module: sale_stock +#: model:ir.model.fields,field_description:sale_stock.field_stock_config_settings_default_picking_policy +msgid "Shipping Management" +msgstr "" + +#. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_sale_order_picking_policy msgid "Shipping Policy" msgstr "" @@ -259,7 +293,7 @@ msgid "This allows to apply a special route on sales order lines (e.g. dropshipp msgstr "" #. module: sale_stock -#: code:addons/sale_stock/models/sale_order.py:202 +#: code:addons/sale_stock/models/sale_order.py:203 #, python-format msgid "This product is packaged by %.2f %s. You should sell %.2f %s." msgstr "" @@ -292,12 +326,22 @@ msgid "Warehouse" msgstr "" #. module: sale_stock -#: code:addons/sale_stock/models/sale_order.py:201 +#: code:addons/sale_stock/models/sale_order.py:202 #, python-format msgid "Warning" msgstr "" #. module: sale_stock +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "When to reserve sold products" +msgstr "" + +#. module: sale_stock +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "When to start shipping" +msgstr "" + +#. module: sale_stock #: 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." @@ -311,11 +355,21 @@ msgid "You plan to sell %s %s but you only have %s %s available!\n" msgstr "" #. module: sale_stock +#: model:ir.ui.view,arch_db:sale_stock.stock_config_settings_view_form_inherit_sale_stock +msgid "days" +msgstr "" + +#. module: sale_stock #: 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_config_settings +msgid "stock.config.settings" +msgstr "" + +#. module: sale_stock #: model:ir.model,name:sale_stock.model_stock_return_picking_line msgid "stock.return.picking.line" msgstr "" diff --git a/addons/sales_team/i18n/sales_team.pot b/addons/sales_team/i18n/sales_team.pot index 8e283097d51..e0168459d1f 100644 --- a/addons/sales_team/i18n/sales_team.pot +++ b/addons/sales_team/i18n/sales_team.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -76,6 +76,12 @@ msgid "Activities Done" msgstr "" #. module: sales_team +#: model:ir.actions.act_window,name:sales_team.mail_activity_type_action_config_sales +#: model:ir.ui.menu,name:sales_team.sales_team_menu_config_activity_types +msgid "Activity Types" +msgstr "" + +#. module: sales_team #: model:ir.ui.view,arch_db:sales_team.crm_team_salesteams_search msgid "Archived" msgstr "" @@ -97,7 +103,7 @@ msgid "Bar" msgstr "" #. module: sales_team -#: code:addons/sales_team/models/crm_team.py:235 +#: code:addons/sales_team/models/crm_team.py:237 #, python-format msgid "Big Pretty Button :)" msgstr "" @@ -170,6 +176,11 @@ msgid "Configure Sales" msgstr "" #. module: sales_team +#: model:ir.model,name:sales_team.model_res_partner +msgid "Contact" +msgstr "" + +#. module: sales_team #: model:ir.ui.menu,name:sales_team.menu_partner_category_form msgid "Contact Tags" msgstr "" @@ -388,11 +399,6 @@ msgid "Manage leads, opportunities, meetings and activities" msgstr "" #. module: sales_team -#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale_contract -msgid "Manage subscriptions and recurring invoicing" -msgstr "" - -#. module: sales_team #: model:res.groups,name:sales_team.group_sale_manager msgid "Manager" msgstr "" @@ -450,11 +456,6 @@ msgid "Only Integer Value should be valid." msgstr "" #. module: sales_team -#: model:ir.model,name:sales_team.model_res_partner -msgid "Partner" -msgstr "" - -#. module: sales_team #. openerp-web #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:102 #, python-format @@ -571,6 +572,11 @@ msgid "Settings" msgstr "" #. module: sales_team +#: model:ir.model.fields,field_description:sales_team.field_sale_config_settings_module_sale_contract +msgid "Subscriptions" +msgstr "" + +#. module: sales_team #. openerp-web #: code:addons/sales_team/static/src/xml/sales_team_dashboard.xml:148 #, python-format @@ -714,8 +720,8 @@ msgid "Type" msgstr "" #. module: sales_team -#: code:addons/sales_team/models/crm_team.py:122 -#: code:addons/sales_team/models/crm_team.py:125 +#: code:addons/sales_team/models/crm_team.py:124 +#: code:addons/sales_team/models/crm_team.py:127 #, python-format msgid "Undefined graph model for Sales Channel: %s" msgstr "" diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 4a409b8be61..1296f083384 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,6 @@ msgstr "" "Plural-Forms: \n" #. 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\n" -"-This installs the module stock_dropshipping." -msgstr "" - -#. module: stock #: code:addons/stock/models/stock_move.py:214 #, python-format msgid " (%s reserved)" @@ -52,7 +45,7 @@ msgid "#Products" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:453 +#: code:addons/stock/models/stock_warehouse.py:483 #, python-format msgid "%s: Supply Product from %s" msgstr "" @@ -461,7 +454,7 @@ msgid "<strong>When you process an incoming shipment, internal transfer or deliv msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:109 +#: code:addons/stock/models/stock_inventory.py:115 #, python-format msgid "A Pack" msgstr "" @@ -511,13 +504,19 @@ msgid "Active" msgstr "" #. module: stock -#: selection:stock.config.settings,module_stock_calendar:0 -msgid "Adapt lead times using the suppliers' open days calendars (advanced)" +#: model:ir.ui.view,arch_db:stock.view_picking_form +msgid "Add an internal note that will be printed on the Picking Operations sheet" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_picking_form -msgid "Add an internal note that will be printed on the Picking Operations sheet" +#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_adv_location +msgid "Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. \n" +" You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks)." +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks)." msgstr "" #. module: stock @@ -542,8 +541,8 @@ msgid "Advanced" msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_adv_location:0 -msgid "Advanced routing of products using rules" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Advanced Scheduling" msgstr "" #. module: stock @@ -583,66 +582,29 @@ msgid "All items couldn't be shipped, the remaining ones will be shipped as soon msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:99 +#: code:addons/stock/models/stock_inventory.py:105 #, python-format msgid "All products" msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_tracking_owner:0 -msgid "All products in your warehouse belong to your company" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_move_returned_move_ids msgid "All returned moves" msgstr "" #. module: stock -#: code:addons/stock/models/procurement.py:222 +#: code:addons/stock/models/procurement.py:220 #, python-format msgid "All stock moves have been cancelled for this procurement." msgstr "" #. module: stock -#: 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 "" #. module: stock -#: selection:stock.config.settings,module_stock_dropshipping:0 -msgid "Allow suppliers to deliver directly to your customers" -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 sales order.\n" -" This installs the module procurement_jit." -msgstr "" - -#. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_packaging -msgid "Allows you to create and manage your packaging dimensions and types you want to be maintained in your system." -msgstr "" - -#. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_group_uom -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 "" @@ -673,11 +635,6 @@ msgid "Applied On" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_stock_config_settings -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 @@ -689,11 +646,6 @@ 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 "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.view_make_procurment_wizard msgid "Ask New Products" msgstr "" @@ -715,10 +667,16 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_attribute_action +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Attributes" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_product_variant +msgid "Attributes & Variants" +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_location_path_auto msgid "Automatic Move" msgstr "" @@ -750,6 +708,11 @@ msgid "Available Products" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Avoid stock-outs with purchase requests based on demand and stock levels" +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_move_backorder_id #: model:ir.model.fields,field_description:stock.field_stock_picking_backorder_id msgid "Back Order of" @@ -767,7 +730,7 @@ msgid "Back order <em>%s</em> <b>cancelled</b>." msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:979 +#: code:addons/stock/models/stock_picking.py:981 #, python-format msgid "Back order <em>%s</em> <b>created</b>." msgstr "" @@ -800,11 +763,6 @@ msgid "Barcode" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_stock_config_settings -msgid "Barcode Interface" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_picking_type_barcode_nomenclature_id msgid "Barcode Nomenclature" msgstr "" @@ -816,7 +774,7 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_barcode -msgid "Barcode scanner support" +msgid "Barcode Scanner" msgstr "" #. module: stock @@ -851,7 +809,7 @@ msgid "By Unique Serial Number" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:389 +#: code:addons/stock/models/stock_move.py:386 #, python-format msgid "By changing this quantity here, you accept the new quantity as complete: Odoo will not automatically generate a back order." msgstr "" @@ -882,13 +840,13 @@ msgid "Calendar View" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:400 +#: code:addons/stock/models/stock_warehouse.py:430 #, python-format msgid "Can't find any customer or supplier location." msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:448 +#: code:addons/stock/models/stock_warehouse.py:478 #, python-format msgid "Can't find any generic Make To Order route." msgstr "" @@ -923,11 +881,6 @@ msgid "Cannot unreserve a done move" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_stock_config_settings -msgid "Carriers" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_product_product_route_from_categ_ids #: model:ir.model.fields,field_description:stock.field_product_template_route_from_categ_ids msgid "Category Routes" @@ -944,6 +897,16 @@ msgid "Change Product Quantity" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Change must be higher than" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_picking_form +msgid "Check Availability" +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 "" @@ -1014,7 +977,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.stock_picking_type_action -msgid "Click to create a new picking type." +msgid "Click to create a new operation type." msgstr "" #. module: stock @@ -1142,11 +1105,21 @@ msgid "Congratulations!" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_owner +msgid "Consignment" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search msgid "Consumable" msgstr "" #. module: stock +#: model:ir.model,name:stock.model_res_partner +msgid "Contact" +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_quant_package_children_ids #: model:ir.ui.view,arch_db:stock.view_quant_package_form msgid "Contained Packages" @@ -1209,7 +1182,7 @@ msgid "Create Backorder" msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:813 +#: code:addons/stock/models/stock_picking.py:815 #, python-format msgid "Create Backorder?" msgstr "" @@ -1358,7 +1331,7 @@ msgid "Creation Date, usually the time of the order" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:405 +#: code:addons/stock/models/stock_warehouse.py:435 #, python-format msgid "Cross-Dock" msgstr "" @@ -1425,7 +1398,7 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_dhl -msgid "DHL integration" +msgid "DHL" msgstr "" #. module: stock @@ -1494,11 +1467,6 @@ msgid "Day(s) to purchase" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_decimal_precision -msgid "Decimal precision on weight" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_picking_type_default_location_dest_id msgid "Default Destination Location" msgstr "" @@ -1546,11 +1514,6 @@ msgid "Defaults routes through the warehouse" msgstr "" #. module: stock -#: selection:stock.config.settings,module_product_expiry:0 -msgid "Define Expiration Date on serial numbers" -msgstr "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Define routes within your warehouse according to business needs, such as Quality Control, After Sales Services or Supplier Returns" msgstr "" @@ -1622,11 +1585,6 @@ 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,..." @@ -1783,22 +1741,6 @@ msgid "Do not hesitate to send us an email to describe your experience or to sug 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_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 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_qty_done @@ -1822,6 +1764,11 @@ msgid "Done Transfers by Date" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Don’t propagate scheduling changes through chains of operations" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Download the" msgstr "" @@ -1840,11 +1787,6 @@ msgid "Draft Moves" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_dropshipping -msgid "Dropshipping" -msgstr "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Edit its details or add new ones" msgstr "" @@ -1855,6 +1797,11 @@ msgid "End" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Engage successfully with your customers thanks to an integrated supply chain" +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" @@ -1897,12 +1844,7 @@ msgid "External note..." msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_stock_config_settings -msgid "Extra Features" -msgstr "" - -#. module: stock -#: code:addons/stock/models/stock_picking.py:953 +#: code:addons/stock/models/stock_picking.py:955 #, python-format msgid "Extra Move: " msgstr "" @@ -1914,7 +1856,7 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_fedex -msgid "Fedex integration" +msgid "FedEx" msgstr "" #. module: stock @@ -2010,23 +1952,23 @@ msgid "Future Receipts" 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." +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Get a full traceability from vendors to customers" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.stock_location_path_filter -msgid "Global" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Get informative or blocking warnings on partners" msgstr "" #. module: stock -#: model:ir.ui.menu,name:stock.menu_procurement_rules -msgid "Global Procurement Rules" +#: 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 "" #. module: stock -#: model:ir.ui.menu,name:stock.menu_stock_location_path -msgid "Global Push Rules" +#: model:ir.ui.view,arch_db:stock.stock_location_path_filter +msgid "Global" msgstr "" #. module: stock @@ -2151,7 +2093,7 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_stock_picking_type_id #: model:ir.model.fields,field_description:stock.field_stock_production_lot_id #: model:ir.model.fields,field_description:stock.field_stock_quant_id -#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8585 +#: model:ir.model.fields,field_description:stock.field_stock_quant_package_id_8746 #: 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 @@ -2161,7 +2103,7 @@ msgid "ID" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:391 +#: code:addons/stock/models/stock_inventory.py:392 #, python-format msgid "INV:" msgstr "" @@ -2204,11 +2146,6 @@ msgid "If checked, when this move is cancelled, cancel the linked move too" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_procurement_rule_route_id -msgid "If route_id is False, the rule is global" -msgstr "" - -#. module: stock #: model:ir.model.fields,help:stock.field_stock_pack_operation_result_package_id msgid "If set, the operations are packed into this package" msgstr "" @@ -2240,7 +2177,7 @@ 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 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. " +msgid "If this is checked, you will be able to choose the Lots/Serial Numbers. You can also decide to not put lots in this operation type. This means it will create stock with no lot or not put a restriction on the lot taken. " msgstr "" #. module: stock @@ -2286,7 +2223,7 @@ msgid "Immediate Transfer" msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:795 +#: code:addons/stock/models/stock_picking.py:797 #, python-format msgid "Immediate Transfer?" msgstr "" @@ -2297,6 +2234,11 @@ msgid "Immediate transfer?" msgstr "" #. module: stock +#: selection:stock.config.settings,module_procurement_jit:0 +msgid "Immediately after sales order confirmation" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Import using the top left button in" msgstr "" @@ -2405,11 +2347,6 @@ msgid "Input Location" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_module_stock_picking_wave -msgid "Install the picking wave module which will help you grouping your pickings and processing them in batch" -msgstr "" - -#. module: stock #: model:stock.location,name:stock.stock_location_inter_wh msgid "Inter Company Transit" msgstr "" @@ -2859,11 +2796,6 @@ msgid "Location" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_stock_config_settings -msgid "Location & Warehouse" -msgstr "" - -#. module: stock #: model:ir.actions.report.xml,name:stock.action_report_location_barcode msgid "Location BarCode" msgstr "" @@ -2902,6 +2834,7 @@ msgstr "" #: model:ir.ui.view,arch_db:stock.view_move_picking_form #: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form #: model:ir.ui.view,arch_db:stock.view_picking_type_form +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings #: model:ir.ui.view,arch_db:stock.view_warehouse msgid "Locations" msgstr "" @@ -2972,19 +2905,19 @@ msgid "Lot/Serial number for pack ops" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible -msgid "Lots Visible" +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_production_lot +msgid "Lots & Serial Numbers" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_production_lot -msgid "Lots and Serial Numbers" +#: model:ir.model.fields,field_description:stock.field_stock_pack_operation_lots_visible +msgid "Lots Visible" msgstr "" #. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Lots can be encoded on incoming shipments, internal transfers and\n" -" outgoing deliveries according to the settings in the picking type.\n" +" outgoing deliveries according to the settings in the operation type.\n" " The tracking can be configured on every product: not any tracing at\n" " all, tracking by lot, or tracking by unique serial number." msgstr "" @@ -3004,7 +2937,7 @@ msgid "Lots/Serial Numbers Used" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:504 +#: code:addons/stock/models/stock_warehouse.py:534 #, python-format msgid "MTO" msgstr "" @@ -3020,7 +2953,7 @@ msgid "Make Procurements" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:446 +#: code:addons/stock/models/stock_warehouse.py:476 #: model:stock.location.route,name:stock.route_warehouse0_mto #, python-format msgid "Make To Order" @@ -3052,16 +2985,6 @@ msgid "Manage Push and Pull inventory flows" msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_packaging:0 -msgid "Manage available packaging options per products" -msgstr "" - -#. module: stock -#: selection:stock.config.settings,group_stock_tracking_owner:0 -msgid "Manage consignee stocks (advanced)" -msgstr "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Manage default locations per product" msgstr "" @@ -3077,47 +3000,22 @@ 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 "" - -#. module: stock -#: selection:stock.config.settings,module_stock_picking_wave:0 -msgid "Manage pickings one at a time" -msgstr "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Manage product manufacturing chains" msgstr "" #. module: stock #: model:ir.ui.view,arch_db:stock.view_stock_config_settings -msgid "Manage quality control points, checks and measures" +msgid "Manage product packaging" 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" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Manage quality control points, checks and measures" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_warehouses +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Manage several warehouses" msgstr "" @@ -3132,6 +3030,16 @@ msgid "Manual Operation" msgstr "" #. module: stock +#: selection:stock.config.settings,module_procurement_jit:0 +msgid "Manually or based on automatic scheduler" +msgstr "" + +#. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_mrp +msgid "Manufacturing" +msgstr "" + +#. module: stock #: selection:stock.picking.type,code:0 msgid "Manufacturing Operation" msgstr "" @@ -3184,16 +3092,10 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_product_product_orderpoint_ids -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_calendar msgid "Minimum Stock Rules" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_propagation_minimum_delta -msgid "Minimum days to trigger a propagation of date change in pushed/pull flows." -msgstr "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.view_warehouse_orderpoint_form msgid "Misc" msgstr "" @@ -3209,11 +3111,6 @@ 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" @@ -3302,6 +3199,16 @@ msgid "Moves that operate(d) on this quant" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_adv_location +msgid "Multi-Step Routes" +msgstr "" + +#. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_warehouses +msgid "Multi-Warehouses" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_picking_internal_search msgid "My Activities" msgstr "" @@ -3369,6 +3276,12 @@ msgid "No Message" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_default_new_propagation_minimum_delta +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_propagation_minimum_delta +msgid "No Rescheduling Propagation" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.report_stock_lines_date_search msgid "No Stock Move yet" msgstr "" @@ -3379,12 +3292,7 @@ msgid "No Tracking" msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_adv_location:0 -msgid "No automatic routing of products" -msgstr "" - -#. module: stock -#: code:addons/stock/models/stock_picking.py:826 +#: code:addons/stock/models/stock_picking.py:828 #, python-format msgid "No negative quantities allowed" msgstr "" @@ -3396,17 +3304,12 @@ msgid "No products to return (only lines in Done state and not fully returned ye msgstr "" #. module: stock -#: code:addons/stock/models/procurement.py:183 +#: code:addons/stock/models/procurement.py:181 #, python-format msgid "No source location defined!" msgstr "" #. module: stock -#: selection:stock.config.settings,group_product_variant:0 -msgid "No variants on products" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_picking_pack_operation_product_ids msgid "Non pack" msgstr "" @@ -3431,7 +3334,7 @@ msgid "Notes" msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:466 +#: code:addons/stock/models/stock_picking.py:468 #, python-format msgid "Nothing to check the availability for." msgstr "" @@ -3512,31 +3415,31 @@ msgid "Once it's fully working, give us some feedback: we love to hear from our msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:107 +#: code:addons/stock/models/stock_inventory.py:113 #, python-format msgid "One Lot/Serial Number" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:105 +#: code:addons/stock/models/stock_inventory.py:111 #, python-format msgid "One owner only" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:100 +#: code:addons/stock/models/stock_inventory.py:106 #, python-format msgid "One product category" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:105 +#: code:addons/stock/models/stock_inventory.py:111 #, python-format msgid "One product for a specific owner" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:101 +#: code:addons/stock/models/stock_inventory.py:107 #, python-format msgid "One product only" msgstr "" @@ -3559,6 +3462,26 @@ msgid "Operation Name" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_procurement_rule_picking_type_id +#: model:ir.model.fields,field_description:stock.field_stock_location_path_picking_type_id +#: model:ir.model.fields,field_description:stock.field_stock_move_picking_type_id +#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_id +#: model:ir.ui.view,arch_db:stock.view_picking_internal_search +#: model:ir.ui.view,arch_db:stock.view_pickingtype_filter +msgid "Operation Type" +msgstr "" + +#. module: stock +#: model:ir.model.fields,help:stock.field_procurement_rule_picking_type_id +msgid "Operation Type determines the way the picking should be shown in the view, reports, ..." +msgstr "" + +#. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_picking_type_return_picking_type_id +msgid "Operation Type for Returns" +msgstr "" + +#. 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 @@ -3567,8 +3490,14 @@ msgid "Operation Types" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_picking_type_name +msgid "Operation Types Name" +msgstr "" + +#. module: stock #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt #: model:ir.ui.view,arch_db:stock.view_picking_form +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Operations" msgstr "" @@ -3790,6 +3719,11 @@ msgid "Package Type" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Package Types" +msgstr "" + +#. module: stock #: model:ir.actions.act_window,name:stock.action_package_view #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_lot #: model:ir.ui.menu,name:stock.menu_package @@ -3804,16 +3738,12 @@ msgid "Packages are usually created by pack operations made on transfers and can msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging #: model:ir.ui.view,arch_db:stock.quant_package_search_view msgid "Packaging" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_packaging -msgid "Packaging Methods" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_warehouse_wh_pack_stock_loc_id msgid "Packing Location" msgstr "" @@ -3864,7 +3794,6 @@ msgid "Partially Available" msgstr "" #. module: stock -#: model:ir.model,name:stock.model_res_partner #: model:ir.model.fields,field_description:stock.field_procurement_group_partner_id #: model:ir.model.fields,field_description:stock.field_stock_picking_partner_id #: model:ir.ui.view,arch_db:stock.view_move_search @@ -3918,13 +3847,13 @@ msgid "Pick" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:407 +#: code:addons/stock/models/stock_warehouse.py:437 #, python-format msgid "Pick + Pack + Ship" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:406 +#: code:addons/stock/models/stock_warehouse.py:436 #, python-format msgid "Pick + Ship" msgstr "" @@ -3956,31 +3885,6 @@ msgid "Picking Operations" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_procurement_rule_picking_type_id -#: model:ir.model.fields,field_description:stock.field_stock_location_path_picking_type_id -#: model:ir.model.fields,field_description:stock.field_stock_move_picking_type_id -#: model:ir.model.fields,field_description:stock.field_stock_picking_picking_type_id -#: model:ir.ui.view,arch_db:stock.view_picking_internal_search -#: model:ir.ui.view,arch_db:stock.view_pickingtype_filter -msgid "Picking Type" -msgstr "" - -#. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_picking_type_name -msgid "Picking Type Name" -msgstr "" - -#. module: stock -#: model:ir.model.fields,help:stock.field_procurement_rule_picking_type_id -msgid "Picking Type determines the way the picking should be shown in the view, reports, ..." -msgstr "" - -#. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_picking_type_return_picking_type_id -msgid "Picking Type for Returns" -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_picking_wave msgid "Picking Waves" msgstr "" @@ -4026,13 +3930,13 @@ msgid "Planner" msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:782 +#: code:addons/stock/models/stock_picking.py:784 #, python-format msgid "Please create some Initial Demand or Mark as Todo and create some Operations. " msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:1018 +#: code:addons/stock/models/stock_picking.py:1020 #, python-format msgid "Please process some quantities to put in the pack first!" msgstr "" @@ -4097,6 +4001,16 @@ msgid "Priority for this picking. Setting manually a value here would set it as msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Process operations faster with barcodes" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Process picking in batch per worker" +msgstr "" + +#. module: stock #: model:ir.model,name:stock.model_procurement_order #: model:ir.model.fields,field_description:stock.field_stock_move_procurement_id #: selection:stock.location,usage:0 @@ -4154,7 +4068,6 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.do_view_procurement_op -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_procurement_jit #: model:ir.ui.view,arch_db:stock.view_warehouse_orderpoint_form #: model:stock.location,name:stock.location_procurement msgid "Procurements" @@ -4226,11 +4139,6 @@ msgid "Product Name" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_tracking_owner -msgid "Product Owners" -msgstr "" - -#. module: stock #: model:ir.ui.menu,name:stock.menu_product_packagings msgid "Product Packaging" msgstr "" @@ -4254,7 +4162,6 @@ 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 "" @@ -4293,16 +4200,6 @@ msgid "Products" msgstr "" #. module: stock -#: selection:stock.config.settings,group_product_variant:0 -msgid "Products can have several attributes, defining variants (Example: size, color,...)" -msgstr "" - -#. module: stock -#: selection:stock.config.settings,group_uom:0 -msgid "Products have only one unit of measure (easier)" -msgstr "" - -#. module: stock #: 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 "" @@ -4321,6 +4218,11 @@ msgid "Propagate cancel and split" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_purchase +msgid "Purchase" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Purchase Flow" msgstr "" @@ -4354,6 +4256,12 @@ msgid "Put Away Strategy" msgstr "" #. module: stock +#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_lot +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Put products in packages and get shipping labels per package unit thanks to shipping connectors." +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_putaway msgid "Putaway" msgstr "" @@ -4369,12 +4277,8 @@ msgid "Qty Multiple must be greater than or equal to zero." msgstr "" #. module: stock -#: 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:98 +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_quality #, python-format msgid "Quality Control" msgstr "" @@ -4514,19 +4418,19 @@ msgid "Receipt Route" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:404 +#: code:addons/stock/models/stock_warehouse.py:434 #, python-format msgid "Receipt in 1 step" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:404 +#: code:addons/stock/models/stock_warehouse.py:434 #, python-format msgid "Receipt in 2 steps" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:405 +#: code:addons/stock/models/stock_warehouse.py:435 #, python-format msgid "Receipt in 3 steps" msgstr "" @@ -4557,6 +4461,11 @@ msgid "Recheck Availability" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Recommended Apps" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_picking_form msgid "Recompute" msgstr "" @@ -4567,11 +4476,6 @@ msgid "Recompute pack operation?" msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_tracking_lot:0 -msgid "Record packages used on packing: pallets, boxes, ..." -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 @@ -4685,18 +4589,19 @@ msgid "Res Model" msgstr "" #. module: stock -#: model:ir.ui.view,arch_db:stock.view_picking_form -msgid "Reserve" +#: model:ir.model.fields,help:stock.field_stock_config_settings_default_new_propagation_minimum_delta +msgid "Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n" +" This option allows to not propagate the rescheduling if the change is not critical." msgstr "" #. module: stock -#: selection:stock.config.settings,module_procurement_jit:0 -msgid "Reserve products immediately after the sales order confirmation" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. This option allows to not propagate the rescheduling if the change is not critical." msgstr "" #. module: stock -#: selection:stock.config.settings,module_procurement_jit:0 -msgid "Reserve products manually or based on automatic scheduler" +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_procurement_jit +msgid "Reservation" msgstr "" #. module: stock @@ -4725,6 +4630,11 @@ msgid "Reserved quants" msgstr "" #. module: stock +#: model:ir.model.fields,help:stock.field_stock_config_settings_module_procurement_jit +msgid "Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs." +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_picking_form msgid "Reset Operations" msgstr "" @@ -4800,10 +4710,8 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_product_category_route_ids #: model:ir.model.fields,field_description:stock.field_product_product_route_ids #: model:ir.model.fields,field_description:stock.field_product_template_route_ids -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_adv_location #: model:ir.model.fields,field_description:stock.field_stock_warehouse_route_ids #: model:ir.ui.menu,name:stock.menu_routes_config -#: model:ir.ui.menu,name:stock.menu_stock_routes #: model:ir.ui.view,arch_db:stock.product_form_view_procurement_button #: model:ir.ui.view,arch_db:stock.product_template_form_view_procurement_button #: model:ir.ui.view,arch_db:stock.stock_location_route_tree @@ -4843,6 +4751,11 @@ msgid "Sale Conditions" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_sale +msgid "Sales" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "Sales Flow" msgstr "" @@ -4850,10 +4763,16 @@ msgstr "" #. module: stock #: model:ir.ui.view,arch_db:stock.view_pack_operation_details_form_save #: model:ir.ui.view,arch_db:stock.view_pack_operation_lot_form +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Save" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Save this page and come back here to set up the feature." +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_move_search msgid "Scheduled" msgstr "" @@ -4869,6 +4788,12 @@ msgid "Scheduled date for the processing of this move" msgstr "" #. module: stock +#: model:ir.model.fields,help:stock.field_stock_config_settings_module_stock_calendar +msgid "Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).\n" +"By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules." +msgstr "" + +#. module: stock #: model:ir.model.fields,help:stock.field_stock_picking_min_date msgid "Scheduled time for the first part of the shipment to be processed. Setting manually a value here would set it as expected date for all the stock moves." msgstr "" @@ -4884,7 +4809,7 @@ msgid "Schedulers" msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:1030 +#: code:addons/stock/models/stock_picking.py:1032 #: 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 @@ -4932,7 +4857,13 @@ msgid "Search Stock Location Paths" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:102 +#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_packaging +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Select or scan the packaging used to transfer products in operations. This allows to update or check the unit # transferred (which must be a multiple of the unit # per package). Packaging types are set on product detail form." +msgstr "" + +#. module: stock +#: code:addons/stock/models/stock_inventory.py:108 #, python-format msgid "Select products manually" msgstr "" @@ -4948,6 +4879,11 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Sell and purchase products in different units of measure" +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 @@ -4957,31 +4893,31 @@ msgid "Sequence" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:651 +#: code:addons/stock/models/stock_warehouse.py:679 #, python-format msgid "Sequence in" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:655 +#: code:addons/stock/models/stock_warehouse.py:683 #, python-format msgid "Sequence internal" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:652 +#: code:addons/stock/models/stock_warehouse.py:680 #, python-format msgid "Sequence out" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:653 +#: code:addons/stock/models/stock_warehouse.py:681 #, python-format msgid "Sequence packing" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:654 +#: code:addons/stock/models/stock_warehouse.py:682 #, python-format msgid "Sequence picking" msgstr "" @@ -4997,13 +4933,33 @@ msgid "Served Warehouse" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Set Putaway Strategies on Locations" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Set Warehouse Routes" +msgstr "" + +#. module: stock #: model:ir.model.fields,help:stock.field_product_category_removal_strategy_id msgid "Set a specific removal strategy that will be used regardless of the source location for this product category" msgstr "" #. module: stock -#: selection:stock.config.settings,module_stock_calendar:0 -msgid "Set lead times in calendar days (easy)" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Set expiration dates on lots & serial numbers" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Set owner on stored products" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Set product attributes (e.g. color, size) to manage variants" msgstr "" #. module: stock @@ -5038,7 +4994,7 @@ msgid "Shelves (Y)" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:406 +#: code:addons/stock/models/stock_warehouse.py:436 #, python-format msgid "Ship Only" msgstr "" @@ -5050,10 +5006,40 @@ msgstr "" #. module: stock #: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Ship with DHL" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Ship with FedEx" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Ship with UPS" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Ship with USPS" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Shipping Connectors" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_picking_move_type +msgid "Shipping Policy" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods." +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_warehouse_code msgid "Short Name" msgstr "" @@ -5074,12 +5060,7 @@ msgid "Show various information on stock availability for this move" msgstr "" #. module: stock -#: selection:stock.config.settings,group_uom:0 -msgid "Some products may be sold/purchased in different units of measure (advanced)" -msgstr "" - -#. module: stock -#: code:addons/stock/models/stock_picking.py:790 +#: code:addons/stock/models/stock_picking.py:792 #, python-format msgid "Some products require lots/serial numbers, so you need to specify those first!" msgstr "" @@ -5283,13 +5264,24 @@ msgid "Stockable" msgstr "" #. module: stock -#: model:ir.model.fields,field_description:stock.field_stock_location_route_supplied_wh_id -msgid "Supplied Warehouse" +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_stock_multi_locations +msgid "Storage Locations" +msgstr "" + +#. module: stock +#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_multi_locations +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly." msgstr "" #. module: stock -#: selection:stock.config.settings,module_stock_dropshipping:0 -msgid "Suppliers always deliver to your warehouse(s)" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Streamline your manufacturing operations with an integrated inventory management" +msgstr "" + +#. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_location_route_supplied_wh_id +msgid "Supplied Warehouse" msgstr "" #. module: stock @@ -5432,7 +5424,7 @@ msgid "The demand represented by a procurement from e.g. a sale order, a reorder msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:517 +#: code:addons/stock/models/stock_picking.py:519 #, python-format msgid "The destination location must be the same for all the moves of the picking." msgstr "" @@ -5463,31 +5455,31 @@ msgid "The new location where the goods need to go" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_quant_package_parent_id -msgid "The package containing this item" +#: model:ir.model,name:stock.model_stock_picking_type +msgid "The operation type determines the picking view" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_quant_package_id -msgid "The package containing this quant" +#: model:ir.actions.act_window,help:stock.stock_picking_type_action +msgid "The operation type system allows you to assign each stock\n" +" operation a specific type which will alter its views accordingly.\n" +" On the operation type you could e.g. specify if packing is needed by default,\n" +" if it should show the customer." 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." +#: model:ir.model.fields,help:stock.field_stock_quant_package_parent_id +msgid "The package containing this item" msgstr "" #. module: stock -#: model:ir.model,name:stock.model_stock_picking_type -msgid "The picking type determines the picking view" +#: model:ir.model.fields,help:stock.field_stock_quant_package_id +msgid "The package containing this quant" msgstr "" #. module: stock -#: model:ir.actions.act_window,help:stock.stock_picking_type_action -msgid "The picking type system allows you to assign each stock\n" -" operation a specific type which will alter its views accordingly.\n" -" On the picking type you could e.g. specify if packing is needed by default,\n" -" if it should show the customer." +#: 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 @@ -5523,16 +5515,16 @@ msgid "The requested operation cannot be processed because of a programming erro msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:822 +#: code:addons/stock/models/stock_move.py:825 #, python-format msgid "The roundings of your unit of measure %s on the move vs. %s on the product don't allow to do these operations or you are not transferring the picking at once. " msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:138 -#: code:addons/stock/models/stock_inventory.py:140 -#: code:addons/stock/models/stock_inventory.py:142 #: code:addons/stock/models/stock_inventory.py:144 +#: code:addons/stock/models/stock_inventory.py:146 +#: code:addons/stock/models/stock_inventory.py:148 +#: code:addons/stock/models/stock_inventory.py:150 #, python-format msgid "The selected inventory options are not coherent." msgstr "" @@ -5544,7 +5536,7 @@ msgid "The serial number %s is already in stock." msgstr "" #. module: stock -#: code:addons/stock/models/stock_picking.py:515 +#: code:addons/stock/models/stock_picking.py:517 #, python-format msgid "The source location must be the same for all the moves of the picking." msgstr "" @@ -5570,22 +5562,6 @@ msgid "Theoretical Quantity" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_lot -msgid "This allows to manipulate packages. You can put something in, take something from a package, but also move entire packages and put them even in another package. " -msgstr "" - -#. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_production_lot -msgid "This allows you to assign a lot (or serial number) to the pickings and moves. This can make it possible to know which production lot was sent to a certain client, ..." -msgstr "" - -#. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_module_stock_calendar -msgid "This allows you to handle minimum stock rules differently by the possibility to take into account the purchase and delivery calendars \n" -"-This installs the module stock_calendar." -msgstr "" - -#. module: stock #: model:ir.actions.act_window,help:stock.quantsact msgid "This analysis gives you a fast overview on the current stock level of your products and their current inventory value." msgstr "" @@ -5609,12 +5585,12 @@ msgstr "" #. module: stock #: model:ir.model.fields,help:stock.field_stock_picking_type_default_location_dest_id -msgid "This is the default destination location when you create a picking manually with this picking type. It is possible however to change it or that the routes put another location. If it is empty, it will check for the customer location on the partner. " +msgid "This is the default destination location when you create a picking manually with this operation type. It is possible however to change it or that the routes put another location. If it is empty, it will check for the customer location on the partner. " msgstr "" #. module: stock #: model:ir.model.fields,help:stock.field_stock_picking_type_default_location_src_id -msgid "This is the default source location when you create a picking manually with this picking type. It is possible however to change it or that the routes put another location. If it is empty, it will check for the supplier location on the partner. " +msgid "This is the default source location when you create a picking manually with this operation type. It is possible however to change it or that the routes put another location. If it is empty, it will check for the supplier location on the partner. " msgstr "" #. module: stock @@ -5624,13 +5600,13 @@ msgid "This is the list of all the production lots you recorded. When\n" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_quant_owner_id -msgid "This is the owner of the quant" +#: model:ir.model.fields,help:stock.field_stock_location_path_picking_type_id +msgid "This is the operation type that will be put on the stock moves" msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_location_path_picking_type_id -msgid "This is the picking type that will be put on the stock moves" +#: model:ir.model.fields,help:stock.field_stock_quant_owner_id +msgid "This is the owner of the quant" msgstr "" #. module: stock @@ -5646,11 +5622,6 @@ msgid "This menu gives you the full traceability of inventory\n" 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.ui.view,arch_db:stock.view_template_property_form msgid "This note will be displayed on Delivery orders." msgstr "" @@ -5661,11 +5632,6 @@ msgid "This note will be displayed on the Receptions." 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 "" - -#. module: stock #: model:ir.ui.view,arch_db:stock.view_stock_return_picking_form msgid "This picking appears to be chained with another operation. Later, if you receive the goods you are returning now, make sure to <b>reverse</b> the returned picking in order to avoid logistic rules to be applied again (which would create duplicated operations)" msgstr "" @@ -5714,11 +5680,6 @@ msgid "This stock location will be used, instead of the default one, as the sour msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_config_settings_group_stock_tracking_owner -msgid "This way you can receive products attributed to a certain owner. " -msgstr "" - -#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_pack_operation_to_loc msgid "To" msgstr "" @@ -5795,18 +5756,23 @@ 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." +msgid "Track following dates on lots & serial numbers: best before, removal, end of life, alert. \n" +" Such dates are set automatically at lot/serial number creation based on values set on the product (in days)." +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Track following dates on lots & serial numbers: best before, removal, end of life, alert. Such dates are set automatically at lot/serial number creation based on values set on the product (in days)." msgstr "" #. module: stock -#: selection:stock.config.settings,group_stock_production_lot:0 -msgid "Track lots or serial numbers" +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Track product location in your warehouse" +msgstr "" + +#. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Track product packages (e.g.pallets, boxes)" msgstr "" #. module: stock @@ -5817,7 +5783,7 @@ msgid "Tracking" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:963 +#: code:addons/stock/models/stock_move.py:966 #: 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 @@ -5869,12 +5835,12 @@ msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_ups -msgid "UPS integration" +msgid "UPS" msgstr "" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_delivery_usps -msgid "USPS integration" +msgid "USPS" msgstr "" #. module: stock @@ -5926,6 +5892,11 @@ msgid "Unit of Measure Categories" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Units Of Measure" +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_uom #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action @@ -6018,6 +5989,11 @@ msgid "Use this assistant to generate a procurement request for this\n" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "Use your own routes and putaway strategies" +msgstr "" + +#. module: stock #: model:ir.model.fields,help:stock.field_stock_picking_type_sequence msgid "Used to order the 'All Operations' kanban view" msgstr "" @@ -6063,6 +6039,11 @@ msgid "Vendor" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_module_stock_calendar +msgid "Vendor Calendar for Reordering" +msgstr "" + +#. module: stock #: model:ir.model.fields,field_description:stock.field_res_partner_property_stock_supplier #: selection:stock.location,usage:0 msgid "Vendor Location" @@ -6154,6 +6135,7 @@ msgstr "" #: 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_stock_config_settings #: model:ir.ui.view,arch_db:stock.view_warehouse #: model:ir.ui.view,arch_db:stock.view_warehouse_tree #: model:ir.ui.view,arch_db:stock.warehouse_orderpoint_search @@ -6186,7 +6168,7 @@ msgid "Warehouse to consider for the route selection" msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:681 +#: code:addons/stock/models/stock_warehouse.py:709 #, python-format msgid "Warehouse's Routes" msgstr "" @@ -6196,16 +6178,11 @@ msgstr "" #: model:ir.model.fields,field_description:stock.field_stock_location_route_warehouse_ids #: model:ir.ui.menu,name:stock.menu_action_warehouse_form #: model:ir.ui.view,arch_db:stock.stock_location_route_form_view +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings msgid "Warehouses" msgstr "" #. module: stock -#: 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 -#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_warning_stock #: selection:res.partner,picking_warn:0 msgid "Warning" msgstr "" @@ -6222,6 +6199,11 @@ msgid "Warning!" msgstr "" #. module: stock +#: model:ir.model.fields,field_description:stock.field_stock_config_settings_group_warning_stock +msgid "Warnings" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "We handle the whole import process\n" " for you: simply send your Odoo project\n" @@ -6310,11 +6292,6 @@ msgid "Wizard checks all the stock minimum rules and generate procurement order. msgstr "" #. module: stock -#: model:ir.model.fields,help:stock.field_stock_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: stock #: model:ir.actions.act_window,help:stock.action_routes_form msgid "You can define here the main routes that run through\n" " your warehouses and that define the flows of your products. These\n" @@ -6365,7 +6342,7 @@ msgid "You can not reserve a negative quantity or a negative quant." msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:906 +#: code:addons/stock/models/stock_move.py:909 #, python-format msgid "You can only delete draft moves." msgstr "" @@ -6376,13 +6353,13 @@ msgid "You can review and edit the predefined units via the" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:653 +#: code:addons/stock/models/stock_move.py:656 #, python-format msgid "You cannot cancel a stock move that has been set to 'Done'." msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:369 +#: code:addons/stock/models/stock_inventory.py:375 #, python-format msgid "You cannot have two inventory adjustements in state 'in Progess' with the same product(%s), same location(%s), same package, same owner and same lot. Please first validatethe first inventory adjustement with this product before creating another one." msgstr "" @@ -6400,20 +6377,20 @@ msgid "You cannot scrap a move without having available stock for %s. You can co msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:156 +#: code:addons/stock/models/stock_inventory.py:162 #, python-format msgid "You cannot set a negative product quantity in an inventory line:\n" " %s - qty: %s" msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:924 +#: code:addons/stock/models/stock_move.py:927 #, python-format msgid "You cannot split a draft move. It needs to be confirmed first." msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:920 +#: code:addons/stock/models/stock_move.py:923 #, python-format msgid "You cannot split a move done" msgstr "" @@ -6425,7 +6402,7 @@ msgid "You do not have any products reserved for this picking. Please click the msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:805 +#: code:addons/stock/models/stock_move.py:808 #, python-format msgid "You have a difference between the quantity on the operation and the quantities specified for the lots. " msgstr "" @@ -6458,7 +6435,7 @@ msgid "You have products in stock that have no lot number. You can assign seria msgstr "" #. module: stock -#: code:addons/stock/models/stock_warehouse.py:761 +#: code:addons/stock/models/stock_warehouse.py:789 #, 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 "" @@ -6476,13 +6453,13 @@ msgid "You may only return Done pickings" msgstr "" #. module: stock -#: code:addons/stock/models/stock_inventory.py:21 +#: code:addons/stock/models/stock_inventory.py:22 #, python-format msgid "You must define a warehouse for the company: %s." msgstr "" #. module: stock -#: code:addons/stock/models/stock_move.py:553 +#: code:addons/stock/models/stock_move.py:552 #: code:addons/stock/models/stock_pack_operation.py:232 #, python-format msgid "You need to provide a Lot/Serial Number for product %s" @@ -6566,6 +6543,11 @@ msgid "days" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.view_stock_config_settings +msgid "days to be propagated" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.view_inventory_form msgid "e.g. Annual inventory" msgstr "" @@ -6668,6 +6650,11 @@ msgid "stock.scrap" msgstr "" #. module: stock +#: model:ir.ui.view,arch_db:stock.report_delivery_document +msgid "t-field-options='{\"widget\": \"contact\", \"fields\": [\"address\", \"name\", \"phone\", \"fax\"], \"no_marker\": true}'/>" +msgstr "" + +#. module: stock #: model:ir.ui.view,arch_db:stock.inventory_planner msgid "the list of products" msgstr "" diff --git a/addons/stock_account/i18n/stock_account.pot b/addons/stock_account/i18n/stock_account.pot index 58ab4d3d980..5d6a801043f 100644 --- a/addons/stock_account/i18n/stock_account.pot +++ b/addons/stock_account/i18n/stock_account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,8 +31,14 @@ msgid "Accounting Information" 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." +#: model:ir.model.fields,help:stock_account.field_stock_config_settings_module_stock_landed_costs +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Affect landed costs on receipt operations and split them among products to update their cost price." +msgstr "" + +#. module: stock_account +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Allow perpetual stock valuation in accounting" msgstr "" #. module: stock_account @@ -53,13 +59,13 @@ msgid "Cancel" msgstr "" #. module: stock_account -#: code:addons/stock_account/models/stock.py:252 +#: code:addons/stock_account/models/stock.py:260 #, 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:254 +#: code:addons/stock_account/models/stock.py:262 #, 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 "" @@ -108,13 +114,7 @@ msgid "Compute" 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 cost" -msgstr "" - -#. module: stock_account -#: code:addons/stock_account/models/stock.py:327 +#: code:addons/stock_account/models/stock.py:335 #, python-format msgid "Configuration error. Please configure the price difference account on the product or its category to process this operation." msgstr "" @@ -131,6 +131,11 @@ msgid "Cost Method" msgstr "" #. module: stock_account +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Costing & Valuation" +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 @@ -143,6 +148,11 @@ msgid "Counter-Part Account" msgstr "" #. module: stock_account +#: model:ir.model.fields,field_description:stock_account.field_stock_change_standard_price_counterpart_account_id_required +msgid "Counter-Part Account Required" +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" @@ -201,13 +211,8 @@ msgid "If perpetual valuation is enabled for a product, the system will automati msgstr "" #. module: stock_account -#: selection:stock.config.settings,module_stock_landed_costs:0 -msgid "Include landed costs in product costing computation" -msgstr "" - -#. module: stock_account -#: model:ir.model.fields,help:stock_account.field_stock_config_settings_module_stock_landed_costs -msgid "Install the module that allows to affect landed costs on pickings, and split them onto the different products." +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Include landed costs in product cost" msgstr "" #. module: stock_account @@ -224,7 +229,6 @@ msgstr "" #: model:ir.model.fields,field_description:stock_account.field_product_category_property_valuation #: model:ir.model.fields,field_description:stock_account.field_product_product_property_valuation #: model:ir.model.fields,field_description:stock_account.field_product_template_property_valuation -#: model:ir.model.fields,field_description:stock_account.field_stock_config_settings_group_stock_inventory_valuation #: model:ir.ui.view,arch_db:stock_account.view_category_property_form msgid "Inventory Valuation" msgstr "" @@ -302,11 +306,6 @@ msgid "No difference between standard price and new price!" msgstr "" #. module: stock_account -#: selection:stock.config.settings,module_stock_landed_costs:0 -msgid "No landed costs" -msgstr "" - -#. module: stock_account #: model:ir.model.fields,field_description:stock_account.field_stock_history_date msgid "Operation Date" msgstr "" @@ -318,19 +317,25 @@ msgid "Periodic (manual)" msgstr "" #. module: stock_account -#: selection:stock.config.settings,group_stock_inventory_valuation:0 -msgid "Periodic inventory valuation (recommended)" -msgstr "" - -#. module: stock_account #: selection:product.category,property_valuation:0 #: selection:product.template,property_valuation:0 msgid "Perpetual (automated)" msgstr "" #. module: stock_account -#: selection:stock.config.settings,group_stock_inventory_valuation:0 -msgid "Perpetual inventory valuation (stock move generates accounting entries)" +#: model:ir.model.fields,field_description:stock_account.field_stock_config_settings_group_stock_inventory_valuation +msgid "Perpetual Valuation" +msgstr "" + +#. module: stock_account +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Perpetual valuation allows to get an up-to-date stock valuation in your accounting whenever products are transferred. It is only tailored for big companies where such a need matters. It requires extra configuration and testing to make sure accounting is impacted the right way for every kind of stock move. This must be set on product categories. The Periodic mode is applied by default (i.e. manual accounting entries at the end of the fiscal year). This last mode is recommended for starters and small/medium-size companies." +msgstr "" + +#. module: stock_account +#: model:ir.model.fields,help:stock_account.field_stock_config_settings_group_stock_inventory_valuation +msgid "Perpetual valuation allows to get up-to-date books whenever products are transferred. It is only tailored for big companies where such a need matters. It requires extra configuration and testing to make sure accounting is impacted the right way for every kind of stock move. \n" +" This must be set on product categories. The Periodic mode is applied by default (i.e. manual accounting entries at the end of the fiscal year). This last mode is recommended for starters and small/medium-size companies." msgstr "" #. module: stock_account @@ -381,6 +386,11 @@ msgid "Retrieve the Inventory Value" msgstr "" #. module: stock_account +#: model:ir.ui.view,arch_db:stock_account.view_stock_config_settings_inherit +msgid "Save this page and come back here to set up the feature." +msgstr "" + +#. module: stock_account #: model:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit #: model:ir.ui.view,arch_db:stock_account.view_template_property_form msgid "Set standard cost" @@ -420,11 +430,6 @@ 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.actions.act_window,name:stock_account.action_stock_history msgid "Stock History" msgstr "" @@ -488,7 +493,7 @@ msgid "Templates for Account Chart" msgstr "" #. module: stock_account -#: code:addons/stock_account/models/stock.py:281 +#: code:addons/stock_account/models/stock.py:289 #, 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 "" @@ -557,14 +562,14 @@ msgid "Wizard that opens the stock valuation history table" msgstr "" #. module: stock_account -#: code:addons/stock_account/models/stock.py:250 +#: code:addons/stock_account/models/stock.py:258 #, python-format msgid "You don't have any stock journal defined on your product category, check if you have installed a chart of accounts" msgstr "" #. module: stock_account #: code:addons/stock_account/models/product.py:110 -#: code:addons/stock_account/models/stock.py:256 +#: code:addons/stock_account/models/stock.py:264 #, python-format msgid "You don't have any stock valuation account defined on your product category. You must define one before processing this operation." msgstr "" diff --git a/addons/stock_landed_costs/i18n/stock_landed_costs.pot b/addons/stock_landed_costs/i18n/stock_landed_costs.pot index 98d7f40a224..c0a2a4810d4 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,10 +16,10 @@ msgstr "" "Plural-Forms: \n" #. module: stock_landed_costs -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:353 -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:357 -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:374 -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:378 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:354 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:358 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:375 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:379 #, python-format msgid " already out" msgstr "" @@ -228,6 +228,11 @@ msgid "Landed Cost Type" msgstr "" #. module: stock_landed_costs +#: model:ir.ui.view,arch_db:stock_landed_costs.view_stock_config_settings_inherit_landed_cost +msgid "Landed Cost Types" +msgstr "" + +#. module: stock_landed_costs #: model:ir.actions.act_window,name:stock_landed_costs.action_stock_landed_cost #: model:ir.model.fields,field_description:stock_landed_costs.field_product_template_landed_cost_ok #: model:ir.ui.menu,name:stock_landed_costs.menu_stock_landed_cost @@ -298,7 +303,7 @@ msgid "Pickings" msgstr "" #. module: stock_landed_costs -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:320 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:321 #, python-format msgid "Please configure Stock Expense Account for product: %s." msgstr "" @@ -372,7 +377,7 @@ msgid "Stock Valuation Adjustment Lines" msgstr "" #. module: stock_landed_costs -#: code:addons/stock_landed_costs/models/stock_landed_cost.py:171 +#: code:addons/stock_landed_costs/models/stock_landed_cost.py:172 #, 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 "" diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index 26e68251391..1362fd9ccca 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -186,13 +186,6 @@ msgid "(nolabel)" msgstr "" #. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1044 -#, python-format -msgid "...Upload in progress..." -msgstr "" - -#. module: web #: model:ir.ui.view,arch_db:web.menu_secondary msgid "<span class=\"oe_logo_edit\">Edit Company data</span>" msgstr "" @@ -204,14 +197,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:707 +#: code:addons/web/static/src/xml/base.xml:708 #, python-format msgid "ALL" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:708 +#: code:addons/web/static/src/xml/base.xml:709 #, python-format msgid "ANY" msgstr "" @@ -232,7 +225,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1431 +#: code:addons/web/static/src/xml/base.xml:1438 #, python-format msgid "Access to all Enterprise Apps" msgstr "" @@ -246,7 +239,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1124 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1123 #, python-format msgid "Action Button" msgstr "" @@ -260,7 +253,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:692 +#: code:addons/web/static/src/js/views/form_widgets.js:695 #, python-format msgid "Activate" msgstr "" @@ -274,80 +267,80 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:689 -#: code:addons/web/static/src/js/views/form_widgets.js:695 -#: code:addons/web/static/src/js/views/form_widgets.js:701 +#: code:addons/web/static/src/js/views/form_widgets.js:692 +#: code:addons/web/static/src/js/views/form_widgets.js:698 +#: code:addons/web/static/src/js/views/form_widgets.js:704 #, python-format msgid "Active" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1380 -#: code:addons/web/static/src/xml/base.xml:1260 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1379 +#: code:addons/web/static/src/xml/base.xml:1267 #, python-format msgid "Add" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1085 +#: code:addons/web/static/src/xml/base.xml:1091 #, python-format msgid "Add Custom Filter" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1089 +#: code:addons/web/static/src/xml/base.xml:1095 #, python-format msgid "Add a condition" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1020 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1019 #, python-format msgid "Add an item" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1195 +#: code:addons/web/static/src/xml/base.xml:1201 #, python-format msgid "Add custom group" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:715 +#: code:addons/web/static/src/xml/base.xml:716 #, python-format msgid "Add filter" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:769 +#: code:addons/web/static/src/xml/base.xml:770 #, python-format msgid "Add new value" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:250 +#: code:addons/web/static/src/xml/base.xml:251 #, python-format msgid "Add..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1307 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1306 #, python-format msgid "Add: " msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1061 +#: code:addons/web/static/src/xml/base.xml:1067 #, python-format msgid "Advanced Search..." msgstr "" @@ -361,15 +354,15 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:697 -#: code:addons/web/static/src/xml/base.xml:702 +#: code:addons/web/static/src/xml/base.xml:698 +#: code:addons/web/static/src/xml/base.xml:703 #, python-format msgid "All" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:479 +#: code:addons/web/static/src/xml/base.xml:480 #, python-format msgid "All users" msgstr "" @@ -383,30 +376,30 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1436 +#: code:addons/web/static/src/xml/base.xml:1443 #, python-format msgid "And more" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:698 -#: code:addons/web/static/src/xml/base.xml:703 +#: code:addons/web/static/src/xml/base.xml:699 +#: code:addons/web/static/src/xml/base.xml:704 #, python-format msgid "Any" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1088 -#: code:addons/web/static/src/xml/base.xml:1206 +#: code:addons/web/static/src/xml/base.xml:1094 +#: code:addons/web/static/src/xml/base.xml:1212 #, python-format msgid "Apply" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:696 +#: code:addons/web/static/src/js/views/form_widgets.js:699 #: code:addons/web/static/src/js/views/list_view.js:289 #, python-format msgid "Archive" @@ -414,14 +407,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:697 +#: code:addons/web/static/src/js/views/form_widgets.js:700 #, python-format msgid "Archived" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:245 +#: code:addons/web/static/src/js/views/search_menus.js:250 #, python-format msgid "Are you sure that you want to remove this filter?" msgstr "" @@ -435,28 +428,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1256 +#: code:addons/web/static/src/xml/base.xml:1263 #, python-format msgid "Available fields" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:546 +#: code:addons/web/static/src/xml/base.xml:547 #, python-format msgid "Bar Chart" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1855 +#: code:addons/web/static/src/js/views/list_view.js:1857 #, python-format msgid "Binary file" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1435 +#: code:addons/web/static/src/xml/base.xml:1442 #, python-format msgid "Bugfixes guarantee" msgstr "" @@ -503,10 +496,10 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/controllers/main.py:743 -#: code:addons/web/controllers/main.py:745 -#: code:addons/web/controllers/main.py:750 -#: code:addons/web/controllers/main.py:751 +#: code:addons/web/controllers/main.py:754 +#: code:addons/web/controllers/main.py:756 +#: code:addons/web/controllers/main.py:761 +#: code:addons/web/controllers/main.py:762 #: code:addons/web/static/src/js/widgets/change_password.js:15 #: code:addons/web/static/src/xml/base.xml:64 #, python-format @@ -522,8 +515,8 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:966 -#: code:addons/web/static/src/xml/base.xml:995 +#: code:addons/web/static/src/xml/base.xml:969 +#: code:addons/web/static/src/xml/base.xml:999 #, python-format msgid "Clear" msgstr "" @@ -538,24 +531,24 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:868 -#: code:addons/web/static/src/js/views/form_view.js:1099 -#: code:addons/web/static/src/js/views/form_widgets.js:703 +#: code:addons/web/static/src/js/views/form_view.js:1122 +#: code:addons/web/static/src/js/views/form_widgets.js:706 #: code:addons/web/static/src/js/widgets/data_export.js:203 -#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:22 +#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:21 #, python-format msgid "Close" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:702 +#: code:addons/web/static/src/js/views/form_widgets.js:705 #, python-format msgid "Closed" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:453 +#: code:addons/web/static/src/xml/base.xml:454 #, python-format msgid "Condition:" msgstr "" @@ -611,14 +604,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1312 +#: code:addons/web/static/src/js/views/form_widgets.js:1322 #, python-format msgid "Could not display the selected image." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1032 +#: code:addons/web/static/src/js/views/list_view.js:1034 #, python-format msgid "Could not find id in dataset" msgstr "" @@ -635,8 +628,8 @@ msgstr "" #: code:addons/web/static/src/js/views/graph_view.js:87 #: code:addons/web/static/src/js/views/graph_widget.js:22 #: code:addons/web/static/src/js/views/pivot_view.js:196 -#: code:addons/web/static/src/xml/base.xml:542 -#: code:addons/web/static/src/xml/base.xml:571 +#: code:addons/web/static/src/xml/base.xml:543 +#: code:addons/web/static/src/xml/base.xml:572 #, python-format msgid "Count" msgstr "" @@ -646,8 +639,8 @@ msgstr "" #: code:addons/web/static/src/js/views/form_common.js:1050 #: code:addons/web/static/src/js/views/form_relational_widgets.js:29 #: code:addons/web/static/src/js/views/list_view.js:49 -#: code:addons/web/static/src/js/views/list_view.js:1938 -#: code:addons/web/static/src/xml/base.xml:415 +#: code:addons/web/static/src/js/views/list_view.js:1940 +#: code:addons/web/static/src/xml/base.xml:416 #, python-format msgid "Create" msgstr "" @@ -683,7 +676,7 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:281 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1082 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1081 #, python-format msgid "Create: " msgstr "" @@ -711,7 +704,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:177 +#: code:addons/web/static/src/js/views/search_menus.js:178 #, python-format msgid "Custom Filter" msgstr "" @@ -723,30 +716,30 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:590 +#: code:addons/web/static/src/xml/base.xml:591 #, python-format msgid "Day" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:690 +#: code:addons/web/static/src/js/views/form_widgets.js:693 #, python-format msgid "Deactivate" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:436 +#: code:addons/web/static/src/xml/base.xml:437 #, python-format msgid "Default:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:166 +#: code:addons/web/static/src/js/views/form_view.js:164 #: code:addons/web/static/src/js/views/list_view.js:291 -#: code:addons/web/static/src/xml/base.xml:1301 +#: code:addons/web/static/src/xml/base.xml:1308 #, python-format msgid "Delete" msgstr "" @@ -760,7 +753,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1049 +#: code:addons/web/static/src/xml/base.xml:1048 #, python-format msgid "Delete this file" msgstr "" @@ -768,30 +761,30 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:868 -#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:29 -#: code:addons/web/static/src/xml/base.xml:347 -#: code:addons/web/static/src/xml/base.xml:425 +#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:28 +#: code:addons/web/static/src/xml/base.xml:348 +#: code:addons/web/static/src/xml/base.xml:426 #, python-format msgid "Discard" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:218 +#: code:addons/web/static/src/js/widgets/sidebar.js:219 #, python-format msgid "Do you really want to delete this attachment ?" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:319 +#: code:addons/web/static/src/js/widgets/data_export.js:325 #, python-format msgid "Do you really want to delete this export template?" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:705 +#: code:addons/web/static/src/js/views/form_view.js:728 #, python-format msgid "Do you really want to delete this record?" msgstr "" @@ -805,14 +798,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1416 +#: code:addons/web/static/src/xml/base.xml:1423 #, python-format msgid "Documentation" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:34 +#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:33 #, python-format msgid "Domain" msgstr "" @@ -833,28 +826,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1855 +#: code:addons/web/static/src/js/views/list_view.js:1857 #, python-format msgid "Download" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1871 +#: code:addons/web/static/src/js/views/list_view.js:1873 #, python-format msgid "Download \"%s\"" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:577 +#: code:addons/web/static/src/xml/base.xml:578 #, python-format msgid "Download xls" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:167 +#: code:addons/web/static/src/js/views/form_view.js:165 #, python-format msgid "Duplicate" msgstr "" @@ -862,8 +855,8 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:159 -#: code:addons/web/static/src/xml/base.xml:411 -#: code:addons/web/static/src/xml/base.xml:965 +#: code:addons/web/static/src/xml/base.xml:412 +#: code:addons/web/static/src/xml/base.xml:968 #, python-format msgid "Edit" msgstr "" @@ -892,7 +885,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:682 +#: code:addons/web/static/src/xml/base.xml:683 #, python-format msgid "Edit domain" msgstr "" @@ -906,28 +899,28 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/framework/crash_manager.js:130 #: code:addons/web/static/src/js/view_manager.js:222 -#: code:addons/web/static/src/js/views/search_menus.js:85 -#: code:addons/web/static/src/js/views/search_menus.js:92 +#: code:addons/web/static/src/js/views/search_menus.js:86 +#: code:addons/web/static/src/js/views/search_menus.js:93 #, python-format msgid "Error" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:751 +#: code:addons/web/controllers/main.py:762 #, python-format msgid "Error, password not changed !" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:993 +#: code:addons/web/static/src/js/framework/pyeval.js:1024 #, python-format msgid "Evaluation Error" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:576 +#: code:addons/web/static/src/xml/base.xml:577 #, python-format msgid "Expand all" msgstr "" @@ -948,7 +941,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1249 +#: code:addons/web/static/src/xml/base.xml:1256 #, python-format msgid "Export Formats :" msgstr "" @@ -962,14 +955,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1242 +#: code:addons/web/static/src/xml/base.xml:1249 #, python-format msgid "Export Type :" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1245 +#: code:addons/web/static/src/xml/base.xml:1252 #, python-format msgid "Export all Data" msgstr "" @@ -983,14 +976,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1212 +#: code:addons/web/static/src/xml/base.xml:1218 #, python-format msgid "Favorites" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1272 +#: code:addons/web/static/src/js/views/form_view.js:1299 #, python-format msgid "Field '%s' specified in view could not be found." msgstr "" @@ -1019,21 +1012,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1268 +#: code:addons/web/static/src/xml/base.xml:1275 #, python-format msgid "Fields to export" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1175 +#: code:addons/web/static/src/js/views/form_widgets.js:1185 #, python-format msgid "File Upload" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1155 +#: code:addons/web/static/src/js/views/form_widgets.js:1165 #, python-format msgid "File upload" msgstr "" @@ -1047,7 +1040,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:85 +#: code:addons/web/static/src/js/views/search_menus.js:86 #, python-format msgid "Filter name is required." msgstr "" @@ -1061,21 +1054,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:92 +#: code:addons/web/static/src/js/views/search_menus.js:93 #, python-format msgid "Filter with same name already exists." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1081 +#: code:addons/web/static/src/xml/base.xml:1087 #, python-format msgid "Filters" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:575 +#: code:addons/web/static/src/xml/base.xml:576 #, python-format msgid "Flip axis" msgstr "" @@ -1092,14 +1085,14 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_view.js:33 -#: code:addons/web/static/src/js/views/form_view.js:303 +#: code:addons/web/static/src/js/views/form_view.js:301 #, python-format msgid "Form" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1428 +#: code:addons/web/static/src/xml/base.xml:1435 #, python-format msgid "Get this feature and much more with Odoo Enterprise!" msgstr "" @@ -1121,7 +1114,7 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search_inputs.js:699 -#: code:addons/web/static/src/xml/base.xml:1190 +#: code:addons/web/static/src/xml/base.xml:1196 #, python-format msgid "Group By" msgstr "" @@ -1154,21 +1147,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1312 +#: code:addons/web/static/src/js/views/form_widgets.js:1322 #, python-format msgid "Image" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1244 +#: code:addons/web/static/src/xml/base.xml:1251 #, python-format msgid "Import-Compatible Export" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:691 +#: code:addons/web/static/src/js/views/form_widgets.js:694 #, python-format msgid "Inactive" msgstr "" @@ -1182,15 +1175,22 @@ msgid "Invalid data" msgstr "" #. module: web +#: code:addons/web/controllers/main.py:658 +#: code:addons/web/controllers/main.py:672 +#, python-format +msgid "Invalid database name. Only alphanumerical characters and underscore are allowed." +msgstr "" + +#. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:680 +#: code:addons/web/static/src/xml/base.xml:681 #, python-format msgid "Invalid domain" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:807 +#: code:addons/web/static/src/xml/base.xml:808 #, python-format msgid "Invalid field chain" msgstr "" @@ -1203,7 +1203,7 @@ msgid "JS Tests" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:758 +#: code:addons/web/controllers/main.py:769 #, python-format msgid "Languages" msgstr "" @@ -1231,7 +1231,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:547 +#: code:addons/web/static/src/xml/base.xml:548 #, python-format msgid "Line Chart" msgstr "" @@ -1266,7 +1266,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:997 +#: code:addons/web/static/src/js/framework/pyeval.js:1028 #, python-format msgid "Local evaluation failure\n" "%s\n" @@ -1281,7 +1281,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1421 +#: code:addons/web/static/src/xml/base.xml:1428 #, python-format msgid "Log out" msgstr "" @@ -1315,21 +1315,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:714 +#: code:addons/web/static/src/xml/base.xml:715 #, python-format msgid "Match" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:721 +#: code:addons/web/static/src/xml/base.xml:722 #, python-format msgid "Match records with" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:719 +#: code:addons/web/static/src/xml/base.xml:720 #, python-format msgid "Match records with the following rule:" msgstr "" @@ -1343,8 +1343,8 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:534 -#: code:addons/web/static/src/xml/base.xml:563 +#: code:addons/web/static/src/xml/base.xml:535 +#: code:addons/web/static/src/xml/base.xml:564 #, python-format msgid "Measures" msgstr "" @@ -1372,7 +1372,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1433 +#: code:addons/web/static/src/xml/base.xml:1440 #, python-format msgid "Mobile support" msgstr "" @@ -1393,14 +1393,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:592 +#: code:addons/web/static/src/xml/base.xml:593 #, python-format msgid "Month" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:945 +#: code:addons/web/static/src/xml/base.xml:948 #, python-format msgid "More" msgstr "" @@ -1412,42 +1412,42 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1264 +#: code:addons/web/static/src/xml/base.xml:1271 #, python-format msgid "Move Down" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1263 +#: code:addons/web/static/src/xml/base.xml:1270 #, python-format msgid "Move Up" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1420 +#: code:addons/web/static/src/xml/base.xml:1427 #, python-format msgid "My Odoo.com account" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:709 +#: code:addons/web/static/src/xml/base.xml:710 #, python-format msgid "NONE" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1318 +#: code:addons/web/static/src/xml/base.xml:1325 #, python-format msgid "Name:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:317 +#: code:addons/web/static/src/js/views/form_view.js:315 #, python-format msgid "New" msgstr "" @@ -1461,7 +1461,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1432 +#: code:addons/web/static/src/xml/base.xml:1439 #, python-format msgid "New design" msgstr "" @@ -1489,7 +1489,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:609 +#: code:addons/web/static/src/xml/base.xml:610 #, 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." @@ -1504,7 +1504,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:608 +#: code:addons/web/static/src/xml/base.xml:609 #, python-format msgid "No data to display." msgstr "" @@ -1539,7 +1539,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:699 +#: code:addons/web/static/src/xml/base.xml:700 #, python-format msgid "None" msgstr "" @@ -1560,7 +1560,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:897 +#: code:addons/web/static/src/xml/base.xml:900 #, python-format msgid "Not shown in kanban" msgstr "" @@ -1630,7 +1630,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:710 +#: code:addons/web/static/src/js/views/form_widgets.js:716 #, python-format msgid "Off" msgstr "" @@ -1640,7 +1640,7 @@ msgstr "" #: code:addons/web/static/src/js/framework/dialog.js:41 #: code:addons/web/static/src/js/framework/dialog.js:159 #: code:addons/web/static/src/js/framework/dialog.js:177 -#: code:addons/web/static/src/xml/base.xml:1291 +#: code:addons/web/static/src/xml/base.xml:1298 #, python-format msgid "Ok" msgstr "" @@ -1654,7 +1654,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:708 +#: code:addons/web/static/src/js/views/form_widgets.js:714 #, python-format msgid "On" msgstr "" @@ -1675,14 +1675,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:472 +#: code:addons/web/static/src/xml/base.xml:473 #, python-format msgid "Only you" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:704 +#: code:addons/web/static/src/js/views/form_widgets.js:707 #, python-format msgid "Open" msgstr "" @@ -1705,8 +1705,8 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/views/form_relational_widgets.js:154 #: code:addons/web/static/src/js/views/form_relational_widgets.js:922 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1106 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1323 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1105 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1322 #, python-format msgid "Open: " msgstr "" @@ -1718,7 +1718,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:548 +#: code:addons/web/static/src/xml/base.xml:549 #, python-format msgid "Pie Chart" msgstr "" @@ -1753,28 +1753,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1279 +#: code:addons/web/static/src/xml/base.xml:1286 #, 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:1278 +#: code:addons/web/static/src/xml/base.xml:1285 #, 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:435 +#: code:addons/web/static/src/js/widgets/data_export.js:441 #, python-format msgid "Please select fields to export..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:421 +#: code:addons/web/static/src/js/widgets/data_export.js:427 #, python-format msgid "Please select fields to save export list..." msgstr "" @@ -1798,7 +1798,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1419 +#: code:addons/web/static/src/xml/base.xml:1426 #, python-format msgid "Preferences" msgstr "" @@ -1819,13 +1819,20 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:593 +#: code:addons/web/static/src/xml/base.xml:594 #, python-format msgid "Quarter" msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/js/widgets/model_field_selector.js:40 +#, python-format +msgid "Relation not allowed" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:79 #, python-format msgid "Relation:" @@ -1833,14 +1840,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1261 +#: code:addons/web/static/src/xml/base.xml:1268 #, python-format msgid "Remove" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1262 +#: code:addons/web/static/src/xml/base.xml:1269 #, python-format msgid "Remove All" msgstr "" @@ -1854,7 +1861,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:698 +#: code:addons/web/static/src/js/views/form_widgets.js:701 #: code:addons/web/static/src/js/views/list_view.js:290 #, python-format msgid "Restore" @@ -1870,10 +1877,10 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:874 -#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:26 -#: code:addons/web/static/src/xml/base.xml:344 -#: code:addons/web/static/src/xml/base.xml:421 -#: code:addons/web/static/src/xml/base.xml:1229 +#: code:addons/web/static/src/js/widgets/domain_selector_dialog.js:25 +#: code:addons/web/static/src/xml/base.xml:345 +#: code:addons/web/static/src/xml/base.xml:422 +#: code:addons/web/static/src/xml/base.xml:1236 #, python-format msgid "Save" msgstr "" @@ -1887,42 +1894,42 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1192 +#: code:addons/web/static/src/js/views/form_widgets.js:1202 #, python-format msgid "Save As..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1291 +#: code:addons/web/static/src/xml/base.xml:1298 #, python-format msgid "Save as:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1217 +#: code:addons/web/static/src/xml/base.xml:1224 #, python-format msgid "Save current search" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1100 +#: code:addons/web/static/src/js/views/form_view.js:1123 #, python-format msgid "Save default" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1268 +#: code:addons/web/static/src/xml/base.xml:1275 #, python-format msgid "Save fields list" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1294 +#: code:addons/web/static/src/xml/base.xml:1301 #, python-format msgid "Saved exports:" msgstr "" @@ -1952,7 +1959,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1063 +#: code:addons/web/static/src/xml/base.xml:1069 #, python-format msgid "Search..." msgstr "" @@ -1974,8 +1981,8 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_common.js:1055 -#: code:addons/web/static/src/xml/base.xml:993 -#: code:addons/web/static/src/xml/base.xml:994 +#: code:addons/web/static/src/xml/base.xml:997 +#: code:addons/web/static/src/xml/base.xml:998 #, python-format msgid "Select" msgstr "" @@ -1987,7 +1994,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:684 +#: code:addons/web/static/src/xml/base.xml:685 #, python-format msgid "Select a model to add a filter." msgstr "" @@ -2001,7 +2008,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:510 +#: code:addons/web/static/src/js/views/form_widgets.js:513 #, python-format msgid "Selected records" msgstr "" @@ -2015,7 +2022,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1097 +#: code:addons/web/static/src/js/views/form_view.js:1120 #, python-format msgid "Set Default" msgstr "" @@ -2036,7 +2043,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1226 +#: code:addons/web/static/src/xml/base.xml:1233 #, python-format msgid "Share with all users" msgstr "" @@ -2056,7 +2063,7 @@ msgid "Size:" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:1061 +#: code:addons/web/controllers/main.py:1070 #, python-format msgid "Something horrible happened" msgstr "" @@ -2084,28 +2091,28 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1417 +#: code:addons/web/static/src/xml/base.xml:1424 #, python-format msgid "Support" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:709 +#: code:addons/web/static/src/js/views/form_widgets.js:715 #, python-format msgid "Switch Off" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:711 +#: code:addons/web/static/src/js/views/form_widgets.js:717 #, python-format msgid "Switch On" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/domain_selector.js:272 +#: code:addons/web/static/src/js/widgets/domain_selector.js:264 #, python-format msgid "Syntax error" msgstr "" @@ -2126,21 +2133,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/domain_selector.js:272 +#: code:addons/web/static/src/js/widgets/domain_selector.js:264 #, python-format msgid "The domain you entered is not properly formed" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1192 +#: code:addons/web/static/src/js/views/form_widgets.js:1202 #, 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:859 +#: code:addons/web/static/src/js/views/form_view.js:882 #, python-format msgid "The following fields are invalid:" msgstr "" @@ -2153,69 +2160,69 @@ msgid "The line has been modified, your changes will be discarded. Are you sure msgstr "" #. module: web -#: code:addons/web/controllers/main.py:745 +#: code:addons/web/controllers/main.py:756 #, 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:1125 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1124 #, python-format msgid "The o2m record must be saved before an action can be used" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:750 +#: code:addons/web/controllers/main.py:761 #, 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:303 +#: code:addons/web/static/src/js/views/form_view.js:301 #, python-format msgid "The record could not be found in the database." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:728 +#: code:addons/web/static/src/js/views/form_view.js:751 #, 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:1154 +#: code:addons/web/static/src/js/views/form_widgets.js:1164 #, 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:1597 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1581 #, 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:1175 +#: code:addons/web/static/src/js/views/form_widgets.js:1185 #, 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:244 +#: code:addons/web/static/src/js/views/search_menus.js:249 #, python-format msgid "This filter is global and will be removed for everybody if you continue." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1235 +#: code:addons/web/static/src/xml/base.xml:1242 #, 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." @@ -2223,7 +2230,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:923 +#: code:addons/web/static/src/js/views/form_widgets.js:929 #, 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 "" @@ -2274,9 +2281,9 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/graph_widget.js:80 -#: code:addons/web/static/src/js/views/list_view.js:1387 -#: code:addons/web/static/src/js/views/list_view.js:1393 -#: code:addons/web/static/src/js/views/list_view.js:1411 +#: code:addons/web/static/src/js/views/list_view.js:1389 +#: code:addons/web/static/src/js/views/list_view.js:1395 +#: code:addons/web/static/src/js/views/list_view.js:1413 #: code:addons/web/static/src/js/views/pivot_view.js:525 #, python-format msgid "Undefined" @@ -2284,14 +2291,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:616 +#: code:addons/web/static/src/xml/base.xml:617 #, python-format msgid "Unhandled widget" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:862 +#: code:addons/web/static/src/js/views/form_widgets.js:868 #, python-format msgid "Unknown" msgstr "" @@ -2305,14 +2312,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1094 +#: code:addons/web/static/src/js/views/list_view.js:1096 #, python-format msgid "Unknown m2m command %s" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:961 +#: code:addons/web/static/src/js/framework/pyeval.js:992 #, python-format msgid "Unknown nonliteral type " msgstr "" @@ -2340,7 +2347,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1404 +#: code:addons/web/static/src/xml/base.xml:1411 #, python-format msgid "Update translations" msgstr "" @@ -2354,38 +2361,39 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1434 +#: code:addons/web/static/src/xml/base.xml:1441 #, python-format msgid "Upgrade to future versions" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:993 +#: code:addons/web/static/src/xml/base.xml:997 #, python-format msgid "Upload your file" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1656 -#: code:addons/web/static/src/js/widgets/sidebar.js:174 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1641 +#: code:addons/web/static/src/js/widgets/sidebar.js:175 #, python-format msgid "Uploading Error" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:200 -#: code:addons/web/static/src/xml/base.xml:968 -#: code:addons/web/static/src/xml/base.xml:997 +#: code:addons/web/static/src/js/widgets/sidebar.js:201 +#: code:addons/web/static/src/xml/base.xml:971 +#: code:addons/web/static/src/xml/base.xml:1001 +#: code:addons/web/static/src/xml/base.xml:1058 #, python-format msgid "Uploading..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1223 +#: code:addons/web/static/src/xml/base.xml:1230 #, python-format msgid "Use by default" msgstr "" @@ -2406,7 +2414,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1938 +#: code:addons/web/static/src/js/views/list_view.js:1940 #: code:addons/web/static/src/xml/base.xml:159 #, python-format msgid "View" @@ -2437,7 +2445,7 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/framework/crash_manager.js:13 #: code:addons/web/static/src/js/framework/crash_manager.js:14 -#: code:addons/web/static/src/js/views/form_view.js:733 +#: code:addons/web/static/src/js/views/form_view.js:756 #: code:addons/web/static/src/js/views/list_view.js:677 #: code:addons/web/static/src/js/widgets/sidebar.js:132 #, python-format @@ -2446,14 +2454,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:591 +#: code:addons/web/static/src/xml/base.xml:592 #, python-format msgid "Week" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1276 +#: code:addons/web/static/src/js/views/form_view.js:1303 #, python-format msgid "Widget type '%s' is not implemented" msgstr "" @@ -2466,7 +2474,7 @@ msgid "Widget:" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:475 +#: code:addons/web/controllers/main.py:477 #, python-format msgid "Wrong login/password" msgstr "" @@ -2487,7 +2495,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:594 +#: code:addons/web/static/src/xml/base.xml:595 #, python-format msgid "Year" msgstr "" @@ -2515,14 +2523,21 @@ msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:743 +#. openerp-web +#: code:addons/web/static/src/js/widgets/model_field_selector.js:40 +#, python-format +msgid "You cannot follow relations for this field chain construction" +msgstr "" + +#. module: web +#: code:addons/web/controllers/main.py:754 #, python-format msgid "You cannot leave any password empty." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1402 +#: code:addons/web/static/src/xml/base.xml:1409 #, python-format msgid "You have updated" msgstr "" @@ -2592,7 +2607,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:714 +#: code:addons/web/static/src/xml/base.xml:715 #, python-format msgid "all records" msgstr "" @@ -2648,8 +2663,8 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/views/search_filters.js:282 #: code:addons/web/static/src/js/views/search_filters.js:317 -#: code:addons/web/static/src/js/widgets/domain_selector.js:487 -#: code:addons/web/static/src/xml/base.xml:796 +#: code:addons/web/static/src/js/widgets/domain_selector.js:503 +#: code:addons/web/static/src/xml/base.xml:797 #, python-format msgid "is" msgstr "" @@ -2696,7 +2711,7 @@ msgstr "" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search_filters.js:318 -#: code:addons/web/static/src/js/widgets/domain_selector.js:488 +#: code:addons/web/static/src/js/widgets/domain_selector.js:504 #, python-format msgid "is not" msgstr "" @@ -2745,7 +2760,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/utils.js:303 +#: code:addons/web/static/src/js/framework/utils.js:336 #, python-format msgid "kMGTPE" msgstr "" @@ -2777,7 +2792,7 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:798 +#: code:addons/web/static/src/xml/base.xml:799 #, python-format msgid "not" msgstr "" @@ -2812,22 +2827,22 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:723 +#: code:addons/web/static/src/xml/base.xml:724 #, python-format msgid "of the following rules:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:735 +#: code:addons/web/static/src/xml/base.xml:736 #, python-format msgid "of:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:789 -#: code:addons/web/static/src/xml/base.xml:1158 +#: code:addons/web/static/src/xml/base.xml:790 +#: code:addons/web/static/src/xml/base.xml:1164 #, python-format msgid "or" msgstr "" @@ -2841,14 +2856,14 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:678 +#: code:addons/web/static/src/xml/base.xml:679 #, python-format msgid "record(s)" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:798 +#: code:addons/web/static/src/xml/base.xml:799 #, python-format msgid "set" msgstr "" diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot index eb66cff79d1..9f46e207c83 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:911 +#: code:addons/web_editor/static/src/js/rte.summernote.js:919 #, python-format msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)" msgstr "" @@ -66,14 +66,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/ace.js:360 +#: code:addons/web_editor/static/src/js/ace.js:583 #, python-format -msgid "A server error occured. Please check you correctly signed in and that the XML you are saving is well-formed." +msgid "A server error occured. Please check you correctly signed in and that the file you are saving is well-formed." msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:963 +#: code:addons/web_editor/static/src/js/rte.summernote.js:971 #, python-format msgid "Action" msgstr "" @@ -99,21 +99,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:945 +#: code:addons/web_editor/static/src/js/rte.summernote.js:953 #, python-format msgid "Align center" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:944 +#: code:addons/web_editor/static/src/js/rte.summernote.js:952 #, python-format msgid "Align left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:946 +#: code:addons/web_editor/static/src/js/rte.summernote.js:954 #, python-format msgid "Align right" msgstr "" @@ -132,7 +132,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:335 +#: code:addons/web_editor/static/src/xml/editor.xml:298 #, python-format msgid "Assign a focal point that will always be visible" msgstr "" @@ -158,7 +158,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:952 +#: code:addons/web_editor/static/src/js/rte.summernote.js:960 #: code:addons/web_editor/static/src/xml/snippets.xml:49 #, python-format msgid "Background Color" @@ -173,47 +173,40 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:374 +#: code:addons/web_editor/static/src/xml/editor.xml:337 #, python-format msgid "Background height" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:384 +#: code:addons/web_editor/static/src/xml/editor.xml:347 #, python-format msgid "Background position" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:406 +#: code:addons/web_editor/static/src/xml/editor.xml:369 #, python-format msgid "Background repeat" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:362 +#: code:addons/web_editor/static/src/xml/editor.xml:325 #, python-format msgid "Background size" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:365 +#: code:addons/web_editor/static/src/xml/editor.xml:328 #, python-format msgid "Background width" msgstr "" #. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:258 -#, python-format -msgid "Basic" -msgstr "" - -#. module: web_editor #: model:ir.ui.view,arch_db:web_editor.colorpicker msgid "Beta" msgstr "" @@ -239,13 +232,20 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:872 +#: code:addons/web_editor/static/src/js/rte.summernote.js:880 #, python-format msgid "Bold" msgstr "" #. module: web_editor #. openerp-web +#: code:addons/web_editor/static/src/js/ace.js:108 +#, python-format +msgid "Careful !" +msgstr "" + +#. module: web_editor +#. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:100 #, python-format msgid "Center" @@ -260,32 +260,32 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:961 +#: code:addons/web_editor/static/src/js/rte.summernote.js:969 #: code:addons/web_editor/static/src/js/translator.js:74 -#: code:addons/web_editor/static/src/xml/ace.xml:17 +#: code:addons/web_editor/static/src/xml/ace.xml:30 #, python-format msgid "Close" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:923 +#: code:addons/web_editor/static/src/js/rte.summernote.js:931 #, python-format msgid "Code" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:938 +#: code:addons/web_editor/static/src/js/rte.summernote.js:946 #, python-format msgid "Code View" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:250 +#: code:addons/web_editor/static/src/xml/editor.xml:248 #, python-format -msgid "Color Style" +msgid "Color" msgstr "" #. module: web_editor @@ -304,14 +304,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:330 +#: code:addons/web_editor/static/src/xml/editor.xml:293 #, python-format msgid "Contain" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:329 +#: code:addons/web_editor/static/src/xml/editor.xml:292 #, python-format msgid "Cover" msgstr "" @@ -328,7 +328,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:331 +#: code:addons/web_editor/static/src/xml/editor.xml:294 #, python-format msgid "Custom" msgstr "" @@ -341,24 +341,20 @@ 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 -#, python-format msgid "Danger" msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/summernote.js:1927 -#: 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:407 +#: code:addons/web_editor/static/src/xml/editor.xml:370 #, python-format msgid "Define if/how the background image will be repeated" msgstr "" @@ -406,21 +402,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:965 +#: code:addons/web_editor/static/src/js/rte.summernote.js:973 #, python-format msgid "Document Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:847 +#: code:addons/web_editor/static/src/js/rte.summernote.js:855 #, python-format msgid "Double-click to edit" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:892 +#: code:addons/web_editor/static/src/js/rte.summernote.js:900 #, python-format msgid "Drag an image here" msgstr "" @@ -442,7 +438,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:159 -#: code:addons/web_editor/static/src/js/rte.summernote.js:901 +#: code:addons/web_editor/static/src/js/rte.summernote.js:909 #, python-format msgid "Edit" msgstr "" @@ -456,14 +452,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/backend.xml:44 +#: code:addons/web_editor/static/src/xml/backend.xml:43 #, python-format msgid "English" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/backend.xml:43 +#: code:addons/web_editor/static/src/xml/backend.xml:42 #, python-format msgid "English (edit mode)" msgstr "" @@ -475,14 +471,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:290 +#: code:addons/web_editor/static/src/js/ace.js:73 +#, python-format +msgid "Expected " +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/editor.xml:240 #, python-format msgid "Extra Small" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:884 +#: code:addons/web_editor/static/src/js/rte.summernote.js:892 #, python-format msgid "File / Image" msgstr "" @@ -496,56 +499,56 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:889 +#: code:addons/web_editor/static/src/js/rte.summernote.js:897 #, python-format msgid "Float Left" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:891 +#: code:addons/web_editor/static/src/js/rte.summernote.js:899 #, python-format msgid "Float None" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:890 +#: code:addons/web_editor/static/src/js/rte.summernote.js:898 #, python-format msgid "Float Right" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:953 +#: code:addons/web_editor/static/src/js/rte.summernote.js:961 #, python-format msgid "Font Color" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:880 +#: code:addons/web_editor/static/src/js/rte.summernote.js:888 #, python-format msgid "Font Family" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:881 +#: code:addons/web_editor/static/src/js/rte.summernote.js:889 #, python-format msgid "Font Size" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/ace.xml:16 +#: code:addons/web_editor/static/src/xml/ace.xml:37 #, python-format msgid "Format" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:937 +#: code:addons/web_editor/static/src/js/rte.summernote.js:945 #, python-format msgid "Full Screen" msgstr "" @@ -587,56 +590,56 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:924 +#: code:addons/web_editor/static/src/js/rte.summernote.js:932 #, python-format msgid "Header 1" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:925 +#: code:addons/web_editor/static/src/js/rte.summernote.js:933 #, python-format msgid "Header 2" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:926 +#: code:addons/web_editor/static/src/js/rte.summernote.js:934 #, python-format msgid "Header 3" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:927 +#: code:addons/web_editor/static/src/js/rte.summernote.js:935 #, python-format msgid "Header 4" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:928 +#: code:addons/web_editor/static/src/js/rte.summernote.js:936 #, python-format msgid "Header 5" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:929 +#: code:addons/web_editor/static/src/js/rte.summernote.js:937 #, python-format msgid "Header 6" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:936 +#: code:addons/web_editor/static/src/js/rte.summernote.js:944 #, python-format msgid "Help" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:387 +#: code:addons/web_editor/static/src/xml/editor.xml:350 #, python-format msgid "Horizontal" msgstr "" @@ -655,6 +658,13 @@ msgstr "" #. module: web_editor #. openerp-web +#: code:addons/web_editor/static/src/js/ace.js:107 +#, python-format +msgid "If you reset this file, all your customizations will be lost as it will be reverted to the default file." +msgstr "" + +#. module: web_editor +#. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:50 #, python-format msgid "Image" @@ -662,86 +672,97 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:894 +#: code:addons/web_editor/static/src/js/rte.summernote.js:902 #, python-format msgid "Image URL" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/ace.xml:9 +#: code:addons/web_editor/static/src/xml/ace.xml:23 +#, python-format +msgid "Include All LESS Files" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/xml/ace.xml:17 #, python-format msgid "Include Asset Bundles" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:943 +#: code:addons/web_editor/static/src/js/rte.summernote.js:951 #, python-format msgid "Indent" msgstr "" #. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:270 #: model:ir.ui.view,arch_db:web_editor.colorpicker -#, python-format msgid "Info" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:917 +#: code:addons/web_editor/static/src/js/rte.summernote.js:925 #, python-format msgid "Insert Horizontal Rule" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:885 +#: code:addons/web_editor/static/src/js/rte.summernote.js:893 #, python-format msgid "Insert Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:899 +#: code:addons/web_editor/static/src/js/rte.summernote.js:907 #, python-format msgid "Insert Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:909 +#: code:addons/web_editor/static/src/js/rte.summernote.js:917 #, python-format msgid "Insert Video" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:873 +#: code:addons/web_editor/static/src/js/rte.summernote.js:881 #, python-format msgid "Italic" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:947 +#: code:addons/web_editor/static/src/js/rte.summernote.js:955 #, python-format msgid "Justify full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:960 +#: code:addons/web_editor/static/src/js/rte.summernote.js:968 #, python-format msgid "Keyboard shortcuts" msgstr "" #. module: web_editor #. openerp-web +#: code:addons/web_editor/static/src/xml/ace.xml:11 +#, python-format +msgid "LESS (CSS)" +msgstr "" + +#. module: web_editor +#. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:114 -#: code:addons/web_editor/static/src/xml/editor.xml:302 +#: code:addons/web_editor/static/src/xml/editor.xml:243 #, python-format msgid "Large" msgstr "" @@ -763,15 +784,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:879 +#: code:addons/web_editor/static/src/js/ace.js:464 +#, python-format +msgid "Less file: %s" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:887 #, python-format msgid "Line Height" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:898 -#: code:addons/web_editor/static/src/xml/editor.xml:254 +#: code:addons/web_editor/static/src/js/rte.summernote.js:906 #, python-format msgid "Link" msgstr "" @@ -793,13 +820,14 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:113 +#: code:addons/web_editor/static/src/xml/editor.xml:242 #, python-format msgid "Medium" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:951 +#: code:addons/web_editor/static/src/js/rte.summernote.js:959 #, python-format msgid "More Color" msgstr "" @@ -818,7 +846,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:409 +#: code:addons/web_editor/static/src/xml/editor.xml:372 #, python-format msgid "No repeat" msgstr "" @@ -833,7 +861,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:921 +#: code:addons/web_editor/static/src/js/rte.summernote.js:929 #, python-format msgid "Normal" msgstr "" @@ -847,22 +875,22 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:904 -#: code:addons/web_editor/static/src/xml/editor.xml:235 +#: code:addons/web_editor/static/src/js/rte.summernote.js:912 +#: code:addons/web_editor/static/src/xml/editor.xml:269 #, python-format msgid "Open in new window" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:933 +#: code:addons/web_editor/static/src/js/rte.summernote.js:941 #, python-format msgid "Ordered list" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:942 +#: code:addons/web_editor/static/src/js/rte.summernote.js:950 #, python-format msgid "Outdent" msgstr "" @@ -876,14 +904,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:941 +#: code:addons/web_editor/static/src/js/rte.summernote.js:949 #, python-format msgid "Paragraph" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:964 +#: code:addons/web_editor/static/src/js/rte.summernote.js:972 #, python-format msgid "Paragraph formatting" msgstr "" @@ -899,22 +927,19 @@ msgstr "" #. openerp-web #: 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 +#: code:addons/web_editor/static/src/xml/editor.xml:277 #, python-format msgid "Preview" msgstr "" #. module: web_editor -#. openerp-web -#: 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 #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:922 +#: code:addons/web_editor/static/src/js/rte.summernote.js:930 #, python-format msgid "Quote" msgstr "" @@ -928,14 +953,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:950 +#: code:addons/web_editor/static/src/js/rte.summernote.js:958 #, python-format msgid "Recent Color" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:969 +#: code:addons/web_editor/static/src/js/rte.summernote.js:977 #, python-format msgid "Redo" msgstr "" @@ -956,49 +981,50 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:878 +#: code:addons/web_editor/static/src/js/rte.summernote.js:886 #, python-format msgid "Remove Font Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:895 +#: code:addons/web_editor/static/src/js/rte.summernote.js:903 #, python-format msgid "Remove Image" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:349 +#: code:addons/web_editor/static/src/xml/editor.xml:312 #, python-format msgid "Repeat" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:410 +#: code:addons/web_editor/static/src/xml/editor.xml:373 #, python-format msgid "Repeat both" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:411 +#: code:addons/web_editor/static/src/xml/editor.xml:374 #, python-format msgid "Repeat x" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:412 +#: code:addons/web_editor/static/src/xml/editor.xml:375 #, python-format msgid "Repeat y" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:956 +#: code:addons/web_editor/static/src/js/rte.summernote.js:964 +#: code:addons/web_editor/static/src/xml/ace.xml:36 #, python-format msgid "Reset" msgstr "" @@ -1012,28 +1038,35 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:957 +#: code:addons/web_editor/static/src/js/rte.summernote.js:965 #, python-format msgid "Reset to default" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:886 +#: code:addons/web_editor/static/src/js/ace.js:482 +#, python-format +msgid "Reseting views is not supported yet" +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:894 #, python-format msgid "Resize Full" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:887 +#: code:addons/web_editor/static/src/js/rte.summernote.js:895 #, python-format msgid "Resize Half" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:888 +#: code:addons/web_editor/static/src/js/rte.summernote.js:896 #, python-format msgid "Resize Quarter" msgstr "" @@ -1048,7 +1081,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets.js:25 -#: code:addons/web_editor/static/src/xml/ace.xml:15 +#: code:addons/web_editor/static/src/xml/ace.xml:29 #: code:addons/web_editor/static/src/xml/editor.xml:13 #, python-format msgid "Save" @@ -1091,14 +1124,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:893 +#: code:addons/web_editor/static/src/js/rte.summernote.js:901 #, python-format msgid "Select from files" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/ace.js:358 +#: code:addons/web_editor/static/src/js/ace.js:581 #, python-format msgid "Server error" msgstr "" @@ -1112,21 +1145,21 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:385 +#: code:addons/web_editor/static/src/xml/editor.xml:348 #, 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:955 +#: code:addons/web_editor/static/src/js/rte.summernote.js:963 #, python-format msgid "Set transparent" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:363 +#: code:addons/web_editor/static/src/xml/editor.xml:326 #, python-format msgid "Sets the width and height of the background image in percent of the parent element." msgstr "" @@ -1140,7 +1173,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:286 +#: code:addons/web_editor/static/src/xml/editor.xml:237 #, python-format msgid "Size" msgstr "" @@ -1148,7 +1181,7 @@ msgstr "" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/rte.summernote.js:112 -#: code:addons/web_editor/static/src/xml/editor.xml:294 +#: code:addons/web_editor/static/src/xml/editor.xml:241 #, python-format msgid "Small" msgstr "" @@ -1162,65 +1195,61 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:875 +#: code:addons/web_editor/static/src/js/rte.summernote.js:883 #, python-format msgid "Strikethrough" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:920 -#: code:addons/web_editor/static/src/xml/editor.xml:246 +#: code:addons/web_editor/static/src/js/rte.summernote.js:928 #, python-format msgid "Style" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:876 +#: code:addons/web_editor/static/src/js/rte.summernote.js:884 #, python-format msgid "Subscript" msgstr "" #. module: web_editor -#. openerp-web -#: 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 #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:877 +#: code:addons/web_editor/static/src/js/rte.summernote.js:885 #, python-format msgid "Superscript" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:914 +#: code:addons/web_editor/static/src/js/rte.summernote.js:922 #, python-format msgid "Table" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/ace.js:266 +#: code:addons/web_editor/static/src/js/ace.js:462 #, python-format msgid "Template ID: %s" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:962 +#: code:addons/web_editor/static/src/js/rte.summernote.js:970 #, python-format msgid "Text formatting" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:902 +#: code:addons/web_editor/static/src/js/rte.summernote.js:910 #, python-format msgid "Text to display" msgstr "" @@ -1257,7 +1286,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:903 +#: code:addons/web_editor/static/src/js/rte.summernote.js:911 #, python-format msgid "To what URL should this link go?" msgstr "" @@ -1278,7 +1307,7 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:954 +#: code:addons/web_editor/static/src/js/rte.summernote.js:962 #: model:ir.ui.view,arch_db:web_editor.colorpicker #, python-format msgid "Transparent" @@ -1286,35 +1315,42 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:238 +#: code:addons/web_editor/static/src/xml/editor.xml:231 #, python-format -msgid "URL or Email Address" +msgid "URL or Email" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:874 +#: code:addons/web_editor/static/src/js/rte.summernote.js:882 #, python-format msgid "Underline" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:968 +#: code:addons/web_editor/static/src/js/rte.summernote.js:976 #, python-format msgid "Undo" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:900 +#: code:addons/web_editor/static/src/js/ace.js:66 +#, python-format +msgid "Unexpected " +msgstr "" + +#. module: web_editor +#. openerp-web +#: code:addons/web_editor/static/src/js/rte.summernote.js:908 #, python-format msgid "Unlink" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:932 +#: code:addons/web_editor/static/src/js/rte.summernote.js:940 #, python-format msgid "Unordered list" msgstr "" @@ -1342,14 +1378,14 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:396 +#: code:addons/web_editor/static/src/xml/editor.xml:359 #, python-format msgid "Vertical" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:907 +#: code:addons/web_editor/static/src/js/rte.summernote.js:915 #: code:addons/web_editor/static/src/xml/editor.xml:53 #, python-format msgid "Video" @@ -1357,23 +1393,20 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:908 +#: code:addons/web_editor/static/src/js/rte.summernote.js:916 #, python-format msgid "Video Link" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:910 +#: code:addons/web_editor/static/src/js/rte.summernote.js:918 #, python-format msgid "Video URL?" msgstr "" #. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:274 #: model:ir.ui.view,arch_db:web_editor.colorpicker -#, python-format msgid "Warning" msgstr "" @@ -1398,26 +1431,27 @@ msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/js/rte.summernote.js:115 +#: code:addons/web_editor/static/src/xml/ace.xml:8 +#: code:addons/web_editor/static/src/xml/ace.xml:10 #, python-format -msgid "Xl" +msgid "XML (HTML)" msgstr "" #. module: web_editor #. openerp-web -#: 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 +#: code:addons/web_editor/static/src/js/rte.summernote.js:115 #, python-format -msgid "auto" +msgid "Xl" msgstr "" #. module: web_editor #. openerp-web -#: code:addons/web_editor/static/src/xml/editor.xml:241 +#: code:addons/web_editor/static/src/xml/editor.xml:331 +#: code:addons/web_editor/static/src/xml/editor.xml:340 +#: code:addons/web_editor/static/src/xml/editor.xml:353 +#: code:addons/web_editor/static/src/xml/editor.xml:362 #, python-format -msgid "https://www.odoo.com" +msgid "auto" msgstr "" #. module: web_editor @@ -1523,13 +1557,6 @@ msgid "ir.ui.view" msgstr "" #. module: web_editor -#. openerp-web -#: code:addons/web_editor/static/src/js/ace.js:302 -#, python-format -msgid "unsaved changes" -msgstr "" - -#. module: web_editor #: model:ir.model,name:web_editor.model_web_editor_converter_test msgid "web_editor.converter.test" msgstr "" diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index e69bf5803ac..a6611b6fcc6 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -775,6 +775,13 @@ msgid "Add page in menu" msgstr "" #. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:55 +#, python-format +msgid "Add this feature" +msgstr "" + +#. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Adding relevant and popular keywords" msgstr "" @@ -972,7 +979,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.backendDashboard.js:86 +#: code:addons/website/static/src/js/website.backendDashboard.js:92 #: 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_form @@ -1129,6 +1136,11 @@ msgid "Connect with us" msgstr "" #. module: website +#: model:ir.model,name:website.model_res_partner +msgid "Contact" +msgstr "" + +#. module: website #: model:ir.model.fields,field_description:website.field_website_config_settings_module_website_crm msgid "Contact Form" msgstr "" @@ -1206,13 +1218,6 @@ msgid "Create a community" msgstr "" #. module: website -#. openerp-web -#: code:addons/website/static/src/js/website.editor.js:137 -#, python-format -msgid "Create page '%s'" -msgstr "" - -#. module: website #: model:ir.ui.view,arch_db:website.website_config_settings_view_form msgid "Create several versions of your website pages" msgstr "" @@ -1260,6 +1265,7 @@ msgid "Customize any block through this menu. Try to change the background of th msgstr "" #. module: website +#: model:ir.actions.client,name:website.backend_dashboard #: model:ir.ui.menu,name:website.menu_dashboard msgid "Dashboard" msgstr "" @@ -1479,7 +1485,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:21 +#: code:addons/website/static/src/xml/website.backend.xml:73 #, python-format msgid "Edit my Analytics Client ID" msgstr "" @@ -1625,7 +1631,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:22 +#: code:addons/website/static/src/xml/website.editor.xml:6 #, python-format msgid "Follow all the" msgstr "" @@ -1713,7 +1719,15 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:45 +#: code:addons/website/static/src/xml/website.backend.xml:20 +#: code:addons/website/static/src/xml/website.backend.xml:22 +#, python-format +msgid "Go to Website" +msgstr "" + +#. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:96 #, python-format msgid "Go to our" msgstr "" @@ -1737,7 +1751,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.backendDashboard.js:73 +#: code:addons/website/static/src/js/website.backendDashboard.js:79 #: model:ir.model.fields,field_description:website.field_website_config_settings_has_google_analytics #, python-format msgid "Google Analytics" @@ -1824,7 +1838,7 @@ msgstr "" #. module: website #: model:ir.ui.view,arch_db:website.user_navbar -msgid "HTML Editor" +msgid "HTML/CSS Editor" msgstr "" #. module: website @@ -1858,7 +1872,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:20 +#: code:addons/website/static/src/xml/website.editor.xml:4 #: 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 @@ -1877,7 +1891,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_1796 +#: model:ir.model.fields,field_description:website.field_website_menu_id_1831 #: 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" @@ -1906,7 +1920,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.backendDashboard.js:96 +#: code:addons/website/static/src/js/website.backendDashboard.js:102 #, python-format msgid "Incorrect Client ID" msgstr "" @@ -2026,6 +2040,13 @@ msgid "Last Modified on" msgstr "" #. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:102 +#, python-format +msgid "Last Month" +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_write_uid @@ -2040,6 +2061,20 @@ msgid "Last Updated on" msgstr "" #. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:101 +#, python-format +msgid "Last Week" +msgstr "" + +#. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:103 +#, python-format +msgid "Last Year" +msgstr "" + +#. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Launch" msgstr "" @@ -2056,7 +2091,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:21 +#: code:addons/website/static/src/xml/website.editor.xml:5 #, python-format msgid "Let's start designing." msgstr "" @@ -2068,7 +2103,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:29 +#: code:addons/website/static/src/xml/website.backend.xml:81 #, python-format msgid "Link my Analytics Account" msgstr "" @@ -2133,7 +2168,7 @@ msgid "Medium" msgstr "" #. module: website -#: code:addons/website/models/website.py:323 +#: code:addons/website/models/website.py:327 #: model:ir.model.fields,field_description:website.field_website_menu_name #, python-format msgid "Menu" @@ -2141,16 +2176,16 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.mobile.js:42 +#: code:addons/website/static/src/js/website.contentMenu.js:326 #, python-format -msgid "Mobile preview" +msgid "Menu Label" msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:51 +#: code:addons/website/static/src/js/website.mobile.js:42 #, python-format -msgid "Month" +msgid "Mobile preview" msgstr "" #. module: website @@ -2214,13 +2249,6 @@ msgid "New incoming messages are managed as leads or opportunities in your CRM a msgstr "" #. module: website -#. openerp-web -#: code:addons/website/static/src/js/website.editor.js:122 -#, python-format -msgid "New or existing page" -msgstr "" - -#. module: website #: model:ir.ui.view,arch_db:website.kanban_contain #: model:ir.ui.view,arch_db:website.pager msgid "Next" @@ -2415,15 +2443,13 @@ msgid "Our products are designed for small to medium size companies willing to o msgstr "" #. module: website -#. openerp-web -#: code:addons/website/models/website.py:302 -#: code:addons/website/static/src/xml/website.editor.xml:10 +#: code:addons/website/models/website.py:306 #, python-format msgid "Page" msgstr "" #. module: website -#: code:addons/website/models/website.py:308 +#: code:addons/website/models/website.py:312 #, python-format msgid "Page <b>%s</b> contains a link to this page" msgstr "" @@ -2462,11 +2488,6 @@ msgid "Parent Rigth" msgstr "" #. module: website -#: model:ir.model,name:website.model_res_partner -msgid "Partner" -msgstr "" - -#. module: website #: model:ir.model.fields,help:website.field_website_partner_id msgid "Partner-related data of the user" msgstr "" @@ -2660,6 +2681,13 @@ msgid "Regroup similar pages into a sub-menu, so they will appear under a unique msgstr "" #. module: website +#. openerp-web +#: code:addons/website/static/src/xml/website.backend.xml:58 +#, python-format +msgid "Remove this suggestion from dashboard" +msgstr "" + +#. module: website #: model:ir.ui.view,arch_db:website.user_navbar msgid "Rename Page" msgstr "" @@ -2720,7 +2748,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.backendDashboard.js:77 +#: code:addons/website/static/src/js/website.backendDashboard.js:83 #: code:addons/website/static/src/js/website.seo.js:363 #: model:ir.ui.view,arch_db:website.website_config_settings_view_form #, python-format @@ -2945,7 +2973,7 @@ msgid "Tell what's the value for the<br/>customer for this feature." msgstr "" #. module: website -#: code:addons/website/models/website.py:313 +#: code:addons/website/models/website.py:317 #, python-format msgid "Template <b>%s (id:%s)</b> contains a link to this page" msgstr "" @@ -2962,7 +2990,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/js/website.backendDashboard.js:96 +#: code:addons/website/static/src/js/website.backendDashboard.js:102 #, python-format msgid "The Google Analytics Client ID you have entered seems incorrect." msgstr "" @@ -3054,7 +3082,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:28 +#: code:addons/website/static/src/xml/website.backend.xml:80 #, python-format msgid "There is no data currently available." msgstr "" @@ -3082,7 +3110,7 @@ msgid "This page does not exists, but you can create it as you are administrator msgstr "" #. module: website -#: code:addons/website/models/website.py:327 +#: code:addons/website/models/website.py:331 #, python-format msgid "This page is in the menu <b>%s</b>" msgstr "" @@ -3273,7 +3301,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:45 +#: code:addons/website/static/src/xml/website.backend.xml:96 #, python-format msgid "User Documentation" msgstr "" @@ -3316,7 +3344,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:18 +#: code:addons/website/static/src/xml/website.backend.xml:70 #, python-format msgid "Visits" msgstr "" @@ -3357,7 +3385,7 @@ msgstr "" #: model:ir.model,name:website.model_website #: 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.menu,name:website.menu_website_configuration #: model:ir.ui.view,arch_db:website.user_navbar #: model:ir.ui.view,arch_db:website.view_server_action_search_website #: model:ir.ui.view,arch_db:website.website_config_settings_view_form @@ -3365,21 +3393,11 @@ msgid "Website" msgstr "" #. module: website -#: model:ir.ui.menu,name:website.menu_website_configuration -msgid "Website Admin" -msgstr "" - -#. module: website #: model:ir.actions.act_window,name:website.action_module_website 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 "" @@ -3521,6 +3539,11 @@ msgid "Website meta title" msgstr "" #. module: website +#: model:ir.actions.server,name:website.ir_actions_server_website_dashboard +msgid "Website: Dashboard" +msgstr "" + +#. module: website #: model:ir.ui.view,arch_db:website.view_website_tree msgid "Websites" msgstr "" @@ -3531,27 +3554,20 @@ msgid "Websites to translate" msgstr "" #. module: website -#. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:50 -#, python-format -msgid "Week" -msgstr "" - -#. module: website #: model:ir.ui.view,arch_db:website.website_planner msgid "Welcome" msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:20 +#: code:addons/website/static/src/xml/website.editor.xml:4 #, python-format msgid "Welcome to your" msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:26 +#: code:addons/website/static/src/xml/website.editor.xml:10 #, python-format msgid "What do you want to do?" msgstr "" @@ -3623,13 +3639,6 @@ 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:52 -#, python-format -msgid "Year" -msgstr "" - -#. module: website #: model:ir.ui.view,arch_db:website.s_faq_collapse msgid "Yes" msgstr "" @@ -3657,14 +3666,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:30 -#, python-format -msgid "You do not have sufficient access rights to configure the Google Analytics account." -msgstr "" - -#. module: website -#. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:40 +#: code:addons/website/static/src/xml/website.backend.xml:91 #, python-format msgid "You do not seem to have access to this Analytics Account." msgstr "" @@ -3676,7 +3678,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:39 +#: code:addons/website/static/src/xml/website.backend.xml:90 #, python-format msgid "You need to log in to your Google Account before:" msgstr "" @@ -3694,7 +3696,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:43 +#: code:addons/website/static/src/xml/website.backend.xml:94 #, python-format msgid "Your Google Analytic Client ID:" msgstr "" @@ -3706,7 +3708,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:27 +#: code:addons/website/static/src/xml/website.editor.xml:11 #, python-format msgid "Your current changes will be saved automatically." msgstr "" @@ -3937,7 +3939,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.editor.xml:22 +#: code:addons/website/static/src/xml/website.editor.xml:6 #, python-format msgid "signs to get your website ready in no time." msgstr "" @@ -3967,7 +3969,7 @@ msgstr "" #. module: website #. openerp-web -#: code:addons/website/static/src/xml/website.backend.xml:45 +#: code:addons/website/static/src/xml/website.backend.xml:96 #, python-format msgid "to get more information." 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 e8acffc4d3c..a32d10ac906 100644 --- a/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot +++ b/addons/website_crm_partner_assign/i18n/website_crm_partner_assign.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgid "\n" "\n" "<ol>\n" "% for lead in ctx['partner_leads']:\n" -" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>\n" +" <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.partner_name or lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li><br/>\n" "% endfor\n" "</ol>\n" "\n" @@ -247,6 +247,11 @@ msgid "Confirm" msgstr "" #. module: website_crm_partner_assign +#: model:ir.model,name:website_crm_partner_assign.model_res_partner +msgid "Contact" +msgstr "" + +#. module: website_crm_partner_assign #: code:addons/website_crm_partner_assign/controllers/main.py:51 #: code:addons/website_crm_partner_assign/controllers/main.py:108 #: model:ir.ui.view,arch_db:website_crm_partner_assign.portal_my_leads @@ -629,7 +634,7 @@ msgid "Leads Analysis" msgstr "" #. module: website_crm_partner_assign -#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_8790 +#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_id_10215 #: model:ir.ui.view,arch_db:website_crm_partner_assign.view_partner_grade_form msgid "Level" msgstr "" @@ -760,8 +765,12 @@ msgid "Opening Date" msgstr "" #. module: website_crm_partner_assign -#: model:ir.actions.act_window,name:website_crm_partner_assign.action_report_crm_opportunity_assign #: model:ir.ui.menu,name:website_crm_partner_assign.menu_report_crm_opportunities_assign_tree +msgid "Opp. Assignment" +msgstr "" + +#. module: website_crm_partner_assign +#: model:ir.actions.act_window,name:website_crm_partner_assign.action_report_crm_opportunity_assign msgid "Opp. Assignment Analysis" msgstr "" @@ -802,7 +811,6 @@ msgid "Overpassed Deadline" msgstr "" #. module: website_crm_partner_assign -#: model:ir.model,name:website_crm_partner_assign.model_res_partner #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_report_assign_partner_assigned_id #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_partner_report_assign_partner_id #: model:ir.ui.view,arch_db:website_crm_partner_assign.grade_in_detail @@ -971,7 +979,7 @@ msgstr "" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_activation_sequence #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence -#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence_8793 +#: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade_sequence_10218 msgid "Sequence" msgstr "" diff --git a/addons/website_customer/i18n/website_customer.pot b/addons/website_customer/i18n/website_customer.pot index 7fce757753f..61380192763 100644 --- a/addons/website_customer/i18n/website_customer.pot +++ b/addons/website_customer/i18n/website_customer.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -52,6 +52,11 @@ msgid "Click to create a new partner tag." msgstr "" #. module: website_customer +#: model:ir.model,name:website_customer.model_res_partner +msgid "Contact" +msgstr "" + +#. module: website_customer #: model:ir.model.fields,field_description:website_customer.field_res_partner_tag_create_uid msgid "Created by" msgstr "" @@ -110,11 +115,6 @@ msgid "Our References" msgstr "" #. module: website_customer -#: model:ir.model,name:website_customer.model_res_partner -msgid "Partner" -msgstr "" - -#. module: website_customer #: model:ir.ui.view,arch_db:website_customer.view_partner_tag_form msgid "Partner Tag" msgstr "" diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot index 56427c17264..8598ee5695e 100644 --- a/addons/website_event/i18n/website_event.pot +++ b/addons/website_event/i18n/website_event.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -115,6 +115,11 @@ msgid "All Events" msgstr "" #. module: website_event +#: model:ir.ui.view,arch_db:website_event.event_config_settings_view_form_inherit_website +msgid "Ask questions to attendees when registering online" +msgstr "" + +#. module: website_event #: model:ir.ui.view,arch_db:website_event.registration_attendee_details msgid "Attendee #%s" msgstr "" @@ -125,6 +130,12 @@ msgid "Cancel Registration" msgstr "" #. module: website_event +#: model:ir.ui.view,arch_db:website_event.event_type_view_form_inherit_website +msgid "Check this option to have menus for your event on the\n" +" website: registrations, schedule, map, ..." +msgstr "" + +#. module: website_event #. openerp-web #: code:addons/website_event/static/src/js/website.tour.event.js:24 #, python-format @@ -165,16 +176,21 @@ msgid "Create a name for your new event and click <em>\"Continue\"</em>. e.g: Te msgstr "" #. module: website_event -#: model:ir.model.fields,help:website_event.field_event_event_show_menu +#: model:ir.model.fields,help:website_event.field_event_event_website_menu msgid "Creates menus Introduction, Location and Register on the page of the event on the website." msgstr "" #. module: website_event -#: model:ir.model.fields,field_description:website_event.field_event_event_show_menu +#: model:ir.model.fields,field_description:website_event.field_event_event_website_menu msgid "Dedicated Menu" msgstr "" #. module: website_event +#: model:ir.model.fields,field_description:website_event.field_event_type_website_menu +msgid "Display a dedicated menu on Website" +msgstr "" + +#. module: website_event #. openerp-web #: code:addons/website_event/static/src/js/website.tour.event.js:28 #, python-format @@ -187,7 +203,7 @@ msgid "E-mail" msgstr "" #. module: website_event -#: model:ir.ui.view,arch_db:website_event.view_event_sale_form +#: model:ir.ui.view,arch_db:website_event.event_event_view_form_inherit_website msgid "Edit Badges" msgstr "" @@ -202,6 +218,11 @@ msgid "Event" msgstr "" #. module: website_event +#: model:ir.model,name:website_event.model_event_type +msgid "Event Category" +msgstr "" + +#. module: website_event #: model:ir.ui.view,arch_db:website_event.registration_complete msgid "Event Details" msgstr "" @@ -286,7 +307,7 @@ msgid "Free" msgstr "" #. module: website_event -#: code:addons/website_event/models/event.py:54 +#: code:addons/website_event/models/event.py:63 #, python-format msgid "Introduction" msgstr "" @@ -297,7 +318,7 @@ msgid "Is Participating" msgstr "" #. module: website_event -#: code:addons/website_event/models/event.py:55 +#: code:addons/website_event/models/event.py:64 #, python-format msgid "Location" msgstr "" @@ -314,7 +335,7 @@ msgstr "" #. module: website_event #. openerp-web -#: code:addons/website_event/controllers/main.py:182 +#: code:addons/website_event/controllers/main.py:185 #: 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 @@ -409,12 +430,17 @@ msgid "Quantity" msgstr "" #. module: website_event +#: model:ir.ui.view,arch_db:website_event.event_config_settings_view_form_inherit_website +msgid "Questions" +msgstr "" + +#. module: website_event #: model:ir.ui.view,arch_db:website_event.registration_complete msgid "Reference" msgstr "" #. module: website_event -#: code:addons/website_event/models/event.py:63 +#: code:addons/website_event/models/event.py:65 #, python-format msgid "Register" msgstr "" @@ -483,11 +509,6 @@ msgid "Today" msgstr "" #. module: website_event -#: model:ir.model.fields,field_description:website_event.field_event_event_twitter_hashtag -msgid "Twitter Hashtag" -msgstr "" - -#. module: website_event #: model:ir.ui.view,arch_db:website_event.index msgid "Use the top menu <i>'Content'</i> to create your first event." msgstr "" @@ -513,6 +534,11 @@ msgid "Website Home" msgstr "" #. module: website_event +#: model:ir.ui.view,arch_db:website_event.event_event_view_form_inherit_website +msgid "Website Menu" +msgstr "" + +#. module: website_event #: model:ir.model.fields,field_description:website_event.field_event_event_website_message_ids msgid "Website Messages" msgstr "" diff --git a/addons/website_event_questions/i18n/website_event_questions.pot b/addons/website_event_questions/i18n/website_event_questions.pot index c4dda36732f..4eb8efddf67 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -80,11 +80,21 @@ msgid "Event Answer" msgstr "" #. module: website_event_questions +#: model:ir.model,name:website_event_questions.model_event_type +msgid "Event Category" +msgstr "" + +#. module: website_event_questions #: model:ir.model.fields,field_description:website_event_questions.field_event_registration_answer_event_registration_id msgid "Event Registration" msgstr "" #. module: website_event_questions +#: model:ir.model.fields,field_description:website_event_questions.field_event_question_event_type_id +msgid "Event Type" +msgstr "" + +#. module: website_event_questions #: model:ir.model.fields,field_description:website_event_questions.field_event_event_general_question_ids msgid "General Questions" msgstr "" @@ -139,7 +149,14 @@ msgid "Question" msgstr "" #. module: website_event_questions +#: code:addons/website_event_questions/models/event.py:82 +#, python-format +msgid "Question should belong to either event category or event but not both" +msgstr "" + +#. module: website_event_questions #: 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_type_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" @@ -154,6 +171,11 @@ msgid "Questions Analysis" msgstr "" #. module: website_event_questions +#: model:ir.model.fields,field_description:website_event_questions.field_event_type_use_questions +msgid "Questions to Attendees" +msgstr "" + +#. module: website_event_questions #: model:ir.model.fields,field_description:website_event_questions.field_event_question_report_attendee_id #: model:ir.ui.view,arch_db:website_event_questions.view_event_question_report_search msgid "Registration" diff --git a/addons/website_event_sale/i18n/website_event_sale.pot b/addons/website_event_sale/i18n/website_event_sale.pot index 89c4daaf866..adbce54b79a 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -51,7 +51,12 @@ msgid "Product" msgstr "" #. module: website_event_sale -#: code:addons/website_event_sale/controllers/main.py:61 +#: model:ir.ui.view,arch_db:website_event_sale.registration_template +msgid "Register Now" +msgstr "" + +#. module: website_event_sale +#: code:addons/website_event_sale/controllers/main.py:65 #, python-format msgid "Registration" msgstr "" diff --git a/addons/website_event_track/i18n/website_event_track.pot b/addons/website_event_track/i18n/website_event_track.pot index 2584cc9d710..2cd7f9e24e9 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,8 +16,24 @@ msgstr "" "Plural-Forms: \n" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_event_count_sponsor -msgid "# Sponsors" +#: model:mail.template,body_html:website_event_track.mail_template_data_track_confirmation +msgid "<?xml version=\"1.0\"?>\n" +"<div>\n" +" <p>\n" +" Dear <t t-esc=\"object.partner_name\"/>\n" +" </p><p>\n" +" We are pleased to inform you that your proposal ${object.name} has been accepted and confirmed for the event ${object.event_id.name}.\n" +" </p><p>\n" +" You will find more details here:\n" +" <div style=\"margin-top: 16px;\">\n" +" <a href=\"/event/${object.event_id.id}/\" style=\"padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #875A7B; border: 0px solid #875A7B; border-radius:3px\">\n" +" View Event\n" +" </a>\n" +" </div>\n" +" </p>\n" +" <p>Sincerely,</p>\n" +"</div>\n" +" " msgstr "" #. module: website_event_track @@ -51,11 +67,6 @@ 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/>" @@ -90,17 +101,30 @@ msgid "<strong>Regular Talks</strong>. These are standard talks with slides,\n" msgstr "" #. module: website_event_track +#: model:ir.model.fields,help:website_event_track.field_event_track_kanban_state +msgid "A track's kanban state indicates special situations affecting it:\n" +" * Grey is the default situation\n" +" * Red indicates something is preventing the progress of this track\n" +" * Green indicates the track is ready to be pulled to the next stage" +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_stage_is_done +msgid "Accepted Stage" +msgstr "" + +#. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track_active msgid "Active" msgstr "" #. module: website_event_track -#: code:addons/website_event_track/models/event.py:26 +#: code:addons/website_event_track/models/event.py:89 #, python-format msgid "Agenda" msgstr "" @@ -117,7 +141,7 @@ msgid "Allow video and audio recording of their\n" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: model:event.track.stage,name:website_event_track.event_track_stage2 msgid "Announced" msgstr "" @@ -147,11 +171,21 @@ msgid "Call for Proposals" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_is_cancel +msgid "Canceled Stage" +msgstr "" + +#. module: website_event_track +#: model:event.track.stage,name:website_event_track.event_track_stage5 msgid "Cancelled" msgstr "" #. module: website_event_track +#: model:ir.actions.act_window,help:website_event_track.event_track_stage_action +msgid "Click to add a stage in the task pipeline." +msgstr "" + +#. module: website_event_track #: model:ir.actions.act_window,help:website_event_track.action_event_track #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event msgid "Click to add a track." @@ -164,7 +198,17 @@ msgid "Color Index" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: model:event.type,name:website_event_track.event_type_data_tracks +msgid "Conference" +msgstr "" + +#. module: website_event_track +#: model:mail.template,subject:website_event_track.mail_template_data_track_confirmation +msgid "Confirmation of ${object.name}" +msgstr "" + +#. module: website_event_track +#: model:event.track.stage,name:website_event_track.event_track_stage1 msgid "Confirmed" msgstr "" @@ -173,6 +217,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_create_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_create_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_create_uid +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_create_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_create_uid msgid "Created by" msgstr "" @@ -182,6 +227,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_create_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_create_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_create_date +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_create_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_create_date msgid "Created on" msgstr "" @@ -192,6 +238,14 @@ msgid "Date" msgstr "" #. module: website_event_track +#: model:ir.actions.act_window,help:website_event_track.event_track_stage_action +msgid "Define the steps that will be used in the event from the\n" +" creation of the track, up to the closing of the track.\n" +" You will use these stages in order to track the progress in\n" +" solving an event track." +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban msgid "Delete" msgstr "" @@ -201,6 +255,7 @@ msgstr "" #: 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 #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_display_name +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_display_name #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_display_name msgid "Display Name" msgstr "" @@ -221,6 +276,11 @@ msgid "Edit Track" msgstr "" #. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_mail_template_id +msgid "Email Template" +msgstr "" + +#. module: website_event_track #: model:ir.model,name:website_event_track.model_event_event #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_event_id #: model:ir.model.fields,field_description:website_event_track.field_event_track_event_id @@ -229,6 +289,11 @@ msgid "Event" msgstr "" #. module: website_event_track +#: model:ir.model,name:website_event_track.model_event_type +msgid "Event Category" +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" @@ -240,6 +305,12 @@ msgid "Event Locations" msgstr "" #. module: website_event_track +#: model:ir.model,name:website_event_track.model_event_sponsor +msgid "Event Sponsor" +msgstr "" + +#. module: website_event_track +#: model:ir.model,name:website_event_track.model_event_sponsor_type #: model:ir.ui.view,arch_db:website_event_track.view_event_sponsor_type_tree msgid "Event Sponsor Type" msgstr "" @@ -294,11 +365,26 @@ msgid "Find out what people see and say about this event,\n" msgstr "" #. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_fold +msgid "Folded in Kanban" +msgstr "" + +#. module: website_event_track #: model:event.sponsor.type,name:website_event_track.event_sponsor_type3 msgid "Gold" msgstr "" #. module: website_event_track +#: selection:event.track,kanban_state:0 +msgid "Green" +msgstr "" + +#. module: website_event_track +#: selection:event.track,kanban_state:0 +msgid "Grey" +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search msgid "Group By" msgstr "" @@ -318,11 +404,17 @@ msgstr "" #: 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 #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_id #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_id msgid "ID" msgstr "" #. module: website_event_track +#: model:ir.model.fields,help:website_event_track.field_event_track_stage_mail_template_id +msgid "If set an email will be sent to the customer when the track reaches this step." +msgstr "" + +#. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track_image msgid "Image" msgstr "" @@ -333,10 +425,16 @@ msgid "Introduction" msgstr "" #. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_kanban_state +msgid "Kanban State" +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 #: model:ir.model.fields,field_description:website_event_track.field_event_track_location___last_update +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage___last_update #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag___last_update msgid "Last Modified on" msgstr "" @@ -345,6 +443,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_write_uid #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_write_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_write_uid +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_write_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_write_uid #: model:ir.model.fields,field_description:website_event_track.field_event_track_write_uid msgid "Last Updated by" @@ -354,6 +453,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_write_date #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_write_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_write_date +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_write_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_write_date #: model:ir.model.fields,field_description:website_event_track.field_event_track_write_date msgid "Last Updated on" @@ -386,8 +486,8 @@ msgid "Medium-sized image of this contact. It is automatically resized as a 128x msgstr "" #. module: website_event_track -#: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban -msgid "More" +#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search +msgid "My Activities" msgstr "" #. module: website_event_track @@ -416,23 +516,8 @@ msgid "Our Sponsors" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_biography -msgid "Partner Biography" -msgstr "" - -#. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email -msgid "Partner Email" -msgstr "" - -#. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_name -msgid "Partner Name" -msgstr "" - -#. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_phone -msgid "Partner Phone" +#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search +msgid "Overdue Activities" msgstr "" #. module: website_event_track @@ -446,7 +531,7 @@ msgid "Priority" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: model:event.track.stage,name:website_event_track.event_track_stage0 msgid "Proposal" msgstr "" @@ -456,13 +541,17 @@ msgid "Proposals are closed!" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_id +#: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track_proposal +msgid "Proposals on Website" +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.track_view msgid "Proposed by" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: model:event.track.stage,name:website_event_track.event_track_stage3 msgid "Published" msgstr "" @@ -474,7 +563,12 @@ msgid "Put here the list of documents, like slides of\n" msgstr "" #. module: website_event_track -#: selection:event.track,state:0 +#: selection:event.track,kanban_state:0 +msgid "Red" +msgstr "" + +#. module: website_event_track +#: model:event.track.stage,name:website_event_track.event_track_stage4 msgid "Refused" msgstr "" @@ -485,7 +579,7 @@ msgid "Responsible" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_8933 +#: model:ir.model.fields,field_description:website_event_track.field_event_track_location_id_9002 #: model:ir.model.fields,field_description:website_event_track.field_event_track_location_name msgid "Room" msgstr "" @@ -493,12 +587,13 @@ msgstr "" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_sequence #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor_type_sequence +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_sequence msgid "Sequence" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_event_show_tracks -msgid "Show Tracks on Website" +#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search +msgid "Show all records which has next action date is before today" msgstr "" #. module: website_event_track @@ -512,13 +607,35 @@ msgid "Social Stream" msgstr "" #. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_id +msgid "Speaker" +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_biography #: model:ir.ui.view,arch_db:website_event_track.event_track_proposal msgid "Speaker Biography" msgstr "" #. module: website_event_track -#: code:addons/website_event_track/models/website_event_track.py:123 -#: model:ir.model.fields,field_description:website_event_track.field_event_track_speaker_ids +#: code:addons/website_event_track/models/event_track.py:160 +#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_email +#, python-format +msgid "Speaker Email" +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_name +msgid "Speaker Name" +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_partner_phone +msgid "Speaker Phone" +msgstr "" + +#. module: website_event_track +#: code:addons/website_event_track/models/event_track.py:166 #, python-format msgid "Speakers" msgstr "" @@ -550,15 +667,20 @@ msgid "Sponsoring Type" msgstr "" #. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_event_sponsor_count #: model:ir.model.fields,field_description:website_event_track.field_event_event_sponsor_ids -#: model:ir.ui.view,arch_db:website_event_track.view_event_form msgid "Sponsors" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_track_state +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_id_9024 #: model:ir.ui.view,arch_db:website_event_track.view_event_track_search -msgid "Status" +msgid "Stage" +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_track_stage_name +msgid "Stage Name" msgstr "" #. module: website_event_track @@ -593,7 +715,8 @@ msgid "Talk Introduction" msgstr "" #. module: website_event_track -#: code:addons/website_event_track/models/event.py:28 +#: code:addons/website_event_track/models/event.py:62 +#: code:addons/website_event_track/models/event.py:91 #, python-format msgid "Talk Proposals" msgstr "" @@ -604,7 +727,8 @@ msgid "Talk Title" msgstr "" #. module: website_event_track -#: code:addons/website_event_track/models/event.py:25 +#: code:addons/website_event_track/models/event.py:56 +#: code:addons/website_event_track/models/event.py:88 #, python-format msgid "Talks" msgstr "" @@ -625,6 +749,11 @@ msgid "This event does not accept proposals." msgstr "" #. module: website_event_track +#: model:ir.model.fields,help:website_event_track.field_event_track_stage_fold +msgid "This stage is folded in the kanban view when there are no records in that stage to display." +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.event_track_proposal msgid "Timely release of presentation material (slides),\n" " for publishing on our website." @@ -636,11 +765,21 @@ msgid "Title" msgstr "" #. module: website_event_track +#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search +msgid "Today Activities" +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.view_event_track_form msgid "Track" msgstr "" #. module: website_event_track +#: model:mail.message.subtype,name:website_event_track.mt_track_blocked +msgid "Track Blocked" +msgstr "" + +#. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track_date msgid "Track Date" msgstr "" @@ -656,6 +795,42 @@ msgid "Track Location" msgstr "" #. module: website_event_track +#: model:ir.ui.view,arch_db:website_event_track.view_event_form +msgid "Track Proposals on Website" +msgstr "" + +#. module: website_event_track +#: model:mail.message.subtype,name:website_event_track.mt_track_ready +msgid "Track Ready" +msgstr "" + +#. module: website_event_track +#: model:mail.message.subtype,description:website_event_track.mt_track_ready +msgid "Track Ready for Next Stage" +msgstr "" + +#. module: website_event_track +#: code:addons/website_event_track/models/event_track.py:53 +#, python-format +msgid "Track Speakers" +msgstr "" + +#. module: website_event_track +#: model:ir.model,name:website_event_track.model_event_track_stage +#: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_form +#: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search +#: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_tree +msgid "Track Stage" +msgstr "" + +#. module: website_event_track +#: model:ir.actions.act_window,name:website_event_track.event_track_stage_action +#: model:ir.ui.menu,name:website_event_track.event_track_stage_menu +#: model:ir.ui.view,arch_db:website_event_track.event_track_stage_view_search +msgid "Track Stages" +msgstr "" + +#. module: website_event_track #: model:ir.model,name:website_event_track.model_event_track_tag msgid "Track Tag" msgstr "" @@ -668,7 +843,12 @@ msgid "Track Tags" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_event_count_tracks +#: model:mail.message.subtype,description:website_event_track.mt_track_blocked +msgid "Track blocked" +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_event_track_count #: model:ir.model.fields,field_description:website_event_track.field_event_event_track_ids #: model:ir.model.fields,field_description:website_event_track.field_event_track_tag_track_ids #: model:ir.ui.view,arch_db:website_event_track.view_event_track_graph @@ -676,18 +856,25 @@ msgid "Tracks" msgstr "" #. module: website_event_track -#: model:ir.model.fields,field_description:website_event_track.field_event_event_show_track_proposal -msgid "Tracks Proposals" +#: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track_proposal +msgid "Tracks Proposals on Website" msgstr "" #. module: website_event_track #: model:ir.actions.act_window,help:website_event_track.action_event_track_from_event -msgid "Tracks define the agenda of your event. These can be a talk, a round table, a meeting, etc." +msgid "Tracks define the schedule of your event. These can be a talk, a round table, a meeting, etc." msgstr "" #. module: website_event_track #: model:ir.actions.act_window,help:website_event_track.action_event_track -msgid "Tracks define the agenda of your event. These can bea talk, a round table, a meeting, etc." +msgid "Tracks define the schedule of your event. These can bea talk, a round table, a meeting, etc." +msgstr "" + +#. module: website_event_track +#: model:ir.model.fields,field_description:website_event_track.field_event_event_website_track +#: model:ir.model.fields,field_description:website_event_track.field_event_type_website_track +#: model:ir.ui.view,arch_db:website_event_track.view_event_form +msgid "Tracks on Website" msgstr "" #. module: website_event_track @@ -696,6 +883,11 @@ msgid "Unread Messages" msgstr "" #. module: website_event_track +#: model:ir.ui.view,arch_db:website_event_track.view_event_track_search +msgid "Upcoming Activities (7 days)" +msgstr "" + +#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.event_track_social msgid "Use this tag:" msgstr "" @@ -747,16 +939,6 @@ msgid "e.g. Inspiring Business Talk" msgstr "" #. module: website_event_track -#: model:ir.model,name:website_event_track.model_event_sponsor -msgid "event.sponsor" -msgstr "" - -#. module: website_event_track -#: model:ir.model,name:website_event_track.model_event_sponsor_type -msgid "event.sponsor.type" -msgstr "" - -#. module: website_event_track #: model:ir.ui.view,arch_db:website_event_track.view_event_track_form #: model:ir.ui.view,arch_db:website_event_track.view_event_track_kanban msgid "hours" @@ -768,6 +950,7 @@ msgid "talks" msgstr "" #. module: website_event_track +#: model:ir.ui.view,arch_db:website_event_track.agenda #: model:ir.ui.view,arch_db:website_event_track.tracks msgid "unpublished" msgstr "" diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot index bf592eacd66..5fddf1e74a5 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:47+0000\n" +"PO-Revision-Date: 2017-04-18 14:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1384,6 +1384,11 @@ msgid "Help" msgstr "" #. module: website_forum +#: model:ir.ui.view,arch_db:website_forum.new_question +msgid "How to create a physical inventory at an anterior date?, How is the 'remaining hours' field computed on tasks?, How to configure TPS and TVQ's canadian taxes?" +msgstr "" + +#. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum_id #: model:ir.model.fields,field_description:website_forum.field_forum_post_id #: model:ir.model.fields,field_description:website_forum.field_forum_post_reason_id @@ -1434,6 +1439,11 @@ msgid "Insert tags related to your question." msgstr "" #. module: website_forum +#: model:ir.ui.view,arch_db:website_forum.new_question +msgid "Inventory Date Problem, Task remaining hours, Can you help solve solve my tax computation problem in Canada?" +msgstr "" + +#. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post_user_favourite msgid "Is Favourite" msgstr "" @@ -1666,14 +1676,14 @@ msgid "Nofollow links" msgstr "" #. module: website_forum -#: code:addons/website_forum/models/forum.py:871 -#: code:addons/website_forum/models/forum.py:891 +#: code:addons/website_forum/models/forum.py:872 +#: code:addons/website_forum/models/forum.py:892 #, python-format msgid "Not allowed to vote for its own post" msgstr "" #. module: website_forum -#: code:addons/website_forum/models/forum.py:935 +#: code:addons/website_forum/models/forum.py:936 #, python-format msgid "Not enough karma to create a new Tag" msgstr "" diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot index 3ad2ea0ad68..ff076294ffe 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -40,11 +40,6 @@ msgid "Add a Newsletter Subscribe Popup" msgstr "" #. module: website_mass_mailing -#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 -msgid "Allow the use of a pop-up snippet on website to encourage visitors to sign up on a mass mailing list" -msgstr "" - -#. module: website_mass_mailing #: model:ir.ui.view,arch_db:website_mass_mailing.newsletter_subscribe_options msgid "Change Newsletter" msgstr "" @@ -61,8 +56,8 @@ msgid "Contact" msgstr "" #. module: website_mass_mailing -#: selection:mass.mailing.config.settings,group_website_popup_on_exit:0 -msgid "Do not add extra content on website pages to encourage visitors to sign up" +#: model:ir.ui.view,arch_db:website_mass_mailing.inherited_view_mass_mailing_configuration +msgid "Encourage to subscribe to mailing lists with a popup" msgstr "" #. module: website_mass_mailing @@ -110,6 +105,11 @@ msgid "Thanks for your subscription!" msgstr "" #. module: website_mass_mailing +#: model:ir.ui.view,arch_db:website_mass_mailing.inherited_view_mass_mailing_configuration +msgid "This adds a new Newsletter Popup snippet to drag & drop on on your website pages. It triggers a popup when visitors land on the page. This popup prompts them to enter their email address to join a mailing list." +msgstr "" + +#. module: website_mass_mailing #. openerp-web #: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js:80 #, python-format @@ -123,7 +123,7 @@ msgstr "" #. module: website_mass_mailing #: model:ir.model.fields,field_description:website_mass_mailing.field_mass_mailing_config_settings_group_website_popup_on_exit -msgid "Website Pop-up" +msgid "Website Popup" msgstr "" #. module: website_mass_mailing @@ -142,9 +142,13 @@ msgid "You are not subscribed to any of our mailing list." msgstr "" #. module: website_mass_mailing +#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed +msgid "You have been successfully <strong>unsubscribed</strong>!" +msgstr "" + +#. module: website_mass_mailing #. openerp-web #: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:154 -#: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed #, python-format msgid "Your changes have been saved." msgstr "" diff --git a/addons/website_partner/i18n/website_partner.pot b/addons/website_partner/i18n/website_partner.pot index f4fdc6d094a..3906e660495 100644 --- a/addons/website_partner/i18n/website_partner.pot +++ b/addons/website_partner/i18n/website_partner.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. module: website_partner #: model:ir.model,name:website_partner.model_res_partner -msgid "Partner" +msgid "Contact" msgstr "" #. module: website_partner diff --git a/addons/website_portal/i18n/website_portal.pot b/addons/website_portal/i18n/website_portal.pot index b1b8286aa5e..8efdd356448 100644 --- a/addons/website_portal/i18n/website_portal.pot +++ b/addons/website_portal/i18n/website_portal.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -23,6 +23,11 @@ msgid "<span class=\"sr-only\">Toggle navigation</span>\n" msgstr "" #. module: website_portal +#: model:ir.ui.view,arch_db:website_portal.portal_searchbar +msgid "<span id=\"search_label\">Search</span> <span class=\"caret\"/>" +msgstr "" + +#. module: website_portal #: model:ir.ui.view,arch_db:website_portal.portal_archive_groups msgid "Archives" msgstr "" @@ -79,7 +84,7 @@ msgid "Email" msgstr "" #. module: website_portal -#: code:addons/website_portal/controllers/main.py:106 +#: code:addons/website_portal/controllers/main.py:118 #, python-format msgid "Invalid Email! Please enter a valid email address." msgstr "" @@ -106,7 +111,7 @@ msgid "Saleman" msgstr "" #. module: website_portal -#: code:addons/website_portal/controllers/main.py:122 +#: code:addons/website_portal/controllers/main.py:134 #, python-format msgid "Some required fields are empty." msgstr "" diff --git a/addons/website_portal_sale/i18n/website_portal_sale.pot b/addons/website_portal_sale/i18n/website_portal_sale.pot index b1c0d64b9dd..59568ac5d39 100644 --- a/addons/website_portal_sale/i18n/website_portal_sale.pot +++ b/addons/website_portal_sale/i18n/website_portal_sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,18 @@ msgstr "" "Plural-Forms: \n" #. module: website_portal_sale +#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders +msgid "&nbsp;" +msgstr "" + +#. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices -msgid "<i class=\"fa fa-arrow-circle-right\"/> Pay Now" +msgid "<i class=\"fa fa-arrow-circle-right\"/><span class=\"hidden-xs\"> Pay Now</span>" msgstr "" #. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices -msgid "<span class=\"h3\">Your Invoices and Payments</span>" +msgid "<span class=\"h3\">Your Invoices</span>" msgstr "" #. module: website_portal_sale @@ -37,17 +42,23 @@ msgstr "" #. module: website_portal_sale #: 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>" +msgid "<span class=\"hidden-xs\">Sales Order #</span>\n" +" <span class=\"visible-xs\">Ref.</span>" +msgstr "" + +#. module: website_portal_sale +#: 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\"/><span class=\"hidden-xs\"> Problem</span></span>" msgstr "" #. module: website_portal_sale #: 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>" +msgid "<span class=\"label label-default hidden-xs\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Done</span></span>" msgstr "" #. module: website_portal_sale #: 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>" +msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-check\"/><span class=\"hidden-xs\"> Paid</span></span>" msgstr "" #. module: website_portal_sale @@ -56,24 +67,28 @@ msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-clock-o\"/> Ex msgstr "" #. module: website_portal_sale -#: 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 "" #. module: website_portal_sale +#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices +msgid "<span class=\"label label-default\"><i class=\"fa fa-fw fa-remove\"/><span class=\"hidden-xs\"> Cancelled</span></span>" +msgstr "" + +#. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.orders_followup msgid "<span class=\"label label-info orders_label_text_align\"><i class=\"fa fa-fw fa-clock-o\"/> Waiting</span>" msgstr "" #. module: website_portal_sale #: 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>" +msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Invoiced</span></span>" msgstr "" #. module: website_portal_sale #: 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>" +msgid "<span class=\"label label-info\"><i class=\"fa fa-fw fa-clock-o\"/><span class=\"hidden-xs\"> Waiting for Payment</span></span>" msgstr "" #. module: website_portal_sale @@ -157,25 +172,30 @@ msgid "Awaiting Payment" msgstr "" #. module: website_portal_sale -#: code:addons/website_portal_sale/controllers/main.py:222 +#: code:addons/website_portal_sale/controllers/main.py:228 #, 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:225 +#: code:addons/website_portal_sale/controllers/main.py:231 #, python-format msgid "Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation." msgstr "" #. module: website_portal_sale -#: code:addons/website_portal_sale/controllers/main.py:177 +#: code:addons/website_portal_sale/controllers/main.py:183 #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices #, python-format msgid "Due Date" msgstr "" #. module: website_portal_sale +#: model:ir.model.fields,help:website_portal_sale.field_sale_order_line_product_image +msgid "Image of the product variant (Big-sized image of product template if false). It is automatically resized as a 1024x1024px image, with aspect ratio preserved." +msgstr "" + +#. module: website_portal_sale #: model:ir.model,name:website_portal_sale.model_account_invoice msgid "Invoice" msgstr "" @@ -186,7 +206,7 @@ msgid "Invoice #" msgstr "" #. module: website_portal_sale -#: code:addons/website_portal_sale/controllers/main.py:176 +#: code:addons/website_portal_sale/controllers/main.py:182 #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices #, python-format msgid "Invoice Date" @@ -208,14 +228,6 @@ msgid "My Quotations" msgstr "" #. module: website_portal_sale -#: code:addons/website_portal_sale/controllers/main.py:59 -#: code:addons/website_portal_sale/controllers/main.py:109 -#: code:addons/website_portal_sale/controllers/main.py:178 -#, python-format -msgid "Name" -msgstr "" - -#. module: website_portal_sale #: model:ir.model.fields,field_description:website_portal_sale.field_crm_team_pending_payment_transactions_count msgid "Number of pending transactions" msgstr "" @@ -232,7 +244,7 @@ msgstr "" #. module: website_portal_sale #: code:addons/website_portal_sale/controllers/main.py:58 -#: code:addons/website_portal_sale/controllers/main.py:108 +#: code:addons/website_portal_sale/controllers/main.py:109 #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_quotations #, python-format @@ -265,6 +277,11 @@ msgid "Pending Payment Transactions" msgstr "" #. module: website_portal_sale +#: model:ir.model.fields,field_description:website_portal_sale.field_sale_order_line_product_image +msgid "Product Image" +msgstr "" + +#. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.orders_followup msgid "Quotation" msgstr "" @@ -280,6 +297,14 @@ msgid "Quotations" msgstr "" #. module: website_portal_sale +#: code:addons/website_portal_sale/controllers/main.py:59 +#: code:addons/website_portal_sale/controllers/main.py:110 +#: code:addons/website_portal_sale/controllers/main.py:184 +#, python-format +msgid "Reference" +msgstr "" + +#. module: website_portal_sale #: model:ir.model,name:website_portal_sale.model_crm_team msgid "Sales Channel" msgstr "" @@ -291,12 +316,12 @@ msgid "Sales Order" msgstr "" #. module: website_portal_sale -#: model:ir.ui.view,arch_db:website_portal_sale.portal_my_orders -msgid "Sales Order #" +#: model:ir.model,name:website_portal_sale.model_sale_order_line +msgid "Sales Order Line" msgstr "" #. module: website_portal_sale -#: code:addons/website_portal_sale/controllers/main.py:179 +#: code:addons/website_portal_sale/controllers/main.py:185 #, python-format msgid "Status" msgstr "" @@ -307,6 +332,11 @@ msgid "Taxes:" msgstr "" #. module: website_portal_sale +#: model:ir.model.fields,help:website_portal_sale.field_sale_order_website_url +msgid "The full URL to access the document through the website." +msgstr "" + +#. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_invoices msgid "There are currently no invoices and payments for your account." msgstr "" @@ -353,8 +383,13 @@ msgid "Valid Until" msgstr "" #. module: website_portal_sale +#: model:ir.model.fields,field_description:website_portal_sale.field_sale_order_website_url +msgid "Website URL" +msgstr "" + +#. module: website_portal_sale #: model:ir.ui.view,arch_db:website_portal_sale.portal_my_home_sale -msgid "Your Invoices and Payments" +msgid "Your Invoices" msgstr "" #. module: website_portal_sale diff --git a/addons/website_project/i18n/website_project.pot b/addons/website_project/i18n/website_project.pot index d27647ab4fe..5bfc4aa1b0d 100644 --- a/addons/website_project/i18n/website_project.pot +++ b/addons/website_project/i18n/website_project.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgid "<strong>Reported by</strong>" msgstr "" #. module: website_project -#: code:addons/website_project/controllers/main.py:84 +#: code:addons/website_project/controllers/main.py:88 #, python-format msgid "All" msgstr "" @@ -78,7 +78,7 @@ msgid "Edit Task" msgstr "" #. module: website_project -#: code:addons/website_project/controllers/main.py:81 +#: code:addons/website_project/controllers/main.py:85 #, python-format msgid "Last Stage Update" msgstr "" @@ -95,7 +95,6 @@ msgstr "" #. module: website_project #: code:addons/website_project/controllers/main.py:31 -#: code:addons/website_project/controllers/main.py:79 #: model:ir.ui.view,arch_db:website_project.my_projects #, python-format msgid "Name" @@ -103,7 +102,7 @@ msgstr "" #. module: website_project #: code:addons/website_project/controllers/main.py:30 -#: code:addons/website_project/controllers/main.py:78 +#: code:addons/website_project/controllers/main.py:82 #, python-format msgid "Newest" msgstr "" @@ -124,7 +123,7 @@ msgid "Projects" msgstr "" #. module: website_project -#: code:addons/website_project/controllers/main.py:80 +#: code:addons/website_project/controllers/main.py:84 #: model:ir.ui.view,arch_db:website_project.my_tasks #, python-format msgid "Stage" @@ -147,13 +146,18 @@ msgid "Tasks" msgstr "" #. module: website_project +#: model:ir.model.fields,help:website_project.field_project_task_website_url +msgid "The full URL to access the document through the website." +msgstr "" + +#. module: website_project #: model:ir.ui.view,arch_db:website_project.portal_my_home msgid "There are currently no projects." msgstr "" #. module: website_project #: model:ir.ui.view,arch_db:website_project.portal_my_home -msgid "There are currently no quotes." +msgid "There are currently no tasks." msgstr "" #. module: website_project @@ -167,6 +171,17 @@ msgid "There are no tasks." msgstr "" #. module: website_project +#: code:addons/website_project/controllers/main.py:83 +#, python-format +msgid "Title" +msgstr "" + +#. module: website_project +#: model:ir.model.fields,field_description:website_project.field_project_task_website_url +msgid "Website URL" +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" diff --git a/addons/website_project_issue/i18n/website_project_issue.pot b/addons/website_project_issue/i18n/website_project_issue.pot index 8154a9faf43..ce0fb8732f9 100644 --- a/addons/website_project_issue/i18n/website_project_issue.pot +++ b/addons/website_project_issue/i18n/website_project_issue.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -41,24 +41,34 @@ msgid "<strong>Reported by</strong>" msgstr "" #. module: website_project_issue -#: code:addons/website_project_issue/controllers/main.py:38 +#: code:addons/website_project_issue/controllers/main.py:39 #, 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" +#: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue +msgid "Attachment" +msgstr "" + +#. module: website_project_issue +#: model:ir.model.fields,help:website_project_issue.field_project_issue_attachment_ids +msgid "Attachment that don't come from message." msgstr "" #. module: website_project_issue #: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue -msgid "Current stage of this issue" +msgid "Attachments" msgstr "" #. module: website_project_issue #: model:ir.ui.view,arch_db:website_project_issue.my_issues -msgid "Description" +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 @@ -78,12 +88,17 @@ msgid "Issues" msgstr "" #. module: website_project_issue -#: code:addons/website_project_issue/controllers/main.py:35 +#: code:addons/website_project_issue/controllers/main.py:36 #, python-format msgid "Last Stage Update" msgstr "" #. module: website_project_issue +#: model:ir.model.fields,field_description:website_project_issue.field_project_issue_attachment_ids +msgid "Main Attachments" +msgstr "" + +#. module: website_project_issue #: model:ir.ui.view,arch_db:website_project_issue.my_issues_issue msgid "My Issues" msgstr "" @@ -91,28 +106,51 @@ msgstr "" #. module: website_project_issue #: code:addons/website_project_issue/controllers/main.py:33 #, python-format -msgid "Name" +msgid "Newest" +msgstr "" + +#. module: website_project_issue +#: model:ir.model,name:website_project_issue.model_project_issue +msgid "Project Issue" msgstr "" #. module: website_project_issue -#: code:addons/website_project_issue/controllers/main.py:32 +#: code:addons/website_project_issue/controllers/main.py:42 #, python-format -msgid "Newest" +msgid "Search <span class=\"nolabel\"> (in Content)</span>" msgstr "" #. module: website_project_issue -#: model:ir.model,name:website_project_issue.model_project_issue -msgid "Project Issue" +#: code:addons/website_project_issue/controllers/main.py:45 +#, python-format +msgid "Search in All" msgstr "" #. module: website_project_issue -#: code:addons/website_project_issue/controllers/main.py:34 +#: code:addons/website_project_issue/controllers/main.py:44 +#, python-format +msgid "Search in Customer" +msgstr "" + +#. module: website_project_issue +#: code:addons/website_project_issue/controllers/main.py:43 +#, python-format +msgid "Search in Messages" +msgstr "" + +#. module: website_project_issue +#: code:addons/website_project_issue/controllers/main.py:35 #: model:ir.ui.view,arch_db:website_project_issue.my_issues #, python-format msgid "Stage" msgstr "" #. module: website_project_issue +#: model:ir.model.fields,help:website_project_issue.field_project_issue_website_url +msgid "The full URL to access the document through the website." +msgstr "" + +#. module: website_project_issue #: model:ir.ui.view,arch_db:website_project_issue.portal_my_home msgid "There are currently no issues." msgstr "" @@ -123,6 +161,18 @@ msgid "There are no issues." msgstr "" #. module: website_project_issue +#: code:addons/website_project_issue/controllers/main.py:34 +#: model:ir.ui.view,arch_db:website_project_issue.my_issues +#, python-format +msgid "Title" +msgstr "" + +#. module: website_project_issue +#: model:ir.model.fields,field_description:website_project_issue.field_project_issue_website_url +msgid "Website URL" +msgstr "" + +#. module: website_project_issue #: model:ir.ui.view,arch_db:website_project_issue.my_issues #: model:ir.ui.view,arch_db:website_project_issue.portal_my_home msgid "Your Issues" diff --git a/addons/website_quote/i18n/website_quote.pot b/addons/website_quote/i18n/website_quote.pot index 409a049fcf6..3c28cd87d68 100644 --- a/addons/website_quote/i18n/website_quote.pot +++ b/addons/website_quote/i18n/website_quote.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -230,13 +230,13 @@ msgid "Add to order lines" msgstr "" #. module: website_quote -#: model:ir.model.fields,field_description:website_quote.field_sale_order_amount_undiscounted -msgid "Amount Before Discount" +#: model:ir.ui.view,arch_db:website_quote.pricing +msgid "Amount" msgstr "" #. module: website_quote -#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form -msgid "An administrator can set up default Terms and conditions in your Company settings." +#: model:ir.model.fields,field_description:website_quote.field_sale_order_amount_undiscounted +msgid "Amount Before Discount" msgstr "" #. module: website_quote @@ -409,8 +409,8 @@ msgid "If edit a quotation from the 'Preview' of a quotation, you will\n" msgstr "" #. module: website_quote -#: code:addons/website_quote/controllers/main.py:76 -#: code:addons/website_quote/controllers/main.py:211 +#: code:addons/website_quote/controllers/main.py:77 +#: code:addons/website_quote/controllers/main.py:216 #, python-format msgid "If we store your payment information on our server, subscription payments will be made automatically." msgstr "" @@ -512,13 +512,13 @@ msgid "Optional Products Lines" msgstr "" #. module: website_quote -#: code:addons/website_quote/models/sale_order.py:169 +#: code:addons/website_quote/models/sale_order.py:188 #, 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:93 #, python-format msgid "Order signed by %s" msgstr "" @@ -544,8 +544,8 @@ msgid "Our Service" msgstr "" #. module: website_quote -#: code:addons/website_quote/controllers/main.py:65 -#: code:addons/website_quote/controllers/main.py:204 +#: code:addons/website_quote/controllers/main.py:66 +#: code:addons/website_quote/controllers/main.py:209 #, python-format msgid "Pay & Confirm" msgstr "" @@ -562,18 +562,23 @@ msgid "Payment Method:" msgstr "" #. module: website_quote +#: model:ir.ui.menu,name:website_quote.payment_acquirer_menu_sale #: model:ir.ui.view,arch_db:website_quote.sale_config_settings_view_form_inherit_website_quote msgid "Payment Methods" msgstr "" #. module: website_quote +#: model:ir.ui.view,arch_db:website_quote.so_quotation_content +msgid "Payment Terms:" +msgstr "" + +#. module: website_quote #: model:ir.ui.view,arch_db:website_quote.sale_order_form_quote msgid "Preview" msgstr "" #. module: website_quote #: model:ir.ui.view,arch_db:website_quote.optional_products -#: model:ir.ui.view,arch_db:website_quote.pricing #: model:sale.quote.template,website_description:website_quote.website_quote_template_default msgid "Price" msgstr "" @@ -674,7 +679,7 @@ msgid "Quotation Viewed" msgstr "" #. module: website_quote -#: code:addons/website_quote/controllers/main.py:26 +#: code:addons/website_quote/controllers/main.py:27 #, python-format msgid "Quotation viewed by customer" msgstr "" @@ -795,6 +800,11 @@ msgid "Terms and conditions" msgstr "" #. module: website_quote +#: model:ir.ui.view,arch_db:website_quote.view_sale_quote_template_form +msgid "These Terms & Conditions will replace the default ones set in the Configuration menu." +msgstr "" + +#. module: website_quote #: model:ir.model.fields,help:website_quote.field_sale_quote_template_mail_template_id msgid "This e-mail template will be sent on confirmation. Leave empty to send nothing." msgstr "" @@ -890,7 +900,7 @@ msgid "You can <strong>set a description per product</strong>. Odoo will\n" msgstr "" #. module: website_quote -#: code:addons/website_quote/controllers/main.py:134 +#: code:addons/website_quote/controllers/main.py:137 #, python-format msgid "You cannot add options to a confirmed order." msgstr "" diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot index 23850dc0eda..1e1a4e53796 100644 --- a/addons/website_sale/i18n/website_sale.pot +++ b/addons/website_sale/i18n/website_sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-04-18 14:45+0000\n" +"PO-Revision-Date: 2017-04-18 14:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,6 +31,16 @@ msgid "(processing fees apply)" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.reduction_code +msgid "/shop/cart" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment +msgid "/shop/payment" +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" @@ -83,7 +93,7 @@ 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 @@ -518,28 +528,29 @@ msgid "A few % discount can bring you twice more customers! Here are a few kinds msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:72 +#, python-format +msgid "AT A GLANCE" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale msgid "Abandoned Cart" msgstr "" #. module: website_sale +#. openerp-web #: code:addons/website_sale/models/crm_team.py:48 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:28 +#: model:ir.actions.act_window,name:website_sale.action_abandoned_orders_ecommerce +#: model:ir.ui.menu,name:website_sale.menu_orders_abandoned_orders #: model:ir.ui.view,arch_db:website_sale.crm_team_salesteams_view_kanban_inherit_website_sale #, python-format msgid "Abandoned Carts" 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,help:website_sale.field_product_product_accessory_product_ids #: model:ir.model.fields,help:website_sale.field_product_template_accessory_product_ids msgid "Accessories show up when the customer reviews the cart before paying (cross-sell strategy, e.g. for computers: mouse, keyboard, etc.). An algorithm figures out a list of accessories based on all the products added to cart." @@ -594,6 +605,11 @@ msgid "All Products" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale +msgid "Allow shoppers to compare products based on their attributes" +msgstr "" + +#. module: website_sale #: model:ir.model.fields,help:website_sale.field_product_pricelist_selectable msgid "Allow the end user to choose this price list" msgstr "" @@ -615,19 +631,12 @@ msgid "Alternative Products:" msgstr "" #. module: website_sale -#. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:31 -#, python-format -msgid "Amount" -msgstr "" - -#. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_crm_team_abandoned_carts_amount msgid "Amount of Abandoned Carts" msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.reduction_code +#: model:ir.ui.view,arch_db:website_sale.coupon_form msgid "Apply" msgstr "" @@ -662,6 +671,12 @@ msgid "Assignation of online orders" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_catalog_variants_action +msgid "Attribute Values" +msgstr "" + +#. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_product_attribute_action #: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale msgid "Attributes" msgstr "" @@ -685,7 +700,15 @@ msgstr "" #. module: website_sale #. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:21 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:99 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:100 +#, python-format +msgid "Average Order" +msgstr "" + +#. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:111 #, python-format msgid "Best Sellers" msgstr "" @@ -716,11 +739,26 @@ msgid "Can take up to several days to receive the money" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:19 +#, python-format +msgid "Capture order payments when the delivery is completed." +msgstr "" + +#. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_sale_order_cart_quantity msgid "Cart Quantity" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:90 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:91 +#, python-format +msgid "Carts" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Cash amount or percentage discounts" msgstr "" @@ -864,6 +902,13 @@ msgid "Confirm Order <span class=\"fa fa-long-arrow-right\"/>" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:5 +#, python-format +msgid "Confirm orders when you get paid." +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale msgid "Confirmation Email" msgstr "" @@ -879,6 +924,24 @@ msgid "Confirmed" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.view_sales_order_filter_ecommerce +msgid "Confirmed Orders" +msgstr "" + +#. module: website_sale +#: model:ir.model,name:website_sale.model_res_partner +msgid "Contact" +msgstr "" + +#. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:103 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:104 +#, python-format +msgid "Conversion" +msgstr "" + +#. module: website_sale #: model:ir.model,name:website_sale.model_res_country #: model:ir.ui.view,arch_db:website_sale.address msgid "Country" @@ -925,6 +988,11 @@ msgid "Customer Segments" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_orders_customers +msgid "Customers" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Customers review:" msgstr "" @@ -1134,6 +1202,11 @@ msgid "Fedex integration" msgstr "" #. module: website_sale +#: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce +msgid "Find here all the abandoned carts, i.e. the carts generated by your website's visitors more than one hour ago and not confirmed." +msgstr "" + +#. module: website_sale #. openerp-web #: code:addons/website_sale/static/src/js/website_sale_tour_shop.js:62 #, python-format @@ -1156,6 +1229,13 @@ msgid "From Website" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:12 +#, python-format +msgid "Generate an invoice from orders ready for invoicing." +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.extra_info msgid "Give us your feedback..." msgstr "" @@ -1201,6 +1281,7 @@ msgid "HTTP routing" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.payment #: model:ir.ui.view,arch_db:website_sale.reduction_code msgid "Have a coupon code? Fill in this field and apply." msgstr "" @@ -1281,19 +1362,33 @@ msgid "Install shipping connectors" msgstr "" #. module: website_sale +#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_comparison +msgid "Installs *e-Commerce Comparator*" +msgstr "" + +#. module: website_sale #: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_options msgid "Installs *e-Commerce Optional Products*" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:474 +#: model:ir.model.fields,help:website_sale.field_website_config_settings_module_website_sale_wishlist +msgid "Installs *e-Commerce Wishlist*" +msgstr "" + +#. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_internal_product_categories +msgid "Internal Categories" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:478 #, python-format msgid "Invalid Email! Please enter a valid email address." msgstr "" #. module: website_sale #: model:ir.actions.act_window,name:website_sale.action_invoices_ecommerce -#: model:ir.ui.menu,name:website_sale.menu_orders_invoices msgid "Invoices" msgstr "" @@ -1308,7 +1403,7 @@ msgid "Invoicing Policy" msgstr "" #. module: website_sale -#: code:addons/website_sale/models/sale_order.py:115 +#: code:addons/website_sale/models/sale_order.py:120 #, python-format msgid "It is forbidden to modify a sales order which is not in draft status" msgstr "" @@ -1331,6 +1426,11 @@ msgid "Last Modified on" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website +msgid "Last Month" +msgstr "" + +#. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_res_partner_last_website_so_id msgid "Last Online Sales Order" msgstr "" @@ -1350,12 +1450,27 @@ msgid "Last Updated on" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website +msgid "Last Week" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website +msgid "Last Year" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Legal Name" msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale +msgid "Let returning shoppers save products in a whishlist" +msgstr "" + +#. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale msgid "Let the customer enter a shipping address" msgstr "" @@ -1431,7 +1546,7 @@ msgstr "" #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website_config_settings_sale_pricelist_setting_split_1 -msgid "Multiple Prices per Products" +msgid "Multiple Prices per Product" msgstr "" #. module: website_sale @@ -1455,12 +1570,12 @@ msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.sort -msgid "Name <i class=\"fa fa-carret-down\" aria-hidden=\"true\"/>" +msgid "Name <i class=\"fa fa-caret-down\" aria-hidden=\"true\"/>" msgstr "" #. module: website_sale #. openerp-web -#: code:addons/website_sale/controllers/main.py:970 +#: code:addons/website_sale/controllers/main.py:975 #: 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 @@ -1573,24 +1688,44 @@ msgid "Ordered quantities" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:74 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:75 +#: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce #: model:ir.ui.menu,name:website_sale.menu_orders #: model:ir.ui.menu,name:website_sale.menu_orders_orders +#, python-format msgid "Orders" msgstr "" #. module: website_sale -#: model:ir.model.fields,field_description:website_sale.field_product_public_category_parent_id -msgid "Parent Category" +#: model:ir.actions.act_window,name:website_sale.sale_order_action_to_invoice +msgid "Orders To Invoice" msgstr "" #. module: website_sale -#: model:ir.model,name:website_sale.model_res_partner -msgid "Partner" +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:14 +#, python-format +msgid "Orders to Invoice" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:727 -#: code:addons/website_sale/controllers/main.py:837 +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:95 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:96 +#, python-format +msgid "Orders/Day" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_public_category_parent_id +msgid "Parent Category" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/main.py:732 +#: code:addons/website_sale/controllers/main.py:842 #, python-format msgid "Pay Now" msgstr "" @@ -1611,11 +1746,6 @@ msgid "Payment Acquirer" msgstr "" #. module: website_sale -#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers -msgid "Payment Acquirers" -msgstr "" - -#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.report_shop_saleorder_document msgid "Payment Information" msgstr "" @@ -1626,6 +1756,7 @@ msgid "Payment Method:" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_ecommerce_payment_acquirers #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Payment Methods" msgstr "" @@ -1636,19 +1767,19 @@ msgid "Payment must be reconciled manually" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:761 +#: code:addons/website_sale/controllers/main.py:766 #, python-format msgid "Payment transaction (%s) failed : <%s>" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:755 +#: code:addons/website_sale/controllers/main.py:760 #, python-format msgid "Payment transaction failed (%s)" msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:762 +#: code:addons/website_sale/controllers/main.py:767 #, python-format msgid "Payment transaction failed (Contact Administrator)" msgstr "" @@ -1660,6 +1791,18 @@ msgid "Payment<span class=\"chevron\"/>" msgstr "" #. module: website_sale +#: model:ir.actions.act_window,name:website_sale.payment_transaction_action_payments_to_capture +msgid "Payments To Capture" +msgstr "" + +#. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:21 +#, python-format +msgid "Payments to Capture" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address msgid "Phone" msgstr "" @@ -1680,6 +1823,24 @@ msgid "Prefered by some customers" msgstr "" #. module: website_sale +#: code:addons/website_sale/controllers/backend.py:110 +#, python-format +msgid "Previous Month" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/backend.py:108 +#, python-format +msgid "Previous Week" +msgstr "" + +#. module: website_sale +#: code:addons/website_sale/controllers/backend.py:112 +#, python-format +msgid "Previous Year" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.cart_lines #: model:ir.ui.view,arch_db:website_sale.payment msgid "Price" @@ -1687,12 +1848,12 @@ msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.sort -msgid "Price <i class=\"fa fa-carret-down\" aria-hidden=\"true\"/>" +msgid "Price <i class=\"fa fa-caret-down\" aria-hidden=\"true\"/>" msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.sort -msgid "Price <i class=\"fa fa-carret-up\" aria-hidden=\"true\"/>" +msgid "Price <i class=\"fa fa-caret-up\" aria-hidden=\"true\"/>" msgstr "" #. module: website_sale @@ -1734,7 +1895,7 @@ msgstr "" #. module: website_sale #. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:29 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:114 #: 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 @@ -1753,6 +1914,11 @@ msgid "Product Catalog" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_comparison +msgid "Product Comparator" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.product_template_form_view #: model:ir.ui.view,arch_db:website_sale.view_product_image_form msgid "Product Images" @@ -1785,6 +1951,11 @@ msgid "Product Template" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.product_catalog_variants +msgid "Product Variants" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Product attributes filter" msgstr "" @@ -1816,8 +1987,9 @@ msgid "Product prices displaying in web catalog" msgstr "" #. module: website_sale -#: model:ir.actions.act_window,name:website_sale.product_template_action +#: model:ir.actions.act_window,name:website_sale.product_template_action_website #: model:ir.ui.menu,name:website_sale.menu_catalog_products +#: model:ir.ui.menu,name:website_sale.menu_product_settings #: model:ir.ui.view,arch_db:website_sale.confirmation #: model:ir.ui.view,arch_db:website_sale.product msgid "Products" @@ -1871,13 +2043,6 @@ msgid "Put the practical details (shipping, payment methods, etc.) as links in t msgstr "" #. module: website_sale -#. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:30 -#, python-format -msgid "Qty Sold" -msgstr "" - -#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.cart_popover msgid "Qty:" msgstr "" @@ -1888,9 +2053,12 @@ msgid "Quantities to invoice from sales orders" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:115 #: model:ir.ui.view,arch_db:website_sale.cart_lines #: model:ir.ui.view,arch_db:website_sale.confirmation #: model:ir.ui.view,arch_db:website_sale.payment +#, python-format msgid "Quantity" msgstr "" @@ -1916,6 +2084,16 @@ msgid "Rating" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_feedback +msgid "Rating Last Feedback" +msgstr "" + +#. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_image +msgid "Rating Last Image" +msgstr "" + +#. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_product_product_rating_last_value msgid "Rating Last Value" msgstr "" @@ -1926,8 +2104,8 @@ 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" +#: model:ir.model.fields,help:website_sale.field_product_product_rating_last_feedback +msgid "Reason of the rating" msgstr "" #. module: website_sale @@ -1936,6 +2114,11 @@ msgid "Related Product" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_reporting +msgid "Reporting" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.404 msgid "Return to the product list." msgstr "" @@ -1956,10 +2139,20 @@ msgid "Sale" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_graph_website +msgid "Sale Report" +msgstr "" + +#. module: website_sale #. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:9 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:44 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:56 +#: model:ir.actions.act_window,name:website_sale.sale_report_action_carts +#: model:ir.actions.act_window,name:website_sale.sale_report_action_dashboard +#: model:ir.ui.menu,name:website_sale.menu_report_sales +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_search_website #, python-format -msgid "Sales /" +msgid "Sales" msgstr "" #. module: website_sale @@ -1981,6 +2174,19 @@ msgid "Sales Price" msgstr "" #. module: website_sale +#: model:ir.ui.view,arch_db:website_sale.sale_report_view_pivot_website +msgid "Sales Report" +msgstr "" + +#. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:42 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:54 +#, python-format +msgid "Sales Since Last" +msgstr "" + +#. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website_config_settings_salesperson_id #: model:ir.model.fields,field_description:website_sale.field_website_salesperson_id msgid "Salesperson" @@ -2074,6 +2280,13 @@ msgid "Sell your products on eBay" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:26 +#, python-format +msgid "Send a recovery email to visitors who haven't completed their order." +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_config_settings_view_form_inherit_website_sale msgid "Send delivery orders to your warehouse and get delivered quantities updated in sales orders accordingly." msgstr "" @@ -2245,12 +2458,20 @@ msgid "Small-sized image of the category. It is automatically resized as a 64x64 msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:83 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:116 +#, python-format +msgid "Sold" +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.website_planner msgid "Some acquirers like Authorize.net and Ingenico can be used as payment gateways with your own payment processor." msgstr "" #. module: website_sale -#: code:addons/website_sale/controllers/main.py:485 +#: code:addons/website_sale/controllers/main.py:489 #, python-format msgid "Some required fields are empty." msgstr "" @@ -2430,9 +2651,9 @@ msgstr "" #. module: website_sale #. openerp-web -#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:23 +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:60 #, python-format -msgid "There is no recent online sale." +msgid "There is no recent confirmed order." msgstr "" #. module: website_sale @@ -2456,7 +2677,7 @@ msgid "This field holds the image used as image for the category, limited to 102 msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.reduction_code +#: model:ir.ui.view,arch_db:website_sale.coupon_form msgid "This promo code is not available" msgstr "" @@ -2517,13 +2738,19 @@ msgid "Unit Price" msgstr "" #. module: website_sale +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:7 +#: model:ir.actions.act_window,name:website_sale.action_unpaid_orders_ecommerce #: model:ir.ui.menu,name:website_sale.menu_orders_unpaid_orders +#, python-format msgid "Unpaid Orders" msgstr "" #. module: website_sale -#: model:ir.actions.act_window,name:website_sale.action_unpaid_orders_ecommerce -msgid "Unpaid eCommerce Orders" +#. openerp-web +#: code:addons/website_sale/static/src/xml/website_sale_dashboard.xml:82 +#, python-format +msgid "Untaxed Total Sold" msgstr "" #. module: website_sale @@ -2563,6 +2790,7 @@ msgid "Website" msgstr "" #. module: website_sale +#: model:ir.ui.menu,name:website_sale.menu_catalog_categories #: model:ir.ui.view,arch_db:website_sale.product_template_form_view msgid "Website Categories" msgstr "" @@ -2575,7 +2803,6 @@ 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 msgid "Website Product Categories" msgstr "" @@ -2645,6 +2872,11 @@ msgid "Websites using this sales channel" msgstr "" #. module: website_sale +#: model:ir.model.fields,field_description:website_sale.field_website_config_settings_module_website_sale_wishlist +msgid "Wishlists " +msgstr "" + +#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.payment_token_form_confirm msgid "Yes, pay with this card" msgstr "" @@ -2655,13 +2887,20 @@ msgid "You can setup 3 types of <strong>payment methods in Odoo:</strong>" msgstr "" #. module: website_sale -#: model:ir.actions.act_window,help:website_sale.action_abandonned_orders_ecommerce -msgid "You don't have any cancelled order from the website." +#: 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.actions.act_window,help:website_sale.action_orders_ecommerce -msgid "You don't have any confirmed order from the website." +#: model:ir.actions.act_window,help:website_sale.sale_order_action_to_invoice +#: model:ir.actions.act_window,help:website_sale.sale_report_action_carts +#: model:ir.actions.act_window,help:website_sale.sale_report_action_dashboard +msgid "You don't have any order from the website." +msgstr "" + +#. module: website_sale +#: model:ir.actions.act_window,help:website_sale.payment_transaction_action_payments_to_capture +msgid "You don't have any payments to capture from the website." msgstr "" #. module: website_sale @@ -2670,19 +2909,19 @@ msgid "You don't have any unpaid order from the website." msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.address -msgid "Your Address" +#: model:ir.actions.act_window,help:website_sale.action_abandoned_orders_ecommerce +msgid "You should send an email to revive them!" msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address -msgid "Your Address\n" -" <small> or </small>" +msgid "Your Address" msgstr "" #. module: website_sale #: model:ir.ui.view,arch_db:website_sale.address -msgid "Your Order" +msgid "Your Address\n" +" <small> or </small>" msgstr "" #. module: website_sale @@ -2732,7 +2971,7 @@ msgid "all angles, detailed view, package, etc." msgstr "" #. module: website_sale -#: model:ir.ui.view,arch_db:website_sale.reduction_code +#: model:ir.ui.view,arch_db:website_sale.coupon_form msgid "code..." msgstr "" @@ -2767,11 +3006,6 @@ msgid "eCommerce Integrations" msgstr "" #. module: website_sale -#: model:ir.actions.act_window,name:website_sale.action_orders_ecommerce -msgid "eCommerce Orders" -msgstr "" - -#. module: website_sale #: model:ir.ui.view,arch_db:website_sale.search count msgid "found)" msgstr "" diff --git a/addons/website_sale_delivery/i18n/website_sale_delivery.pot b/addons/website_sale_delivery/i18n/website_sale_delivery.pot index 8c3f3488f04..841f3e728a6 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 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-04-18 14:46+0000\n" +"PO-Revision-Date: 2017-04-18 14:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -182,6 +182,16 @@ msgid "Rating" msgstr "" #. module: website_sale_delivery +#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_feedback +msgid "Rating Last Feedback" +msgstr "" + +#. module: website_sale_delivery +#: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_image +msgid "Rating Last Image" +msgstr "" + +#. module: website_sale_delivery #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier_rating_last_value msgid "Rating Last Value" msgstr "" @@ -192,8 +202,8 @@ msgid "Rating count" msgstr "" #. module: website_sale_delivery -#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_rating_last_value -msgid "Rating value: 0=Unhappy, 10=Happy" +#: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier_rating_last_feedback +msgid "Reason of the rating" msgstr "" #. module: website_sale_delivery |