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 ${object.number}\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 ${object.amount_total} ${object.currency_id.name}\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 "" @@ -105,11 +105,21 @@ msgstr "" 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}" @@ -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 "" @@ -181,15 +191,37 @@ msgstr "" 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 "\n" +"

Dear ${object.partner_id.name},

\n" +"

Thank you for your payment.
Here is your payment receipt ${(object.name or '').replace('/','-')} amounting to ${object.amount} ${object.currency_id.name} from ${object.company_id.name}.

\n" +"

If you have any questions, please do not hesitate to contact us.

\n" +"

Best regards,\n" +"% if user and user.signature:\n" +"${user.signature | safe}\n" +"% endif\n" +"

\n" +"" +msgstr "" + #. module: account #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice msgid "\n" " \n" +" % set record = ctx.get('record')\n" +" % set company = record and record.company_id or user.company_id\n" " \n" " \n" " \n" @@ -205,7 +237,7 @@ msgid "\n" " \n" " \n" " \n" " \n" "
\n" -" \"${user.company_id.name}\"\n" +" \"${company.name}\"\n" "
\n" @@ -231,16 +263,16 @@ msgid "\n" " \n" " \n" " \n" " \n" @@ -250,7 +282,7 @@ msgid "\n" " \n" " \n" " \n" " \n" " \n" @@ -270,11 +302,6 @@ msgstr "" msgid " Invite Your Users" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.partner_view_buttons -msgid "Invoiced" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "\n" @@ -527,6 +554,11 @@ msgstr "" msgid "Customer Code:" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Customer: " +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.report_financial #: model:ir.ui.view,arch_db:account.report_generalledger @@ -599,6 +631,11 @@ msgid "Mark the bills to pay
\n" " Group or filter your bills to see those due in the next week, then open each bill individually, click on 'Pay' and select the payment method you prefer." msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Memo: " +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Next action:
" @@ -620,6 +657,21 @@ msgstr "" msgid "Partner's:" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Payment Amount: " +msgstr "" + +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Payment Date: " +msgstr "" + +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Payment Method: " +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance msgid "Period Length (days)" @@ -750,6 +802,11 @@ msgstr "" msgid "Validate the bill
after encoding the products and taxes." msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.report_payment_receipt +msgid "Vendor: " +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" @@ -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 "" @@ -1395,6 +1452,11 @@ msgstr "" 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" @@ -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 "" @@ -1489,16 +1551,6 @@ msgstr "" 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." @@ -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 @@ -1555,6 +1607,11 @@ msgstr "" 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" @@ -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 "" @@ -2333,6 +2392,11 @@ msgstr "" 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 @@ -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 "" @@ -2778,6 +2842,11 @@ msgstr "" 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" @@ -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." @@ -4130,11 +4201,6 @@ msgstr "" 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" @@ -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 "" @@ -4694,6 +4761,11 @@ msgstr "" 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!" @@ -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 "" @@ -6191,6 +6259,11 @@ msgstr "" 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" @@ -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 "" @@ -6277,12 +6350,6 @@ msgstr "" 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" @@ -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 @@ -6374,16 +6440,6 @@ msgstr "" 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" @@ -6504,6 +6560,11 @@ msgstr "" 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 @@ -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 "" @@ -6807,6 +6868,11 @@ msgstr "" 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 @@ -6818,28 +6884,6 @@ msgstr "" 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 @@ -6901,11 +6945,6 @@ msgstr "" 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 @@ -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 @@ -7636,6 +7675,11 @@ msgstr "" 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" @@ -7712,14 +7756,9 @@ msgstr "" 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,11 +8510,17 @@ 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 @@ -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: %s" msgstr "" @@ -8659,6 +8703,13 @@ msgstr "" msgid "This label will be displayed on report to show the balance computed for the given comparison filter." 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." @@ -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,11 +8993,18 @@ 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 @@ -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,18 +9631,25 @@ 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 @@ -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 "" @@ -9735,13 +9800,6 @@ msgstr "" msgid "activate this feature" 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 @@ -9769,13 +9827,6 @@ msgstr "" 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" @@ -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,11 +9874,16 @@ 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 @@ -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 "" @@ -9900,13 +9954,6 @@ msgstr "" 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" @@ -9922,6 +9969,13 @@ msgstr "" 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
your experience or to suggest improvements !" @@ -9929,7 +9983,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 "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 "" @@ -148,6 +149,11 @@ msgstr "" 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 @@ -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 "" @@ -187,11 +194,6 @@ msgstr "" 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" @@ -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" @@ -39,6 +39,11 @@ msgstr "" 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 @@ -98,11 +103,6 @@ msgstr "" 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" 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" @@ -20,6 +20,11 @@ msgstr "" msgid "Change how the system computes the full street field based on the different street subfields" 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" @@ -45,11 +50,6 @@ msgstr "" 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" 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" @@ -71,6 +71,11 @@ msgstr "" 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" @@ -124,11 +129,6 @@ msgstr "" 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" @@ -188,6 +188,11 @@ msgstr "" 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" @@ -227,11 +232,6 @@ msgstr "" 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" @@ -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 "" @@ -397,6 +395,11 @@ msgstr "" 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." @@ -432,11 +435,6 @@ msgstr "" 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" 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" @@ -36,6 +36,11 @@ msgstr "" msgid "Cannot contact geolocation servers. Please make sure that your Internet connection is up and running (%s)." 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" @@ -61,11 +66,6 @@ msgstr "" 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" 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 @@ -56,36 +51,6 @@ msgstr "" 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 @@ -140,16 +105,6 @@ msgstr "" 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" 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" "
\n" -" ${user.company_id.name}
\n" -" ${user.company_id.phone or ''}\n" +" ${company.name}
\n" +" ${company.phone or ''}\n" " 		\n" -" % if user.company_id.email:\n" -" ${user.company_id.email}
\n" +" % if company.email:\n" +" ${company.email}
\n" " % endif\n" -" % if user.company_id.website:\n" -" \n" -" ${user.company_id.website}\n" +" % if company.website:\n" +" \n" +" ${company.website}\n" " \n" " % endif\n" "
\n" -" Powered by Odoo.\n" +" Powered by Odoo.\n" "
\n" "
\n" -"
--
The Odoo Team
PS: People love Odoo, check what they say about it.\n" +"
--
The Odoo Team
PS: People love Odoo, check what they say about it.\n" "
\n" " " 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 "" @@ -1102,6 +1102,11 @@ msgstr "" 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" @@ -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 "" @@ -1413,11 +1418,6 @@ msgstr "" 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" @@ -1555,11 +1555,6 @@ msgstr "" msgid "Email address of the contact" 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." @@ -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 @@ -2228,6 +2224,16 @@ msgstr "" 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" @@ -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'
Subject: %s
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 sales pipeline can be found here, under this app." +msgid "Ready to boost your sales? Your sales pipeline 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 "" @@ -3739,11 +3744,6 @@ msgstr "" msgid "Use the breadcrumbs to go back to your sales pipeline." 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" @@ -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 @@ -3915,11 +3915,6 @@ msgstr "" 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 @@ -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" @@ -287,6 +287,11 @@ msgstr "" 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" @@ -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 "" @@ -1057,11 +1060,6 @@ msgstr "" 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" @@ -1247,6 +1245,11 @@ msgstr "" 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" 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" @@ -355,31 +355,11 @@ msgid "\n" "

