diff --git a/.tx/config b/.tx/config index c2a261b582b..b09a0702e25 100644 --- a/.tx/config +++ b/.tx/config @@ -187,6 +187,11 @@ file_filter = addons/crm_livechat/i18n/.po source_file = addons/crm_livechat/i18n/crm_livechat.pot source_lang = en +[odoo-master.crm_phone_validation] +file_filter = addons/crm_phone_validation/i18n/.po +source_file = addons/crm_phone_validation/i18n/crm_phone_validation.pot +source_lang = en + [odoo-master.crm_project_issue] file_filter = addons/crm_project_issue/i18n/.po source_file = addons/crm_project_issue/i18n/crm_project_issue.pot @@ -297,6 +302,11 @@ file_filter = addons/hr_maintenance/i18n/.po source_file = addons/hr_maintenance/i18n/hr_maintenance.pot source_lang = en +[odoo-master.hr_org_chart] +file_filter = addons/hr_org_chart/i18n/.po +source_file = addons/hr_org_chart/i18n/hr_org_chart.pot +source_lang = en + [odoo-master.hr_payroll] file_filter = addons/hr_payroll/i18n/.po source_file = addons/hr_payroll/i18n/hr_payroll.pot @@ -372,6 +382,16 @@ file_filter = addons/mass_mailing/i18n/.po source_file = addons/mass_mailing/i18n/mass_mailing.pot source_lang = en +[odoo-master.mass_mailing_event] +file_filter = addons/mass_mailing_event/i18n/.po +source_file = addons/mass_mailing_event/i18n/mass_mailing_event.pot +source_lang = en + +[odoo-master.mass_mailing_event_track] +file_filter = addons/mass_mailing_event_track/i18n/.po +source_file = addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot +source_lang = en + [odoo-master.membership] file_filter = addons/membership/i18n/.po source_file = addons/membership/i18n/membership.pot @@ -462,6 +482,11 @@ file_filter = addons/payment_transfer/i18n/.po source_file = addons/payment_transfer/i18n/payment_transfer.pot source_lang = en +[odoo-master.phone_validation] +file_filter = addons/phone_validation/i18n/.po +source_file = addons/phone_validation/i18n/phone_validation.pot +source_lang = en + [odoo-master.point_of_sale] file_filter = addons/point_of_sale/i18n/.po source_file = addons/point_of_sale/i18n/point_of_sale.pot @@ -552,6 +577,11 @@ file_filter = addons/project_issue_sheet/i18n/.po source_file = addons/project_issue_sheet/i18n/project_issue_sheet.pot source_lang = en +[odoo-master.project_timesheet_holidays] +file_filter = addons/project_timesheet_holidays/i18n/.po +source_file = addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot +source_lang = en + [odoo-master.purchase] file_filter = addons/purchase/i18n/.po source_file = addons/purchase/i18n/purchase.pot @@ -862,6 +892,11 @@ file_filter = addons/website_portal_sale/i18n/.po source_file = addons/website_portal_sale/i18n/website_portal_sale.pot source_lang = en +[odoo-master.website_portal_purchase] +file_filter = addons/website_portal_purchase/i18n/.po +source_file = addons/website_portal_purchase/i18n/website_portal_purchase.pot +source_lang = en + [odoo-master.website_project] file_filter = addons/website_project/i18n/.po source_file = addons/website_project/i18n/website_project.pot diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 974411fb254..3d8be6134ce 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -19,9 +19,9 @@ msgstr "" #: model:mail.template,body_html:account.email_template_edi_invoice msgid "\n" "

Dear ${object.partner_id.name}\n" -"% set access_action = object.get_access_action()\n" -"% set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id)\n" +"% set access_action = object.with_context(force_website=True).get_access_action()\n" "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" +"% set access_url = is_online and '/mail/view?model=account.invoice&res_id=%d' % (object.id) or '/report/pdf/account.report_invoice/' + str(object.id)\n" "\n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" @@ -72,13 +72,6 @@ msgid " * The 'Draft' status is used when a user is encoding a new and unconfirm " * The 'Cancelled' status is used when user cancel invoice." msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1501 -#, python-format -msgid " seconds" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_code_digits #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_code_digits @@ -126,21 +119,21 @@ msgid "${object.subject}" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:460 +#: code:addons/account/models/account_bank_statement.py:466 #, python-format msgid "%d transactions were automatically reconciled." msgstr "" #. module: account -#: code:addons/account/models/account.py:585 +#: code:addons/account/models/account.py:595 #, python-format msgid "%s (Copy)" msgstr "" #. module: account #: code:addons/account/models/account.py:128 -#: code:addons/account/models/account.py:299 #: code:addons/account/models/account.py:300 +#: code:addons/account/models/account.py:301 #, python-format msgid "%s (copy)" msgstr "" @@ -166,7 +159,7 @@ msgid "-> View partially reconciled entries" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:461 +#: code:addons/account/models/account_bank_statement.py:467 #, python-format msgid "1 transaction was automatically reconciled." msgstr "" @@ -192,7 +185,7 @@ msgid ": General ledger" msgstr "" #. module: account -#: code:addons/account/models/account.py:354 +#: code:addons/account/models/account.py:355 #, python-format msgid ": Refund" msgstr "" @@ -302,6 +295,11 @@ 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" @@ -426,6 +424,11 @@ msgstr "" msgid "Duplicate" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view +msgid "Journal Entries" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "New Bill" @@ -817,19 +820,19 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1425 +#: code:addons/account/models/account_invoice.py:1464 #, python-format msgid "A Payment Terms should have its last line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1428 +#: code:addons/account/models/account_invoice.py:1467 #, python-format msgid "A Payment Terms should have only one line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account.py:501 +#: code:addons/account/models/account.py:511 #, python-format msgid "A bank account can only belong to one journal." msgstr "" @@ -876,7 +879,7 @@ msgid "A product in Odoo is something you sell or buy \n" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:800 +#: code:addons/account/models/account_move.py:791 #, python-format msgid "A reconciliation must involve at least 2 move lines." msgstr "" @@ -887,14 +890,20 @@ msgid "A rounding per line is advised if your prices are tax-included. That way, msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:863 -#: code:addons/account/models/account_bank_statement.py:866 +#: code:addons/account/models/account_bank_statement.py:880 +#: code:addons/account/models/account_bank_statement.py:883 #, python-format msgid "A selected move line was already reconciled." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:218 +#: code:addons/account/models/account_bank_statement.py:891 +#, python-format +msgid "A selected statement line was already reconciled with an account move." +msgstr "" + +#. module: account +#: code:addons/account/models/account_bank_statement.py:225 #, python-format msgid "A statement cannot be canceled when its lines are reconciled." msgstr "" @@ -905,7 +914,7 @@ msgid "A tax fiscal position could be defined only once time on same taxes." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:379 +#: code:addons/account/models/account_bank_statement.py:387 #, python-format msgid "A transaction can't have a 0 amount." msgstr "" @@ -924,10 +933,11 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:98 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:103 -#: code:addons/account/static/src/xml/account_reconciliation.xml:144 -#: code:addons/account/static/src/xml/account_reconciliation.xml:273 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:467 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:469 +#: code:addons/account/static/src/xml/account_reconciliation.xml:168 +#: code:addons/account/static/src/xml/account_reconciliation.xml:217 +#: code:addons/account/static/src/xml/account_reconciliation.xml:242 #: model:ir.model,name:account.model_account_account #: model:ir.model.fields,field_description:account.field_account_invoice_account_id #: model:ir.model.fields,field_description:account.field_account_invoice_line_account_id @@ -1047,6 +1057,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_account_payable_id +#: model:ir.model.fields,field_description:account.field_res_users_property_account_payable_id msgid "Account Payable" msgstr "" @@ -1062,6 +1073,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_account_receivable_id +#: model:ir.model.fields,field_description:account.field_res_users_property_account_receivable_id msgid "Account Receivable" msgstr "" @@ -1201,6 +1213,11 @@ msgstr "" msgid "Account tag" msgstr "" +#. module: account +#: model:ir.model.fields,help:account.field_account_tax_refund_account_id +msgid "Account that will be set on invoice tax lines for credit notes. Leave empty to use the expense account." +msgstr "" + #. module: account #: model:ir.model.fields,help:account.field_account_tax_account_id #: model:ir.model.fields,help:account.field_account_tax_template_account_id @@ -1208,7 +1225,6 @@ msgid "Account that will be set on invoice tax lines for invoices. Leave empty t msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_tax_refund_account_id #: model:ir.model.fields,help:account.field_account_tax_template_refund_account_id msgid "Account that will be set on invoice tax lines for refunds. Leave empty to use the expense account." msgstr "" @@ -1320,7 +1336,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_config_settings_view_form -msgid "Activate Other Currencies" +msgid "Activate Currencies" msgstr "" #. module: account @@ -1343,6 +1359,12 @@ msgstr "" msgid "Add" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.invoice_form +#: model:ir.ui.view,arch_db:account.view_account_invoice_refund +msgid "Add Credit Note" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_reconcile_model_has_second_line #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_has_second_line @@ -1423,12 +1445,9 @@ msgid "Aged Partner Balance is a more detailed report of your receivables by int msgstr "" #. module: account -#. openerp-web #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:310 -#, python-format msgid "All" msgstr "" @@ -1494,8 +1513,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:322 -#: code:addons/account/static/src/xml/account_reconciliation.xml:329 +#: code:addons/account/static/src/xml/account_reconciliation.xml:44 #, python-format msgid "All invoices and payments have been matched, your accounts' balances are clean." msgstr "" @@ -1511,7 +1529,7 @@ msgid "All selected journal entries will be validated and posted. You won't be a msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:240 +#: code:addons/account/models/account_bank_statement.py:247 #, python-format msgid "All the account entries lines must be processed in order to close the statement." msgstr "" @@ -1558,10 +1576,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:138 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:142 -#: code:addons/account/static/src/xml/account_reconciliation.xml:153 -#: code:addons/account/static/src/xml/account_reconciliation.xml:272 +#: code:addons/account/static/src/xml/account_reconciliation.xml:191 +#: code:addons/account/static/src/xml/account_reconciliation.xml:224 +#: code:addons/account/static/src/xml/account_reconciliation.xml:241 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount #: model:ir.model.fields,field_description:account.field_account_invoice_line_price_subtotal #: model:ir.model.fields,field_description:account.field_account_invoice_tax_amount @@ -1676,8 +1693,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:150 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:156 +#: code:addons/account/static/src/xml/account_reconciliation.xml:176 #, python-format msgid "Analytic Acc." msgstr "" @@ -1771,20 +1787,24 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_fiscal_position_auto_apply +#: model:ir.model.fields,help:account.field_account_fiscal_position_template_auto_apply msgid "Apply automatically this fiscal position." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_fiscal_position_country_group_id +#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_group_id msgid "Apply only if delivery or invocing country match the group." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_fiscal_position_country_id +#: model:ir.model.fields,help:account.field_account_fiscal_position_template_country_id msgid "Apply only if delivery or invoicing country match." msgstr "" #. module: account +#: model:ir.model.fields,help:account.field_account_fiscal_position_template_vat_required #: model:ir.model.fields,help:account.field_account_fiscal_position_vat_required msgid "Apply only if partner has a VAT number." msgstr "" @@ -1801,7 +1821,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form -msgid "Ask Refund" +msgid "Ask for a Credit Note" msgstr "" #. module: account @@ -1856,13 +1876,13 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:15 +#: code:addons/account/static/src/xml/account_reconciliation.xml:24 #, python-format msgid "Automatic reconciliation" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:466 +#: code:addons/account/models/account_bank_statement.py:472 #, python-format msgid "Automatically reconciled items" msgstr "" @@ -1879,7 +1899,7 @@ msgid "Awaiting payments" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:183 +#: code:addons/account/models/chart_template.py:186 #, python-format msgid "BILL" msgstr "" @@ -1921,9 +1941,10 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:705 +#: code:addons/account/models/chart_template.py:736 #: model:ir.model.fields,field_description:account.field_account_journal_bank_id #: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count +#: model:ir.model.fields,field_description:account.field_res_users_bank_account_count #, python-format msgid "Bank" msgstr "" @@ -1944,9 +1965,14 @@ msgstr "" msgid "Bank Account" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.view_account_bank_journal_form +msgid "Bank Account Name" +msgstr "" + #. module: account #: model:ir.model.fields,help:account.field_account_invoice_partner_bank_id -msgid "Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Vendor Refund, otherwise a Partner bank account number." +msgid "Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Vendor Credit Note, otherwise a Partner bank account number." msgstr "" #. module: account @@ -1981,13 +2007,6 @@ msgstr "" msgid "Bank Operations" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1120 -#, python-format -msgid "Bank Reconciliation" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.view_account_reconcile_model_tree msgid "Bank Reconciliation Move Presets" @@ -2031,6 +2050,13 @@ msgstr "" msgid "Bank and Cash" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:15 +#, python-format +msgid "Bank reconciliation" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_statement_line_id msgid "Bank statement line reconciled with this entry" @@ -2043,11 +2069,17 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:208 +#: code:addons/account/static/src/xml/account_reconciliation.xml:31 #, python-format msgid "Bank statements are fully reconciled." msgstr "" +#. module: account +#: code:addons/account/models/account_journal_dashboard.py:42 +#, python-format +msgid "Bank: Balance" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_tax_base #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -2086,11 +2118,6 @@ msgstr "" msgid "Bill Date" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view -msgid "Bill Refund" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Bill lines" @@ -2117,7 +2144,7 @@ msgid "Bills Payment" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:164 +#: code:addons/account/models/account_journal_dashboard.py:179 #, python-format msgid "Bills to pay" msgstr "" @@ -2158,6 +2185,11 @@ msgstr "" msgid "By Country" msgstr "" +#. module: account +#: model:ir.filters,name:account.filter_invoice_refund +msgid "By Credit Note" +msgstr "" + #. module: account #: model:ir.filters,name:account.filter_invoice_product msgid "By Product" @@ -2168,11 +2200,6 @@ msgstr "" msgid "By Product Category" msgstr "" -#. module: account -#: model:ir.filters,name:account.filter_invoice_refund -msgid "By Refund" -msgstr "" - #. module: account #: model:ir.filters,name:account.filter_invoice_salespersons msgid "By Salespersons" @@ -2183,6 +2210,13 @@ msgstr "" msgid "By unchecking the active field, you may hide a fiscal position without deleting it." msgstr "" +#. module: account +#: code:addons/account/models/chart_template.py:165 +#: code:addons/account/models/chart_template.py:189 +#, python-format +msgid "CABA" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_config_settings_view_form msgid "CAMT Import" @@ -2258,7 +2292,7 @@ msgstr "" #. module: account #: selection:account.invoice.refund,filter_refund:0 -msgid "Cancel: create refund and reconcile" +msgid "Cancel: create credit note and reconcile" msgstr "" #. module: account @@ -2273,6 +2307,18 @@ msgstr "" msgid "Cancelled Invoice" msgstr "" +#. module: account +#: code:addons/account/wizard/account_invoice_refund.py:56 +#, python-format +msgid "Cannot create a credit note for the invoice which is already reconciled, invoice should be unreconciled first, then only you can add credit note for this invoice." +msgstr "" + +#. module: account +#: code:addons/account/wizard/account_invoice_refund.py:54 +#, python-format +msgid "Cannot create credit note for the draft/cancelled invoice." +msgstr "" + #. module: account #: code:addons/account/models/account_move.py:189 #, python-format @@ -2286,40 +2332,28 @@ msgid "Cannot create unbalanced journal entry." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:492 +#: code:addons/account/models/account_invoice.py:499 #, python-format msgid "Cannot find a chart of accounts for this company, You should configure it. \n" "Please go to Account Configuration." msgstr "" #. module: account -#: code:addons/account/models/account.py:391 +#: code:addons/account/models/account.py:392 #, python-format msgid "Cannot generate an unused account code." msgstr "" #. module: account -#: code:addons/account/models/account.py:421 +#: code:addons/account/models/account.py:422 #, python-format msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field." msgstr "" -#. module: account -#: code:addons/account/wizard/account_invoice_refund.py:54 -#, python-format -msgid "Cannot refund draft/cancelled invoice." -msgstr "" - -#. module: account -#: code:addons/account/wizard/account_invoice_refund.py:56 -#, python-format -msgid "Cannot refund invoice which is already reconciled, invoice should be unreconciled first. You can only refund this invoice." -msgstr "" - #. module: account #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:705 +#: code:addons/account/models/chart_template.py:736 #, python-format msgid "Cash" msgstr "" @@ -2330,7 +2364,18 @@ msgid "Cash Accounts Prefix" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:203 +#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id +msgid "Cash Basis Journal" +msgstr "" + +#. module: account +#: code:addons/account/models/chart_template.py:189 +#, python-format +msgid "Cash Basis Tax Journal" +msgstr "" + +#. module: account +#: code:addons/account/models/account_bank_statement.py:210 #: model:ir.actions.act_window,name:account.action_view_account_bnk_stmt_cashbox #, python-format msgid "Cash Control" @@ -2357,11 +2402,17 @@ msgid "Cash and Banks" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:178 +#: code:addons/account/models/account_bank_statement.py:185 #, python-format msgid "Cash difference observed during the counting (%s)" msgstr "" +#. module: account +#: code:addons/account/models/account_journal_dashboard.py:40 +#, python-format +msgid "Cash: Balance" +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_cashbox_line msgid "CashBox Line" @@ -2400,6 +2451,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_template_chart_template_id #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_chart_template_id +#: model:ir.model.fields,field_description:account.field_account_reconcile_model_template_chart_template_id #: model:ir.model.fields,field_description:account.field_account_tax_template_chart_template_id #: model:ir.model.fields,field_description:account.field_res_company_chart_template_id #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_chart_template_id @@ -2457,7 +2509,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_journal_refund_sequence -msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal" +msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal" msgstr "" #. module: account @@ -2490,7 +2542,7 @@ msgid "Children Taxes" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:146 +#: code:addons/account/models/chart_template.py:147 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart #, python-format msgid "Choose Accounting Template" @@ -2498,7 +2550,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1879 +#: code:addons/account/static/src/xml/account_reconciliation.xml:129 #, python-format msgid "Choose counterpart" msgstr "" @@ -2528,6 +2580,11 @@ msgstr "" msgid "Click to add/remove from favorite" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_out_refund +msgid "Click to create a credit note." +msgstr "" + #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree1 msgid "Click to create a customer invoice." @@ -2558,6 +2615,11 @@ msgstr "" msgid "Click to record a new vendor bill." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_in_refund +msgid "Click to record a new vendor credit note." +msgstr "" + #. module: account #: model:ir.actions.act_window,help:account.action_bank_statement_tree msgid "Click to register a bank statement." @@ -2571,23 +2633,16 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:41 +#: code:addons/account/static/src/xml/account_reconciliation.xml:249 #, python-format msgid "Close" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:232 +#: code:addons/account/static/src/xml/account_reconciliation.xml:58 #, python-format -msgid "Close the statement" -msgstr "" - -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:231 -#, python-format -msgid "Close the statements" +msgid "Close statement" msgstr "" #. module: account @@ -2614,6 +2669,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_tag_color +#: model:ir.model.fields,field_description:account.field_account_journal_color msgid "Color Index" msgstr "" @@ -2650,6 +2706,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_ref_company_ids +#: model:ir.model.fields,field_description:account.field_res_users_ref_company_ids msgid "Companies that refers to partner" msgstr "" @@ -2733,7 +2790,7 @@ msgid "Complete Set of Taxes" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:429 +#: code:addons/account/models/account_invoice.py:434 #, python-format msgid "Compose Email" msgstr "" @@ -2754,28 +2811,28 @@ msgid "Configuration" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:477 -#: code:addons/account/models/account_payment.py:479 +#: code:addons/account/models/account_payment.py:509 +#: code:addons/account/models/account_payment.py:511 #, python-format msgid "Configuration Error !" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:341 +#: code:addons/account/models/account_invoice.py:346 #, python-format msgid "Configuration error!\n" "Could not find any account to create the invoice, are you sure you have a chart of account installed?" msgstr "" #. module: account -#: code:addons/account/models/account.py:258 +#: code:addons/account/models/account.py:259 #, python-format msgid "Configuration error!\n" "The currency of the journal should be the same than the default credit account." msgstr "" #. module: account -#: code:addons/account/models/account.py:260 +#: code:addons/account/models/account.py:261 #, python-format msgid "Configuration error!\n" "The currency of the journal should be the same than the default debit account." @@ -2832,7 +2889,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1505 +#: code:addons/account/static/src/xml/account_reconciliation.xml:50 #, python-format msgid "Congrats, you're all done !" msgstr "" @@ -2855,6 +2912,8 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_contract_ids #: model:ir.model.fields,field_description:account.field_res_partner_contracts_count +#: model:ir.model.fields,field_description:account.field_res_users_contract_ids +#: model:ir.model.fields,field_description:account.field_res_users_contracts_count msgid "Contracts" msgstr "" @@ -2880,11 +2939,13 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_id +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_country_id msgid "Country" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_group_id +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_country_group_id msgid "Country Group" msgstr "" @@ -2898,11 +2959,6 @@ msgstr "" msgid "Create Customers" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.view_account_invoice_refund -msgid "Create Refund" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Create Vendors" @@ -2910,14 +2966,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1876 +#: code:addons/account/static/src/xml/account_reconciliation.xml:129 #, python-format msgid "Create Write-off" msgstr "" #. module: account #: selection:account.invoice.refund,filter_refund:0 -msgid "Create a draft refund" +msgid "Create a draft credit note" msgstr "" #. module: account @@ -2926,31 +2982,24 @@ msgid "Create and post move" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:240 +#: code:addons/account/models/account_journal_dashboard.py:258 #, python-format msgid "Create cash statement" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:226 +#: code:addons/account/models/account_journal_dashboard.py:244 #, python-format msgid "Create invoice/bill" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:84 +#: code:addons/account/static/src/xml/account_reconciliation.xml:161 #, python-format msgid "Create model" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2482 -#, python-format -msgid "Create writeoff" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Create your products" @@ -3108,10 +3157,41 @@ msgid "Credit Move" msgstr "" #. module: account +#: code:addons/account/models/account_invoice.py:998 +#: code:addons/account/wizard/account_invoice_refund.py:111 +#: model:ir.actions.act_window,name:account.action_account_invoice_refund +#: model:ir.model,name:account.model_account_invoice_refund +#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view +#: model:ir.ui.view,arch_db:account.invoice_form +#: model:ir.ui.view,arch_db:account.invoice_supplier_form +#: model:ir.ui.view,arch_db:account.report_invoice_document #: model:ir.ui.view,arch_db:account.view_account_invoice_refund +#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search +#, python-format msgid "Credit Note" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view +msgid "Credit Note Bill" +msgstr "" + +#. module: account +#: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice +msgid "Credit Note Date" +msgstr "" + +#. module: account +#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id +msgid "Credit Note Entry Sequence" +msgstr "" + +#. module: account +#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view +#: model:ir.ui.view,arch_db:account.view_account_invoice_filter +msgid "Credit Notes" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_credit_account_id msgid "Credit account" @@ -3154,8 +3234,8 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_payment_currency_id #: model:ir.model.fields,field_description:account.field_account_register_payments_currency_id #: model:ir.model.fields,field_description:account.field_res_partner_currency_id +#: model:ir.model.fields,field_description:account.field_res_users_currency_id #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_currency_id -#: model:ir.ui.view,arch_db:account.account_config_settings_view_form #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_journal #: model:ir.ui.view,arch_db:account.report_partnerledger @@ -3175,8 +3255,8 @@ msgid "Currency as per company's country." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1462 -#: code:addons/account/models/account_move.py:1472 +#: code:addons/account/models/account_move.py:1450 +#: code:addons/account/models/account_move.py:1465 #, python-format msgid "Currency exchange rate difference" msgstr "" @@ -3208,6 +3288,20 @@ msgstr "" msgid "Customer" msgstr "" +#. module: account +#: selection:account.invoice,type:0 +#: selection:account.invoice.report,type:0 +#: code:addons/account/models/account_payment.py:542 +#, python-format +msgid "Customer Credit Note" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:account.action_invoice_out_refund +#: model:ir.ui.menu,name:account.menu_action_invoice_out_refund +msgid "Customer Credit Notes" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Customer Flow" @@ -3220,7 +3314,7 @@ msgid "Customer Invoice" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:182 +#: code:addons/account/models/chart_template.py:185 #: model:ir.actions.act_window,name:account.action_invoice_tree1 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1 #: model:ir.ui.view,arch_db:account.account_planner @@ -3229,13 +3323,14 @@ msgid "Customer Invoices" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:508 +#: code:addons/account/models/account_payment.py:540 #, python-format msgid "Customer Payment" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_payment_term_id +#: model:ir.model.fields,field_description:account.field_res_users_property_payment_term_id msgid "Customer Payment Terms" msgstr "" @@ -3245,14 +3340,7 @@ msgid "Customer Payments" msgstr "" #. module: account -#: selection:account.invoice,type:0 -#: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_payment.py:510 -#, python-format -msgid "Customer Refund" -msgstr "" - -#. module: account +#: model:ir.model.fields,field_description:account.field_product_product_taxes_id #: model:ir.model.fields,field_description:account.field_product_template_taxes_id msgid "Customer Taxes" msgstr "" @@ -3263,10 +3351,7 @@ msgid "Customer ref:" msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:307 #: model:ir.ui.menu,name:account.menu_account_customer -#, python-format msgid "Customers" msgstr "" @@ -3280,8 +3365,8 @@ msgstr "" #: selection:account.print.journal,sort_selection:0 #: selection:account.report.general.ledger,sortby:0 #: selection:accounting.report,filter_cmp:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:146 -#: code:addons/account/static/src/xml/account_reconciliation.xml:268 +#: code:addons/account/static/src/xml/account_reconciliation.xml:222 +#: code:addons/account/static/src/xml/account_reconciliation.xml:237 #: model:ir.model.fields,field_description:account.field_account_bank_statement_date #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_date #: model:ir.model.fields,field_description:account.field_account_invoice_report_date @@ -3371,7 +3456,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence -msgid "Dedicated Refund Sequence" +msgid "Dedicated Credit Note Sequence" msgstr "" #. module: account @@ -3422,6 +3507,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_trust +#: model:ir.model.fields,field_description:account.field_res_users_trust msgid "Degree of trust you have in this debtor" msgstr "" @@ -3443,7 +3529,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:271 +#: code:addons/account/static/src/xml/account_reconciliation.xml:240 #: model:ir.model.fields,field_description:account.field_account_account_type_note #: model:ir.model.fields,field_description:account.field_account_invoice_line_name #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -3465,6 +3551,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_auto_apply +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_auto_apply msgid "Detect Automatically" msgstr "" @@ -3645,6 +3732,12 @@ msgstr "" msgid "Draft Bill" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.invoice_form +#: model:ir.ui.view,arch_db:account.invoice_supplier_form +msgid "Draft Credit Note" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -3656,12 +3749,6 @@ msgstr "" msgid "Draft Invoices" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.invoice_form -#: model:ir.ui.view,arch_db:account.invoice_supplier_form -msgid "Draft Refund" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Draft bills" @@ -3684,7 +3771,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:147 +#: code:addons/account/static/src/xml/account_reconciliation.xml:223 #: model:ir.model.fields,field_description:account.field_account_invoice_date_due #: model:ir.model.fields,field_description:account.field_account_invoice_report_date_due #: model:ir.ui.view,arch_db:account.report_overdue_document @@ -3719,9 +3806,9 @@ msgid "Due date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:930 +#: code:addons/account/models/account_invoice.py:940 #, python-format -msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund." +msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note." msgstr "" #. module: account @@ -3740,22 +3827,15 @@ msgid "EU Digital Goods VAT" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:162 -#: code:addons/account/models/chart_template.py:175 -#: code:addons/account/models/chart_template.py:185 +#: code:addons/account/models/chart_template.py:163 +#: code:addons/account/models/chart_template.py:178 +#: code:addons/account/models/chart_template.py:188 #, python-format msgid "EXCH" msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1509 -#, python-format -msgid "Efficiency at its finest" -msgstr "" - -#. module: account -#: code:addons/account/models/account_move.py:958 +#: code:addons/account/models/account_move.py:954 #, python-format msgid "Either pass both debit and credit or none." msgstr "" @@ -3821,7 +3901,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:923 +#: code:addons/account/models/account_move.py:919 #, python-format msgid "Entries are not of the same account!" msgstr "" @@ -3858,24 +3938,19 @@ msgstr "" msgid "Equity" msgstr "" -#. module: account -#: code:addons/account/wizard/account_report_common.py:28 -#, python-format -msgid "Error!" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Excel template" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:185 +#: code:addons/account/models/chart_template.py:188 #, python-format msgid "Exchange Difference" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_config_settings_currency_exchange_journal_id #: model:ir.model.fields,field_description:account.field_res_company_currency_exchange_journal_id msgid "Exchange Gain or Loss Journal" msgstr "" @@ -3907,6 +3982,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_product_category_property_account_expense_categ_id +#: model:ir.model.fields,field_description:account.field_product_product_property_account_expense_id #: model:ir.model.fields,field_description:account.field_product_template_property_account_expense_id #: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh msgid "Expense Account" @@ -3933,13 +4009,6 @@ msgstr "" msgid "Extra Features" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1516 -#, python-format -msgid "Fast reconciler" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Favorite" @@ -3957,6 +4026,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_state_ids +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_state_ids msgid "Federal States" msgstr "" @@ -3977,7 +4047,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:69 +#: code:addons/account/static/src/xml/account_reconciliation.xml:139 #, python-format msgid "Filter..." msgstr "" @@ -4045,6 +4115,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_fiscal_position_id #: model:ir.model.fields,field_description:account.field_account_invoice_report_fiscal_position_id #: model:ir.model.fields,field_description:account.field_res_partner_property_account_position_id +#: model:ir.model.fields,field_description:account.field_res_users_property_account_position_id #: model:ir.ui.view,arch_db:account.view_account_position_form #: model:ir.ui.view,arch_db:account.view_account_position_template_search #: model:ir.ui.view,arch_db:account.view_account_position_template_tree @@ -4136,7 +4207,18 @@ msgid "Forces all moves for this account to have this secondary currency." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:81 +#: code:addons/account/report/account_aged_partner_balance.py:201 +#: code:addons/account/report/account_balance.py:64 +#: code:addons/account/report/account_general_ledger.py:114 +#: code:addons/account/report/account_journal.py:100 +#: code:addons/account/report/account_partner_ledger.py:74 +#: code:addons/account/report/account_report_financial.py:149 +#, python-format +msgid "Form content is missing, this report cannot be printed." +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:86 #, python-format msgid "Free Reference" msgstr "" @@ -4168,7 +4250,7 @@ msgid "Full Reconcile" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:103 +#: code:addons/account/models/account_journal_dashboard.py:116 #, python-format msgid "Future" msgstr "" @@ -4238,13 +4320,13 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:229 +#: code:addons/account/static/src/xml/account_reconciliation.xml:55 #, python-format -msgid "Go to bank statements" +msgid "Go to bank statement(s)" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:493 +#: code:addons/account/models/account_invoice.py:500 #, python-format msgid "Go to the configuration panel" msgstr "" @@ -4256,9 +4338,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:208 -#: code:addons/account/static/src/xml/account_reconciliation.xml:321 -#: code:addons/account/static/src/xml/account_reconciliation.xml:328 +#: code:addons/account/static/src/xml/account_reconciliation.xml:31 +#: code:addons/account/static/src/xml/account_reconciliation.xml:43 #, python-format msgid "Good Job!" msgstr "" @@ -4305,6 +4386,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_has_unreconciled_entries +#: model:ir.model.fields,field_description:account.field_res_users_has_unreconciled_entries msgid "Has Unreconciled Entries" msgstr "" @@ -4398,13 +4480,13 @@ msgid "ID" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:182 +#: code:addons/account/models/chart_template.py:185 #, python-format msgid "INV" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:385 +#: code:addons/account/models/account_bank_statement.py:393 #, python-format msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well." msgstr "" @@ -4566,13 +4648,13 @@ msgid "In Odoo," msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:405 +#: code:addons/account/models/account_bank_statement.py:413 #, python-format msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:192 +#: code:addons/account/models/account_bank_statement.py:199 #, python-format msgid "In order to delete a bank statement, you must first cancel it to delete related journal items." msgstr "" @@ -4624,6 +4706,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_product_category_property_account_income_categ_id +#: model:ir.model.fields,field_description:account.field_product_product_property_account_income_id #: model:ir.model.fields,field_description:account.field_product_template_property_account_income_id #: model:ir.ui.view,arch_db:account.view_account_chart_template_seacrh msgid "Income Account" @@ -4636,7 +4719,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1798 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:566 #, python-format msgid "Incorrect Operation" msgstr "" @@ -4707,7 +4790,7 @@ msgid "Internal notes..." msgstr "" #. module: account -#: code:addons/account/models/partner.py:44 +#: code:addons/account/models/partner.py:45 #, python-format msgid "Invalid \"Zip Range\", please configure it properly." msgstr "" @@ -4718,11 +4801,12 @@ msgid "Invite Users" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:980 +#: code:addons/account/models/account_invoice.py:996 #: model:ir.model,name:account.model_account_invoice #: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id #: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id #: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn +#: model:ir.model.fields,field_description:account.field_res_users_invoice_warn #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_tree @@ -4776,11 +4860,6 @@ msgstr "" msgid "Invoice Reference" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_invoice_refund -msgid "Invoice Refund" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_state msgid "Invoice Status" @@ -4793,35 +4872,35 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_refund_invoice_id -msgid "Invoice for which this invoice is the refund" +msgid "Invoice for which this invoice is the credit note" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:557 +#: code:addons/account/models/account_invoice.py:569 #, python-format msgid "Invoice must be cancelled in order to reset it to draft." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:603 +#: code:addons/account/models/account_invoice.py:617 #, python-format msgid "Invoice must be in draft or open state in order to be cancelled." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:579 +#: code:addons/account/models/account_invoice.py:591 #, python-format msgid "Invoice must be in draft state in order to validate it." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:597 +#: code:addons/account/models/account_invoice.py:611 #, python-format msgid "Invoice must be paid in order to set it to register payment." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:589 +#: code:addons/account/models/account_invoice.py:603 #, python-format msgid "Invoice must be validated in order to set it to register payment." msgstr "" @@ -4832,13 +4911,7 @@ msgid "Invoice paid" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:113 -#, python-format -msgid "Invoice refund" -msgstr "" - -#. module: account -#: code:addons/account/models/account_invoice.py:1514 +#: code:addons/account/models/account_invoice.py:1559 #, python-format msgid "Invoice sent" msgstr "" @@ -4864,6 +4937,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_invoices #: model:ir.model.fields,field_description:account.field_account_payment_invoice_ids #: model:ir.model.fields,field_description:account.field_res_partner_invoice_ids +#: model:ir.model.fields,field_description:account.field_res_users_invoice_ids #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.view_account_invoice_filter @@ -4875,13 +4949,6 @@ msgstr "" msgid "Invoices" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2115 -#, python-format -msgid "Invoices & Payments Matching" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_invoice_report_all #: model:ir.actions.act_window,name:account.action_account_invoice_report_all_supp @@ -4898,7 +4965,7 @@ msgid "Invoices Statistics" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:164 +#: code:addons/account/models/account_journal_dashboard.py:179 #, python-format msgid "Invoices owed to you" msgstr "" @@ -4948,26 +5015,20 @@ msgid "It indicates that the invoice has been sent." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:956 +#: code:addons/account/models/account_move.py:952 #, python-format msgid "It is mandatory to specify an account and a journal to create a write-off." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:407 -#, python-format -msgid "It is not allowed to delete a bank statement line that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert." -msgstr "" - -#. module: account -#: code:addons/account/models/account_payment.py:329 +#: code:addons/account/models/account_payment.py:353 #, python-format msgid "It is not allowed to delete a payment that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:216 +#: code:addons/account/static/src/xml/account_reconciliation.xml:51 #, python-format msgid "It took you" msgstr "" @@ -5009,9 +5070,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2151 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2156 -#: code:addons/account/static/src/xml/account_reconciliation.xml:145 +#: code:addons/account/static/src/xml/account_reconciliation.xml:183 +#: code:addons/account/static/src/xml/account_reconciliation.xml:218 #: model:ir.model,name:account.model_account_journal #: model:ir.model.fields,field_description:account.field_account_bank_statement_journal_id #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_id @@ -5038,7 +5098,7 @@ msgid "Journal & Partner" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:254 +#: code:addons/account/models/account_bank_statement.py:261 #: model:ir.actions.act_window,name:account.action_move_journal_line #: model:ir.actions.act_window,name:account.action_move_select #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form @@ -5091,7 +5151,7 @@ msgid "Journal Item Label" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:278 +#: code:addons/account/models/account_payment.py:302 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line #: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open #: model:ir.actions.act_window,name:account.action_account_moves_all_a @@ -5105,8 +5165,8 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_move_line_select_by_type #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_entry_ids #: model:ir.model.fields,field_description:account.field_account_move_line_ids -#: model:ir.model.fields,field_description:account.field_res_partner_issued_total #: model:ir.model.fields,field_description:account.field_res_partner_journal_item_count +#: model:ir.model.fields,field_description:account.field_res_users_journal_item_count #: model:ir.ui.menu,name:account.menu_action_account_moves_all #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.view_account_payment_form @@ -5119,7 +5179,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2114 +#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:261 #: model:ir.actions.client,name:account.action_manual_reconcile #, python-format msgid "Journal Items to Reconcile" @@ -5208,8 +5268,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:112 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:116 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:468 +#: code:addons/account/static/src/xml/account_reconciliation.xml:187 +#: code:addons/account/static/src/xml/account_reconciliation.xml:219 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_name #: model:ir.model.fields,field_description:account.field_account_move_line_name #: model:ir.ui.view,arch_db:account.report_journal @@ -5302,9 +5363,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:342 +#: code:addons/account/static/src/xml/account_reconciliation.xml:117 #, python-format -msgid "Last Reconciliation :" +msgid "Last Reconciliation:" msgstr "" #. module: account @@ -5445,6 +5506,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_last_time_entries_checked +#: model:ir.model.fields,help:account.field_res_users_last_time_entries_checked msgid "Last time the invoices & payments matching was performed for this partner. It is set either if there's not at least an unreconciled debit and an unreconciled credit or if you click the \"Done\" button." msgstr "" @@ -5456,6 +5518,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_last_time_entries_checked #: model:ir.model.fields,field_description:account.field_res_partner_last_time_entries_checked +#: model:ir.model.fields,field_description:account.field_res_users_last_time_entries_checked msgid "Latest Invoices & Payments Matching Date" msgstr "" @@ -5475,14 +5538,14 @@ msgid "Legal mentions that have to be printed on the invoices." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:149 +#: code:addons/account/models/account_invoice.py:154 #, python-format msgid "Less Payment" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:15 +#: code:addons/account/static/src/xml/account_reconciliation.xml:24 #, python-format msgid "Let odoo try to reconcile entries for the user" msgstr "" @@ -5535,7 +5598,7 @@ msgid "Logo" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:166 +#: code:addons/account/models/account_bank_statement.py:173 #, python-format msgid "Loss" msgstr "" @@ -5552,7 +5615,7 @@ msgid "Loss Exchange Rate Account" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:184 +#: code:addons/account/models/chart_template.py:187 #, python-format msgid "MISC" msgstr "" @@ -5563,6 +5626,7 @@ msgid "Mail your invoices in one-click using" msgstr "" #. module: account +#: model:ir.ui.view,arch_db:account.account_config_settings_view_form #: model:ir.ui.view,arch_db:account.account_planner msgid "Main Currency" msgstr "" @@ -5582,12 +5646,6 @@ msgstr "" msgid "Main currency of your company" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.tax_adjustments_form -#: model:ir.ui.menu,name:account.menu_action_tax_adjustment -msgid "Make Manual Tax Adjustments" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Manage time & material contracts or fixed-price recurring subscriptions." @@ -5627,13 +5685,9 @@ msgstr "" msgid "Manual Invoice Taxes" msgstr "" -#. module: account -#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation -msgid "Manual Payments & Invoices Matching" -msgstr "" - #. module: account #: model:ir.actions.client,name:account.action_manual_reconciliation +#: model:ir.ui.menu,name:account.menu_action_manual_reconciliation msgid "Manual Reconciliation" msgstr "" @@ -5684,6 +5738,11 @@ msgstr "" msgid "Matching Number" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_partial_reconcile_max_date +msgid "Max Date of Matched Lines" +msgstr "" + #. module: account #: selection:res.company,fiscalyear_last_month:0 msgid "May" @@ -5715,6 +5774,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn_msg +#: model:ir.model.fields,field_description:account.field_res_users_invoice_warn_msg msgid "Message for Invoice" msgstr "" @@ -5756,7 +5816,7 @@ msgid "Miscellaneous" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:184 +#: code:addons/account/models/chart_template.py:187 #: model:ir.ui.view,arch_db:account.view_account_move_filter #, python-format msgid "Miscellaneous Operations" @@ -5764,14 +5824,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:85 +#: code:addons/account/static/src/xml/account_reconciliation.xml:162 #, python-format msgid "Modify models" msgstr "" #. module: account #: selection:account.invoice.refund,filter_refund:0 -msgid "Modify: create refund, reconcile and create a new draft invoice" +msgid "Modify: create credit note, reconcile and create a new draft invoice" msgstr "" #. module: account @@ -5784,18 +5844,6 @@ msgstr "" msgid "Monthly Turnover" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:108 -#, python-format -msgid "More" -msgstr "" - -#. module: account -#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view -msgid "More " -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Most currencies are already created by default. If you plan\n" @@ -5818,7 +5866,17 @@ msgid "Move Line" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1249 +#: model:ir.model.fields,field_description:account.field_account_bank_statement_move_line_count +msgid "Move Line Count" +msgstr "" + +#. module: account +#: model:ir.model.fields,field_description:account.field_account_payment_move_reconciled +msgid "Move Reconciled" +msgstr "" + +#. module: account +#: code:addons/account/models/account_move.py:1245 #, python-format msgid "Move name (id): %s (%s)" msgstr "" @@ -5886,9 +5944,8 @@ msgid "Navigate easily through reports and see what is behind the numbers" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.act_account_tax_net #: model:ir.actions.act_window,name:account.act_account_tax_net_posted -msgid "Net Tax Lines" +msgid "Net Tax Lines (Posted)" msgstr "" #. module: account @@ -5907,7 +5964,7 @@ msgid "New Transactions" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1226 +#: code:addons/account/models/account_move.py:1222 #, python-format msgid "New expected payment date: " msgstr "" @@ -5917,11 +5974,6 @@ msgstr "" msgid "Next, register any unmatched payments:
" msgstr "" -#. module: account -#: selection:account.journal,bank_statements_source:0 -msgid "No Feeds" -msgstr "" - #. module: account #: selection:accounting.report,filter_cmp:0 msgid "No Filters" @@ -5938,7 +5990,7 @@ msgid "No Message" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1104 +#: code:addons/account/models/account_invoice.py:1135 #, python-format msgid "No appropriate payment method enabled on journal %s" msgstr "" @@ -5948,13 +6000,6 @@ msgstr "" msgid "No detail" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:127 -#, python-format -msgid "No result matching '" -msgstr "" - #. module: account #: model:ir.model.fields,help:account.field_res_company_fiscalyear_lock_date msgid "No users, including Advisers, can edit accounts prior to and inclusive of this date. Use it for fiscal year locking for example." @@ -6002,20 +6047,20 @@ msgstr "" msgid "Not Paid" msgstr "" -#. module: account -#: code:addons/account/wizard/account_report_common.py:28 -#, python-format -msgid "Not implemented." -msgstr "" - #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:274 +#: code:addons/account/static/src/xml/account_reconciliation.xml:243 #: model:ir.model.fields,field_description:account.field_account_account_template_note #, python-format msgid "Note" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_out_refund +msgid "Note that the easiest way to create a credit note is to do it directly form\n" +" the customer invoice, to refund it totally or partially." +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_note #: model:ir.model.fields,field_description:account.field_account_fiscal_position_note @@ -6068,7 +6113,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:196 +#: code:addons/account/static/src/xml/account_reconciliation.xml:17 #, python-format msgid "OK" msgstr "" @@ -6167,24 +6212,17 @@ msgid "Only One Chart Template Available" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:343 +#: code:addons/account/models/account_payment.py:367 #, python-format msgid "Only a draft payment can be posted. Trying to post a payment in state %s." msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:808 +#: code:addons/account/models/chart_template.py:839 #, python-format msgid "Only administrators can change the settings" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1510 -#, python-format -msgid "Only use the ctrl-enter shortcut to validate reconciliations." -msgstr "" - #. module: account #: model:ir.model.fields,help:account.field_res_company_period_lock_date msgid "Only users with the 'Adviser' role can edit accounts prior to and inclusive of this date. Use it for period locking inside an open fiscal year, for example." @@ -6205,9 +6243,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1882 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1914 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2049 +#: code:addons/account/static/src/xml/account_reconciliation.xml:129 #, python-format msgid "Open balance" msgstr "" @@ -6223,7 +6259,7 @@ msgid "Operation Templates" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:994 +#: code:addons/account/models/account_bank_statement.py:1013 #, python-format msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it." msgstr "" @@ -6285,13 +6321,6 @@ msgstr "" msgid "Other Info" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:309 -#, python-format -msgid "OtherAccounts" -msgstr "" - #. module: account #: selection:account.payment.method,payment_type:0 msgid "Outbound" @@ -6314,13 +6343,13 @@ msgid "Outstanding Transactions" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:116 +#: code:addons/account/models/account_invoice.py:121 #, python-format msgid "Outstanding credits" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:119 +#: code:addons/account/models/account_invoice.py:124 #, python-format msgid "Outstanding debits" msgstr "" @@ -6364,7 +6393,7 @@ msgid "Paid" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:290 +#: code:addons/account/models/account_payment.py:314 #, python-format msgid "Paid Invoices" msgstr "" @@ -6404,8 +6433,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1739 -#: code:addons/account/static/src/xml/account_reconciliation.xml:269 +#: code:addons/account/static/src/xml/account_reconciliation.xml:221 +#: code:addons/account/static/src/xml/account_reconciliation.xml:238 #: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_id #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_id #: model:ir.model.fields,field_description:account.field_account_invoice_line_partner_id @@ -6465,7 +6494,7 @@ msgid "Partners" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:96 +#: code:addons/account/models/account_journal_dashboard.py:109 #, python-format msgid "Past" msgstr "" @@ -6500,6 +6529,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_debit_limit +#: model:ir.model.fields,field_description:account.field_res_users_debit_limit msgid "Payable Limit" msgstr "" @@ -6530,6 +6560,11 @@ msgstr "" msgid "Payment Journal" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.view_account_payment_form +msgid "Payment Matching" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_account_payment_search msgid "Payment Method" @@ -6699,7 +6734,7 @@ msgid "Percentage of balance" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1496 +#: code:addons/account/models/account_invoice.py:1541 #, python-format msgid "Percentages for Payment Terms Line must be between 0 and 100." msgstr "" @@ -6737,7 +6772,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:829 +#: code:addons/account/models/account_invoice.py:843 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -6745,7 +6780,7 @@ msgstr "" #. module: account #: code:addons/account/models/account_move.py:151 #, python-format -msgid "Please define a sequence for the refunds" +msgid "Please define a sequence for the credit notes" msgstr "" #. module: account @@ -6755,7 +6790,7 @@ msgid "Please define a sequence on the journal." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:827 +#: code:addons/account/models/account_invoice.py:841 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" @@ -6918,7 +6953,7 @@ msgid "Products" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:170 +#: code:addons/account/models/account_bank_statement.py:177 #, python-format msgid "Profit" msgstr "" @@ -6981,6 +7016,12 @@ msgstr "" msgid "Purchase Tax(%)" msgstr "" +#. module: account +#: code:addons/account/models/account_journal_dashboard.py:38 +#, python-format +msgid "Purchase: Untaxed Total" +msgstr "" + #. module: account #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 @@ -7068,9 +7109,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1860 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2466 -#: code:addons/account/static/src/xml/account_reconciliation.xml:335 +#: code:addons/account/static/src/xml/account_reconciliation.xml:71 +#: code:addons/account/static/src/xml/account_reconciliation.xml:103 +#: code:addons/account/static/src/xml/account_reconciliation.xml:104 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #: model:ir.ui.view,arch_db:account.account_move_line_reconcile_writeoff #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full @@ -7146,13 +7187,6 @@ msgstr "" msgid "Reconciliation on Bank Statements" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2179 -#, python-format -msgid "Reconciling " -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Reconciling journal entries" @@ -7174,8 +7208,11 @@ msgid "Recording invoices" msgstr "" #. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:220 #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_partnerledger +#, python-format msgid "Ref" msgstr "" @@ -7219,33 +7256,6 @@ msgstr "" msgid "Reference/Description" msgstr "" -#. module: account -#: code:addons/account/models/account_invoice.py:982 -#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view -#: model:ir.ui.view,arch_db:account.invoice_form -#: model:ir.ui.view,arch_db:account.invoice_supplier_form -#: model:ir.ui.view,arch_db:account.report_invoice_document -#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search -#, python-format -msgid "Refund" -msgstr "" - -#. module: account -#: model:ir.model.fields,field_description:account.field_account_invoice_refund_date_invoice -msgid "Refund Date" -msgstr "" - -#. module: account -#: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id -msgid "Refund Entry Sequence" -msgstr "" - -#. module: account -#: model:ir.actions.act_window,name:account.action_account_invoice_refund -#: model:ir.ui.view,arch_db:account.invoice_form -msgid "Refund Invoice" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_refund_filter_refund msgid "Refund Method" @@ -7256,12 +7266,6 @@ msgstr "" msgid "Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view -#: model:ir.ui.view,arch_db:account.view_account_invoice_filter -msgid "Refunds" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_invoice_payment #: model:ir.actions.act_window,name:account.action_account_payment_from_invoices @@ -7359,7 +7363,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:153 +#: code:addons/account/static/src/xml/account_reconciliation.xml:225 #, python-format msgid "Residual" msgstr "" @@ -7492,6 +7496,12 @@ msgstr "" msgid "Sales Tax(%)" msgstr "" +#. module: account +#: code:addons/account/models/account_journal_dashboard.py:36 +#, python-format +msgid "Sales: Untaxed Total" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_user_id #: model:ir.model.fields,field_description:account.field_account_invoice_user_id @@ -7507,7 +7517,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:92 +#: code:addons/account/static/src/xml/account_reconciliation.xml:197 #, python-format msgid "Save and New" msgstr "" @@ -7622,14 +7632,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1767 -#, python-format -msgid "Select Partner" -msgstr "" - -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:241 +#: code:addons/account/static/src/xml/account_reconciliation.xml:72 #, python-format msgid "Select a partner or choose a counterpart" msgstr "" @@ -7659,6 +7662,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_invoice_warn +#: model:ir.model.fields,help:account.field_res_users_invoice_warn msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field." msgstr "" @@ -7706,6 +7710,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_sequence #: model:ir.model.fields,field_description:account.field_account_financial_report_sequence #: model:ir.model.fields,field_description:account.field_account_fiscal_position_sequence +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_sequence #: model:ir.model.fields,field_description:account.field_account_invoice_line_sequence #: model:ir.model.fields,field_description:account.field_account_invoice_tax_sequence #: model:ir.model.fields,field_description:account.field_account_journal_sequence @@ -7756,13 +7761,6 @@ msgstr "" msgid "Short Code" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:302 -#, python-format -msgid "Show" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Show all records which has next action date is before today" @@ -7773,13 +7771,6 @@ msgstr "" msgid "Show journal on dashboard" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:20 -#, python-format -msgid "Show more... (" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_financial_report_sign msgid "Sign on Reports" @@ -7792,7 +7783,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:2469 +#: code:addons/account/static/src/xml/account_reconciliation.xml:105 #, python-format msgid "Skip" msgstr "" @@ -7851,7 +7842,7 @@ msgid "Statement" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:245 +#: code:addons/account/models/account_bank_statement.py:252 #, python-format msgid "Statement %s confirmed, journal items were created." msgstr "" @@ -7930,13 +7921,6 @@ msgstr "" msgid "Take Money Out" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1517 -#, python-format -msgid "Take on average less than 5 seconds to reconcile a transaction." -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_target_move #: model:ir.model.fields,field_description:account.field_account_balance_report_target_move @@ -7953,8 +7937,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:124 -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:129 +#: code:addons/account/static/src/xml/account_reconciliation.xml:172 #: model:ir.model,name:account.model_account_tax #: model:ir.model.fields,field_description:account.field_account_invoice_amount_tax #: model:ir.model.fields,field_description:account.field_account_invoice_tax_tax_id @@ -7968,8 +7951,8 @@ msgid "Tax" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:789 -#: code:addons/account/models/chart_template.py:792 +#: code:addons/account/models/chart_template.py:820 +#: code:addons/account/models/chart_template.py:823 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -7983,13 +7966,19 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_refund_account_id +msgid "Tax Account on Credit Notes" +msgstr "" + +#. module: account #: model:ir.model.fields,field_description:account.field_account_tax_template_refund_account_id msgid "Tax Account on Refunds" msgstr "" #. module: account +#: model:ir.actions.act_window,name:account.tax_adjustments_form #: model:ir.model.fields,field_description:account.field_account_tax_tax_adjustment #: model:ir.model.fields,field_description:account.field_account_tax_template_tax_adjustment +#: model:ir.ui.menu,name:account.menu_action_tax_adjustment msgid "Tax Adjustment" msgstr "" @@ -8013,11 +8002,6 @@ msgstr "" msgid "Tax Cash Basis Entry of" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_res_company_tax_cash_basis_journal_id -msgid "Tax Cash Basis Journal" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_amount_type #: model:ir.model.fields,field_description:account.field_account_tax_template_amount_type @@ -8046,12 +8030,15 @@ msgid "Tax ID" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.act_account_tax_tax -#: model:ir.actions.act_window,name:account.act_account_tax_tax_posted #: model:ir.model.fields,field_description:account.field_account_invoice_tax_line_ids msgid "Tax Lines" msgstr "" +#. module: account +#: model:ir.actions.act_window,name:account.act_account_tax_tax_posted +msgid "Tax Lines (Posted)" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_tax_ids #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_tax_ids @@ -8203,6 +8190,11 @@ msgstr "" msgid "Technical field used to adapt the interface to the payment type selected." msgstr "" +#. module: account +#: model:ir.model.fields,help:account.field_account_partial_reconcile_max_date +msgid "Technical field used to determine at which date this reconciliation needs to be shown on the aged receivable/payable reports." +msgstr "" + #. module: account #: model:ir.model.fields,help:account.field_account_abstract_payment_hide_payment_method #: model:ir.model.fields,help:account.field_account_payment_hide_payment_method @@ -8278,7 +8270,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:216 +#: code:addons/account/static/src/xml/account_reconciliation.xml:51 #, python-format msgid "That's on average" msgstr "" @@ -8301,7 +8293,7 @@ msgid "The Deposit Ticket module can also be used to settle credit card batch ma msgstr "" #. module: account -#: code:addons/account/models/account_move.py:925 +#: code:addons/account/models/account_move.py:921 #, python-format msgid "The account %s (%s) is not marked as reconciliable !" msgstr "" @@ -8311,6 +8303,11 @@ msgstr "" msgid "The accounting journal corresponding to this bank account." msgstr "" +#. module: account +#: model:ir.model.fields,help:account.field_account_config_settings_currency_exchange_journal_id +msgid "The accounting journal where automatic exchange differences will be registered" +msgstr "" + #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_line_amount_currency #: model:ir.model.fields,help:account.field_account_move_line_amount_currency @@ -8324,19 +8321,19 @@ msgid "The amount expressed in the related account currency if not equal to the msgstr "" #. module: account -#: code:addons/account/models/account_move.py:476 +#: code:addons/account/models/account_move.py:477 #, python-format msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited." msgstr "" #. module: account -#: code:addons/account/models/account.py:580 +#: code:addons/account/models/account.py:590 #, python-format msgid "The application scope of taxes in a group must be either the same as the group or \"None\"." msgstr "" #. module: account -#: code:addons/account/models/account.py:267 +#: code:addons/account/models/account.py:268 #, python-format msgid "The bank account of a bank journal must belong to the same company (%s)." msgstr "" @@ -8383,7 +8380,7 @@ msgid "The discussions with your customer are automatically displayed at\n" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:184 +#: code:addons/account/models/account_bank_statement.py:191 #, python-format msgid "The ending balance is incorrect !\n" "The expected balance (%s) is different from the computed one. (%s)" @@ -8396,11 +8393,12 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_property_account_position_id +#: model:ir.model.fields,help:account.field_res_users_property_account_position_id msgid "The fiscal position will determine taxes and accounts used for the partner." msgstr "" #. module: account -#: code:addons/account/models/account.py:271 +#: code:addons/account/models/account.py:272 #, python-format msgid "The holder of a journal's bank account must be the company (%s)." msgstr "" @@ -8411,7 +8409,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:477 +#: code:addons/account/models/account_payment.py:509 #, python-format msgid "The journal %s does not have a sequence, please specify one." msgstr "" @@ -8461,11 +8459,12 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_has_unreconciled_entries +#: model:ir.model.fields,help:account.field_res_users_has_unreconciled_entries msgid "The partner has at least one unreconciled debit and credit since last time the invoices & payments matching was performed." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:927 +#: code:addons/account/models/account_move.py:923 #, python-format msgid "The partner has to be the same on all lines for receivable and payable accounts!" msgstr "" @@ -8476,7 +8475,13 @@ msgid "The partner reference of this invoice." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:346 +#: code:addons/account/models/account_payment.py:55 +#, python-format +msgid "The payment amount must be strictly positive." +msgstr "" + +#. module: account +#: code:addons/account/models/account_payment.py:370 #, python-format msgid "The payment cannot be processed because the invoice is not open!" msgstr "" @@ -8492,13 +8497,13 @@ msgid "The residual amount on a journal item expressed in the company currency." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:461 +#: code:addons/account/models/account_move.py:462 #, python-format msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1350 +#: code:addons/account/models/account_invoice.py:1383 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -8510,19 +8515,19 @@ msgid "The sequence field is used to define order in which the tax lines are app msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:479 +#: code:addons/account/models/account_payment.py:511 #, python-format msgid "The sequence of journal %s is deactivated." msgstr "" #. module: account -#: code:addons/account/models/company.py:90 +#: code:addons/account/models/company.py:95 #, python-format msgid "There are still unposted entries in the period you want to lock. You should either post or delete them." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:172 +#: code:addons/account/models/account_bank_statement.py:179 #, python-format msgid "There is no account defined on the journal %s for %s involved in a cash difference." msgstr "" @@ -8534,7 +8539,7 @@ msgid "There is no journal items in draft state to post." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1585 +#: code:addons/account/models/account_move.py:1641 #, python-format msgid "There is no tax cash basis journal defined for this company: \"%s\" \n" "Configure it in Accounting/Configuration/Settings" @@ -8542,19 +8547,11 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:321 -#: code:addons/account/static/src/xml/account_reconciliation.xml:328 +#: code:addons/account/static/src/xml/account_reconciliation.xml:43 #, python-format msgid "There is nothing to reconcile." msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1493 -#, python-format -msgid "There you go, it's all done !" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_config_settings_view_form msgid "These taxes are set in any new product created." @@ -8571,7 +8568,7 @@ msgid "These users handle billing specifically." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1081 +#: code:addons/account/models/account_invoice.py:1110 #, python-format msgid "This %s has been created from: %s" msgstr "" @@ -8582,7 +8579,7 @@ msgid "This Month" msgstr "" #. module: account -#: code:addons/account/models/account_journal_dashboard.py:101 +#: code:addons/account/models/account_journal_dashboard.py:114 #, python-format msgid "This Week" msgstr "" @@ -8593,11 +8590,13 @@ msgid "This Year" msgstr "" #. module: account +#: model:ir.model.fields,help:account.field_product_product_property_account_expense_id #: model:ir.model.fields,help:account.field_product_template_property_account_expense_id msgid "This account will be used for invoices instead of the default one to value expenses for the current product." msgstr "" #. module: account +#: model:ir.model.fields,help:account.field_product_product_property_account_income_id #: model:ir.model.fields,help:account.field_product_template_property_account_income_id msgid "This account will be used for invoices instead of the default one to value sales for the current product." msgstr "" @@ -8614,11 +8613,13 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_property_account_payable_id +#: model:ir.model.fields,help:account.field_res_users_property_account_payable_id msgid "This account will be used instead of the default one as the payable account for the current partner" msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_property_account_receivable_id +#: model:ir.model.fields,help:account.field_res_users_property_account_receivable_id msgid "This account will be used instead of the default one as the receivable account for the current partner" msgstr "" @@ -8649,13 +8650,13 @@ msgid "This feature is useful if you issue a high amounts of invoices." msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_journal_sequence_id -msgid "This field contains the information related to the numbering of the journal entries of this journal." +#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id +msgid "This field contains the information related to the numbering of the credit note entries of this journal." msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id -msgid "This field contains the information related to the numbering of the refund entries of this journal." +#: model:ir.model.fields,help:account.field_account_journal_sequence_id +msgid "This field contains the information related to the numbering of the journal entries of this journal." msgstr "" #. module: account @@ -8687,13 +8688,13 @@ msgid "This is the accounting dashboard. If you have not yet\n" msgstr "" #. module: account -#: code:addons/account/models/account.py:308 +#: code:addons/account/models/account.py:309 #, python-format msgid "This journal already contains items, therefore you cannot modify its company." msgstr "" #. module: account -#: code:addons/account/models/account.py:311 +#: code:addons/account/models/account.py:312 #, python-format msgid "This journal already contains items, therefore you cannot modify its short name." msgstr "" @@ -8705,7 +8706,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:279 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:351 #, python-format msgid "This move's amount is higher than the transaction's amount. Click to register a partial payment and keep the payment balance open." msgstr "" @@ -8722,25 +8723,27 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:209 +#: code:addons/account/static/src/xml/account_reconciliation.xml:32 #, python-format msgid "This page displays all the bank transactions that are to be reconciled and provides with a neat interface to do so." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:157 +#: code:addons/account/static/src/xml/account_reconciliation.xml:229 #, python-format msgid "This payment is registered but not reconciled." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_property_supplier_payment_term_id +#: model:ir.model.fields,help:account.field_res_users_property_supplier_payment_term_id msgid "This payment term will be used instead of the default one for purchase orders and vendor bills" msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_property_payment_term_id +#: model:ir.model.fields,help:account.field_res_users_property_payment_term_id msgid "This payment term will be used instead of the default one for sales orders and customer invoices" msgstr "" @@ -8767,7 +8770,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:21 +#: code:addons/account/static/src/xml/account_reconciliation.xml:28 #, python-format msgid "Tip: Hit CTRL-Enter to reconcile all the balanced items in the sheet." msgstr "" @@ -8803,7 +8806,7 @@ msgid "To pay" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:921 +#: code:addons/account/models/account_move.py:917 #, python-format msgid "To reconcile the entries company should be the same for all entries!" msgstr "" @@ -8819,14 +8822,11 @@ msgid "Today Activities" msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:149 #: model:ir.model.fields,field_description:account.field_account_invoice_amount_total #: model:ir.ui.view,arch_db:account.invoice_supplier_tree #: model:ir.ui.view,arch_db:account.invoice_tree #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance #: model:ir.ui.view,arch_db:account.view_account_bnk_stmt_cashbox -#, python-format msgid "Total" msgstr "" @@ -8849,16 +8849,19 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_total_invoiced +#: model:ir.model.fields,field_description:account.field_res_users_total_invoiced msgid "Total Invoiced" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_debit +#: model:ir.model.fields,field_description:account.field_res_users_debit msgid "Total Payable" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_credit +#: model:ir.model.fields,field_description:account.field_res_users_credit msgid "Total Receivable" msgstr "" @@ -8874,23 +8877,29 @@ msgid "Total Without Tax" msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed #: model:ir.model.fields,help:account.field_account_invoice_line_price_subtotal_signed -msgid "Total amount in the currency of the company, negative for refunds." +msgid "Total amount in the currency of the company, negative for credit note." +msgstr "" + +#. module: account +#: model:ir.model.fields,help:account.field_account_invoice_amount_total_company_signed +msgid "Total amount in the currency of the company, negative for credit notes." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_amount_total_signed -msgid "Total amount in the currency of the invoice, negative for refunds." +msgid "Total amount in the currency of the invoice, negative for credit notes." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_credit +#: model:ir.model.fields,help:account.field_res_users_credit msgid "Total amount this customer owes you." msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_debit +#: model:ir.model.fields,help:account.field_res_users_debit msgid "Total amount you have to pay to this vendor." msgstr "" @@ -8916,7 +8925,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:270 +#: code:addons/account/static/src/xml/account_reconciliation.xml:239 #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view #, python-format msgid "Transaction" @@ -8944,19 +8953,19 @@ msgid "Transfer To" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:228 +#: code:addons/account/models/account_payment.py:252 #, python-format msgid "Transfer account not defined on the company." msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:450 +#: code:addons/account/models/account_payment.py:482 #, python-format msgid "Transfer from %s" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:533 +#: code:addons/account/models/account_payment.py:565 #, python-format msgid "Transfer to %s" msgstr "" @@ -8993,14 +9002,19 @@ msgid "Type" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:850 +#: selection:account.journal,bank_statements_source:0 +msgid "Undefined Yet" +msgstr "" + +#. module: account +#: code:addons/account/models/chart_template.py:881 #, python-format msgid "Undistributed Profits/Losses" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:284 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:348 #, python-format msgid "Undo the partial reconciliation." msgstr "" @@ -9019,7 +9033,7 @@ msgid "Unit of Measure" msgstr "" #. module: account -#: code:addons/account/report/account_aged_partner_balance.py:189 +#: code:addons/account/report/account_aged_partner_balance.py:190 #, python-format msgid "Unknown Partner" msgstr "" @@ -9196,10 +9210,12 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_move_line_company_currency_id #: model:ir.model.fields,help:account.field_account_partial_reconcile_company_currency_id #: model:ir.model.fields,help:account.field_res_partner_currency_id +#: model:ir.model.fields,help:account.field_res_users_currency_id msgid "Utility field to express amount currency" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_vat_required #: model:ir.model.fields,field_description:account.field_account_fiscal_position_vat_required msgid "VAT required" msgstr "" @@ -9211,7 +9227,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1881 +#: code:addons/account/static/src/xml/account_reconciliation.xml:70 #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_form #: model:ir.ui.view,arch_db:account.view_account_payment_from_invoices @@ -9256,7 +9272,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:981 +#: code:addons/account/models/account_invoice.py:997 #: model:ir.ui.view,arch_db:account.invoice_supplier_form #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format @@ -9264,7 +9280,7 @@ msgid "Vendor Bill" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:183 +#: code:addons/account/models/chart_template.py:186 #: model:ir.actions.act_window,name:account.action_invoice_tree2 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2 #: model:ir.ui.view,arch_db:account.account_planner @@ -9272,19 +9288,41 @@ msgstr "" msgid "Vendor Bills" msgstr "" +#. module: account +#: selection:account.invoice,type:0 +#: selection:account.invoice.report,type:0 +#: code:addons/account/models/account_payment.py:545 +#: model:ir.ui.view,arch_db:account.report_invoice_document +#, python-format +msgid "Vendor Credit Note" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:account.action_invoice_in_refund +#: model:ir.ui.menu,name:account.menu_action_invoice_in_refund +msgid "Vendor Credit Notes" +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:999 +#, python-format +msgid "Vendor Credit note" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Vendor Flow" msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:515 +#: code:addons/account/models/account_payment.py:547 #, python-format msgid "Vendor Payment" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_supplier_payment_term_id +#: model:ir.model.fields,field_description:account.field_res_users_property_supplier_payment_term_id msgid "Vendor Payment Terms" msgstr "" @@ -9295,25 +9333,13 @@ msgid "Vendor Reference" msgstr "" #. module: account -#: selection:account.invoice,type:0 -#: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:983 -#: code:addons/account/models/account_payment.py:513 -#: model:ir.ui.view,arch_db:account.report_invoice_document -#, python-format -msgid "Vendor Refund" -msgstr "" - -#. module: account +#: model:ir.model.fields,field_description:account.field_product_product_supplier_taxes_id #: model:ir.model.fields,field_description:account.field_product_template_supplier_taxes_id msgid "Vendor Taxes" msgstr "" #. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:308 #: model:ir.ui.menu,name:account.menu_account_supplier -#, python-format msgid "Vendors" msgstr "" @@ -9328,7 +9354,7 @@ msgid "Warning" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:513 +#: code:addons/account/models/account_invoice.py:520 #, python-format msgid "Warning for %s" msgstr "" @@ -9339,8 +9365,8 @@ msgid "Warning on the Invoice" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1290 -#: code:addons/account/models/account_invoice.py:1349 +#: code:addons/account/models/account_invoice.py:1323 +#: code:addons/account/models/account_invoice.py:1382 #, python-format msgid "Warning!" msgstr "" @@ -9387,13 +9413,6 @@ msgstr "" msgid "Whether this journal should be displayed on the dashboard or not" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1504 -#, python-format -msgid "Whew, that was fast !" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_common_journal_report_amount_currency #: model:ir.model.fields,field_description:account.field_account_print_journal_amount_currency @@ -9434,7 +9453,7 @@ msgid "Wizard for Tax Adjustments" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:962 +#: code:addons/account/models/account_move.py:958 #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full #, python-format msgid "Write-Off" @@ -9466,7 +9485,7 @@ msgid "Wrong credit or debit value in accounting entry !" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:919 +#: code:addons/account/models/account_move.py:915 #, python-format msgid "You are trying to reconcile some entries that are already reconciled!" msgstr "" @@ -9483,7 +9502,7 @@ msgid "You can control the invoice from your vendor according to\n" msgstr "" #. module: account -#: code:addons/account/models/res_config.py:88 +#: code:addons/account/models/res_config.py:94 #, python-format msgid "You can not change a company chart of account once it has been installed" msgstr "" @@ -9495,11 +9514,17 @@ msgid "You can not change the unit of measure of a product that has been already msgstr "" #. module: account -#: code:addons/account/models/account_payment.py:327 +#: code:addons/account/models/account_payment.py:351 #, python-format msgid "You can not delete a payment that is already posted" msgstr "" +#. module: account +#: code:addons/account/models/account_invoice.py:1404 +#, python-format +msgid "You can only delete an invoice line if the invoice is in draft state." +msgstr "" + #. module: account #: code:addons/account/models/account_payment.py:128 #, python-format @@ -9524,7 +9549,7 @@ msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:962 +#: code:addons/account/models/account_invoice.py:978 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -9542,21 +9567,21 @@ msgid "You cannot change the value of the reconciliation on this account as it a msgstr "" #. module: account -#: code:addons/account/models/account_move.py:468 +#: code:addons/account/models/account_move.py:469 #, python-format msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:466 +#: code:addons/account/models/account_invoice.py:471 #, python-format msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:464 +#: code:addons/account/models/account_invoice.py:469 #, python-format -msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead." +msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead." msgstr "" #. module: account @@ -9566,21 +9591,21 @@ msgid "You cannot do that on an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1251 +#: code:addons/account/models/account_move.py:1247 #, python-format msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n" "%s." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1253 +#: code:addons/account/models/account_move.py:1249 #, python-format msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n" "%s." msgstr "" #. module: account -#: code:addons/account/models/account.py:323 +#: code:addons/account/models/account.py:324 #, python-format msgid "You cannot empty the account number once set.\n" "If you would like to delete the account number, you can do it from the Bank Accounts list." @@ -9600,7 +9625,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1799 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:567 #, python-format msgid "You cannot mix items from receivable and payable accounts." msgstr "" @@ -9613,7 +9638,7 @@ msgid "You cannot modify a posted entry of this journal.\n" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:591 +#: code:addons/account/models/account_invoice.py:605 #, python-format msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first." msgstr "" @@ -9631,21 +9656,28 @@ msgid "You cannot remove/deactivate an account which is set on a customer or ven msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1096 -#: code:addons/account/models/account_move.py:1217 +#: code:addons/account/models/account_move.py:1092 +#: code:addons/account/models/account_move.py:1213 #, python-format msgid "You cannot use deprecated account." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1137 +#: code:addons/account/models/account_move.py:1133 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" +#. module: account +#: code:addons/account/models/account_invoice.py:64 +#: code:addons/account/models/account_invoice.py:593 +#, python-format +msgid "You cannot validate an invoice with a negative total amount. You should create a credit note instead." +msgstr "" + #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:77 +#: code:addons/account/static/src/xml/account_reconciliation.xml:156 #, python-format msgid "You did not configure any reconcile model yet, you can do it" msgstr "" @@ -9663,7 +9695,7 @@ msgid "You must define a Start Date" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1291 +#: code:addons/account/models/account_invoice.py:1324 #, python-format msgid "You must first select a partner!" msgstr "" @@ -9681,19 +9713,19 @@ msgid "You must set a start date." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1446 +#: code:addons/account/models/account_move.py:1512 #, python-format msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1448 +#: code:addons/account/models/account_move.py:1514 #, python-format msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1450 +#: code:addons/account/models/account_move.py:1516 #, python-format msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates." msgstr "" @@ -9705,13 +9737,6 @@ msgstr "" msgid "You should have defined an 'Internal Transfer Account' in your cash register's journal!" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:218 -#, python-format -msgid "You validated" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_refund msgid "You will be able to edit and validate this\n" @@ -9761,11 +9786,13 @@ msgid "Zip Range" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_zip_from #: model:ir.model.fields,field_description:account.field_account_fiscal_position_zip_from msgid "Zip Range From" msgstr "" #. module: account +#: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_zip_to #: model:ir.model.fields,field_description:account.field_account_fiscal_position_zip_to msgid "Zip Range To" msgstr "" @@ -9790,11 +9817,6 @@ msgstr "" msgid "account.tax.group" msgstr "" -#. module: account -#: model:ir.ui.view,arch_db:account.account_planner -msgid "accounting settings" -msgstr "" - #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "activate this feature" @@ -9827,6 +9849,11 @@ msgstr "" msgid "create a journal entry" msgstr "" +#. module: account +#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate +msgid "credit note" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_payment_term_line_form msgid "days" @@ -9862,6 +9889,13 @@ msgstr "" msgid "invoice" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_reconciliation.xml:38 +#, python-format +msgid "o_manual_statement" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "outstanding debits" @@ -9872,25 +9906,6 @@ msgstr "" msgid "outstanding payments" msgstr "" -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:218 -#, python-format -msgid "reconciliations with the ctrl-enter shortcut." -msgstr "" - -#. module: account -#: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate -msgid "refund" -msgstr "" - -#. module: account -#. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:20 -#, python-format -msgid "remaining)" -msgstr "" - #. module: account #: model:ir.model,name:account.model_report_account_report_agedpartnerbalance msgid "report.account.report_agedpartnerbalance" @@ -9934,7 +9949,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:216 +#: code:addons/account/static/src/xml/account_reconciliation.xml:51 #, python-format msgid "seconds per transaction." msgstr "" @@ -9971,7 +9986,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:77 +#: code:addons/account/static/src/xml/account_reconciliation.xml:156 #, python-format msgid "there" msgstr "" @@ -9983,7 +9998,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:216 +#: code:addons/account/static/src/xml/account_reconciliation.xml:51 #, python-format msgid "to reconcile" msgstr "" @@ -9995,7 +10010,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:216 +#: code:addons/account/static/src/xml/account_reconciliation.xml:51 #, python-format msgid "transactions." msgstr "" diff --git a/addons/account/models/account_config_settings.py b/addons/account/models/account_config_settings.py index 920106a111a..d0fcbf36a44 100644 --- a/addons/account/models/account_config_settings.py +++ b/addons/account/models/account_config_settings.py @@ -65,8 +65,8 @@ class AccountConfigSettings(models.TransientModel): res = super(AccountConfigSettings, self).get_values() params = self.env['ir.config_parameter'].sudo() res.update( - default_purchase_tax_id=params.get_param('account.default_purchase_tax_id', default=False), - default_sale_tax_id=params.get_param('account.default_sale_tax_id', default=False) + default_purchase_tax_id=int(params.get_param('account.default_purchase_tax_id', default=False)) or False, + default_sale_tax_id=int(params.get_param('account.default_sale_tax_id', default=False)) or False ) return res diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index fd4ae5d0379..93842ff1374 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import time -from odoo import api, models +from odoo import api, models, _ from odoo.exceptions import UserError diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index c817d300664..9c3c79dacf4 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import time -from odoo import api, models +from odoo import api, models, _ from odoo.exceptions import UserError diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 7ae49486fbf..83e1b8bda8c 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import time -from odoo import api, models +from odoo import api, models, _ from odoo.exceptions import UserError diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index 1775eba10ad..2da6c42abe7 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -2,7 +2,7 @@ from datetime import datetime import time -from odoo import api, models +from odoo import api, models, _ from odoo.exceptions import UserError from odoo.tools import DEFAULT_SERVER_DATE_FORMAT diff --git a/addons/account/report/account_report_financial.py b/addons/account/report/account_report_financial.py index 803abe9b890..01e2080307f 100644 --- a/addons/account/report/account_report_financial.py +++ b/addons/account/report/account_report_financial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import time -from odoo import api, models +from odoo import api, models, _ from odoo.exceptions import UserError from odoo.tools import pycompat diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index bb98be1d6e8..634e785e333 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -278,7 +278,7 @@ - @@ -421,7 +421,7 @@ - diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 70740d7b013..7aba5e09846 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -304,8 +304,8 @@