Best regards,

" 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 "\n" @@ -395,8 +375,8 @@ msgstr "" #. module: event #: model:ir.ui.view,arch_db:event.view_event_form msgid "\n" -" to \n" -" " +" to \n" +" " msgstr "" #. module: event @@ -404,50 +384,41 @@ msgstr "" msgid "Active" msgstr "" +#. module: event +#: 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 +#: model:ir.ui.view,arch_db:event.event_config_settings_view_form +msgid "Advertising" +msgstr "" + #. module: event #: selection:event.mail,interval_type:0 +#: selection:event.type.mail,interval_type:0 msgid "After each registration" msgstr "" #. module: event #: selection:event.mail,interval_type:0 +#: selection:event.type.mail,interval_type:0 msgid "After the event" 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" -msgstr "" - -#. module: event -#: selection:event.config.settings,module_website_event_track:0 -msgid "Allow tracks, agenda and dedicated menus/website per event" -msgstr "" - -#. module: event -#: model:ir.ui.view,arch_db:event.view_event_configuration -msgid "Apply" -msgstr "" - #. module: event #: model:ir.ui.view,arch_db:event.view_event_search msgid "Archived" msgstr "" +#. module: event +#: 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 "" @@ -468,11 +439,6 @@ msgstr "" 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 @@ -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 "" @@ -558,27 +534,35 @@ msgstr "" 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 "" @@ -614,17 +597,10 @@ msgstr "" 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,10 +615,16 @@ 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" @@ -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,41 +650,28 @@ 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" @@ -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,16 +701,9 @@ 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" @@ -748,12 +711,14 @@ 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 +#: 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.actions.report.xml,name:event.report_event_event_badge msgid "Event Badge" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Event Beginning Date" -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 "" @@ -802,11 +777,6 @@ msgstr "" 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" @@ -832,11 +802,6 @@ msgstr "" 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 @@ -855,44 +820,16 @@ msgstr "" 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 @@ -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 "" @@ -924,21 +860,22 @@ msgstr "" msgid "Events Mail Schedulers" msgstr "" +#. module: event +#: 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.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_event_search msgid "Events in New state" msgstr "" -#. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Events which are in New state" -msgstr "" - -#. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "Events which are in confirm state" -msgstr "" - #. module: event #: model:ir.ui.view,arch_db:event.view_registration_search msgid "Expected" @@ -949,11 +886,6 @@ msgstr "" 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" @@ -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 "" @@ -1082,8 +998,14 @@ msgstr "" 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 "" @@ -1107,6 +1030,11 @@ msgstr "" 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" @@ -1117,21 +1045,16 @@ msgstr "" 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" -msgstr "" - -#. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_seats_max -msgid "Max Seats" -msgstr "" - #. module: event #: model:ir.model.fields,field_description:event.field_event_event_seats_availability msgid "Maximum Attendees" @@ -1142,13 +1065,30 @@ msgstr "" msgid "Maximum Attendees Number" msgstr "" +#. module: event +#: model:ir.model.fields,field_description:event.field_event_type_default_registration_max +msgid "Maximum Registrations" +msgstr "" + +#. module: event +#: code:addons/event/models/event.py:261 +#, python-format +msgid "Maximum attendees number should be greater than minimum attendees number." +msgstr "" + #. module: event #: model:ir.model.fields,field_description:event.field_event_event_seats_min 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,42 +1098,17 @@ msgid "My Events" msgstr "" #. module: event -#: model:ir.ui.view,arch_db:event.view_report_event_registration_search -msgid "New" -msgstr "" - -#. module: event -#: selection:event.config.settings,module_website_event_questions:0 -msgid "No extra questions on registrations" -msgstr "" - -#. module: event -#: selection:event.config.settings,module_website_event_track:0 -msgid "No mini website per event" -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:210 +#: code:addons/event/models/event.py:266 #, python-format msgid "No more available seats." msgstr "" #. module: event -#: code:addons/event/models/event.py:310 +#: code:addons/event/models/event.py:363 #, python-format msgid "No more seats available for this event." msgstr "" -#. module: event -#: selection:event.config.settings,auto_confirmation:0 -msgid "No validation step on registration" -msgstr "" - -#. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_nbevent -msgid "Number of Events" -msgstr "" - #. module: event #: model:ir.model.fields,field_description:event.field_event_event_seats_expected msgid "Number of Expected Attendees" @@ -1204,11 +1119,6 @@ msgstr "" msgid "Number of Participants" msgstr "" -#. module: event -#: model:ir.model.fields,field_description:event.field_report_event_registration_nbregistration -msgid "Number of Registrations" -msgstr "" - #. module: event #: model:ir.model.fields,help:event.field_res_partner_event_count msgid "Number of events the partner has participated." @@ -1221,6 +1131,39 @@ msgid "Odoo helps you schedule and efficiently organize your events:\n" " sell tickets, etc." msgstr "" +#. module: event +#: 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_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_config_settings_module_website_event +msgid "Online Events" +msgstr "" + +#. module: event +#: model:ir.model.fields,field_description:event.field_event_config_settings_module_website_event_sale +msgid "Online Ticketing" +msgstr "" + +#. module: event +#: 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.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 #: model:ir.model.fields,field_description:event.field_event_event_organizer_id msgid "Organizer" @@ -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 "" @@ -1247,6 +1184,16 @@ msgstr "" 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" @@ -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 @@ -1300,31 +1248,16 @@ msgstr "" 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" @@ -1352,10 +1285,20 @@ 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" @@ -1366,6 +1309,16 @@ msgstr "" 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" @@ -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 "" @@ -1449,6 +1404,22 @@ msgstr "" 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 @@ -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 "" @@ -1477,11 +1449,6 @@ msgstr "" 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" @@ -1492,11 +1459,31 @@ msgstr "" 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?" @@ -1504,24 +1491,26 @@ 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 " -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:242 +#: 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:367 +#: code:addons/event/models/event.py:420 #, python-format -msgid "You must wait for the starting day of the event to do this action." +msgid "You must wait the event confirmation before doing this action." +msgstr "" + +#. module: event +#: code:addons/event/models/event.py:422 +#, python-format +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" @@ -111,6 +111,12 @@ msgstr "" 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" @@ -149,11 +155,6 @@ msgstr "" 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 @@ -161,6 +162,11 @@ msgstr "" 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" @@ -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,11 +264,19 @@ 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" @@ -301,6 +315,11 @@ msgstr "" 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" @@ -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" @@ -20,11 +20,6 @@ msgstr "" msgid "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" @@ -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 "" @@ -132,6 +129,11 @@ msgstr "" 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" @@ -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" @@ -64,6 +64,11 @@ msgstr "" 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" @@ -101,11 +106,6 @@ msgstr "" 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 @@ -119,25 +119,41 @@ 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 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 @@ -163,11 +180,6 @@ msgstr "" 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 @@ -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 @@ -202,11 +215,6 @@ msgstr "" 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" @@ -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 @@ -453,21 +465,11 @@ msgstr "" 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" @@ -481,11 +483,6 @@ msgstr "" 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" @@ -593,11 +590,6 @@ msgstr "" 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" @@ -618,6 +610,11 @@ msgstr "" 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" @@ -653,21 +650,6 @@ msgstr "" 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" -msgstr "" - -#. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_resource_type -msgid "Resource Type" -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_sinid msgid "SIN No" @@ -678,12 +660,23 @@ msgstr "" msgid "SSN No" msgstr "" +#. module: hr +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Save" +msgstr "" + +#. module: hr +#: 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 #: model:ir.model.fields,help:hr.field_hr_job_state msgid "Set whether the recruitment process is open or closed for this job position." msgstr "" #. 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 "" @@ -750,21 +743,11 @@ msgstr "" 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" @@ -778,11 +761,6 @@ msgstr "" msgid "Unread Messages" msgstr "" -#. module: hr -#: model:ir.model.fields,help:hr.field_hr_employee_login -msgid "Used to log into the system" -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_user_id msgid "User" @@ -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 @@ -874,6 +852,11 @@ msgstr "" 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 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" @@ -52,11 +52,6 @@ msgstr "" 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 @@ -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 "" @@ -153,6 +148,11 @@ msgstr "" 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" @@ -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 "" @@ -283,26 +287,11 @@ msgstr "" 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 @@ -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,25 +437,39 @@ 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" @@ -473,6 +477,7 @@ 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 "" @@ -553,11 +558,21 @@ msgstr "" 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 @@ -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 @@ -605,11 +620,22 @@ msgstr "" msgid "The employee will have access to the \"My Attendances\" menu to check in and out from his session" 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." @@ -620,6 +646,16 @@ msgstr "" 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 @@ -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 "Validated By:" 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 %s 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 @@ -298,6 +298,11 @@ msgstr "" 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" @@ -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 "" @@ -430,6 +435,11 @@ msgstr "" 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 @@ -482,6 +492,16 @@ msgstr "" 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 @@ -522,11 +542,6 @@ msgstr "" 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" @@ -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 "" @@ -879,6 +893,12 @@ msgstr "" 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" @@ -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 "" @@ -1113,6 +1133,11 @@ msgstr "" 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)" @@ -1143,11 +1168,21 @@ msgstr "" 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" @@ -1237,6 +1272,11 @@ msgstr "" 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 @@ -1244,6 +1284,11 @@ msgstr "" msgid "Save the report, your manager will receive a notification by email to approve it." 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" @@ -1260,6 +1305,11 @@ msgstr "" msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure" msgstr "" +#. module: hr_expense +#: model:ir.ui.view,arch_db:hr_expense.hr_expense_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" @@ -1290,13 +1340,18 @@ msgstr "" 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 "" @@ -1403,6 +1458,11 @@ msgstr "" 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 @@ -1443,6 +1503,11 @@ msgstr "" 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 @@ -1454,6 +1519,12 @@ msgstr "" 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" @@ -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.
" 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 "" @@ -185,6 +185,12 @@ msgstr "" 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" @@ -242,15 +248,6 @@ msgstr "" msgid "Assign Leaves" msgstr "" -#. module: hr_holidays -#: model:ir.model.fields,help:hr_holidays.field_resource_calendar_uom_id -msgid "Average hours of work per day.\n" -" It is used in an employee leave request to compute the number of days consumed based on the resource calendar.\n" -" It can be used to handle various contract types, e.g.:\n" -" - 38 Hours/Week, 5 Days/Week: 1 Day = 7.6 Hours\n" -" - 45 Hours/Week, 5 Days/Week: 1 Day = 9.0 Hours" -msgstr "" - #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Black" @@ -541,11 +538,6 @@ msgstr "" msgid "HR Leaves Summary Report By Employee" msgstr "" -#. module: hr_holidays -#: model:ir.model.fields,field_description:hr_holidays.field_resource_calendar_uom_id -msgid "Hours per Day" -msgstr "" - #. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_id #: model:ir.model.fields,field_description:hr_holidays.field_hr_holidays_remaining_leaves_user_id @@ -928,6 +920,11 @@ msgstr "" 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" @@ -1082,11 +1079,6 @@ msgstr "" msgid "Reset to Draft" msgstr "" -#. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_resource_calendar -msgid "Resource Calendar" -msgstr "" - #. module: hr_holidays #: model:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter msgid "Search Leave" @@ -1103,6 +1095,18 @@ msgstr "" 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" @@ -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 "" @@ -189,6 +195,11 @@ msgstr "" 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" @@ -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 "" @@ -250,6 +261,11 @@ msgstr "" 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." @@ -365,11 +381,6 @@ msgstr "" 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 @@ -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 "" @@ -567,6 +578,11 @@ msgstr "" 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" @@ -625,6 +641,11 @@ msgstr "" msgid "If the active field is set to false, it will allow you to hide the salary rule without removing it." 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" @@ -643,11 +664,6 @@ msgstr "" 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" @@ -716,11 +732,6 @@ msgstr "" 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." @@ -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 "" @@ -797,6 +808,11 @@ msgstr "" 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" @@ -871,11 +887,26 @@ msgstr "" 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 @@ -883,7 +914,7 @@ 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 "" @@ -992,6 +1023,11 @@ msgstr "" 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" @@ -1056,6 +1092,11 @@ msgstr "" 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 @@ -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,10 +1253,14 @@ 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" @@ -1280,6 +1325,11 @@ msgstr "" msgid "This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." 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 @@ -1293,6 +1343,11 @@ msgstr "" 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 @@ -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" @@ -53,16 +53,41 @@ msgstr "" 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 @@ -101,6 +126,21 @@ msgstr "" 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" @@ -131,6 +171,11 @@ msgstr "" 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 @@ -142,6 +187,26 @@ msgstr "" 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" @@ -152,6 +217,36 @@ msgstr "" 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" @@ -194,6 +289,16 @@ msgstr "" 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 @@ -215,6 +320,22 @@ msgstr "" 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" @@ -248,6 +369,11 @@ msgstr "" msgid "Sum of the planned hours of all sub-tasks (when a sub-task is closed or its spent hours exceed its planned hours, spent hours are counted instead)" msgstr "" +#. module: hr_timesheet +#: model:ir.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 @@ -266,6 +392,11 @@ msgstr "" 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 @@ -278,6 +409,11 @@ msgstr "" 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 @@ -320,6 +456,16 @@ msgstr "" 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" @@ -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 "" @@ -323,11 +323,6 @@ msgstr "" msgid "Group By..." msgstr "" -#. module: im_livechat -#: model:ir.ui.view,arch_db:im_livechat.mail_channel_view_tree -msgid "Has a Rating" -msgstr "" - #. module: im_livechat #: selection:im_livechat.channel.rule,action:0 msgid "Hide the button" @@ -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 "" @@ -512,9 +507,15 @@ msgstr "" 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 "" @@ -627,6 +630,12 @@ msgstr "" 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 @@ -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" " \n" " \n" -" \"${user.company_id.name}\"\n" +" \"${user.company_id.name}\"\n" " \n" "\n" "\n" @@ -65,16 +65,18 @@ msgid "\n" "
\n" " % if ctx.get('subtype') and ctx.get('subtype').internal:\n" -" \n" -" Internal note: replies are not sent to followers.\n" -" \n" +"

\n" +" Internal communication: Replying will post an internal note. Followers won't receive any email notification.\n" +"

\n" " % endif\n" " \n" "\n" "\n" "\n" "% endif\n" -"${object.body | safe}\n" +"
\n" +" ${object.body | safe}\n" +"
\n" "% if ctx.get('tracking'):\n" "