Keep empty for no control
- - + + @@ -2046,8 +2046,8 @@ - - + + diff --git a/addons/account/views/product_view.xml b/addons/account/views/product_view.xml index fdfd2b1ee16..f8979bd45da 100644 --- a/addons/account/views/product_view.xml +++ b/addons/account/views/product_view.xml @@ -11,13 +11,13 @@ - + - + diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot index 658534d9812..494727727f1 100644 --- a/addons/account_accountant/i18n/account_accountant.pot +++ b/addons/account_accountant/i18n/account_accountant.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgstr "" #. module: account_accountant #: model:ir.ui.view,arch_db:account_accountant.account_config_settings_view_form_inherit_account_accountant -msgid "Last day of your fiscal year" +msgid "Last day of your fiscal year, for automatic opening entries" msgstr "" #. module: account_accountant diff --git a/addons/account_accountant/views/account_config_settings_views.xml b/addons/account_accountant/views/account_config_settings_views.xml index 818db791472..50ce3007618 100644 --- a/addons/account_accountant/views/account_config_settings_views.xml +++ b/addons/account_accountant/views/account_config_settings_views.xml @@ -71,7 +71,7 @@
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot index 59277192469..068569c20b5 100644 --- a/addons/account_asset/i18n/account_asset.pot +++ b/addons/account_asset/i18n/account_asset.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: \n" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:399 +#: code:addons/account_asset/models/account_asset.py:404 #, python-format msgid " (copy)" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:534 +#: code:addons/account_asset/models/account_asset.py:538 #, python-format msgid " (grouped)" msgstr "" @@ -74,6 +74,13 @@ msgstr "" msgid "Account used to record the purchase of the asset at its original price." msgstr "" +#. module: account_asset +#. openerp-web +#: code:addons/account_asset/static/src/js/account_asset.js:41 +#, python-format +msgid "Accounting entries waiting for manual verification" +msgstr "" + #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_active #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_active @@ -86,7 +93,7 @@ msgid "Additional Options" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:591 +#: code:addons/account_asset/models/account_asset.py:595 #, python-format msgid "Amount" msgstr "" @@ -155,6 +162,7 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name +#: model:ir.model.fields,field_description:account_asset.field_product_product_asset_category_id #: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form msgid "Asset Type" @@ -187,7 +195,7 @@ msgid "Asset depreciation line" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:319 +#: code:addons/account_asset/models/account_asset.py:318 #, python-format msgid "Asset sold or disposed. Accounting entry awaiting for validation." msgstr "" @@ -375,7 +383,7 @@ msgid "Cumulative Depreciation" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:591 +#: code:addons/account_asset/models/account_asset.py:595 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id #, python-format msgid "Currency" @@ -418,6 +426,7 @@ msgid "Deferred Revenue Account" msgstr "" #. module: account_asset +#: model:ir.model.fields,field_description:account_asset.field_product_product_deferred_revenue_category_id #: model:ir.model.fields,field_description:account_asset.field_product_template_deferred_revenue_category_id #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form msgid "Deferred Revenue Type" @@ -504,7 +513,7 @@ msgid "Depreciation board modified" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:594 +#: code:addons/account_asset/models/account_asset.py:598 #, python-format msgid "Depreciation line posted." msgstr "" @@ -520,19 +529,19 @@ msgid "Display Name" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:322 +#: code:addons/account_asset/models/account_asset.py:327 #, python-format msgid "Disposal Move" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:325 +#: code:addons/account_asset/models/account_asset.py:330 #, python-format msgid "Disposal Moves" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:573 +#: code:addons/account_asset/models/account_asset.py:577 #, python-format msgid "Document closed." msgstr "" @@ -657,7 +666,7 @@ msgid "Journal" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:433 +#: code:addons/account_asset/models/account_asset.py:438 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form #, python-format msgid "Journal Entries" @@ -764,7 +773,7 @@ msgid "One Entry Every" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:593 +#: code:addons/account_asset/models/account_asset.py:597 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_partner_id #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_partner_id #, python-format @@ -789,7 +798,7 @@ msgstr "" #. module: account_asset #. openerp-web -#: code:addons/account_asset/static/src/js/account_asset.js:28 +#: code:addons/account_asset/static/src/js/account_asset.js:38 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_posted_check #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_move_check #: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search @@ -819,7 +828,7 @@ msgid "Prorata Temporis" msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:365 +#: code:addons/account_asset/models/account_asset.py:370 #, python-format msgid "Prorata temporis can be applied only for time method \"number of depreciations\"." msgstr "" @@ -965,7 +974,7 @@ msgstr "" #. module: account_asset #. openerp-web -#: code:addons/account_asset/static/src/js/account_asset.js:28 +#: code:addons/account_asset/static/src/js/account_asset.js:44 #, python-format msgid "Unposted" msgstr "" @@ -1007,13 +1016,13 @@ msgid "You cannot delete a document that contains posted entries." msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:602 +#: code:addons/account_asset/models/account_asset.py:606 #, python-format msgid "You cannot delete posted depreciation lines." msgstr "" #. module: account_asset -#: code:addons/account_asset/models/account_asset.py:604 +#: code:addons/account_asset/models/account_asset.py:608 #, python-format msgid "You cannot delete posted installment lines." msgstr "" diff --git a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot index 32c6952c711..04956ae121a 100644 --- a/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot +++ b/addons/account_bank_statement_import/i18n/account_bank_statement_import.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: \n" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:240 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245 #, python-format msgid "%d transactions had already been imported and were ignored." msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:240 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:245 #, python-format msgid "1 transaction had already been imported and was ignored." msgstr "" @@ -53,7 +53,7 @@ msgid "Allow Cancelling Entries" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:242 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:247 #, python-format msgid "Already imported items" msgstr "" @@ -69,7 +69,7 @@ msgid "At Least One Outbound" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:76 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:78 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_bank_id #, python-format msgid "Bank" @@ -112,14 +112,24 @@ msgid "Cancel" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:165 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:167 #, python-format msgid "Cannot find in which journal import this statement. Please manually select a journal." msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected +msgid "Check Printing Payment Method Selected" +msgstr "" + +#. module: account_bank_statement_import +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id +msgid "Check Sequence" +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence -msgid "Check this box if you don't want to share the same sequence for invoices and refunds made from this journal" +msgid "Check this box if you don't want to share the same sequence for invoices and credit notes made from this journal" msgstr "" #. module: account_bank_statement_import @@ -127,11 +137,26 @@ msgstr "" msgid "Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal" msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing +msgid "Check this option if your pre-printed checks are not numbered." +msgstr "" + +#. module: account_bank_statement_import +#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_sequence_id +msgid "Checks numbering sequence." +msgstr "" + #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view msgid "Choose a file to import..." msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_color +msgid "Color Index" +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_company_id msgid "Company" @@ -143,7 +168,7 @@ msgid "Company related to this journal" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:106 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:108 #, python-format msgid "Could not make sense of the given file.\n" "Did you install the module to support this type of file ?" @@ -161,6 +186,11 @@ msgstr "" msgid "Created on" msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id +msgid "Credit Note Entry Sequence" +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id msgid "Currency" @@ -173,7 +203,7 @@ msgstr "" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence -msgid "Dedicated Refund Sequence" +msgid "Dedicated Credit Note Sequence" msgstr "" #. module: account_bank_statement_import @@ -275,7 +305,7 @@ msgid "Journal" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:67 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:69 #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view #, python-format msgid "Journal Creation" @@ -324,6 +354,11 @@ msgstr "" msgid "Loss Account" msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_manual_sequencing +msgid "Manual Numbering" +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_inbound_payment_method_ids msgid "Means of payment for collecting money. Odoo modules offer various payments handling facilities, but you can always use the 'Manual' payment method in order to manage payments outside of the software." @@ -335,7 +370,12 @@ msgid "Means of payment for sending money. Odoo modules offer various payments h msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:136 +#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number +msgid "Next Check Number" +msgstr "" + +#. module: account_bank_statement_import +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:138 #, python-format msgid "No currency found matching '%s'." msgstr "" @@ -355,11 +395,6 @@ msgstr "" msgid "Profit Account" msgstr "" -#. module: account_bank_statement_import -#: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id -msgid "Refund Entry Sequence" -msgstr "" - #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type msgid "Select 'Sale' for customer invoices journals.\n" @@ -378,6 +413,11 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_next_number +msgid "Sequence number of the next printed check." +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code msgid "Short Code" @@ -388,19 +428,24 @@ msgstr "" msgid "Show journal on dashboard" msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_check_printing_payment_method_selected +msgid "Technical feature used to know whether check printing was enabled as payment method." +msgstr "" + #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view msgid "The account of the statement you are importing is not yet recorded in Odoo. In order to proceed with the import, you need to create a bank journal for this account." msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:151 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:153 #, python-format msgid "The account of this statement (%s) is not the same as the journal (%s)." msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:161 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:163 #, python-format msgid "The currency of the bank statement (%s) is not the same as the currency of the journal (%s) !" msgstr "" @@ -415,24 +460,24 @@ msgstr "" msgid "The journal entries of this journal will be named using this prefix." msgstr "" +#. module: account_bank_statement_import +#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id +msgid "This field contains the information related to the numbering of the credit note entries of this journal." +msgstr "" + #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id msgid "This field contains the information related to the numbering of the journal entries of this journal." msgstr "" #. module: account_bank_statement_import -#: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id -msgid "This field contains the information related to the numbering of the refund entries of this journal." -msgstr "" - -#. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:111 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:113 #, python-format msgid "This file doesn't contain any statement." msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:119 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:121 #, python-format msgid "This file doesn't contain any transaction." msgstr "" @@ -463,7 +508,7 @@ msgid "Whether this journal should be displayed on the dashboard or not" msgstr "" #. module: account_bank_statement_import -#: code:addons/account_bank_statement_import/account_bank_statement_import.py:232 +#: code:addons/account_bank_statement_import/account_bank_statement_import.py:237 #, python-format msgid "You have already imported that file." msgstr "" diff --git a/addons/account_check_printing/i18n/account_check_printing.pot b/addons/account_check_printing/i18n/account_check_printing.pot index 1df76126dfd..ab9e18ea5de 100644 --- a/addons/account_check_printing/i18n/account_check_printing.pot +++ b/addons/account_check_printing/i18n/account_check_printing.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -22,14 +22,13 @@ msgid " : Check Number Sequence" msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:37 -#: code:addons/account_check_printing/models/account_payment.py:74 +#: code:addons/account_check_printing/models/account_payment.py:59 #, python-format msgid " and %s/100" msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:83 +#: code:addons/account_check_printing/models/account_payment.py:81 #, python-format msgid "A check memo cannot exceed 60 characters." msgstr "" @@ -45,11 +44,6 @@ msgstr "" msgid "Cancel" msgstr "" -#. module: account_check_printing -#: model:account.payment.method,name:account_check_printing.account_payment_method_check -msgid "Check" -msgstr "" - #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_number #: model:ir.model.fields,field_description:account_check_printing.field_account_register_payments_check_number @@ -83,6 +77,11 @@ msgstr "" msgid "Check to print" msgstr "" +#. module: account_check_printing +#: model:account.payment.method,name:account_check_printing.account_payment_method_check +msgid "Checks" +msgstr "" + #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.view_payment_check_printing_search msgid "Checks To Print" @@ -125,7 +124,7 @@ msgid "ID" msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:103 +#: code:addons/account_check_printing/models/account_payment.py:101 #, python-format msgid "In order to print multiple checks at once, they must belong to the same bank journal." msgstr "" @@ -174,7 +173,7 @@ msgid "Payments" msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:100 +#: code:addons/account_check_printing/models/account_payment.py:98 #, python-format msgid "Payments to print as a checks must have 'Check' selected as payment method and not have already been reconciled" msgstr "" @@ -200,7 +199,7 @@ msgid "Print Checks" msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:113 +#: code:addons/account_check_printing/models/account_payment.py:111 #: model:ir.model,name:account_check_printing.model_print_prenumbered_checks #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view #, python-format @@ -234,7 +233,7 @@ msgid "The selected journal is configured to print check numbers. If your pre-pr msgstr "" #. module: account_check_printing -#: code:addons/account_check_printing/models/account_payment.py:136 +#: code:addons/account_check_printing/models/account_payment.py:133 #, python-format msgid "There is no check layout configured.\n" "Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct." diff --git a/addons/account_voucher/views/account_voucher_views.xml b/addons/account_voucher/views/account_voucher_views.xml index ea279a24be2..ced7d16a4ef 100644 --- a/addons/account_voucher/views/account_voucher_views.xml +++ b/addons/account_voucher/views/account_voucher_views.xml @@ -253,7 +253,7 @@ - + @@ -369,7 +369,7 @@ - + diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot index 29927eaaae7..f034eee2fea 100644 --- a/addons/barcodes/i18n/barcodes.pot +++ b/addons/barcodes/i18n/barcodes.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -52,6 +52,13 @@ msgstr "" msgid "A barcode nomenclature defines how the point of sale identify and interprets barcodes" msgstr "" +#. module: barcodes +#. openerp-web +#: code:addons/barcodes/static/src/js/barcode_form_view.js:323 +#, python-format +msgid "Action currently unavailable" +msgstr "" + #. module: barcodes #: code:addons/barcodes/models/barcodes.py:183 #: selection:barcode.rule,type:0 @@ -143,7 +150,7 @@ msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:102 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:286 #, python-format msgid "Discard" msgstr "" @@ -182,14 +189,21 @@ msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:233 +#, python-format +msgid "Error : Barcode command is undefined" +msgstr "" + +#. module: barcodes +#. openerp-web +#: code:addons/barcodes/static/src/js/barcode_form_view.js:59 #, python-format msgid "Error : Document not editable" msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:259 #, python-format msgid "Error : No last scanned barcode" msgstr "" @@ -272,7 +286,7 @@ msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:88 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:279 #, python-format msgid "Select" msgstr "" @@ -284,7 +298,7 @@ msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:87 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:278 #, python-format msgid "Set quantity" msgstr "" @@ -324,14 +338,14 @@ msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:64 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:60 #, python-format msgid "To modify this document, please first start edition." msgstr "" #. module: barcodes #. openerp-web -#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:68 +#: code:addons/barcodes/static/src/js/barcode_form_view.js:260 #, python-format msgid "To set the quantity please scan a barcode first." msgstr "" diff --git a/addons/base_address_extended/i18n/base_address_extended.pot b/addons/base_address_extended/i18n/base_address_extended.pot index 518eeb3fb53..c3730653181 100644 --- a/addons/base_address_extended/i18n/base_address_extended.pot +++ b/addons/base_address_extended/i18n/base_address_extended.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -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_company +msgid "Companies" +msgstr "" + #. module: base_address_extended #: model:ir.model,name:base_address_extended.model_res_partner msgid "Contact" @@ -31,7 +36,9 @@ msgid "Country" msgstr "" #. module: base_address_extended +#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number2 #: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number2 +#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number2 msgid "Door Number" msgstr "" @@ -46,7 +53,9 @@ msgid "Format to use for streets belonging to this country.\n" msgstr "" #. module: base_address_extended +#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_number #: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_number +#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_number msgid "House Number" msgstr "" @@ -56,13 +65,16 @@ msgid "Street Format" msgstr "" #. module: base_address_extended +#: model:ir.model.fields,field_description:base_address_extended.field_res_company_street_name #: model:ir.model.fields,field_description:base_address_extended.field_res_partner_street_name +#: model:ir.model.fields,field_description:base_address_extended.field_res_users_street_name msgid "Street Name" msgstr "" #. module: base_address_extended #: model:ir.ui.view,arch_db:base_address_extended.view_partner_address_structured_form #: model:ir.ui.view,arch_db:base_address_extended.view_partner_structured_form +#: model:ir.ui.view,arch_db:base_address_extended.view_res_company_extended_form msgid "Street Name..." msgstr "" diff --git a/addons/base_sparse_field/i18n/base_sparse_field.pot b/addons/base_sparse_field/i18n/base_sparse_field.pot new file mode 100644 index 00000000000..f13fe8be1d9 --- /dev/null +++ b/addons/base_sparse_field/i18n/base_sparse_field.pot @@ -0,0 +1,135 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_sparse_field +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.saas~16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_boolean +msgid "Boolean" +msgstr "" + +#. module: base_sparse_field +#: code:addons/base_sparse_field/models/models.py:24 +#, python-format +msgid "Changing the storing system for field \"%s\" is not allowed." +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_char +msgid "Char" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_uid +msgid "Created by" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_create_date +msgid "Created on" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_data +msgid "Data" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_display_name +msgid "Display Name" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model,name:base_sparse_field.model_ir_model_fields +msgid "Fields" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_float +msgid "Float" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_id +msgid "ID" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,help:base_sparse_field.field_ir_model_fields_serialization_field_id +msgid "If set, this field will be stored in the sparse structure of the serialization field, instead of having its own database column. This cannot be changed after creation." +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_integer +msgid "Integer" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test___last_update +msgid "Last Modified on" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_write_date +msgid "Last Updated on" +msgstr "" + +#. module: base_sparse_field +#: selection:sparse_fields.test,selection:0 +msgid "One" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_partner +msgid "Partner" +msgstr "" + +#. module: base_sparse_field +#: code:addons/base_sparse_field/models/models.py:26 +#, python-format +msgid "Renaming sparse field \"%s\" is not allowed" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_sparse_fields_test_selection +msgid "Selection" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model.fields,field_description:base_sparse_field.field_ir_model_fields_serialization_field_id +msgid "Serialization Field" +msgstr "" + +#. module: base_sparse_field +#: code:addons/base_sparse_field/models/models.py:38 +#, python-format +msgid "Serialization field `%s` not found for sparse field `%s`!" +msgstr "" + +#. module: base_sparse_field +#: selection:sparse_fields.test,selection:0 +msgid "Two" +msgstr "" + +#. module: base_sparse_field +#: model:ir.model,name:base_sparse_field.model_sparse_fields_test +msgid "sparse_fields.test" +msgstr "" + diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot index 5ea6bc086a5..16ef54cf24b 100644 --- a/addons/board/i18n/board.pot +++ b/addons/board/i18n/board.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/js/dashboard.js:423 +#: code:addons/board/static/src/js/favorite_menu.js:97 #, python-format msgid "'%s' added to dashboard" msgstr "" @@ -36,23 +36,23 @@ msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/xml/board.xml:70 +#: code:addons/board/static/src/xml/board.xml:69 #, python-format msgid "Add" msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/xml/board.xml:64 +#: code:addons/board/static/src/xml/board.xml:63 #, python-format msgid "Add to my Dashboard" msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/js/dashboard.js:141 +#: code:addons/board/static/src/js/dashboard.js:332 #, python-format -msgid "Are you sure you want to remove this item ?" +msgid "Are you sure you want to remove this item?" msgstr "" #. module: board @@ -76,14 +76,14 @@ msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/xml/board.xml:37 +#: code:addons/board/static/src/xml/board.xml:36 #, python-format msgid "Choose dashboard layout" msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/js/dashboard.js:425 +#: code:addons/board/static/src/js/favorite_menu.js:99 #, python-format msgid "Could not add filter to dashboard" msgstr "" @@ -95,7 +95,7 @@ msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/js/dashboard.js:96 +#: code:addons/board/static/src/js/dashboard.js:86 #, python-format msgid "Edit Layout" msgstr "" @@ -112,7 +112,7 @@ msgstr "" #. module: board #. openerp-web -#: code:addons/board/static/src/js/dashboard.js:32 +#: code:addons/board/static/src/js/dashboard.js:49 #: model:ir.actions.act_window,name:board.open_board_my_dash_action #: model:ir.ui.menu,name:board.menu_board_my_dash #: model:ir.ui.view,arch_db:board.board_my_dash_view diff --git a/addons/calendar/i18n/calendar.pot b/addons/calendar/i18n/calendar.pot index 8ffc467d4c3..616ee3ffe54 100644 --- a/addons/calendar/i18n/calendar.pot +++ b/addons/calendar/i18n/calendar.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:47+0000\n" -"PO-Revision-Date: 2017-04-18 14:47+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -140,7 +140,7 @@ msgid "\n" " ${object.event_id.user_id.partner_id.name} invited you for the ${object.event_id.name} meeting of ${object.event_id.user_id.company_id.name}.

\n" " \n" " - - + + + + diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index bc4a3fa8df8..8dac1cf74fd 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -37,8 +37,8 @@ - - + + @@ -50,8 +50,8 @@ - - + + diff --git a/addons/pos_sale/i18n/pos_sale.pot b/addons/pos_sale/i18n/pos_sale.pot index ce795c53ce1..20da8d8d705 100644 --- a/addons/pos_sale/i18n/pos_sale.pot +++ b/addons/pos_sale/i18n/pos_sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -74,6 +74,12 @@ msgstr "" msgid "Sales Channel" msgstr "" +#. module: pos_sale +#: code:addons/pos_sale/models/crm_team.py:115 +#, python-format +msgid "Sales: Untaxed Amount" +msgstr "" + #. module: pos_sale #: selection:crm.team,dashboard_graph_group_pos:0 msgid "Salesperson" @@ -100,12 +106,6 @@ msgstr "" msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" -#. module: pos_sale -#: code:addons/pos_sale/models/crm_team.py:115 -#, python-format -msgid "Untaxed Amount" -msgstr "" - #. module: pos_sale #: selection:crm.team,dashboard_graph_group_pos:0 msgid "Week" diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 8e9efa08c48..5069bd39164 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgid "%s %% discount and %s surcharge" msgstr "" #. module: product -#: code:addons/product/models/product_template.py:317 +#: code:addons/product/models/product_template.py:327 #, python-format msgid "%s (copy)" msgstr "" @@ -94,9 +94,7 @@ msgid "Warning: adding or deleting attributes\n" msgstr "" #. module: product -#: code:addons/product/models/product.py:171 #: sql_constraint:product.product:0 -#, python-format msgid "A barcode can only be assigned to one product !" msgstr "" @@ -108,13 +106,13 @@ msgstr "" #. module: product #: model:ir.model.fields,help:product.field_product_product_description_sale #: model:ir.model.fields,help:product.field_product_template_description_sale -msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Refund" +msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note" msgstr "" #. module: product #: model:ir.model.fields,help:product.field_product_product_description_purchase #: model:ir.model.fields,help:product.field_product_template_description_purchase -msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund." +msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note." msgstr "" #. module: product @@ -388,6 +386,11 @@ msgstr "" msgid "Company" msgstr "" +#. module: product +#: model:ir.model.fields,field_description:product.field_product_category_complete_name +msgid "Complete Name" +msgstr "" + #. module: product #: model:ir.model.fields,field_description:product.field_product_pricelist_item_compute_price #: model:ir.ui.view,arch_db:product.product_pricelist_item_form_view @@ -395,7 +398,7 @@ msgid "Compute Price" msgstr "" #. module: product -#: code:addons/product/models/product_template.py:42 +#: code:addons/product/models/product_template.py:52 #: selection:product.template,type:0 #, python-format msgid "Consumable" @@ -412,7 +415,7 @@ msgid "Conversion between Units of Measure can only occur if they belong to the msgstr "" #. module: product -#: code:addons/product/models/product_uom.py:96 +#: code:addons/product/models/product_uom.py:98 #, python-format msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!." msgstr "" @@ -513,7 +516,7 @@ msgid "Day(s)" msgstr "" #. module: product -#: code:addons/product/models/res_company.py:58 +#: code:addons/product/models/res_company.py:59 #, python-format msgid "Default %(currency)s pricelist for %(company)s" msgstr "" @@ -601,7 +604,7 @@ msgid "Ending valid for the pricelist item validation" msgstr "" #. module: product -#: code:addons/product/models/product.py:43 +#: code:addons/product/models/product.py:57 #, python-format msgid "Error ! You cannot create recursive categories." msgstr "" @@ -613,7 +616,7 @@ msgid "Error ! You cannot use this attribute with the following value." msgstr "" #. module: product -#: code:addons/product/models/product.py:308 +#: code:addons/product/models/product.py:286 #, python-format msgid "Error! It is not allowed to choose more than one value for a given attribute." msgstr "" @@ -631,7 +634,7 @@ msgid "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceLi msgstr "" #. module: product -#: code:addons/product/models/product_template.py:267 +#: code:addons/product/models/product_template.py:277 #, python-format msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category." msgstr "" @@ -690,6 +693,12 @@ msgstr "" msgid "Global" msgstr "" +#. module: product +#: code:addons/product/models/product_template.py:32 +#, python-format +msgid "Go to Internal Categories" +msgstr "" + #. module: product #: model:ir.ui.view,arch_db:product.product_supplierinfo_search_view msgid "Group By" @@ -970,27 +979,18 @@ msgstr "" msgid "Other Pricelist" msgstr "" +#. module: product +#: model:ir.model.fields,field_description:product.field_product_packaging_name +msgid "Package Type" +msgstr "" + #. module: product #: model:ir.model,name:product.model_product_packaging -#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids -#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids -#: model:ir.ui.view,arch_db:product.product_packaging_form_view -#: model:ir.ui.view,arch_db:product.product_packaging_tree_view #: model:ir.ui.view,arch_db:product.product_template_form_view #: model:ir.ui.view,arch_db:product.product_variant_easy_edit_view msgid "Packaging" msgstr "" -#. module: product -#: model:ir.model.fields,field_description:product.field_product_packaging_name -msgid "Packaging Type" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.action_packaging_view -msgid "Packagings" -msgstr "" - #. module: product #: model:ir.model.fields,field_description:product.field_product_category_parent_id msgid "Parent Category" @@ -1197,6 +1197,19 @@ msgstr "" msgid "Product Name" msgstr "" +#. module: product +#: model:ir.actions.act_window,name:product.action_packaging_view +#: model:ir.model.fields,field_description:product.field_product_product_packaging_ids +#: model:ir.model.fields,field_description:product.field_product_template_packaging_ids +#: model:ir.ui.view,arch_db:product.product_packaging_tree_view +msgid "Product Packages" +msgstr "" + +#. module: product +#: model:ir.ui.view,arch_db:product.product_packaging_form_view +msgid "Product Packaging" +msgstr "" + #. module: product #: model:ir.model,name:product.model_product_template #: model:ir.model.fields,field_description:product.field_product_attribute_line_product_tmpl_id @@ -1272,7 +1285,7 @@ msgid "Products Price Search" msgstr "" #. module: product -#: code:addons/product/models/product.py:471 +#: code:addons/product/models/product.py:449 #, python-format msgid "Products: " msgstr "" @@ -1375,6 +1388,7 @@ msgstr "" #. module: product #: model:ir.model.fields,field_description:product.field_res_partner_property_product_pricelist +#: model:ir.model.fields,field_description:product.field_res_users_property_product_pricelist msgid "Sale Pricelist" msgstr "" @@ -1412,7 +1426,7 @@ msgid "Sequence" msgstr "" #. module: product -#: code:addons/product/models/product_template.py:43 +#: code:addons/product/models/product_template.py:53 #: selection:product.template,type:0 #, python-format msgid "Service" @@ -1534,9 +1548,7 @@ msgid "The computed quantity will be a multiple of this value. Use 1.0 for a Uni msgstr "" #. module: product -#: code:addons/product/models/product_uom.py:43 #: sql_constraint:product.uom:0 -#, python-format msgid "The conversion ratio for a unit of measure cannot be 0!" msgstr "" @@ -1582,9 +1594,7 @@ msgid "The product form contains information to simplify the sale process: price msgstr "" #. module: product -#: code:addons/product/models/product_uom.py:44 #: sql_constraint:product.uom:0 -#, python-format msgid "The rounding precision must be greater than 0!" msgstr "" @@ -1642,6 +1652,7 @@ msgstr "" #. module: product #: model:ir.model.fields,help:product.field_res_partner_property_product_pricelist +#: model:ir.model.fields,help:product.field_res_users_property_product_pricelist msgid "This pricelist will be used, instead of the default one, for sales to the current partner" msgstr "" @@ -1843,7 +1854,7 @@ msgid "Working Time" msgstr "" #. module: product -#: code:addons/product/models/product_template.py:262 +#: code:addons/product/models/product_template.py:272 #, python-format msgid "You cannot create a product with an Internal Category set as View. Please change the category or the category type." msgstr "" @@ -1857,7 +1868,7 @@ msgstr "" #. module: product #: code:addons/product/wizard/product_price_list.py:26 #, python-format -msgid "You have to set a logo for your company." +msgid "You have to set a logo or a layout for your company." msgstr "" #. module: product @@ -1886,6 +1897,12 @@ msgstr "" msgid "You must define a product for everything you sell, whether it's a physical product, a consumable or a service you offer to customers." msgstr "" +#. module: product +#: code:addons/product/models/product_template.py:31 +#, python-format +msgid "You must define at least one product category (that is not a view) in order to be able to create products." +msgstr "" + #. module: product #: model:ir.model,name:product.model_base_config_settings msgid "base.config.settings" diff --git a/addons/product/models/product.py b/addons/product/models/product.py index 348e5d8881d..8e63236e48d 100644 --- a/addons/product/models/product.py +++ b/addons/product/models/product.py @@ -79,7 +79,7 @@ class ProductProduct(models.Model): _description = "Product" _inherits = {'product.template': 'product_tmpl_id'} _inherit = ['mail.thread'] - _order = 'default_code, id' + _order = 'default_code, name, id' price = fields.Float( 'Price', compute='_compute_product_price', diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index eca69380267..5da76b71711 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -137,6 +137,7 @@ msgstr "" #. module: project #: model:ir.model.fields,field_description:project.field_res_partner_task_count +#: model:ir.model.fields,field_description:project.field_res_users_task_count msgid "# Tasks" msgstr "" @@ -151,8 +152,8 @@ msgid "# of Tasks" msgstr "" #. module: project -#: code:addons/project/models/project.py:242 -#: code:addons/project/models/project.py:428 +#: code:addons/project/models/project.py:244 +#: code:addons/project/models/project.py:436 #, python-format msgid "%s (copy)" msgstr "" @@ -218,7 +219,7 @@ msgid " Person Responsible" msgstr "" #. module: project -#: code:addons/project/models/project.py:122 +#: code:addons/project/models/project.py:124 #, python-format msgid "

\n" " Documents are attached to the tasks and issues of your project.

\n" @@ -228,7 +229,7 @@ msgid "

\n" msgstr "" #. module: project -#: code:addons/project/models/project.py:150 +#: code:addons/project/models/project.py:152 #, python-format msgid "

Click to create a new project.

" msgstr "" @@ -268,11 +269,6 @@ msgstr "" msgid " The Right Way to use projects:" msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_project_kanban -msgid "Documents" -msgstr "" - #. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "\n" @@ -905,7 +901,7 @@ msgid "At the end of the week, each employee should review\n" msgstr "" #. module: project -#: code:addons/project/models/project.py:115 +#: code:addons/project/models/project.py:117 #: model:ir.model.fields,field_description:project.field_project_task_attachment_ids #, python-format msgid "Attachments" @@ -1291,7 +1287,7 @@ msgid "Currently there are not any activity scheduled." msgstr "" #. module: project -#: code:addons/project/models/project.py:658 +#: code:addons/project/models/project.py:666 #: model:ir.model.fields,field_description:project.field_project_project_partner_id #: model:ir.model.fields,field_description:project.field_project_task_partner_id #: model:ir.ui.view,arch_db:project.edit_project @@ -1300,7 +1296,7 @@ msgid "Customer" msgstr "" #. module: project -#: code:addons/project/models/project.py:658 +#: code:addons/project/models/project.py:666 #, python-format msgid "Customer Email" msgstr "" @@ -1425,7 +1421,7 @@ msgstr "" #. module: project #. openerp-web -#: code:addons/project/static/src/js/project.js:50 +#: code:addons/project/static/src/js/project.js:71 #: model:ir.ui.view,arch_db:project.project_project_view_form_simplified #, python-format msgid "Discard" @@ -1545,7 +1541,7 @@ msgid "Ending Date" msgstr "" #. module: project -#: code:addons/project/models/project.py:436 +#: code:addons/project/models/project.py:444 #, python-format msgid "Error ! Task starting date must be lower than its ending date." msgstr "" @@ -1790,7 +1786,7 @@ msgid "Holds visibility of the tasks or issues that belong to the current projec msgstr "" #. module: project -#: code:addons/project/models/project.py:585 +#: code:addons/project/models/project.py:593 #, python-format msgid "I take it" msgstr "" @@ -2175,11 +2171,6 @@ msgstr "" msgid "Merge into an existing task" msgstr "" -#. module: project -#: model:ir.ui.view,arch_db:project.view_project_kanban -msgid "More " -msgstr "" - #. module: project #: model:ir.ui.view,arch_db:project.project_planner msgid "More efficient communication between employees" @@ -2195,6 +2186,11 @@ msgstr "" msgid "My Favorites" msgstr "" +#. module: project +#: model:ir.ui.view,arch_db:project.view_task_search_form +msgid "My Followed Tasks" +msgstr "" + #. module: project #: model:ir.actions.act_window,name:project.project_task_action_activity msgid "My Next Task Activities" @@ -2297,7 +2293,7 @@ msgid "Odoo's project management allows you to manage the pipeline of your tasks msgstr "" #. module: project -#: code:addons/project/models/project.py:205 +#: code:addons/project/models/project.py:207 #: selection:project.project,privacy_visibility:0 #, python-format msgid "On invitation only" @@ -2397,7 +2393,7 @@ msgid "Planner" msgstr "" #. module: project -#: code:addons/project/models/project.py:738 +#: code:addons/project/models/project.py:746 #, python-format msgid "Please remove existing tasks in the project linked to the accounts you want to delete." msgstr "" @@ -2625,7 +2621,7 @@ msgstr "" #. module: project #. openerp-web -#: code:addons/project/static/src/js/project.js:48 +#: code:addons/project/static/src/js/project.js:69 #, python-format msgid "Remove Cover Image" msgstr "" @@ -2704,7 +2700,7 @@ msgstr "" #. module: project #. openerp-web -#: code:addons/project/static/src/js/project.js:46 +#: code:addons/project/static/src/js/project.js:62 #, python-format msgid "Select" msgstr "" @@ -2743,7 +2739,7 @@ msgstr "" #. module: project #. openerp-web -#: code:addons/project/static/src/js/project.js:45 +#: code:addons/project/static/src/js/project.js:61 #, python-format msgid "Set a Cover Image" msgstr "" @@ -3003,6 +2999,7 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_project_task_ids #: model:ir.model.fields,field_description:project.field_project_project_task_needaction_count #: model:ir.model.fields,field_description:project.field_res_partner_task_ids +#: model:ir.model.fields,field_description:project.field_res_users_task_ids #: model:ir.ui.menu,name:project.menu_action_view_task #: model:ir.ui.view,arch_db:project.edit_project #: model:ir.ui.view,arch_db:project.project_planner @@ -3377,14 +3374,14 @@ msgid "View statistics for the week" msgstr "" #. module: project -#: code:addons/project/models/project.py:206 +#: code:addons/project/models/project.py:208 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by all employees" msgstr "" #. module: project -#: code:addons/project/models/project.py:207 +#: code:addons/project/models/project.py:209 #: selection:project.project,privacy_visibility:0 #, python-format msgid "Visible by following customers" @@ -3617,7 +3614,7 @@ msgid "send us an email" msgstr "" #. module: project -#: code:addons/project/models/project.py:484 +#: code:addons/project/models/project.py:492 #, python-format msgid "tasks" msgstr "" diff --git a/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot new file mode 100644 index 00000000000..8ed6c814b54 --- /dev/null +++ b/addons/project_timesheet_holidays/i18n/project_timesheet_holidays.pot @@ -0,0 +1,120 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * project_timesheet_holidays +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.saas~16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: project_timesheet_holidays +#: model:ir.model,name:project_timesheet_holidays.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_timesheet_ids +msgid "Analytic Lines" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model,name:project_timesheet_holidays.model_res_company +msgid "Companies" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id +#: model:ir.model.fields,help:project_timesheet_holidays.field_res_company_leave_timesheet_project_id +msgid "Default project value for timesheet generated from leave type." +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate +msgid "Generate Timesheet" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_generate +msgid "If checked, when validating a leave, timesheet will be generated in the Vacation Project of the company." +msgstr "" + +#. module: project_timesheet_holidays +#: code:addons/project_timesheet_holidays/models/res_company.py:33 +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_project_id +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_project_id +#, python-format +msgid "Internal Project" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_holidays_status_timesheet_task_id +msgid "Internal Task for timesheet" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_account_analytic_line_holiday_id +msgid "Leave Request" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_hr_timesheet_config_settings_leave_timesheet_task_id +#: model:ir.model.fields,field_description:project_timesheet_holidays.field_res_company_leave_timesheet_task_id +msgid "Leave Task" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model,name:project_timesheet_holidays.model_hr_holidays_status +msgid "Leave Type" +msgstr "" + +#. module: project_timesheet_holidays +#: code:addons/project_timesheet_holidays/models/res_company.py:43 +#, python-format +msgid "Leaves" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit +msgid "Project" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.ui.view,arch_db:project_timesheet_holidays.timesheet_config_settings_view_form_inherit +msgid "Task" +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model.fields,help:project_timesheet_holidays.field_hr_holidays_status_timesheet_project_id +msgid "The project will contain the timesheet generated when a leave is validated." +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.ui.view,arch_db:project_timesheet_holidays.hr_holiday_status_view_form_inherit +msgid "Timesheet" +msgstr "" + +#. module: project_timesheet_holidays +#: code:addons/project_timesheet_holidays/models/account_analytic.py:16 +#, python-format +msgid "You cannot delete timesheet lines attached to a leaves. Please cancel the leaves instead." +msgstr "" + +#. module: project_timesheet_holidays +#: model:ir.model,name:project_timesheet_holidays.model_hr_timesheet_config_settings +msgid "hr.timesheet.config.settings" +msgstr "" + diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 7d9711ccd49..f5e48770e67 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgid "\n" msgstr "" #. module: purchase -#: code:addons/purchase/models/stock.py:87 +#: code:addons/purchase/models/stock.py:89 #, python-format msgid " Buy" msgstr "" @@ -85,6 +85,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_partner_supplier_invoice_count +#: model:ir.model.fields,field_description:purchase.field_res_users_supplier_invoice_count msgid "# Vendor Bills" msgstr "" @@ -100,6 +101,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_order_count +#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_order_count msgid "# of Purchase Order" msgstr "" @@ -363,7 +365,7 @@ msgid "Billed Qty" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:578 +#: code:addons/purchase/models/purchase.py:579 #, python-format msgid "Billed Quantity" msgstr "" @@ -391,8 +393,8 @@ msgid "Blocking Message" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:835 -#: code:addons/purchase/models/stock.py:81 +#: code:addons/purchase/models/purchase.py:841 +#: code:addons/purchase/models/stock.py:83 #: model:stock.location.route,name:purchase.route_warehouse0_buy #, python-format msgid "Buy" @@ -419,13 +421,13 @@ msgid "Calls for tenders are used when you want to generate requests for quotati msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:851 +#: code:addons/purchase/models/purchase.py:857 #, python-format msgid "Can not cancel a procurement related to a purchase order. Please cancel the purchase order first." msgstr "" #. module: purchase -#: code:addons/purchase/models/stock.py:84 +#: code:addons/purchase/models/stock.py:86 #, python-format msgid "Can't find any generic Buy route." msgstr "" @@ -443,7 +445,7 @@ msgid "Cancelled" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:701 +#: code:addons/purchase/models/purchase.py:707 #, python-format msgid "Cannot delete a purchase order line which is in state '%s'." msgstr "" @@ -682,7 +684,7 @@ msgid "Extended Filters" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:556 +#: code:addons/purchase/models/purchase.py:557 #, python-format msgid "Extra line with %s " msgstr "" @@ -891,6 +893,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn_msg +#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_warn_msg msgid "Message for Purchase Order" msgstr "" @@ -932,11 +935,6 @@ msgstr "" msgid "My Activities" msgstr "" -#. module: purchase -#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter -msgid "New Mail" -msgstr "" - #. module: purchase #: selection:product.template,purchase_line_warn:0 #: selection:res.partner,purchase_warn:0 @@ -949,7 +947,7 @@ msgid "No longer edit orders once confirmed" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:996 +#: code:addons/purchase/models/purchase.py:1018 #, python-format msgid "No vendor associated to product %s. Please set one to fix this procurement." msgstr "" @@ -1022,7 +1020,7 @@ msgid "Order of Day" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:575 +#: code:addons/purchase/models/purchase.py:576 #, python-format msgid "Ordered Quantity" msgstr "" @@ -1033,7 +1031,7 @@ msgid "Ordered quantities" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:808 +#: code:addons/purchase/models/purchase.py:814 #, python-format msgid "Ordered quantity decreased!" msgstr "" @@ -1211,6 +1209,7 @@ msgstr "" #: model:ir.model.fields,field_description:purchase.field_account_invoice_line_purchase_id #: model:ir.model.fields,field_description:purchase.field_procurement_order_purchase_id #: model:ir.model.fields,field_description:purchase.field_res_partner_purchase_warn +#: model:ir.model.fields,field_description:purchase.field_res_users_purchase_warn #: model:ir.ui.view,arch_db:purchase.purchase_order_form #: model:ir.ui.view,arch_db:purchase.purchase_order_graph #: model:ir.ui.view,arch_db:purchase.purchase_order_pivot @@ -1282,7 +1281,7 @@ msgid "Purchase Orders Statistics" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:703 +#: code:addons/purchase/models/purchase.py:709 #, python-format msgid "Purchase order line deleted." msgstr "" @@ -1394,7 +1393,7 @@ msgid "Received Qty" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:577 +#: code:addons/purchase/models/purchase.py:578 #, python-format msgid "Received Quantity" msgstr "" @@ -1518,6 +1517,7 @@ msgstr "" #: model:ir.model.fields,help:purchase.field_product_product_purchase_line_warn #: model:ir.model.fields,help:purchase.field_product_template_purchase_line_warn #: model:ir.model.fields,help:purchase.field_res_partner_purchase_warn +#: model:ir.model.fields,help:purchase.field_res_users_purchase_warn msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field." msgstr "" @@ -1611,6 +1611,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_partner_property_purchase_currency_id +#: model:ir.model.fields,field_description:purchase.field_res_users_property_purchase_currency_id msgid "Supplier Currency" msgstr "" @@ -1637,7 +1638,7 @@ msgid "Terms and Conditions" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:571 +#: code:addons/purchase/models/purchase.py:572 #, python-format msgid "The ordered quantity has been decreased. Do not forget to take it into account on your bills and receipts." msgstr "" @@ -1693,6 +1694,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,help:purchase.field_res_partner_property_purchase_currency_id +#: model:ir.model.fields,help:purchase.field_res_users_property_purchase_currency_id msgid "This currency will be used, instead of the default one, for purchases from the current partner" msgstr "" @@ -1708,25 +1710,25 @@ msgid "This note will be displayed for vendors." msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:1024 +#: code:addons/purchase/models/purchase.py:1035 #, python-format msgid "This purchase order has been created from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:1037 +#: code:addons/purchase/models/purchase.py:1048 #, python-format msgid "This purchase order has been modified from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/account_invoice.py:197 +#: code:addons/purchase/models/account_invoice.py:200 #, python-format msgid "This vendor bill has been created from: %s" msgstr "" #. module: purchase -#: code:addons/purchase/models/account_invoice.py:211 +#: code:addons/purchase/models/account_invoice.py:214 #, python-format msgid "This vendor bill has been modified from: %s" msgstr "" @@ -1813,6 +1815,11 @@ msgstr "" msgid "Unlock" msgstr "" +#. module: purchase +#: model:ir.ui.view,arch_db:purchase.view_purchase_order_filter +msgid "Unread Messages" +msgstr "" + #. module: purchase #: model:ir.ui.view,arch_db:purchase.purchase_order_tree msgid "Untaxed" @@ -1935,7 +1942,7 @@ msgstr "" #. module: purchase #: code:addons/purchase/models/purchase.py:253 -#: code:addons/purchase/models/purchase.py:769 +#: code:addons/purchase/models/purchase.py:775 #, python-format msgid "Warning for %s" msgstr "" @@ -1961,7 +1968,7 @@ msgid "When products are bought, they can be delivered to this warehouse" msgstr "" #. module: purchase -#: code:addons/purchase/models/purchase.py:809 +#: code:addons/purchase/models/purchase.py:815 #, python-format msgid "You are decreasing the ordered quantity!\n" "You must update the quantities on the reception and/or bills." diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index ff3728753fc..6cfd2a477b1 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -232,6 +232,14 @@ class PurchaseOrder(models.Model): self.currency_id = self.partner_id.property_purchase_currency_id.id or self.env.user.company_id.currency_id.id return {} + @api.onchange('fiscal_position_id') + def _compute_tax_id(self): + """ + Trigger the recompute of the taxes if the fiscal position is changed on the PO. + """ + for order in self: + order.order_line._compute_tax_id() + @api.onchange('partner_id') def onchange_partner_id_warning(self): if not self.partner_id: @@ -407,6 +415,10 @@ class PurchaseOrder(models.Model): picking = pickings[0] moves = order.order_line._create_stock_moves(picking) moves = moves.filtered(lambda x: x.state not in ('done', 'cancel')).action_confirm() + seq = 0 + for move in moves: + seq += 5 + move.sequence = seq moves.action_assign() picking.message_post_with_view('mail.message_origin_link', values={'self': picking, 'origin': order}, @@ -517,6 +529,14 @@ class PurchaseOrderLine(models.Model): 'price_subtotal': taxes['total_excluded'], }) + @api.multi + def _compute_tax_id(self): + for line in self: + fpos = line.order_id.fiscal_position_id or line.order_id.partner_id.property_account_position_id + # If company_id is set, always filter taxes by the company + taxes = line.product_id.supplier_taxes_id.filtered(lambda r: not line.company_id or r.company_id == line.company_id) + line.taxes_id = fpos.map_tax(taxes, line.product_id, line.order_id.partner_id) if fpos else taxes + @api.depends('invoice_lines.invoice_id.state', 'invoice_lines.quantity') def _compute_qty_invoiced(self): for line in self: diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml index f203ab88e3c..c726db7d145 100644 --- a/addons/purchase/views/purchase_views.xml +++ b/addons/purchase/views/purchase_views.xml @@ -221,7 +221,7 @@ - +
@@ -239,7 +239,7 @@ - + @@ -611,7 +611,7 @@ - + diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot index 20911c20a82..4140d4d3d87 100644 --- a/addons/report_intrastat/i18n/report_intrastat.pot +++ b/addons/report_intrastat/i18n/report_intrastat.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -90,6 +90,11 @@ msgstr "" msgid "Country code" msgstr "" +#. module: report_intrastat +#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document +msgid "Credit Note" +msgstr "" + #. module: report_intrastat #: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_currency_id msgid "Currency" @@ -167,6 +172,8 @@ msgstr "" #. module: report_intrastat #: model:ir.model,name:report_intrastat.model_report_intrastat_code +#: model:ir.model.fields,field_description:report_intrastat.field_delivery_carrier_intrastat_id +#: model:ir.model.fields,field_description:report_intrastat.field_product_product_intrastat_id #: model:ir.model.fields,field_description:report_intrastat.field_product_template_intrastat_id #: model:ir.model.fields,field_description:report_intrastat.field_report_intrastat_intrastat_id #: model:ir.ui.view,arch_db:report_intrastat.view_report_intrastat_code_tree @@ -243,11 +250,6 @@ msgstr "" msgid "Quantity" msgstr "" -#. module: report_intrastat -#: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document -msgid "Refund" -msgstr "" - #. module: report_intrastat #: selection:report.intrastat,month:0 msgid "September" @@ -300,7 +302,7 @@ msgstr "" #. module: report_intrastat #: model:ir.ui.view,arch_db:report_intrastat.report_intrastatinvoice_document -msgid "Vendor Refund" +msgid "Vendor Credit Note" msgstr "" #. module: report_intrastat diff --git a/addons/report_intrastat/report/report_intrastat_invoice_template.xml b/addons/report_intrastat/report/report_intrastat_invoice_template.xml index 0d049f62e02..1e37878fa4a 100644 --- a/addons/report_intrastat/report/report_intrastat_invoice_template.xml +++ b/addons/report_intrastat/report/report_intrastat_invoice_template.xml @@ -129,6 +129,10 @@

Fiscal Position: + +

+

+ Fiscal Position Remark:

diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot index aa093e5292e..e0483c563b1 100644 --- a/addons/resource/i18n/resource.pot +++ b/addons/resource/i18n/resource.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: resource -#: code:addons/resource/models/resource.py:666 +#: code:addons/resource/models/resource.py:691 #, python-format msgid "%s (copy)" msgstr "" @@ -26,11 +26,6 @@ msgstr "" msgid "Active" msgstr "" -#. module: resource -#: model:ir.model.fields,help:resource.field_res_users_country_enforce_cities -msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities." -msgstr "" - #. module: resource #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days msgid "Closing Days" @@ -44,7 +39,6 @@ msgstr "" #. module: resource #: model:ir.model.fields,field_description:resource.field_hr_employee_company_id #: model:ir.model.fields,field_description:resource.field_mrp_workcenter_company_id -#: model:ir.model.fields,field_description:resource.field_res_users_city_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_company_id #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves_company_id #: model:ir.model.fields,field_description:resource.field_resource_mixin_company_id @@ -109,11 +103,6 @@ msgstr "" msgid "Display Name" msgstr "" -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_street_number2 -msgid "Door Number" -msgstr "" - #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_resource_time_efficiency msgid "Efficiency Factor" @@ -126,12 +115,7 @@ msgid "End Date" msgstr "" #. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_country_enforce_cities -msgid "Enforce Cities" -msgstr "" - -#. module: resource -#: code:addons/resource/models/resource.py:697 +#: code:addons/resource/models/resource.py:722 #, python-format msgid "Error! leave start-date must be lower then leave end-date." msgstr "" @@ -153,21 +137,6 @@ msgstr "" msgid "Friday Morning" msgstr "" -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_partner_latitude -msgid "Geo Latitude" -msgstr "" - -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_partner_longitude -msgid "Geo Longitude" -msgstr "" - -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_date_localization -msgid "Geolocation Date" -msgstr "" - #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_global_leave_ids #: model:ir.ui.view,arch_db:resource.resource_calendar_form @@ -185,11 +154,6 @@ msgstr "" msgid "Hours" msgstr "" -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_street_number -msgid "House Number" -msgstr "" - #. module: resource #: selection:resource.resource,resource_type:0 msgid "Human" @@ -421,11 +385,6 @@ msgstr "" msgid "Starting Date of Leave by Month" msgstr "" -#. module: resource -#: model:ir.model.fields,field_description:resource.field_res_users_street_name -msgid "Street Name" -msgstr "" - #. module: resource #: selection:resource.calendar.attendance,dayofweek:0 msgid "Sunday" @@ -437,14 +396,14 @@ msgid "Test Resource Model" msgstr "" #. module: resource -#: model:ir.model.fields,help:resource.field_resource_resource_time_efficiency -msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes." +#: code:addons/resource/models/resource.py:677 +#, python-format +msgid "The efficiency factor cannot be equal to 0." msgstr "" #. module: resource -#: code:addons/resource/models/resource.py:667 -#, python-format -msgid "The efficiency factor cannot be equal to 0." +#: model:ir.model.fields,help:resource.field_resource_resource_time_efficiency +msgid "This field is used to calculate the the expected duration of a work order at this work center. For example, if a work order takes one hour and the efficiency factor is 100%, then the expected duration will be one hour. If the efficiency factor is 200%, however the expected duration will be 30 minutes." msgstr "" #. module: resource diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index e7bf9142dd4..7a067c8d67a 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,10 +20,10 @@ msgstr "" msgid "\n" "

Dear ${object.partner_id.name}\n" "% set access_action = object.with_context(force_website=True).get_access_action()\n" -"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n" "% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" -"% set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n" -"% set access_url = is_online and access_action['url'] or ''\n" +"% set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation'\n" +"% set access_name = is_online and object.template_id and doc_name == 'quotation' and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name\n" +"% set access_url = is_online and '/mail/view?model=sale.order&res_id=%d' % (object.id) or ''\n" "\n" "% if object.partner_id.parent_id:\n" " (${object.partner_id.parent_id.name})\n" @@ -87,6 +87,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_count +#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_count msgid "# of Sales Order" msgstr "" @@ -118,7 +119,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:83 +#: code:addons/sale/static/src/js/tour.js:85 #, python-format msgid "Invite salespeople or managers via email.
Enter one email per line." msgstr "" @@ -208,7 +209,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:64 +#: code:addons/sale/static/src/js/tour.js:66 #, python-format msgid "

Print this quotation. If not yet done, you will be requested to set your company data and to select a document layout.

" msgstr "" @@ -282,7 +283,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,help:sale.field_sale_config_settings_group_stock_packaging -msgid "Ability to select a package type in sales orders and \n" +msgid "Ability to select a package type in sales orders and\n" " to force a quantity that is a multiple of the number of units per package." msgstr "" @@ -317,7 +318,7 @@ msgid "Addresses in Sales Orders" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:153 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:156 #, python-format msgid "Advance: %s" msgstr "" @@ -501,7 +502,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:79 +#: code:addons/sale/static/src/js/tour.js:81 #, python-format msgid "Configuration options are available in the Settings app." msgstr "" @@ -513,6 +514,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_confirmation_date +#: model:ir.model.fields,field_description:sale.field_sale_report_confirmation_date msgid "Confirmation Date" msgstr "" @@ -547,7 +549,7 @@ msgstr "" #. module: sale #: selection:product.template,track_service:0 -msgid "Create a task and track hours" +msgid "Create a task per order line to track hours" msgstr "" #. module: sale @@ -555,11 +557,6 @@ msgstr "" msgid "Create and View Invoices" msgstr "" -#. module: sale -#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale -msgid "Create new projects & tasks for sold services, record time spent and get delivered quantities updated in sales orders accordingly." -msgstr "" - #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv_create_uid #: model:ir.model.fields,field_description:sale.field_sale_layout_category_create_uid @@ -660,7 +657,7 @@ msgid "Delivered" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:724 +#: code:addons/sale/models/sale.py:734 #: model:ir.ui.view,arch_db:sale.view_order_form #, python-format msgid "Delivered Quantity" @@ -819,7 +816,7 @@ msgid "Extended Filters" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:697 +#: code:addons/sale/models/sale.py:707 #, python-format msgid "Extra line with %s " msgstr "" @@ -980,7 +977,7 @@ msgid "Invoiced" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:725 +#: code:addons/sale/models/sale.py:735 #: model:ir.ui.view,arch_db:sale.view_order_form #, python-format msgid "Invoiced Quantity" @@ -1015,6 +1012,12 @@ msgid "Invoices will be created in draft so that you can review\n" " them before validation." msgstr "" +#. module: sale +#: code:addons/sale/models/sales_team.py:96 +#, python-format +msgid "Invoices: Untaxed Total" +msgstr "" + #. module: sale #: model:ir.ui.menu,name:sale.menu_sale_invoicing #: model:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban @@ -1172,6 +1175,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn_msg +#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn_msg msgid "Message for Sales Order" msgstr "" @@ -1226,7 +1230,8 @@ msgstr "" #. module: sale #: code:addons/sale/models/sale.py:104 #: code:addons/sale/models/sale.py:255 -#: code:addons/sale/models/sale.py:256 +#: code:addons/sale/models/sale.py:257 +#: code:addons/sale/models/sale.py:259 #, python-format msgid "New" msgstr "" @@ -1301,7 +1306,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:59 +#: code:addons/sale/static/src/js/tour.js:61 #, python-format msgid "Once your quotation is ready, you can save, print or send it by email." msgstr "" @@ -1313,7 +1318,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/sale.js:26 +#: code:addons/sale/static/src/js/sale.js:32 #, python-format msgid "Only Integer Value should be valid." msgstr "" @@ -1379,7 +1384,7 @@ msgid "Ordered Qty" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:722 +#: code:addons/sale/models/sale.py:732 #: model:ir.ui.view,arch_db:sale.view_order_form #, python-format msgid "Ordered Quantity" @@ -1471,13 +1476,13 @@ msgid "Personalize sales order and invoice report" msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:286 +#: code:addons/sale/models/sale.py:289 #, python-format msgid "Please define an accounting sales journal for this company." msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:807 +#: code:addons/sale/models/sale.py:817 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d) - or for its category: \"%s\"." msgstr "" @@ -1539,7 +1544,6 @@ msgid "Print" msgstr "" #. module: sale -#: model:ir.actions.report.xml,name:sale.report_proforma_quotation #: model:ir.model.fields,field_description:sale.field_sale_config_settings_group_proforma_sales msgid "Pro-Forma" msgstr "" @@ -1690,7 +1694,7 @@ msgid "Quotation sent" msgstr "" #. module: sale -#: code:addons/sale/models/sales_team.py:106 +#: code:addons/sale/models/sales_team.py:101 #: model:ir.actions.act_window,name:sale.action_quotations #: model:ir.actions.act_window,name:sale.action_quotations_salesteams #: model:ir.model.fields,field_description:sale.field_crm_team_use_quotations @@ -1814,6 +1818,8 @@ msgstr "" #: model:ir.model,name:sale.model_sale_order #: model:ir.model.fields,field_description:sale.field_res_partner_sale_order_ids #: model:ir.model.fields,field_description:sale.field_res_partner_sale_warn +#: model:ir.model.fields,field_description:sale.field_res_users_sale_order_ids +#: model:ir.model.fields,field_description:sale.field_res_users_sale_warn #: model:ir.ui.view,arch_db:sale.view_order_form #: model:ir.ui.view,arch_db:sale.view_sales_order_filter #: model:res.request.link,name:sale.req_link_sale_order @@ -1856,7 +1862,7 @@ msgid "Sales Order Lines related to a Sales Order of mine" msgstr "" #. module: sale -#: code:addons/sale/models/sales_team.py:107 +#: code:addons/sale/models/sales_team.py:102 #: model:ir.actions.act_window,name:sale.action_orders #: model:ir.actions.act_window,name:sale.action_orders_salesteams #: model:ir.actions.act_window,name:sale.action_orders_to_invoice_salesteams @@ -1875,6 +1881,12 @@ msgstr "" msgid "Sales Orders Statistics" msgstr "" +#. module: sale +#: code:addons/sale/models/sales_team.py:94 +#, python-format +msgid "Sales: Untaxed Total" +msgstr "" + #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line_salesman_id #: model:ir.model.fields,field_description:sale.field_sale_order_user_id @@ -1923,6 +1935,7 @@ msgstr "" #: model:ir.model.fields,help:sale.field_product_product_sale_line_warn #: model:ir.model.fields,help:sale.field_product_template_sale_line_warn #: model:ir.model.fields,help:sale.field_res_partner_sale_warn +#: model:ir.model.fields,help:sale.field_res_users_sale_warn msgid "Selecting the \"Warning\" option will notify user with the message, Selecting \"Blocking Message\" will throw an exception with the message and block the flow. The Message has to be written in the next field." msgstr "" @@ -1946,6 +1959,11 @@ msgstr "" msgid "Sell products by multiple of unit # per package" msgstr "" +#. module: sale +#: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale +msgid "Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)" +msgstr "" + #. module: sale #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Sell your products on eBay" @@ -1994,7 +2012,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/sale.js:19 +#: code:addons/sale/static/src/js/sale.js:25 #, python-format msgid "Set an invoicing target: " msgstr "" @@ -2196,7 +2214,7 @@ msgid "Terms and conditions" msgstr "" #. module: sale -#: code:addons/sale/models/sale_analytic.py:119 +#: code:addons/sale/models/sale_analytic.py:112 #, python-format msgid "The Sales Order %s linked to the Analytic Account must be validated before registering expenses." msgstr "" @@ -2218,19 +2236,19 @@ msgid "The margin is computed as the sum of product sales prices minus the cost msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:718 +#: code:addons/sale/models/sale.py:728 #, python-format msgid "The ordered quantity has been decreased. Do not forget to take it into account on your invoices and delivery orders." msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:147 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:149 #, python-format msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product." msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:145 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:147 #, python-format msgid "The product used to invoice a down payment should have an invoice policy set to \"Ordered quantities\". Please update your deposit product to be able to create a deposit invoice." msgstr "" @@ -2253,8 +2271,8 @@ msgid "There is no income account defined for this product: \"%s\". You may have msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:363 -#: code:addons/sale/models/sale.py:367 +#: code:addons/sale/models/sale.py:366 +#: code:addons/sale/models/sale.py:370 #, python-format msgid "There is no invoicable line." msgstr "" @@ -2290,7 +2308,7 @@ msgid "This report performs analysis on your sales orders. Analysis check your s msgstr "" #. module: sale -#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_timesheet_grid_sale +#: model:ir.model.fields,field_description:sale.field_sale_config_settings_module_sale_timesheet #: model:ir.ui.view,arch_db:sale.sale_config_settings_view_form_inherit_sale msgid "Timesheets" msgstr "" @@ -2393,10 +2411,7 @@ msgid "Untaxed Amount" msgstr "" #. module: sale -#: code:addons/sale/models/sales_team.py:99 -#: code:addons/sale/models/sales_team.py:101 #: model:ir.model.fields,field_description:sale.field_sale_report_price_subtotal -#, python-format msgid "Untaxed Total" msgstr "" @@ -2423,14 +2438,14 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:69 +#: code:addons/sale/static/src/js/tour.js:71 #, python-format msgid "Use the breadcrumbs to go back to preceeding screens." msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/tour.js:73 +#: code:addons/sale/static/src/js/tour.js:75 #, python-format msgid "Use this menu to access quotations, sales orders and customers." msgstr "" @@ -2492,7 +2507,7 @@ msgstr "" #. module: sale #. openerp-web -#: code:addons/sale/static/src/js/sale.js:26 +#: code:addons/sale/static/src/js/sale.js:32 #, python-format msgid "Wrong value entered!" msgstr "" @@ -2504,7 +2519,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be msgstr "" #. module: sale -#: code:addons/sale/models/sale.py:927 +#: code:addons/sale/models/sale.py:940 #, python-format msgid "You can not remove a sales order line.\n" "Discard changes and try setting the quantity to 0." diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index e2502dc9d59..5299868d2ca 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -547,12 +547,14 @@ class SaleOrder(models.Model): for tax in line.tax_id: group = tax.tax_group_id res.setdefault(group, 0.0) - taxes = tax.compute_all(line.price_reduce + base_tax, quantity=line.product_uom_qty, + # FORWARD-PORT UP TO SAAS-17 + price_reduce = line.price_unit * (1.0 - line.discount / 100.0) + taxes = tax.compute_all(price_reduce + base_tax, quantity=line.product_uom_qty, product=line.product_id, partner=self.partner_shipping_id)['taxes'] for t in taxes: res[group] += t['amount'] if tax.include_base_amount: - base_tax += tax.compute_all(line.price_reduce + base_tax, quantity=1, product=line.product_id, + base_tax += tax.compute_all(price_reduce + base_tax, quantity=1, product=line.product_id, partner=self.partner_shipping_id)['taxes'][0]['amount'] res = sorted(pycompat.items(res), key=lambda l: l[0].sequence) res = [(l[0].name, l[1]) for l in res] @@ -962,7 +964,7 @@ class SaleOrderLine(models.Model): lang=self.order_id.partner_id.lang, partner=self.order_id.partner_id.id, quantity=self.product_uom_qty, - date_order=self.order_id.date_order, + date=self.order_id.date_order, pricelist=self.order_id.pricelist_id.id, uom=self.product_uom.id, fiscal_position=self.env.context.get('fiscal_position') diff --git a/addons/sale/tests/test_product_id_change.py b/addons/sale/tests/test_product_id_change.py index 4a795baa4c8..bf61c8d644f 100644 --- a/addons/sale/tests/test_product_id_change.py +++ b/addons/sale/tests/test_product_id_change.py @@ -68,3 +68,51 @@ class TestOnchangeProductId(TransactionCase): so_line = so.order_line[0] so_line.product_id_change() self.assertEquals(100, so_line.price_unit, "The included tax must be subtracted to the price") + + def test_pricelist_application(self): + """ Test different prices are correctly applied based on dates """ + support_product = self.env.ref('product.product_product_2') + support_product.list_price = 100 + partner = self.res_partner_model.create(dict(name="George")) + + christmas_pricelist = self.env['product.pricelist'].create({ + 'name': 'Christmas pricelist', + 'item_ids': [(0, 0, { + 'date_start': "2017-12-01", + 'date_end': "2017-12-24", + 'compute_price': 'percentage', + 'base': 'list_price', + 'percent_price': 20, + 'applied_on': '3_global', + 'name': 'Pre-Christmas discount' + }), (0, 0, { + 'date_start': "2017-12-25", + 'date_end': "2017-12-31", + 'compute_price': 'percentage', + 'base': 'list_price', + 'percent_price': 50, + 'applied_on': '3_global', + 'name': 'Post-Christmas super-discount' + })] + }) + + so = self.env['sale.order'].create({ + 'partner_id': partner.id, + 'date_order': '2017-12-20', + 'pricelist_id': christmas_pricelist.id, + }) + + order_line = self.env['sale.order.line'].new({ + 'order_id': so.id, + 'product_id': support_product.id, + }) + + # force compute uom and prices + order_line.product_id_change() + order_line.product_uom_change() + + self.assertEqual(order_line.price_unit, 80, "First date pricelist rule not applied") + + so.date_order = '2017-12-30' + order_line.product_id_change() + self.assertEqual(order_line.price_unit, 50, "Second date pricelist rule not applied") diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index b871768b654..1e163564f0f 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -242,7 +242,7 @@ -
\n" -"
\n" +"
\n" " ${object.event_id.get_interval('dayname', tz=object.partner_id.tz if not object.event_id.allday else None)}\n" "
\n" "
\n" @@ -272,13 +272,6 @@ msgid "\n" "
" msgstr "" -#. module: calendar -#. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:98 -#, python-format -msgid " [Me]" -msgstr "" - #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_is_highlighted msgid "# Meetings Highlight" @@ -300,26 +293,26 @@ msgid "${object.event_id.name}: Date updated" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:658 +#: code:addons/calendar/models/calendar.py:671 #, python-format msgid "%s at %s To\n" " %s at %s (%s)" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:656 +#: code:addons/calendar/models/calendar.py:669 #, python-format msgid "%s at (%s To %s) (%s)" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:196 +#: code:addons/calendar/models/calendar.py:206 #, python-format msgid "%s has accepted invitation" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:204 +#: code:addons/calendar/models/calendar.py:214 #, python-format msgid "%s has declined invitation" msgstr "" @@ -347,20 +340,13 @@ msgstr "" msgid "Active" msgstr "" -#. module: calendar -#. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:78 -#, python-format -msgid "Add Favorite Calendar" -msgstr "" - #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_allday msgid "All Day" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:653 +#: code:addons/calendar/models/calendar.py:666 #, python-format msgid "AllDay , %s" msgstr "" @@ -399,7 +385,7 @@ msgid "Availability" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:1506 +#: code:addons/calendar/models/calendar.py:1508 #: selection:calendar.attendee,availability:0 #: selection:calendar.event,show_as:0 #, python-format @@ -447,11 +433,6 @@ msgstr "" msgid "Click to schedule a new meeting." msgstr "" -#. module: calendar -#: model:ir.model.fields,field_description:calendar.field_calendar_event_color_partner_id -msgid "Color index of creator" -msgstr "" - #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_attendee_common_name msgid "Common name" @@ -547,13 +528,6 @@ msgstr "" msgid "Display Name" msgstr "" -#. module: calendar -#. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:159 -#, python-format -msgid "Do you really want to delete this filter from favorites ?" -msgstr "" - #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_duration #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -604,13 +578,13 @@ msgid "Ending at" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:848 +#: code:addons/calendar/models/calendar.py:854 #, python-format msgid "Ending date cannot be set before starting date." msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:846 +#: code:addons/calendar/models/calendar.py:852 #, python-format msgid "Ending datetime cannot be set before starting datetime." msgstr "" @@ -636,13 +610,6 @@ msgstr "" msgid "Event recurrence interval cannot be negative." msgstr "" -#. module: calendar -#. openerp-web -#: code:addons/calendar/static/src/js/base_calendar.js:99 -#, python-format -msgid "Everybody's calendars" -msgstr "" - #. module: calendar #: selection:calendar.event,privacy:0 msgid "Everyone" @@ -659,7 +626,7 @@ msgid "First" msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:888 +#: code:addons/calendar/models/calendar.py:894 #, python-format msgid "First you have to specify the date of the invitation." msgstr "" @@ -791,6 +758,7 @@ msgstr "" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_res_partner_calendar_last_notif_ack +#: model:ir.model.fields,field_description:calendar.field_res_users_calendar_last_notif_ack msgid "Last notification marked as read from base Calendar" msgstr "" @@ -961,6 +929,11 @@ msgstr "" msgid "Participant" msgstr "" +#. module: calendar +#: model:ir.model.fields,help:calendar.field_calendar_event_partner_id +msgid "Partner-related data of the user" +msgstr "" + #. module: calendar #: code:addons/calendar/models/calendar.py:1110 #, python-format @@ -1018,13 +991,6 @@ msgstr "" msgid "Reminders" msgstr "" -#. module: calendar -#. openerp-web -#: code:addons/calendar/static/src/xml/base_calendar.xml:26 -#, python-format -msgid "Remove this favorite from the list" -msgstr "" - #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_count msgid "Repeat" @@ -1051,6 +1017,7 @@ msgid "Repeat x times" msgstr "" #. module: calendar +#: model:ir.model.fields,field_description:calendar.field_calendar_event_partner_id #: model:ir.model.fields,field_description:calendar.field_calendar_event_user_id #: model:ir.ui.view,arch_db:calendar.view_calendar_event_search msgid "Responsible" @@ -1281,7 +1248,7 @@ msgid "Yes I'm going." msgstr "" #. module: calendar -#: code:addons/calendar/models/calendar.py:128 +#: code:addons/calendar/models/calendar.py:137 #, python-format msgid "You cannot duplicate a calendar attendee." msgstr "" diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index d2aa494e98c..64fafb2c725 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -657,11 +657,7 @@ msgid "Active" msgstr "" #. module: crm -#: model:ir.actions.act_window,name:crm.crm_activity_report_action_tree -#: model:ir.model.fields,field_description:crm.field_res_partner_activities_count -#: model:ir.model.fields,field_description:crm.field_res_users_activities_count #: model:ir.ui.menu,name:crm.crm_activity_report_menu -#: model:ir.ui.view,arch_db:crm.view_partners_form_crm1 msgid "Activities" msgstr "" @@ -751,7 +747,7 @@ msgid "All contacts must have the same email. Only the Administrator can merge c msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:844 +#: code:addons/crm/models/crm_lead.py:856 #, python-format msgid "All email incoming to %s will automatically\n" " create new opportunity. Update your business card, phone book, social media,...\n" @@ -991,7 +987,7 @@ msgid "Click on an opportunity to zoom to it." msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:847 +#: code:addons/crm/models/crm_lead.py:859 #, python-format msgid "Click to add a new opportunity" msgstr "" @@ -1168,7 +1164,7 @@ msgid "Convert to opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1018 +#: code:addons/crm/models/crm_lead.py:1031 #: selection:crm.lead2opportunity.partner,name:0 #: selection:crm.lead2opportunity.partner.mass,name:0 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner @@ -1344,7 +1340,7 @@ msgid "Current Line" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1062 +#: code:addons/crm/models/crm_lead.py:1075 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_partner_id #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_partner_id #: model:ir.model.fields,field_description:crm.field_crm_lead2projectissue_wizard_partner_id @@ -1360,7 +1356,7 @@ msgid "Customer" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1064 +#: code:addons/crm/models/crm_lead.py:1077 #, python-format msgid "Customer Email" msgstr "" @@ -1383,7 +1379,7 @@ msgid "Customizations" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:83 +#: code:addons/crm/models/crm_team.py:121 #, python-format msgid "Dashboard graph content cannot be Pipeline if the sales channel doesn't use it. (Pipeline is unchecked.)" msgstr "" @@ -1638,9 +1634,22 @@ msgid "Expected Closing Date" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:190 +#: selection:crm.team,dashboard_graph_group_pipeline:0 +msgid "Expected Closing Day" +msgstr "" + +#. module: crm +#: selection:crm.team,dashboard_graph_group_pipeline:0 +msgid "Expected Closing Month" +msgstr "" + +#. module: crm +#: selection:crm.team,dashboard_graph_group_pipeline:0 +msgid "Expected Closing Week" +msgstr "" + +#. module: crm #: model:ir.model.fields,field_description:crm.field_crm_lead_planned_revenue -#, python-format msgid "Expected Revenue" msgstr "" @@ -1649,6 +1658,11 @@ msgstr "" msgid "Expected Revenues" msgstr "" +#. module: crm +#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_period_pipeline +msgid "Expected to Close" +msgstr "" + #. module: crm #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search msgid "Expiration Closing Month" @@ -1714,7 +1728,7 @@ msgid "Force assignation" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:515 +#: code:addons/crm/models/crm_lead.py:527 #, python-format msgid "From %s : %s" msgstr "" @@ -1772,6 +1786,11 @@ msgstr "" msgid "Group By" msgstr "" +#. module: crm +#: model:ir.model.fields,field_description:crm.field_crm_team_dashboard_graph_group_pipeline +msgid "Group by" +msgstr "" + #. module: crm #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_number_group msgid "Group of Contacts" @@ -1829,6 +1848,11 @@ msgstr "" msgid "High" msgstr "" +#. module: crm +#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_group_pipeline +msgid "How this channel's dashboard graph will group the results." +msgstr "" + #. module: crm #: model:ir.model.fields,field_description:crm.field_base_partner_merge_automatic_wizard_id #: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_id @@ -2021,7 +2045,7 @@ msgid "Last Updated on" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:821 +#: code:addons/crm/models/crm_lead.py:833 #: selection:crm.activity.report,lead_type:0 #: selection:crm.lead,type:0 #: selection:crm.opportunity.report,type:0 @@ -2092,7 +2116,7 @@ msgid "Leads & Opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:56 +#: code:addons/crm/models/crm_lead.py:55 #, python-format msgid "Leads / Opportunities" msgstr "" @@ -2192,7 +2216,7 @@ msgstr "" #. module: crm #. openerp-web -#: code:addons/crm/models/crm_lead.py:1024 +#: code:addons/crm/models/crm_lead.py:1037 #: code:addons/crm/static/src/js/web_planner_crm.js:33 #: model:ir.ui.view,arch_db:crm.crm_case_form_view_oppor #: model:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search @@ -2267,7 +2291,7 @@ msgid "Medium" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:863 +#: code:addons/crm/models/crm_lead.py:875 #, python-format msgid "Meeting scheduled at '%s'
Subject: %s
Duration: %s hour(s)" msgstr "" @@ -2351,25 +2375,25 @@ msgid "Merge with existing opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:466 +#: code:addons/crm/models/crm_lead.py:478 #, python-format msgid "Merged lead" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:497 +#: code:addons/crm/models/crm_lead.py:509 #, python-format msgid "Merged leads" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:497 +#: code:addons/crm/models/crm_lead.py:509 #, python-format msgid "Merged opportunities" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:466 +#: code:addons/crm/models/crm_lead.py:478 #, python-format msgid "Merged opportunity" msgstr "" @@ -2472,11 +2496,6 @@ msgstr "" msgid "New propspect assigned to the right salesperson" msgstr "" -#. module: crm -#: model:ir.model.fields,field_description:crm.field_crm_lead_date_action_next -msgid "Next Action" -msgstr "" - #. module: crm #: model:ir.actions.act_window,name:crm.crm_lead_action_activities #: model:ir.ui.menu,name:crm.crm_lead_menu_activities @@ -2495,7 +2514,7 @@ msgid "Next activity late" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:1084 +#: code:addons/crm/models/crm_lead.py:1097 #, python-format msgid "No Subject" msgstr "" @@ -2667,7 +2686,7 @@ msgid "Opportunities that are assigned to me" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:796 +#: code:addons/crm/models/crm_lead.py:808 #: selection:crm.activity.report,lead_type:0 #: selection:crm.lead,type:0 #: selection:crm.opportunity.report,type:0 @@ -2821,6 +2840,11 @@ msgstr "" msgid "Phone" msgstr "" +#. module: crm +#: model:ir.model.fields,field_description:crm.field_sale_config_settings_module_crm_phone_validation +msgid "Phone Validation" +msgstr "" + #. module: crm #. openerp-web #: code:addons/crm/static/src/js/web_planner_crm.js:23 @@ -2834,7 +2858,7 @@ msgid "Phone scripts" msgstr "" #. module: crm -#: code:addons/crm/models/crm_team.py:134 +#: code:addons/crm/models/crm_team.py:172 #: model:ir.model.fields,field_description:crm.field_crm_team_use_opportunities #: model:ir.ui.menu,name:crm.crm_opportunity_report_menu #: model:ir.ui.view,arch_db:crm.crm_planner @@ -2869,6 +2893,12 @@ msgid "Pipeline Analysis gives you an instant access to\n" "with the the sales channel." msgstr "" +#. module: crm +#: code:addons/crm/models/crm_team.py:238 +#, python-format +msgid "Pipeline: Expected Revenue" +msgstr "" + #. module: crm #: model:web.planner,tooltip_planner:crm.planner_crm msgid "Plan your sales strategy: objectives, leads, KPIs, and much more!" @@ -2880,7 +2910,7 @@ msgid "Planner" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:569 +#: code:addons/crm/models/crm_lead.py:581 #, python-format msgid "Please select more than one element (lead or opportunity) from the list view." msgstr "" @@ -2900,6 +2930,7 @@ msgid "Pricing & Discounts" msgstr "" #. module: crm +#: model:ir.model.fields,field_description:crm.field_crm_lead_priority #: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_priority msgid "Priority" msgstr "" @@ -2999,11 +3030,6 @@ msgstr "" msgid "Quotation signed by the customer" msgstr "" -#. module: crm -#: model:ir.model.fields,field_description:crm.field_crm_lead_priority -msgid "Rating" -msgstr "" - #. module: crm #: model:ir.ui.view,arch_db:crm.crm_planner msgid "Read the documentation about pricing & discounts" @@ -3111,6 +3137,7 @@ msgid "Salesmen" msgstr "" #. module: crm +#: selection:crm.team,dashboard_graph_group_pipeline:0 #: model:ir.model.fields,field_description:crm.field_crm_activity_report_user_id #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass_user_id #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_user_id @@ -3297,6 +3324,7 @@ msgid "Specific team that uses this stage. Other teams will not be able to see o msgstr "" #. module: crm +#: selection:crm.team,dashboard_graph_group_pipeline:0 #: model:ir.model.fields,field_description:crm.field_crm_activity_report_stage_id #: model:ir.model.fields,field_description:crm.field_crm_lead_stage_id #: model:ir.model.fields,field_description:crm.field_crm_opportunity_report_stage_id @@ -3500,6 +3528,11 @@ msgid "The three main practices to develop a sales force are\n" " good sales tools." msgstr "" +#. module: crm +#: model:ir.model.fields,help:crm.field_crm_team_dashboard_graph_period_pipeline +msgid "The time period this channel's dashboard graph will consider." +msgstr "" + #. module: crm #: model:ir.ui.view,arch_db:crm.crm_planner msgid "The whole process may take a few hours. But it's worth doing\n" @@ -3570,7 +3603,7 @@ msgid "This stage is folded in the kanban view when there are no records in that msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:990 +#: code:addons/crm/models/crm_lead.py:1003 #, python-format msgid "This target does not exist." msgstr "" @@ -3784,6 +3817,11 @@ msgstr "" msgid "VIP letter to potential sponsors" msgstr "" +#. module: crm +#: model:ir.ui.view,arch_db:crm.sale_config_settings_view_form_inherit_crm +msgid "Validate and normalize phone numbers." +msgstr "" + #. module: crm #: selection:crm.lead,priority:0 #: selection:crm.opportunity.report,priority:0 @@ -3883,6 +3921,21 @@ msgstr "" msgid "Win / Loss Ratio" msgstr "" +#. module: crm +#: selection:crm.team,dashboard_graph_period_pipeline:0 +msgid "Within a Month" +msgstr "" + +#. module: crm +#: selection:crm.team,dashboard_graph_period_pipeline:0 +msgid "Within a Week" +msgstr "" + +#. module: crm +#: selection:crm.team,dashboard_graph_period_pipeline:0 +msgid "Within a Year" +msgstr "" + #. module: crm #: model:ir.model.fields,field_description:crm.field_base_partner_merge_line_wizard_id msgid "Wizard" @@ -3890,7 +3943,7 @@ msgstr "" #. module: crm #. openerp-web -#: code:addons/crm/models/crm_lead.py:1023 +#: code:addons/crm/models/crm_lead.py:1036 #: code:addons/crm/static/src/js/web_planner_crm.js:15 #: code:addons/crm/static/src/js/web_planner_crm.js:22 #: code:addons/crm/static/src/js/web_planner_crm.js:27 @@ -4067,7 +4120,7 @@ msgid "e.g. www.odoo.com" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:851 +#: code:addons/crm/models/crm_lead.py:863 #, python-format msgid "opportunities" msgstr "" @@ -4129,7 +4182,7 @@ msgid "to setup your own domain\n" msgstr "" #. module: crm -#: code:addons/crm/models/crm_lead.py:857 +#: code:addons/crm/models/crm_lead.py:869 #, python-format msgid "unknown" msgstr "" diff --git a/addons/crm_phone_validation/i18n/crm_phone_validation.pot b/addons/crm_phone_validation/i18n/crm_phone_validation.pot new file mode 100644 index 00000000000..1dc79b222fa --- /dev/null +++ b/addons/crm_phone_validation/i18n/crm_phone_validation.pot @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * crm_phone_validation +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.saas~16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-25 10:05+0000\n" +"PO-Revision-Date: 2017-07-25 10:05+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: crm_phone_validation +#: model:ir.model.fields,help:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method +msgid "Always encode phone numbers using international format. Otherwisenumbers coming from the company's country are nationaly formatted.International numbers are always using international format." +msgstr "" + +#. module: crm_phone_validation +#: model:ir.model,name:crm_phone_validation.model_res_partner +msgid "Contact" +msgstr "" + +#. module: crm_phone_validation +#: model:ir.model.fields,field_description:crm_phone_validation.field_sale_config_settings_crm_phone_valid_method +msgid "Enforce International Format" +msgstr "" + +#. module: crm_phone_validation +#: model:ir.model,name:crm_phone_validation.model_crm_lead +msgid "Lead/Opportunity" +msgstr "" + +#. module: crm_phone_validation +#: model:ir.model,name:crm_phone_validation.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" + diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 929dee54f01..ff6f37f3e52 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -82,12 +82,12 @@ msgstr "" #. module: delivery #: model:ir.model.fields,help:delivery.field_delivery_carrier_description_sale -msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Refund" +msgid "A description of the Product that you want to communicate to your customers. This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note" msgstr "" #. module: delivery #: model:ir.model.fields,help:delivery.field_delivery_carrier_description_purchase -msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Refund." +msgid "A description of the Product that you want to communicate to your vendors. This description will be copied to every Purchase Order, Receipt and Vendor Bill/Credit Note." msgstr "" #. module: delivery @@ -423,6 +423,7 @@ msgstr "" #. module: delivery #: model:ir.model.fields,field_description:delivery.field_res_partner_property_delivery_carrier_id +#: model:ir.model.fields,field_description:delivery.field_res_users_property_delivery_carrier_id #: model:ir.model.fields,field_description:delivery.field_sale_order_carrier_id msgid "Delivery Method" msgstr "" @@ -441,8 +442,15 @@ msgid "Delivery Package Selection Wizard" msgstr "" #. module: delivery -#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id +#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view #: model:ir.ui.menu,name:delivery.menu_delivery_packagings +#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_tree +msgid "Delivery Packages" +msgstr "" + +#. module: delivery +#: model:ir.model.fields,field_description:delivery.field_choose_delivery_package_delivery_packaging_id +#: model:ir.ui.view,arch_db:delivery.product_packaging_delivery_form msgid "Delivery Packaging" msgstr "" @@ -617,6 +625,7 @@ msgstr "" #. module: delivery #: model:delivery.carrier,name:delivery.free_delivery_carrier #: model:product.product,name:delivery.free_delivery_carrier_product_product +#: model:product.template,name:delivery.free_delivery_carrier_product_template msgid "Free delivery charges" msgstr "" @@ -652,6 +661,7 @@ msgstr "" #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_hs_code +#: model:ir.model.fields,field_description:delivery.field_product_product_hs_code #: model:ir.model.fields,field_description:delivery.field_product_template_hs_code msgid "HS Code" msgstr "" @@ -1034,7 +1044,7 @@ msgstr "" #. module: delivery #: code:addons/delivery/models/stock_picking.py:36 -#: code:addons/delivery/models/stock_picking.py:128 +#: code:addons/delivery/models/stock_picking.py:129 #, python-format msgid "Package Details" msgstr "" @@ -1046,15 +1056,9 @@ msgstr "" #. module: delivery #: model:ir.model,name:delivery.model_product_packaging -#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids msgid "Packaging" msgstr "" -#. module: delivery -#: model:ir.actions.act_window,name:delivery.action_delivery_packaging_view -msgid "Packagings" -msgstr "" - #. module: delivery #: model:ir.model,name:delivery.model_stock_pack_operation msgid "Packing Operation" @@ -1143,6 +1147,11 @@ msgstr "" msgid "Product Life Time" msgstr "" +#. module: delivery +#: model:ir.model.fields,field_description:delivery.field_delivery_carrier_packaging_ids +msgid "Product Packages" +msgstr "" + #. module: delivery #: model:ir.model.fields,field_description:delivery.field_delivery_carrier_removal_time msgid "Product Removal Time" @@ -1354,7 +1363,7 @@ msgid "Set to True if your credentials are certified for production." msgstr "" #. module: delivery -#: code:addons/delivery/models/stock_picking.py:147 +#: code:addons/delivery/models/stock_picking.py:150 #, python-format msgid "Shipment sent to carrier %s for shipping with tracking number %s
Cost: %.2f %s" msgstr "" @@ -1395,6 +1404,7 @@ msgstr "" #. module: delivery #: model:ir.model.fields,help:delivery.field_delivery_carrier_hs_code +#: model:ir.model.fields,help:delivery.field_product_product_hs_code #: model:ir.model.fields,help:delivery.field_product_template_hs_code msgid "Standardized code for international shipping and goods declaration" msgstr "" @@ -1521,6 +1531,7 @@ msgstr "" #. module: delivery #: model:ir.model.fields,help:delivery.field_res_partner_property_delivery_carrier_id +#: model:ir.model.fields,help:delivery.field_res_users_property_delivery_carrier_id msgid "This delivery method will be used when invoicing from picking." msgstr "" @@ -1747,14 +1758,14 @@ msgid "Width must be positive" msgstr "" #. module: delivery -#: code:addons/delivery/models/stock_picking.py:187 +#: code:addons/delivery/models/stock_picking.py:190 #, python-format msgid "You are shipping different packaging types in the same shipment.\n" "Packaging Types: %s" msgstr "" #. module: delivery -#: code:addons/delivery/models/stock_picking.py:163 +#: code:addons/delivery/models/stock_picking.py:166 #, python-format msgid "Your delivery method has no redirect on courier provider's website to track this order." msgstr "" diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml index e1bac19c89c..32eaa662481 100644 --- a/addons/delivery/views/delivery_view.xml +++ b/addons/delivery/views/delivery_view.xml @@ -116,8 +116,8 @@ - - + + diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot index 17e1fb17221..b37c332cf8c 100644 --- a/addons/document/i18n/document.pot +++ b/addons/document/i18n/document.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,18 +17,39 @@ msgstr "" #. module: document #. openerp-web -#: code:addons/document/static/src/js/document.js:26 +#: code:addons/document/static/src/js/document.js:69 #, python-format msgid "%s (%s)" msgstr "" #. module: document #. openerp-web -#: code:addons/document/static/src/js/document.js:14 +#: code:addons/document/static/src/js/document.js:18 #, python-format msgid "Attachment(s)" msgstr "" +#. module: document +#. openerp-web +#: code:addons/document/static/src/js/document.js:163 +#, python-format +msgid "Do you really want to delete this attachment ?" +msgstr "" + +#. module: document +#. openerp-web +#: code:addons/document/static/src/js/document.js:176 +#, python-format +msgid "Uploading Error" +msgstr "" + +#. module: document +#. openerp-web +#: code:addons/document/static/src/js/document.js:138 +#, python-format +msgid "Uploading..." +msgstr "" + #. module: document #: model:ir.model,name:document.model_ir_attachment msgid "ir.attachment" diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index b8de719c216..bf5d6ec52a1 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -411,6 +411,11 @@ msgstr "" msgid "Archived" msgstr "" +#. module: event +#: model:ir.ui.view,arch_db:event.view_event_form +msgid "Are you sure you want to cancel this event? All the linked attendees will be cancelled as well." +msgstr "" + #. module: event #: model:ir.ui.view,arch_db:event.event_config_settings_view_form msgid "Attendance" @@ -562,7 +567,7 @@ msgid "Company" msgstr "" #. module: event -#: code:addons/event/models/event.py:467 +#: code:addons/event/models/event.py:480 #, python-format msgid "Compose Email" msgstr "" @@ -655,13 +660,13 @@ msgid "Created on" msgstr "" #. module: event -#: code:addons/event/models/event.py:444 +#: code:addons/event/models/event.py:443 #, python-format msgid "Customer" msgstr "" #. module: event -#: code:addons/event/models/event.py:446 +#: code:addons/event/models/event.py:445 #, python-format msgid "Customer Email" msgstr "" @@ -741,7 +746,7 @@ msgid "Event" msgstr "" #. module: event -#: code:addons/event/models/event.py:333 +#: code:addons/event/models/event.py:332 #, python-format msgid "Event Attendees" msgstr "" @@ -840,6 +845,7 @@ msgstr "" #. module: event #: model:ir.actions.act_window,name:event.action_event_view #: model:ir.model.fields,field_description:event.field_res_partner_event_count +#: model:ir.model.fields,field_description:event.field_res_users_event_count #: model:ir.ui.menu,name:event.event_event_menu_pivot_report #: model:ir.ui.menu,name:event.event_main_menu #: model:ir.ui.menu,name:event.menu_event_event @@ -1104,7 +1110,7 @@ msgid "No more available seats." msgstr "" #. module: event -#: code:addons/event/models/event.py:363 +#: code:addons/event/models/event.py:362 #, python-format msgid "No more seats available for this event." msgstr "" @@ -1121,6 +1127,7 @@ msgstr "" #. module: event #: model:ir.model.fields,help:event.field_res_partner_event_count +#: model:ir.model.fields,help:event.field_res_users_event_count msgid "Number of events the partner has participated." msgstr "" @@ -1382,6 +1389,12 @@ msgstr "" msgid "The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one." msgstr "" +#. module: event +#: code:addons/event/models/event.py:309 +#, python-format +msgid "There are already attendees who attended this event. Please reset it to draft if you want to cancel this event." +msgstr "" + #. module: event #: model:ir.model.fields,help:event.field_event_mail_template_id #: model:ir.model.fields,help:event.field_event_type_mail_template_id @@ -1496,19 +1509,13 @@ msgid "Week(s)" msgstr "" #. module: event -#: code:addons/event/models/event.py:310 -#, python-format -msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event." -msgstr "" - -#. module: event -#: code:addons/event/models/event.py:420 +#: code:addons/event/models/event.py:419 #, python-format msgid "You must wait the event confirmation before doing this action." msgstr "" #. module: event -#: code:addons/event/models/event.py:422 +#: code:addons/event/models/event.py:421 #, python-format msgid "You must wait the event starting day before doing this action." msgstr "" @@ -1539,37 +1546,37 @@ msgid "event.confirm" msgstr "" #. module: event -#: code:addons/event/models/event.py:489 +#: code:addons/event/models/event.py:502 #, python-format msgid "in %d days" msgstr "" #. module: event -#: code:addons/event/models/event.py:493 +#: code:addons/event/models/event.py:506 #, python-format msgid "next month" msgstr "" #. module: event -#: code:addons/event/models/event.py:491 +#: code:addons/event/models/event.py:504 #, python-format msgid "next week" msgstr "" #. module: event -#: code:addons/event/models/event.py:495 +#: code:addons/event/models/event.py:508 #, python-format msgid "on " msgstr "" #. module: event -#: code:addons/event/models/event.py:485 +#: code:addons/event/models/event.py:498 #, python-format msgid "today" msgstr "" #. module: event -#: code:addons/event/models/event.py:487 +#: code:addons/event/models/event.py:500 #, python-format msgid "tomorrow" msgstr "" diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot index 81254654930..3a25f7ef5ac 100644 --- a/addons/fleet/i18n/fleet.pot +++ b/addons/fleet/i18n/fleet.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-07-25 10:05+0000\n" +"PO-Revision-Date: 2017-07-25 10:05+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ msgstr "" "Plural-Forms: \n" #. module: fleet -#: code:addons/fleet/models/fleet.py:307 +#: code:addons/fleet/models/fleet_vehicle.py:196 #, python-format msgid "%s %s has been added to the fleet!" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:652 +#: code:addons/fleet/models/fleet_vehicle_cost.py:266 #, python-format msgid "%s contract(s) need(s) to be renewed and/or closed!" msgstr "" @@ -62,11 +62,6 @@ msgstr "" msgid "A/C Recharge" msgstr "" -#. module: fleet -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date -msgid "Acquisition Date" -msgstr "" - #. module: fleet #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_tree @@ -197,13 +192,13 @@ msgid "Calculation Benefit In Kind" msgstr "" #. module: fleet -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value -msgid "Car Value" +#: model:fleet.service.type,name:fleet.type_service_14 +msgid "Car Wash" msgstr "" #. module: fleet -#: model:fleet.service.type,name:fleet.type_service_14 -msgid "Car Wash" +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_car_value +msgid "Catalog Value (VAT Incl.)" msgstr "" #. module: fleet @@ -407,6 +402,14 @@ msgstr "" msgid "Cost" msgstr "" +#. module: fleet +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_description +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_description +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_description +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_description +msgid "Cost Description" +msgstr "" + #. module: fleet #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_costs_view_form msgid "Cost Details" @@ -498,7 +501,7 @@ msgid "Created on" msgstr "" #. module: fleet -#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id_3011 +#: model:ir.model.fields,help:fleet.field_fleet_vehicle_state_id msgid "Current state of the vehicle" msgstr "" @@ -536,7 +539,7 @@ msgstr "" #. module: fleet #: model:ir.model.fields,help:fleet.field_fleet_vehicle_acquisition_date -msgid "Date when the vehicle has been bought" +msgid "Date when the vehicle has been immatriculated" msgstr "" #. module: fleet @@ -576,16 +579,18 @@ msgstr "" #. module: fleet #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_driver_id +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_driver_id msgid "Driver" msgstr "" #. module: fleet #: model:ir.model.fields,help:fleet.field_fleet_vehicle_driver_id +#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_driver_id msgid "Driver of the vehicle" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:325 +#: code:addons/fleet/models/fleet_vehicle.py:214 #, python-format msgid "Driver: from '%s' to '%s'" msgstr "" @@ -593,7 +598,7 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action msgid "Each contract (e.g.: leasing) may include several services\n" -" (reparation, insurances, periodic maintenance)." +" (reparation, insurances, periodic maintenance)." msgstr "" #. module: fleet @@ -622,7 +627,7 @@ msgid "Employee Car" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:37 +#: code:addons/fleet/models/fleet_vehicle_cost.py:44 #, python-format msgid "Emptying the odometer value of a vehicle is not allowed." msgstr "" @@ -799,15 +804,15 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_action msgid "Here you can add refuelling entries for all vehicles. You can\n" -" also filter logs of a particular vehicle using the search\n" -" field." +" also filter logs of a particular vehicle using the search\n" +" field." msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_action msgid "Here you can add various odometer entries for all vehicles.\n" -" You can also show odometer value for a particular vehicle using\n" -" the search field." +" You can also show odometer value for a particular vehicle using\n" +" the search field." msgstr "" #. module: fleet @@ -832,10 +837,10 @@ msgstr "" #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_id #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_id #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_id -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_2959 -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand_id_3193 +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_3182 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_id -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3038 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_tag_id msgid "ID" msgstr "" @@ -845,8 +850,14 @@ msgstr "" msgid "Ignition Coil Replacement" msgstr "" +#. module: fleet +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_acquisition_date +msgid "Immatriculation Date" +msgstr "" + #. module: fleet #: selection:fleet.vehicle.log.contract,state:0 +#: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search msgid "In Progress" msgstr "" @@ -975,7 +986,7 @@ msgid "License Plate" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:332 +#: code:addons/fleet/models/fleet_vehicle.py:221 #, python-format msgid "License Plate: from '%s' to '%s'" msgstr "" @@ -1034,8 +1045,8 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_action msgid "Manage all your contracts (leasing, insurances, etc.) with\n" -" their related services, costs. Odoo will automatically warn\n" -" you when some contracts have to be renewed." +" their related services, costs. Odoo will automatically warn\n" +" you when some contracts have to be renewed." msgstr "" #. module: fleet @@ -1071,7 +1082,7 @@ msgid "Miles" msgstr "" #. module: fleet -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id_2992 +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_id #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_model_view_form #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search msgid "Model" @@ -1100,12 +1111,12 @@ msgid "Model of a vehicle" msgstr "" #. module: fleet -#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id_2992 +#: model:ir.model.fields,help:fleet.field_fleet_vehicle_model_id msgid "Model of the vehicle" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:321 +#: code:addons/fleet/models/fleet_vehicle.py:210 #, python-format msgid "Model: from '%s' to '%s'" msgstr "" @@ -1149,10 +1160,10 @@ msgid "No" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:320 -#: code:addons/fleet/models/fleet.py:324 -#: code:addons/fleet/models/fleet.py:328 -#: code:addons/fleet/models/fleet.py:331 +#: code:addons/fleet/models/fleet_vehicle.py:209 +#: code:addons/fleet/models/fleet_vehicle.py:213 +#: code:addons/fleet/models/fleet_vehicle.py:217 +#: code:addons/fleet/models/fleet_vehicle.py:220 #, python-format msgid "None" msgstr "" @@ -1203,7 +1214,6 @@ msgstr "" #. module: fleet #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_cost_odometer -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_value @@ -1215,6 +1225,11 @@ msgstr "" msgid "Odometer Values Per Vehicle" msgstr "" +#. module: fleet +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer +msgid "Odometer at creation" +msgstr "" + #. module: fleet #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form msgid "Odometer details" @@ -1225,10 +1240,14 @@ msgstr "" msgid "Odometer log for a vehicle" msgstr "" +#. module: fleet +#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer +msgid "Odometer measure of the vehicle at the moment of the contract creation" +msgstr "" + #. module: fleet #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer #: model:ir.model.fields,help:fleet.field_fleet_vehicle_cost_odometer_id -#: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_contract_odometer_id #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_id @@ -1241,8 +1260,8 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_action msgid "Odoo helps you keeping track of all the services done\n" -" on your vehicle. Services can be of many type: occasional\n" -" repair, fixed maintenance, etc." +" on your vehicle. Services can be of many type: occasional\n" +" repair, fixed maintenance, etc." msgstr "" #. module: fleet @@ -1262,7 +1281,7 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_action msgid "Odoo will warn you when services or contract have to be\n" -" renewed." +" renewed." msgstr "" #. module: fleet @@ -1280,6 +1299,11 @@ msgstr "" msgid "Omnium" msgstr "" +#. module: fleet +#: sql_constraint:fleet.vehicle:0 +msgid "Only one car can be assigned to the same employee!" +msgstr "" + #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_16 msgid "Options" @@ -1392,7 +1416,7 @@ msgid "Refueling Details" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:587 +#: code:addons/fleet/models/fleet_vehicle_cost.py:192 #: model:ir.actions.act_window,name:fleet.act_renew_contract #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form #, python-format @@ -1424,6 +1448,11 @@ msgstr "" msgid "Reporting" msgstr "" +#. module: fleet +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_residual_value +msgid "Residual Value" +msgstr "" + #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_15 msgid "Residual value (Excluding VAT)" @@ -1555,7 +1584,7 @@ msgid "Starter Replacement" msgstr "" #. module: fleet -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id_3011 +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_state_id #: model:ir.ui.view,arch_db:fleet.fleet_vehicle_state_view_tree msgid "State" msgstr "" @@ -1566,7 +1595,7 @@ msgid "State name already exists" msgstr "" #. module: fleet -#: code:addons/fleet/models/fleet.py:329 +#: code:addons/fleet/models/fleet_vehicle.py:218 #, python-format msgid "State: from '%s' to '%s'" msgstr "" @@ -1729,7 +1758,7 @@ msgstr "" #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract_odometer_unit #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel_odometer_unit #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services_odometer_unit -#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3026 +#: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_odometer_unit_3029 msgid "Unit" msgstr "" @@ -1739,7 +1768,7 @@ msgstr "" #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_fuel_odometer_unit #: model:ir.model.fields,help:fleet.field_fleet_vehicle_log_services_odometer_unit #: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit -#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3026 +#: model:ir.model.fields,help:fleet.field_fleet_vehicle_odometer_unit_3029 msgid "Unit of the odometer " msgstr "" @@ -1946,7 +1975,7 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_action msgid "You can customize available status to track the evolution of\n" -" each vehicle. Example: Active, Being Repaired, Sold." +" each vehicle. Example: Active, Being Repaired, Sold." msgstr "" #. module: fleet @@ -1957,8 +1986,8 @@ msgstr "" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_action msgid "You will be able to manage your fleet by keeping track of the\n" -" contracts, services, fixed and recurring costs, odometers and\n" -" fuel logs associated to each vehicle." +" contracts, services, fixed and recurring costs, odometers and\n" +" fuel logs associated to each vehicle." msgstr "" #. module: fleet diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot index a1b24f9137b..2db8c357f54 100644 --- a/addons/gamification/i18n/gamification.pot +++ b/addons/gamification/i18n/gamification.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:50+0000\n" -"PO-Revision-Date: 2017-02-15 09:50+0000\n" +"POT-Creation-Date: 2017-07-25 10:05+0000\n" +"PO-Revision-Date: 2017-07-25 10:05+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,246 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: gamification +#: model:mail.template,body_html:gamification.simple_report_template +msgid "\n" +" \n" +"% set record = ctx.get('record')\n" +"% set company = record and record.company_id or user.company_id\n" +"% set challenge_lines = ctx.get('challenge_lines', []) \n" +"\n" +"\n" +" \n" +"\n" +"
\n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" +" % if object.visibility_mode == 'ranking':\n" +" \n" +" % endif\n" +" \n" +"
\n" +" \n" +" \n" +"

Leaderboard

\n" +"
\n" +" \n" +" \n" +"
\n" +" % if object.visibility_mode == 'personal':\n" +" Here is your current progress in the challenge ${object.name}.\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +"

Personal Performance

\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" % for line in challenge_lines:\n" +" = 100:\n" +" style=\"font-weight:bold;\"\n" +" % endif\n" +" >\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" % endfor \n" +" \n" +"
GoalsTargetCurrentCompleteness
\n" +" ${line['name']}\n" +" % if line['suffix'] or line['monetary']:\n" +" (${line['full_suffix']})\n" +" % endif\n" +" ${\"%.2f\" % line['target']}\n" +" % if line['suffix']:\n" +" ${line['suffix']}\n" +" % endif\n" +" ${\"%.2f\" % line['current']}\n" +" % if line['suffix']:\n" +" ${line['suffix']}\n" +" % endif\n" +" ${line['completeness']| int}%
\n" +" % else: \n" +" \n" +" The following message contains the current progress for the challenge ${object.name}.\n" +" \n" +" % for line in challenge_lines:\n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +"

Top Achievers for goal ${line['name']}

\n" +"
\n" +" \n" +" % if len(line['goals'])>2:\n" +" \n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" % set top_goals = [line['goals'][1], line['goals'][0], line['goals'][2]]\n" +" % for goal in top_goals:\n" +" \n" +" % endfor\n" +" \n" +"
\n" +" % if loop.index == 1:\n" +" % set extra_div = '
'\n" +" % set heightA = 95\n" +" % set heightB = 75\n" +" % set bgColor = '#b898b0'\n" +" % set fontSize = 50\n" +" % set podiumPosition = '2'\n" +" % elif loop.index == 2:\n" +" % set extra_div = ''\n" +" % set heightA = 55\n" +" % set heightB = 115\n" +" % set bgColor = '#9A6C8E'\n" +" % set fontSize = 85\n" +" % set podiumPosition = '1'\n" +" % elif loop.index == 3:\n" +" % set extra_div = '
'\n" +" % set heightA = 115\n" +" % set heightB = 55\n" +" % set bgColor = '#c8afc1'\n" +" % set fontSize = 35\n" +" % set podiumPosition = '3'\n" +" % endif\n" +"
\n" +"
\n" +" ${extra_div | safe} \n" +"
\n" +" \"\"/\n" +"
\n" +"
\n" +" ${goal['name']}\n" +"
\n" +"
\n" +" ${podiumPosition | safe}\n" +"
\n" +"
\n" +"

\n" +" ${\"%.2f\" % goal['current']}\n" +" % if line['suffix'] or line['monetary']:\n" +" ${line['full_suffix']}\n" +" % endif\n" +"

\n" +"
\n" +"
\n" +"
\n" +"
\n" +" % endif\n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" % for goal in line['goals']:\n" +" \n" +" % set tdBgColor = '#fff'\n" +" % set tdColor = 'gray'\n" +" % set mutedColor = '#AAAAAA'\n" +" % set tdPercentageColor = '#9A6C8E'\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" % endfor\n" +" \n" +"
RankNamePerformance \n" +" % if line['suffix']:\n" +" (${line['suffix']})\n" +" % elif line['monetary']:\n" +" (${company.currency_id.symbol})\n" +" % endif\n" +" Completeness
${goal['rank']+1}\n" +" ${goal['name']}${\"%.2f\" % goal['current']}
on ${\"%.2f\" % line['target']}\n" +" 		${goal['completeness'] | int}%
\n" +"
\n" +" % endfor\n" +" % endif\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" \n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${company.name}
\n" +" ${company.phone or ''}\n" +" 		\n" +" % if company.email:\n" +" ${company.email}
\n" +" % endif\n" +" % if company.website:\n" +" \n" +" ${company.website}\n" +" \n" +" % endif\n" +"
\n" +"
\n" +" Powered by Odoo.\n" +"
\n" +"
\n" +"
\n" +" \n" +"\n" +"" +msgstr "" + #. module: gamification #: model:mail.template,body_html:gamification.email_template_goal_reminder msgid "\n" @@ -27,87 +267,13 @@ msgid "\n" msgstr "" #. module: gamification -#: model:mail.template,body_html:gamification.simple_report_template -msgid "\n" -"

\n" -" ${object.name}\n" -"

\n" -"

The following message contains the current progress for the challenge ${object.name}

\n" -"\n" -"% if object.visibility_mode == 'personal':\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % for line in ctx[\"challenge_lines\"]:\n" -" = 100:\n" -" style=\"font-weight:bold;\"\n" -" % endif\n" -" >\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % endfor\n" -"
GoalTargetCurrentCompleteness
${line['name']}${line['target']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -" ${line['current']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -" ${line['completeness']} %
\n" -"% else:\n" -" % for line in ctx[\"challenge_lines\"]:\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % for goal in line['goals']:\n" -" = 100:\n" -" style=\"font-weight:bold;\"\n" -" % endif\n" -" >\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" % endfor\n" -"
${line['name']}
#PersonCompletenessCurrent
${goal['rank']}${goal['name']}${goal['completeness']}%${goal['current']}/${line['target']}\n" -" % if line['suffix']:\n" -" ${line['suffix']}\n" -" % endif\n" -"
\n" -"\n" -"

\n" -"\n" -" % endfor\n" -"% endif\n" -" " -msgstr "" - -#. module: gamification -#: code:addons/gamification/models/challenge.py:586 +#: code:addons/gamification/models/challenge.py:587 #, python-format msgid "%s has joined the challenge" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:595 +#: code:addons/gamification/models/challenge.py:596 #, python-format msgid "%s has refused the challenge" msgstr "" @@ -149,25 +315,25 @@ msgid "\n" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:652 +#: code:addons/gamification/models/challenge.py:653 #, python-format msgid "
%(rank)d. %(user_name)s - %(reward_name)s" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:649 +#: code:addons/gamification/models/challenge.py:650 #, python-format msgid "
Nobody has succeeded to reach every goal, no badge is rewarded for this challenge." msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:647 +#: code:addons/gamification/models/challenge.py:648 #, python-format msgid "
Reward (badge %s) for every succeeding user was sent to %s." msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:657 +#: code:addons/gamification/models/challenge.py:658 #, python-format msgid "
Special rewards were sent to the top competing users. The ranking for this challenge is :" msgstr "" @@ -194,7 +360,7 @@ msgstr "" #. module: gamification #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_condition #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition -#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3164 +#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_condition_3233 msgid "A goal is considered as completed when the current value is compared to the value to reach" msgstr "" @@ -328,7 +494,7 @@ msgid "Can not grant" msgstr "" #. module: gamification -#: code:addons/gamification/models/goal.py:409 +#: code:addons/gamification/models/goal.py:410 #, python-format msgid "Can not modify the configuration of a started goal" msgstr "" @@ -525,7 +691,7 @@ msgid "Defined how will be computed the goals. The result of the operation will msgstr "" #. module: gamification -#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3173 +#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_description_3242 msgid "Definition Description" msgstr "" @@ -724,7 +890,7 @@ msgstr "" #. module: gamification #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_id -#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3175 +#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_id_3244 #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_name #: model:ir.ui.view,arch_db:gamification.goal_search_view msgid "Goal Definition" @@ -755,7 +921,7 @@ msgstr "" #. module: gamification #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_condition #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition -#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3164 +#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_condition_3233 msgid "Goal Performance" msgstr "" @@ -1090,7 +1256,7 @@ msgid "No one, assigned through challenges" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:664 +#: code:addons/gamification/models/challenge.py:665 #, python-format msgid "Nobody reached the required conditions to receive special badges." msgstr "" @@ -1256,7 +1422,7 @@ msgid "Responsible" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:489 +#: code:addons/gamification/models/challenge.py:490 #, python-format msgid "Retrieving progress for personal challenge without user information" msgstr "" @@ -1421,7 +1587,7 @@ msgstr "" #. module: gamification #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line_definition_full_suffix #: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix -#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3169 +#: model:ir.model.fields,field_description:gamification.field_gamification_goal_definition_suffix_3238 msgid "Suffix" msgstr "" @@ -1446,7 +1612,7 @@ msgid "The action that will be called to update the goal value." msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:643 +#: code:addons/gamification/models/challenge.py:644 #, python-format msgid "The challenge %s is finished." msgstr "" @@ -1454,7 +1620,7 @@ msgstr "" #. module: gamification #: model:ir.model.fields,help:gamification.field_gamification_challenge_line_definition_full_suffix #: model:ir.model.fields,help:gamification.field_gamification_goal_definition_full_suffix -#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3169 +#: model:ir.model.fields,help:gamification.field_gamification_goal_definition_suffix_3238 msgid "The currency and suffix field" msgstr "" @@ -1474,7 +1640,7 @@ msgid "The day a new challenge will be automatically started. If no periodicity msgstr "" #. module: gamification -#: code:addons/gamification/models/goal.py:90 +#: code:addons/gamification/models/goal.py:91 #, python-format msgid "The domain for the definition %s seems incorrect, please check it.\n" "\n" @@ -1517,7 +1683,7 @@ msgid "The maximum number of time this badge can be sent per month per person." msgstr "" #. module: gamification -#: code:addons/gamification/models/goal.py:107 +#: code:addons/gamification/models/goal.py:108 #, python-format msgid "The model configuration for the definition %s seems incorrect, please check it.\n" "\n" @@ -1525,7 +1691,7 @@ msgid "The model configuration for the definition %s seems incorrect, please che msgstr "" #. module: gamification -#: code:addons/gamification/models/goal.py:104 +#: code:addons/gamification/models/goal.py:105 #, python-format msgid "The model configuration for the definition %s seems incorrect, please check it.\n" "\n" @@ -1662,7 +1828,7 @@ msgid "Update" msgstr "" #. module: gamification -#: code:addons/gamification/models/goal.py:444 +#: code:addons/gamification/models/goal.py:445 #, python-format msgid "Update %s" msgstr "" @@ -1735,7 +1901,7 @@ msgid "You can not grant a badge to yourself" msgstr "" #. module: gamification -#: code:addons/gamification/models/challenge.py:195 +#: code:addons/gamification/models/challenge.py:196 #, python-format msgid "You can not reset a challenge with unfinished goals." msgstr "" diff --git a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot index 7b61422ff50..307df49a14a 100644 --- a/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot +++ b/addons/gamification_sale_crm/i18n/gamification_sale_crm.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" #. module: gamification_sale_crm #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_customer_refunds -msgid "Customer Refunds" +msgid "Customer Credit Notes" msgstr "" #. module: gamification_sale_crm @@ -65,7 +65,7 @@ msgstr "" #. module: gamification_sale_crm #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_tot_customer_refunds -msgid "Total Customer Refunds" +msgid "Total Customer Credit Notes" msgstr "" #. module: gamification_sale_crm diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot index d5cc39cfbe0..822c08c7416 100644 --- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot +++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -42,13 +42,21 @@ msgstr "" msgid "Name" msgstr "" +#. module: google_spreadsheet +#: model:ir.ui.view,arch_db:google_spreadsheet.base_config_settings_view_form_inherit_spreadsheet +msgid "Please use the settings of Google Drive\n" +" on the left or above." +msgstr "" + #. module: google_spreadsheet #: model:ir.model.fields,help:google_spreadsheet.field_base_config_settings_google_drive_uri_copy +#: model:ir.model.fields,help:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy msgid "The URL to generate the authorization code from Google" msgstr "" #. module: google_spreadsheet #: model:ir.model.fields,field_description:google_spreadsheet.field_base_config_settings_google_drive_uri_copy +#: model:ir.model.fields,field_description:google_spreadsheet.field_hr_timesheet_config_settings_google_drive_uri_copy msgid "URI" msgstr "" diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 6438af674df..a5822f6bd65 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:45+0000\n" -"PO-Revision-Date: 2017-04-18 14:45+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -79,11 +79,6 @@ msgstr "" msgid "Citizenship & Other Information" msgstr "" -#. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_city -msgid "City" -msgstr "" - #. module: hr #: model:ir.actions.act_window,help:hr.act_employee_from_department #: model:ir.actions.act_window,help:hr.open_view_employee_list_my @@ -132,6 +127,11 @@ msgstr "" msgid "Company Working Hours" msgstr "" +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_department_complete_name +msgid "Complete Name" +msgstr "" + #. module: hr #: model:ir.ui.menu,name:hr.menu_human_resources_configuration msgid "Configuration" @@ -220,11 +220,6 @@ msgstr "" msgid "Email Aliases" msgstr "" -#. module: hr -#: model:ir.model,name:hr.model_mail_thread -msgid "Email Thread" -msgstr "" - #. module: hr #: model:ir.model,name:hr.model_hr_employee #: model:ir.ui.view,arch_db:hr.view_employee_form @@ -284,22 +279,22 @@ msgid "Employees Tags" msgstr "" #. module: hr -#: code:addons/hr/models/hr.py:260 +#: model:ir.model.fields,help:hr.field_hr_employee_address_home_id +msgid "Enter here the private address of the employee, not the one linked to your company." +msgstr "" + +#. module: hr +#: code:addons/hr/models/hr.py:294 #, python-format msgid "Error! You cannot create recursive departments." msgstr "" #. module: hr -#: code:addons/hr/models/hr.py:164 +#: code:addons/hr/models/hr.py:181 #, python-format msgid "Error! You cannot create recursive hierarchy of Employee(s)." msgstr "" -#. module: hr -#: model:ir.model.fields,field_description:hr.field_res_users_event_count -msgid "Events" -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_job_no_of_recruitment msgid "Expected New Employees" @@ -351,11 +346,6 @@ msgstr "" msgid "Hired Employees" msgstr "" -#. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id -msgid "Home Address" -msgstr "" - #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_main msgid "Human Resources" @@ -405,6 +395,8 @@ msgstr "" #. module: hr #: model:ir.model,name:hr.model_hr_job +#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id +#: model:ir.model.fields,field_description:hr.field_hr_job_name msgid "Job Position" msgstr "" @@ -421,12 +413,6 @@ msgid "Job Positions are used to define jobs and their requirements.\n" " for the future." msgstr "" -#. module: hr -#: model:ir.model.fields,field_description:hr.field_hr_employee_job_id -#: model:ir.model.fields,field_description:hr.field_hr_job_name -msgid "Job Title" -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_department_jobs_ids #: model:ir.ui.view,arch_db:hr.view_job_filter @@ -460,11 +446,6 @@ msgstr "" msgid "Last Updated on" msgstr "" -#. module: hr -#: model:ir.model.fields,field_description:hr.field_res_users_calendar_last_notif_ack -msgid "Last notification marked as read from base Calendar" -msgstr "" - #. module: hr #: model:ir.ui.view,arch_db:hr.view_hr_job_form msgid "Launch Recruitment" @@ -490,7 +471,7 @@ msgstr "" #. module: hr #: selection:hr.employee,marital:0 -msgid "Married" +msgid "Married (or similar)" msgstr "" #. module: hr @@ -513,11 +494,6 @@ msgstr "" msgid "Messages" msgstr "" -#. module: hr -#: model:ir.ui.view,arch_db:hr.hr_department_view_kanban -msgid "More " -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_name msgid "Name" @@ -548,11 +524,6 @@ msgstr "" msgid "Number of employees currently occupying this job position." msgstr "" -#. module: hr -#: model:ir.model.fields,help:hr.field_res_users_event_count -msgid "Number of events the partner has participated." -msgstr "" - #. module: hr #: model:ir.model.fields,help:hr.field_hr_job_no_of_hired_employee msgid "Number of hired employees for this job position during recruitment phase." @@ -595,11 +566,6 @@ msgstr "" msgid "Passport No" msgstr "" -#. module: hr -#: model:ir.ui.view,arch_db:hr.view_employee_form -msgid "Personal Information" -msgstr "" - #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_image msgid "Photo" @@ -610,14 +576,24 @@ msgstr "" msgid "Position" msgstr "" +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_employee_address_home_id +msgid "Private Address" +msgstr "" + +#. module: hr +#: model:ir.ui.view,arch_db:hr.view_employee_form +msgid "Private Information" +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" +#: model:ir.ui.view,arch_db:hr.view_hr_job_form +msgid "Recruitment" msgstr "" #. module: hr @@ -681,6 +657,21 @@ msgstr "" msgid "Settings" msgstr "" +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_config_settings_module_hr_org_chart +msgid "Show Organizational Chart" +msgstr "" + +#. module: hr +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Show organizational chart on employee form" +msgstr "" + +#. module: hr +#: model:ir.ui.view,arch_db:hr.hr_config_settings_view_form +msgid "Show organizational chart on employee form." +msgstr "" + #. module: hr #: selection:hr.employee,marital:0 msgid "Single" @@ -771,6 +762,16 @@ msgstr "" msgid "Users" msgstr "" +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_expire +msgid "Visa Expire Date" +msgstr "" + +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_employee_visa_no +msgid "Visa No" +msgstr "" + #. module: hr #: selection:hr.employee,marital:0 msgid "Widower" @@ -794,6 +795,11 @@ msgstr "" msgid "Work Email" msgstr "" +#. module: hr +#: model:ir.ui.view,arch_db:hr.view_employee_form +msgid "Work Information" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_work_location msgid "Work Location" @@ -809,6 +815,16 @@ msgstr "" msgid "Work Organization" msgstr "" +#. module: hr +#: model:ir.ui.view,arch_db:hr.view_employee_form +msgid "Work Permit" +msgstr "" + +#. module: hr +#: model:ir.model.fields,field_description:hr.field_hr_employee_permit_no +msgid "Work Permit No" +msgstr "" + #. module: hr #: model:ir.model.fields,field_description:hr.field_hr_employee_work_phone msgid "Work Phone" @@ -831,12 +847,6 @@ msgstr "" msgid "Your document has not been created because your email address is not recognized. Please send emails with the email address recorded on your employee information, or contact your HR manager." msgstr "" -#. module: hr -#: code:addons/hr/models/mail_thread.py:41 -#, python-format -msgid "alias %s does not accept unknown employees" -msgstr "" - #. module: hr #: model:ir.ui.view,arch_db:hr.view_department_form msgid "department" @@ -858,9 +868,8 @@ msgid "hr.config.settings" msgstr "" #. module: hr -#: code:addons/hr/models/mail_thread.py:41 -#, python-format -msgid "skipping" +#: model:ir.model,name:hr.model_mail_alias_mixin +msgid "mail.alias.mixin" msgstr "" #. module: hr diff --git a/addons/hr_attendance/models/hr_attendance.py b/addons/hr_attendance/models/hr_attendance.py index c8728ec0e31..c373bbe23f4 100644 --- a/addons/hr_attendance/models/hr_attendance.py +++ b/addons/hr_attendance/models/hr_attendance.py @@ -91,7 +91,7 @@ class HrAttendance(models.Model): # is the same as the one before our check_in time computed before, otherwise it overlaps last_attendance_before_check_out = self.env['hr.attendance'].search([ ('employee_id', '=', attendance.employee_id.id), - ('check_in', '<=', attendance.check_out), + ('check_in', '<', attendance.check_out), ('id', '!=', attendance.id), ], order='check_in desc', limit=1) if last_attendance_before_check_out and last_attendance_before_check_in != last_attendance_before_check_out: diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot index 46356879c2f..803fdcc1873 100644 --- a/addons/hr_contract/i18n/hr_contract.pot +++ b/addons/hr_contract/i18n/hr_contract.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~14\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-15 09:49+0000\n" -"PO-Revision-Date: 2017-02-15 09:49+0000\n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,16 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form +msgid "(If fixed-term contract)" +msgstr "" + +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form +msgid "/ month" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_advantages msgid "Advantages" @@ -26,8 +36,8 @@ msgid "Advantages..." msgstr "" #. module: hr_contract -#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage -msgid "Basic Salary of the employee" +#: selection:hr.contract,state:0 +msgid "Cancelled" msgstr "" #. module: hr_contract @@ -35,6 +45,11 @@ msgstr "" msgid "Click here to create new contracts." msgstr "" +#. module: hr_contract +#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_company_id +msgid "Company" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_vehicle msgid "Company Vehicle" @@ -46,9 +61,14 @@ msgstr "" msgid "Contract Reference" msgstr "" +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form +msgid "Contract Terms" +msgstr "" + #. module: hr_contract #: model:ir.model,name:hr_contract.model_hr_contract_type -#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6101 +#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_id_6256 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_type_name #: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_form #: model:ir.ui.view,arch_db:hr_contract.hr_contract_type_view_search @@ -75,7 +95,7 @@ msgid "Contract expired" msgstr "" #. module: hr_contract -#: code:addons/hr_contract/models/hr_contract.py:87 +#: code:addons/hr_contract/models/hr_contract.py:100 #, python-format msgid "Contract start date must be less than contract end date." msgstr "" @@ -109,6 +129,11 @@ msgstr "" msgid "Created on" msgstr "" +#. module: hr_contract +#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_currency_id +msgid "Currency" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_contract_id #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form @@ -121,6 +146,11 @@ msgstr "" msgid "Current Employee" msgstr "" +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban +msgid "Delete" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_department_id msgid "Department" @@ -133,8 +163,8 @@ msgid "Display Name" msgstr "" #. module: hr_contract -#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form -msgid "Duration" +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban +msgid "Edit Contract" msgstr "" #. module: hr_contract @@ -149,11 +179,36 @@ msgstr "" msgid "Employee Contract" msgstr "" +#. module: hr_contract +#: model:ir.model.fields,help:hr_contract.field_hr_contract_wage +msgid "Employee's monthly gross wage." +msgstr "" + +#. module: hr_contract +#: model:ir.model.fields,help:hr_contract.field_hr_contract_resource_calendar_id +msgid "Employee's working schedule." +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_date_end msgid "End Date" msgstr "" +#. module: hr_contract +#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_end +msgid "End date of the contract (if it's a fixed-term contract)." +msgstr "" + +#. module: hr_contract +#: model:ir.model.fields,help:hr_contract.field_hr_contract_trial_date_end +msgid "End date of the trial period (if there is one)." +msgstr "" + +#. module: hr_contract +#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end +msgid "End of Trial Period" +msgstr "" + #. module: hr_contract #: selection:hr.contract,state:0 #: model:mail.message.subtype,name:hr_contract.mt_contract_close @@ -205,11 +260,6 @@ msgstr "" msgid "In kilometers" msgstr "" -#. module: hr_contract -#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form -msgid "Information" -msgstr "" - #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_manager msgid "Is a Manager" @@ -222,7 +272,7 @@ msgstr "" #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_job_id -msgid "Job Title" +msgid "Job Position" msgstr "" #. module: hr_contract @@ -258,6 +308,11 @@ msgstr "" msgid "Medical Examination Date" msgstr "" +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form +msgid "Monthly Advantages in Cash" +msgstr "" + #. module: hr_contract #: selection:hr.contract,state:0 msgid "New" @@ -274,6 +329,11 @@ msgstr "" msgid "Number of Children" msgstr "" +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form +msgid "Other Information" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_employee_place_of_birth msgid "Place of Birth" @@ -286,7 +346,7 @@ msgstr "" #. module: hr_contract #: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form -msgid "Salary and Advantages" +msgid "Salary Information" msgstr "" #. module: hr_contract @@ -310,6 +370,16 @@ msgstr "" msgid "Start Date" msgstr "" +#. module: hr_contract +#: model:ir.model.fields,help:hr_contract.field_hr_contract_date_start +msgid "Start date of the contract." +msgstr "" + +#. module: hr_contract +#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_search +msgid "State" +msgstr "" + #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_state msgid "Status" @@ -327,21 +397,6 @@ msgstr "" msgid "To Renew" msgstr "" -#. module: hr_contract -#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_end -msgid "Trial End Date" -msgstr "" - -#. module: hr_contract -#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form -msgid "Trial Period Duration" -msgstr "" - -#. module: hr_contract -#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_trial_date_start -msgid "Trial Start Date" -msgstr "" - #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_visa_expire msgid "Visa Expire Date" @@ -357,18 +412,13 @@ msgstr "" msgid "Wage" msgstr "" -#. module: hr_contract -#: model:ir.ui.view,arch_db:hr_contract.hr_contract_view_form -msgid "Work Permit" -msgstr "" - #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract_permit_no msgid "Work Permit No" msgstr "" #. module: hr_contract -#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_working_hours +#: model:ir.model.fields,field_description:hr_contract.field_hr_contract_resource_calendar_id msgid "Working Schedule" msgstr "" diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index 8f5b56a537e..8368d2aa9d1 100644 --- a/addons/hr_expense/i18n/hr_expense.pot +++ b/addons/hr_expense/i18n/hr_expense.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.saas~15\n" +"Project-Id-Version: Odoo Server 10.saas~16\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-18 14:46+0000\n" -"PO-Revision-Date: 2017-04-18 14:46+0000\n" +"POT-Creation-Date: 2017-07-25 10:03+0000\n" +"PO-Revision-Date: 2017-07-25 10:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -251,6 +251,11 @@ msgstr "" msgid "All Expenses" msgstr "" +#. module: hr_expense +#: model:ir.model.fields,help:hr_expense.field_hr_expense_account_id +msgid "An expense account is expected" +msgstr "" + #. module: hr_expense #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_analytic_account_id #: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter @@ -309,6 +314,7 @@ msgid "Business trip" msgstr "" #. module: hr_expense +#: model:ir.model.fields,field_description:hr_expense.field_product_product_can_be_expensed #: model:ir.model.fields,field_description:hr_expense.field_product_template_can_be_expensed msgid "Can be Expensed" msgstr "" @@ -342,7 +348,7 @@ msgid "Click here to create new expenses." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:318 +#: code:addons/hr_expense/models/hr_expense.py:319 #, python-format msgid "Click to add a new expense," msgstr "" @@ -711,19 +717,19 @@ msgid "Expenses follow this flow:" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:413 +#: code:addons/hr_expense/models/hr_expense.py:414 #, python-format msgid "Expenses must belong to the same Employee." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:525 +#: code:addons/hr_expense/models/hr_expense.py:538 #, python-format msgid "Expenses must have an expense journal specified to generate accounting entries." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:417 +#: code:addons/hr_expense/models/hr_expense.py:418 #, python-format msgid "Expenses must have been paid by the same entity (Company or employee)" msgstr "" @@ -827,7 +833,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id -#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9374 +#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_9585 msgid "ID" msgstr "" @@ -960,19 +966,19 @@ msgid "New Mail" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:258 +#: code:addons/hr_expense/models/hr_expense.py:259 #, python-format msgid "No Expense account found for the product %s (or for its category), please configure one." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:224 +#: code:addons/hr_expense/models/hr_expense.py:225 #, python-format msgid "No Home Address found for the employee %s, please configure one." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:203 +#: code:addons/hr_expense/models/hr_expense.py:204 #, python-format msgid "No credit account found for the %s journal, please configure one." msgstr "" @@ -1091,7 +1097,7 @@ msgid "Planner" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:263 +#: code:addons/hr_expense/models/hr_expense.py:264 #, python-format msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`." msgstr "" @@ -1300,7 +1306,7 @@ msgid "See how to manage payables" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:88 +#: code:addons/hr_expense/models/hr_expense.py:89 #, python-format msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure" msgstr "" @@ -1356,6 +1362,7 @@ msgid "Setup your domain alias" msgstr "" #. module: hr_expense +#: model:ir.model.fields,help:hr_expense.field_product_product_can_be_expensed #: model:ir.model.fields,help:hr_expense.field_product_template_can_be_expensed msgid "Specify whether the product can be selected in an HR expense." msgstr "" @@ -1442,6 +1449,12 @@ msgstr "" msgid "The next step is to settle an internal policy to" msgstr "" +#. module: hr_expense +#: code:addons/hr_expense/wizard/hr_expense_register_payment.py:35 +#, python-format +msgid "The payment amount must be strictly positive." +msgstr "" + #. module: hr_expense #: model:ir.model.fields,help:hr_expense.field_hr_expense_sheet_bank_journal_id msgid "The payment method used when the expense is paid by the company." @@ -1588,7 +1601,7 @@ msgid "When you charge" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:522 +#: code:addons/hr_expense/models/hr_expense.py:535 #, python-format msgid "You can only generate accounting entry for approved expense(s)." msgstr "" @@ -1599,19 +1612,25 @@ msgid "You can setup a generic email alias to create incoming expenses easily. W msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:439 +#: code:addons/hr_expense/models/hr_expense.py:573 +#, python-format +msgid "You cannot add expense lines of another employee." +msgstr "" + +#. module: hr_expense +#: code:addons/hr_expense/models/hr_expense.py:445 #, python-format msgid "You cannot delete a posted expense." msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:106 +#: code:addons/hr_expense/models/hr_expense.py:107 #, python-format msgid "You cannot report expenses for different employees in the same report!" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:104 +#: code:addons/hr_expense/models/hr_expense.py:105 #, python-format msgid "You cannot report twice the same line!" msgstr "" @@ -1628,7 +1647,7 @@ msgid "You record expenses," msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:504 +#: code:addons/hr_expense/models/hr_expense.py:517 #, python-format msgid "Your Expense %s has been refused.
  • Reason : %s
" msgstr "" @@ -1679,7 +1698,7 @@ msgid "hr.expense.config.settings" msgstr "" #. module: hr_expense -#: code:addons/hr_expense/models/hr_expense.py:319 +#: code:addons/hr_expense/models/hr_expense.py:320 #, python-format msgid "or send receipts by email to %s." msgstr "" diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index 20d3fb741e1..26a58ea79ce 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -299,7 +299,7 @@ - + @@ -453,7 +453,7 @@
diff --git a/addons/mass_mailing_event/i18n/mass_mailing_event.pot b/addons/mass_mailing_event/i18n/mass_mailing_event.pot new file mode 100644 index 00000000000..a4895366052 --- /dev/null +++ b/addons/mass_mailing_event/i18n/mass_mailing_event.pot @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_event +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.saas~16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mass_mailing_event +#: model:ir.model,name:mass_mailing_event.model_event_event +msgid "Event" +msgstr "" + +#. module: mass_mailing_event +#: model:ir.ui.view,arch_db:mass_mailing_event.event_event_view_form_inherit_mass_mailing +msgid "Mail Attendees" +msgstr "" + diff --git a/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot new file mode 100644 index 00000000000..0810c9e4560 --- /dev/null +++ b/addons/mass_mailing_event_track/i18n/mass_mailing_event_track.pot @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mass_mailing_event_track +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.saas~16\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-25 10:04+0000\n" +"PO-Revision-Date: 2017-07-25 10:04+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mass_mailing_event_track +#: model:ir.model,name:mass_mailing_event_track.model_event_event +msgid "Event" +msgstr "" + +#. module: mass_mailing_event_track +#: model:ir.ui.view,arch_db:mass_mailing_event_track.event_event_view_form_inherit_mass_mailing_track +msgid "Mail Track Speakers" +msgstr "" + diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml index 988938a1d8d..909ed782082 100644 --- a/addons/membership/views/product_views.xml +++ b/addons/membership/views/product_views.xml @@ -98,7 +98,7 @@ - +
Discount: - - Discount: + +
Total: