diff --git a/.tx/config b/.tx/config index dbeb41e608b..8fd8c2cc976 100644 --- a/.tx/config +++ b/.tx/config @@ -62,6 +62,11 @@ file_filter = addons/association/i18n/.po source_file = addons/association/i18n/association.pot source_lang = en +[odoo-master.attachment_indexation] +file_filter = addons/attachment_indexation/i18n/.po +source_file = addons/attachment_indexation/i18n/attachment_indexation.pot +source_lang = en + [odoo-master.auth_ldap] file_filter = addons/auth_ldap/i18n/.po source_file = addons/auth_ldap/i18n/auth_ldap.pot @@ -282,6 +287,11 @@ file_filter = addons/hr_expense_check/i18n/.po source_file = addons/hr_expense_check/i18n/hr_expense_check.pot source_lang = en +[odoo-master.hr_fleet] +file_filter = addons/hr_fleet/i18n/.po +source_file = addons/hr_fleet/i18n/hr_fleet.pot +source_lang = en + [odoo-master.hr_gamification] file_filter = addons/hr_gamification/i18n/.po source_file = addons/hr_gamification/i18n/hr_gamification.pot @@ -312,6 +322,11 @@ file_filter = addons/hr_payroll_account/i18n/.po source_file = addons/hr_payroll_account/i18n/hr_payroll_account.pot source_lang = en +[odoo-master.hr_presence] +file_filter = addons/hr_presence/i18n/.po +source_file = addons/hr_presence/i18n/hr_presence.pot +source_lang = en + [odoo-master.hr_recruitment] file_filter = addons/hr_recruitment/i18n/.po source_file = addons/hr_recruitment/i18n/hr_recruitment.pot @@ -532,6 +547,11 @@ file_filter = addons/pos_discount/i18n/.po source_file = addons/pos_discount/i18n/pos_discount.pot source_lang = en +[odoo-master.pos_hr] +file_filter = addons/pos_hr/i18n/.po +source_file = addons/pos_hr/i18n/pos_hr.pot +source_lang = en + [odoo-master.pos_mercury] file_filter = addons/pos_mercury/i18n/.po source_file = addons/pos_mercury/i18n/pos_mercury.pot diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 6ba48c6d710..910faeadeb7 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server saas~12.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-25 13:14+0000\n" -"PO-Revision-Date: 2018-10-25 13:14+0000\n" +"POT-Creation-Date: 2018-12-24 10:57+0000\n" +"PO-Revision-Date: 2018-12-24 10:57+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -45,23 +45,23 @@ msgid "${object.company_id.name} Payment Receipt (Ref ${object.name or 'n/a' })" msgstr "" #. module: account -#: code:addons/account/models/account.py:937 +#: code:addons/account/models/account.py:944 #, python-format msgid "%s (Copy)" msgstr "" #. module: account -#: code:addons/account/models/account.py:242 -#: code:addons/account/models/account.py:246 -#: code:addons/account/models/account.py:248 -#: code:addons/account/models/account.py:597 -#: code:addons/account/models/account.py:598 +#: code:addons/account/models/account.py:247 +#: code:addons/account/models/account.py:251 +#: code:addons/account/models/account.py:253 +#: code:addons/account/models/account.py:604 +#: code:addons/account/models/account.py:605 #, python-format msgid "%s (copy)" msgstr "" #. module: account -#: code:addons/account/models/account.py:688 +#: code:addons/account/models/account.py:695 #, python-format msgid "%s Sequence" msgstr "" @@ -112,7 +112,7 @@ msgid "45 Days" msgstr "" #. module: account -#: code:addons/account/models/account.py:686 +#: code:addons/account/models/account.py:693 #, python-format msgid ": Refund" msgstr "" @@ -196,7 +196,7 @@ msgid " Print" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:699 +#: code:addons/account/models/account_invoice.py:714 #, python-format msgid "

You can control the invoice from your vendor based on what you purchased or received.

" msgstr "" @@ -249,6 +249,11 @@ msgstr "" msgid "All selected journal entries will be validated and posted. You won't be able to modify them afterwards." msgstr "" +#. module: account +#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form +msgid "Default Incoterm" +msgstr "" + #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form msgid "Default Taxes\n" @@ -564,13 +569,13 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1895 +#: code:addons/account/models/account_invoice.py:1938 #, python-format msgid "A Payment Term should have only one line of type Balance." msgstr "" #. module: account -#: code:addons/account/models/account.py:854 +#: code:addons/account/models/account.py:861 #, python-format msgid "A bank account can belong to only one journal." msgstr "" @@ -600,13 +605,13 @@ msgid "A journal is used to record transactions of all accounting data\n" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:324 +#: code:addons/account/models/account_move.py:315 #, python-format msgid "A payment journal entry generated in a journal configured to post entries only when payments are reconciled with a bank statement cannot be manually posted. Those will be posted automatically after performing the bank reconciliation." msgstr "" #. module: account -#: code:addons/account/models/reconciliation_widget.py:681 +#: code:addons/account/models/reconciliation_widget.py:692 #, python-format msgid "A reconciliation must involve at least 2 move lines." msgstr "" @@ -617,14 +622,14 @@ 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:527 -#: code:addons/account/models/account_bank_statement.py:530 +#: code:addons/account/models/account_bank_statement.py:537 +#: code:addons/account/models/account_bank_statement.py:540 #, python-format msgid "A selected move line was already reconciled." msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:538 +#: code:addons/account/models/account_bank_statement.py:548 #, python-format msgid "A selected statement line was already reconciled with an account move." msgstr "" @@ -646,11 +651,11 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:559 -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:561 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:546 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:548 #: code:addons/account/static/src/xml/account_reconciliation.xml:181 -#: code:addons/account/static/src/xml/account_reconciliation.xml:282 -#: code:addons/account/static/src/xml/account_reconciliation.xml:307 +#: code:addons/account/static/src/xml/account_reconciliation.xml:284 +#: code:addons/account/static/src/xml/account_reconciliation.xml:309 #: model:ir.model,name:account.model_account_account #: model:ir.model.fields,field_description:account.field_account_cash_rounding__account_id #: model:ir.model.fields,field_description:account.field_account_invoice__account_id @@ -669,7 +674,7 @@ msgid "Account" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:913 +#: code:addons/account/models/account_move.py:905 #, python-format msgid "Account %s (%s) does not allow reconciliation. First change the configuration of this account to allow it." msgstr "" @@ -1060,11 +1065,13 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_ids +#: model:ir.model.fields,field_description:account.field_account_payment__activity_ids msgid "Activities" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_state +#: model:ir.model.fields,field_description:account.field_account_payment__activity_state msgid "Activity State" msgstr "" @@ -1323,8 +1330,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:289 -#: code:addons/account/static/src/xml/account_reconciliation.xml:306 +#: code:addons/account/static/src/xml/account_reconciliation.xml:291 +#: code:addons/account/static/src/xml/account_reconciliation.xml:308 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__amount #: model:ir.model.fields,field_description:account.field_account_move__amount #: model:ir.model.fields,field_description:account.field_account_partial_reconcile__amount @@ -1472,7 +1479,7 @@ msgstr "" #. module: account #: sql_constraint:account.fiscal.position.account:0 -msgid "An account fiscal position could be defined only once time on same accounts." +msgid "An account fiscal position could be defined only one time on same accounts." msgstr "" #. module: account @@ -1781,7 +1788,7 @@ msgid "Automated Entries" msgstr "" #. module: account -#: code:addons/account/models/company.py:407 +#: code:addons/account/models/company.py:430 #, python-format msgid "Automatic Balancing Line" msgstr "" @@ -1797,7 +1804,7 @@ msgid "Automatic Import" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:399 +#: code:addons/account/models/account_move.py:390 #, python-format msgid "Automatic reversal of: %s" msgstr "" @@ -1813,7 +1820,7 @@ msgid "Average Price in Currency" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:410 +#: code:addons/account/models/chart_template.py:419 #, python-format msgid "BILL" msgstr "" @@ -1834,11 +1841,6 @@ msgstr "" msgid "Balance Cash Basis" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Balance Sheet" -msgstr "" - #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement__balance_end msgid "Balance as calculated based on Opening Balance and transaction lines" @@ -1846,7 +1848,7 @@ msgstr "" #. module: account #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:340 +#: code:addons/account/models/chart_template.py:349 #: model:ir.model.fields,field_description:account.field_account_journal__bank_id #: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__bank_id #: model:ir.model.fields,field_description:account.field_res_partner__bank_account_count @@ -1921,7 +1923,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:17 +#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:15 #, python-format msgid "Bank Reconciliation" msgstr "" @@ -1950,7 +1952,7 @@ msgid "Bank Statement" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:591 +#: code:addons/account/models/account_bank_statement.py:602 #, python-format msgid "Bank Statement %s" msgstr "" @@ -2192,8 +2194,8 @@ msgid "By unchecking the active field, you may hide an INCOTERM you will not use msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:389 -#: code:addons/account/models/chart_template.py:413 +#: code:addons/account/models/chart_template.py:398 +#: code:addons/account/models/chart_template.py:422 #, python-format msgid "CABA" msgstr "" @@ -2285,40 +2287,40 @@ msgid "Cannot create credit note for the draft/cancelled invoice." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:358 +#: code:addons/account/models/account_move.py:349 #, python-format msgid "Cannot create moves for different companies." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:390 +#: code:addons/account/models/account_move.py:381 #, python-format msgid "Cannot create unbalanced journal entry." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:757 +#: code:addons/account/models/account_invoice.py:772 #, 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:111 +#: code:addons/account/models/account.py:116 #: code:addons/account/models/chart_template.py:151 #, python-format msgid "Cannot generate an unused account code." msgstr "" #. module: account -#: code:addons/account/models/account.py:756 +#: code:addons/account/models/account.py:763 #, python-format msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field." msgstr "" #. module: account #: selection:account.journal,type:0 -#: code:addons/account/models/chart_template.py:340 +#: code:addons/account/models/chart_template.py:349 #, python-format msgid "Cash" msgstr "" @@ -2334,7 +2336,7 @@ msgid "Cash Basis Journal" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:413 +#: code:addons/account/models/chart_template.py:422 #, python-format msgid "Cash Basis Tax Journal" msgstr "" @@ -2428,19 +2430,19 @@ msgid "Change label of the counterpart that will hold the payment difference" msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:105 +#: code:addons/account/controllers/portal.py:103 #, python-format msgid "Changing VAT number is not allowed once invoices have been issued for your account. Please contact us directly for this operation." msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:111 +#: code:addons/account/controllers/portal.py:109 #, python-format msgid "Changing your company name is not allowed once invoices have been issued for your account. Please contact us directly for this operation." msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:108 +#: code:addons/account/controllers/portal.py:106 #, python-format msgid "Changing your name is not allowed once invoices have been issued for your account. Please contact us directly for this operation." msgstr "" @@ -2465,7 +2467,7 @@ msgid "Chart Templates" msgstr "" #. module: account -#: code:addons/account/models/company.py:320 +#: code:addons/account/models/company.py:337 #: model:ir.actions.act_window,name:account.action_account_form #: model:ir.ui.menu,name:account.menu_action_account_form #: model_terms:ir.ui.view,arch_db:account.onboarding_chart_of_account_step @@ -2549,7 +2551,7 @@ msgid "Children Taxes" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:349 +#: code:addons/account/models/chart_template.py:358 #, python-format msgid "Choose Accounting Template" msgstr "" @@ -2607,7 +2609,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:341 +#: code:addons/account/static/src/xml/account_reconciliation.xml:343 #, python-format msgid "Close" msgstr "" @@ -2676,7 +2678,7 @@ msgid "Commercial Entity" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:519 +#: code:addons/account/models/account_invoice.py:534 #, python-format msgid "Commercial partner and vendor account owners must be identical." msgstr "" @@ -2915,7 +2917,7 @@ msgid "Cost of Revenue" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:192 +#: code:addons/account/models/chart_template.py:204 #, python-format msgid "Could not install new chart of account as there are already accounting entries existing." msgstr "" @@ -2959,7 +2961,7 @@ msgid "Create Or Link Option" msgstr "" #. module: account -#: code:addons/account/models/company.py:276 +#: code:addons/account/models/company.py:292 #, python-format msgid "Create a Bank Account" msgstr "" @@ -3215,8 +3217,8 @@ msgid "Credit Move" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:486 -#: code:addons/account/models/account_invoice.py:1316 +#: code:addons/account/models/account_invoice.py:498 +#: code:addons/account/models/account_invoice.py:1358 #: model:ir.actions.act_window,name:account.action_account_invoice_refund #: model:ir.model,name:account.model_account_invoice_refund #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -3227,7 +3229,7 @@ msgid "Credit Note" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:487 +#: code:addons/account/models/account_invoice.py:499 #, python-format msgid "Credit Note - %s" msgstr "" @@ -3306,15 +3308,14 @@ msgid "Currency Rate" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1429 -#: code:addons/account/models/account_move.py:1441 +#: code:addons/account/models/account_move.py:1419 +#: code:addons/account/models/account_move.py:1431 #, python-format msgid "Currency exchange rate difference" msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_current_assets -#: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Current Assets" msgstr "" @@ -3358,7 +3359,7 @@ msgid "Customer Invoice" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:409 +#: code:addons/account/models/chart_template.py:418 #, python-format msgid "Customer Invoices" msgstr "" @@ -3452,8 +3453,8 @@ msgstr "" #. module: account #. openerp-web #: selection:account.print.journal,sort_selection:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:287 -#: code:addons/account/static/src/xml/account_reconciliation.xml:302 +#: code:addons/account/static/src/xml/account_reconciliation.xml:289 +#: code:addons/account/static/src/xml/account_reconciliation.xml:304 #: 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_send__date @@ -3571,6 +3572,11 @@ msgstr "" msgid "Default Debit Account" msgstr "" +#. module: account +#: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form +msgid "Default Incoterm of your company" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_res_company__account_purchase_tax_id #: model:ir.model.fields,field_description:account.field_res_config_settings__purchase_tax_id @@ -3603,6 +3609,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__incoterm_id +#: model:ir.model.fields,field_description:account.field_res_config_settings__incoterm_id msgid "Default incoterm" msgstr "" @@ -3689,7 +3696,6 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_depreciation -#: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Depreciation" msgstr "" @@ -3700,7 +3706,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:305 +#: code:addons/account/static/src/xml/account_reconciliation.xml:307 #: 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_terms:ir.ui.view,arch_db:account.view_account_payment_search @@ -3897,7 +3903,7 @@ msgid "Draft Credit Note" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:484 +#: code:addons/account/models/account_invoice.py:496 #: model_terms:ir.ui.view,arch_db:account.invoice_form #: model_terms:ir.ui.view,arch_db:account.portal_my_invoices #: model_terms:ir.ui.view,arch_db:account.report_invoice_document @@ -3927,8 +3933,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/controllers/portal.py:41 -#: code:addons/account/static/src/xml/account_reconciliation.xml:288 +#: code:addons/account/controllers/portal.py:39 +#: code:addons/account/static/src/xml/account_reconciliation.xml:290 #: 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_terms:ir.ui.view,arch_db:account.portal_my_invoices @@ -3959,7 +3965,7 @@ msgid "Due the" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1271 +#: code:addons/account/models/account_invoice.py:1285 #, python-format msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/credit note." msgstr "" @@ -3980,15 +3986,15 @@ msgid "EX WORKS" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:387 -#: code:addons/account/models/chart_template.py:402 -#: code:addons/account/models/chart_template.py:412 +#: code:addons/account/models/chart_template.py:396 +#: code:addons/account/models/chart_template.py:411 +#: code:addons/account/models/chart_template.py:421 #, python-format msgid "EXCH" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:973 +#: code:addons/account/models/account_move.py:965 #, python-format msgid "Either pass both debit and credit or none." msgstr "" @@ -4057,7 +4063,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:911 +#: code:addons/account/models/account_move.py:903 #, python-format msgid "Entries are not from the same account." msgstr "" @@ -4086,19 +4092,18 @@ msgstr "" #. module: account #: selection:account.account.type,internal_group:0 #: model:account.account.type,name:account.data_account_type_equity -#: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Equity" msgstr "" #. module: account -#: code:addons/account/models/res_config_settings.py:145 +#: code:addons/account/models/res_config_settings.py:146 #, python-format msgid "Error!" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:412 +#: code:addons/account/models/chart_template.py:421 #, python-format msgid "Exchange Difference" msgstr "" @@ -4138,7 +4143,6 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_expenses -#: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Expenses" msgstr "" @@ -4150,8 +4154,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:318 -#: code:addons/account/static/src/xml/account_reconciliation.xml:333 +#: code:addons/account/static/src/xml/account_reconciliation.xml:320 +#: code:addons/account/static/src/xml/account_reconciliation.xml:335 #, python-format msgid "External link" msgstr "" @@ -4266,7 +4270,7 @@ msgid "Fiscal Positions" msgstr "" #. module: account -#: code:addons/account/models/company.py:293 +#: code:addons/account/models/company.py:310 #: model:ir.model,name:account.model_account_fiscal_year #: model_terms:ir.ui.view,arch_db:account.onboarding_fiscal_year_step #, python-format @@ -4284,6 +4288,16 @@ msgstr "" msgid "Fiscal Years" msgstr "" +#. module: account +#: model:ir.model.fields,help:account.field_account_financial_year_op__fiscalyear_last_day +msgid "Fiscal year last day." +msgstr "" + +#. module: account +#: model:ir.model.fields,help:account.field_account_financial_year_op__fiscalyear_last_month +msgid "Fiscal year last month." +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_financial_year_op__fiscalyear_last_day #: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_last_day @@ -4393,7 +4407,7 @@ msgid "Forces all moves for this account to have this secondary currency." msgstr "" #. module: account -#: code:addons/account/report/account_aged_partner_balance.py:218 +#: code:addons/account/report/account_aged_partner_balance.py:231 #: code:addons/account/report/account_journal.py:101 #, python-format msgid "Form content is missing, this report cannot be printed." @@ -4425,7 +4439,7 @@ msgid "From this report, you can have an overview of the amount invoiced to your msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:385 +#: code:addons/account/models/account_invoice.py:387 #, python-format msgid "From: " msgstr "" @@ -4444,14 +4458,10 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter +#: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Future Activities" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "GROSS PROFIT" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template__income_currency_exchange_account_id #: model:ir.model.fields,field_description:account.field_res_company__income_currency_exchange_account_id @@ -4506,14 +4516,14 @@ msgid "Go to bank statement(s)" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:758 -#: code:addons/account/models/company.py:521 +#: code:addons/account/models/account_invoice.py:773 +#: code:addons/account/models/company.py:544 #, python-format msgid "Go to the configuration panel" msgstr "" #. module: account -#: code:addons/account/models/company.py:459 +#: code:addons/account/models/company.py:482 #, python-format msgid "Go to the journal configuration" msgstr "" @@ -4623,11 +4633,6 @@ msgstr "" msgid "History" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "How do account types affect your reports?" -msgstr "" - #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form msgid "How total tax amount is computed in orders and invoices" @@ -4697,7 +4702,7 @@ msgid "ID" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:409 +#: code:addons/account/models/chart_template.py:418 #, python-format msgid "INV" msgstr "" @@ -4708,12 +4713,6 @@ msgstr "" msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well." msgstr "" -#. module: account -#: code:addons/account/models/account_bank_statement.py:335 -#, python-format -msgid "The currency of the bank statement line must be different than the statement currency." -msgstr "" - #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement__message_unread #: model:ir.model.fields,help:account.field_account_invoice__message_unread @@ -4897,7 +4896,7 @@ msgid "In Payment" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:345 +#: code:addons/account/models/account_bank_statement.py:355 #, python-format msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items." msgstr "" @@ -4938,7 +4937,6 @@ msgstr "" #. module: account #: selection:account.account.type,internal_group:0 #: model:account.account.type,name:account.data_account_type_revenue -#: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Income" msgstr "" @@ -4957,11 +4955,17 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:740 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:759 #, python-format msgid "Incorrect Operation" msgstr "" +#. module: account +#: code:addons/account/wizard/setup_wizards.py:39 +#, python-format +msgid "Incorrect fiscal year date: day is out of range for month. Month: %s; Day: %s" +msgstr "" + #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__incoterm_id msgid "Incoterm" @@ -5071,6 +5075,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_invoice__incoterm_id #: model:ir.model.fields,help:account.field_res_company__incoterm_id +#: model:ir.model.fields,help:account.field_res_config_settings__incoterm_id msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions." msgstr "" @@ -5086,7 +5091,13 @@ msgid "Invalid \"Zip Range\", please configure it properly." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1314 +#: code:addons/account/models/company.py:106 +#, python-format +msgid "Invalid fiscal year last day" +msgstr "" + +#. module: account +#: code:addons/account/models/account_invoice.py:1356 #: model:ir.model,name:account.model_account_invoice #: model:ir.model.fields,field_description:account.field_account_invoice_report__invoice_id #: model:ir.model.fields,field_description:account.field_account_invoice_tax__invoice_id @@ -5108,7 +5119,7 @@ msgid "Invoice #" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:485 +#: code:addons/account/models/account_invoice.py:497 #, python-format msgid "Invoice - %s" msgstr "" @@ -5120,7 +5131,7 @@ msgid "Invoice Created" msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:40 +#: code:addons/account/controllers/portal.py:38 #: model:ir.model.fields,field_description:account.field_account_invoice__date_invoice #: model:ir.model.fields,field_description:account.field_account_invoice_report__date #: model_terms:ir.ui.view,arch_db:account.portal_my_invoices @@ -5187,25 +5198,25 @@ msgid "Invoice for which this invoice is the credit note" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:869 +#: code:addons/account/models/account_invoice.py:884 #, python-format msgid "Invoice must be cancelled in order to reset it to draft." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:893 +#: code:addons/account/models/account_invoice.py:908 #, python-format msgid "Invoice must be in draft state in order to validate it." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:920 +#: code:addons/account/models/account_invoice.py:935 #, 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:907 +#: code:addons/account/models/account_invoice.py:922 #, python-format msgid "Invoice must be validated in order to set it to register payment." msgstr "" @@ -5385,7 +5396,7 @@ msgid "It indicates that the invoice has been sent." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:971 +#: code:addons/account/models/account_move.py:963 #, python-format msgid "It is mandatory to specify an account and a journal to create a write-off." msgstr "" @@ -5409,7 +5420,7 @@ msgstr "" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_reconciliation.xml:200 -#: code:addons/account/static/src/xml/account_reconciliation.xml:283 +#: code:addons/account/static/src/xml/account_reconciliation.xml:285 #: 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 @@ -5520,7 +5531,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:326 +#: code:addons/account/static/src/js/reconciliation/reconciliation_action.js:351 #: model:ir.actions.client,name:account.action_manual_reconcile #, python-format msgid "Journal Items to Reconcile" @@ -5643,9 +5654,9 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:560 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:547 #: code:addons/account/static/src/xml/account_reconciliation.xml:204 -#: code:addons/account/static/src/xml/account_reconciliation.xml:284 +#: code:addons/account/static/src/xml/account_reconciliation.xml:286 #: 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.model.fields,field_description:account.field_account_reconcile_model__match_label @@ -5864,6 +5875,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter +#: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Late Activities" msgstr "" @@ -5999,7 +6011,7 @@ msgid "Loss Exchange Rate Account" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:411 +#: code:addons/account/models/chart_template.py:420 #, python-format msgid "MISC" msgstr "" @@ -6080,7 +6092,7 @@ msgstr "" #: selection:account.reconcile.model,rule_type:0 #: selection:account.reconcile.model.template,rule_type:0 #: code:addons/account/models/account_reconcile_model.py:19 -#: code:addons/account/models/chart_template.py:932 +#: code:addons/account/models/chart_template.py:981 #, python-format msgid "Manually create a write-off on clicked button." msgstr "" @@ -6127,7 +6139,7 @@ msgstr "" #: selection:account.reconcile.model,rule_type:0 #: selection:account.reconcile.model.template,rule_type:0 #: code:addons/account/models/account_reconcile_model.py:21 -#: code:addons/account/models/chart_template.py:934 +#: code:addons/account/models/chart_template.py:983 #, python-format msgid "Match existing invoices/bills." msgstr "" @@ -6227,36 +6239,6 @@ msgstr "" msgid "Messages" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Cost of Revenue" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Credit Card Accounts" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Current Liabilities" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Expenses" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Non-Current Liabilities" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Minus Payable Accounts" -msgstr "" - #. module: account #: selection:account.journal,type:0 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_search @@ -6264,7 +6246,7 @@ msgid "Miscellaneous" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:411 +#: code:addons/account/models/chart_template.py:420 #: model_terms:ir.ui.view,arch_db:account.view_account_move_filter #, python-format msgid "Miscellaneous Operations" @@ -6330,7 +6312,7 @@ msgid "Move Reconciled" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1144 +#: code:addons/account/models/account_move.py:1134 #, python-format msgid "Move name (id): %s (%s)" msgstr "" @@ -6358,16 +6340,6 @@ msgstr "" msgid "My Invoices" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "NET ASSETS" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "NET PROFIT" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_account__name #: model:ir.model.fields,field_description:account.field_account_account_tag__name @@ -6422,7 +6394,7 @@ msgstr "" #. module: account #. openerp-web #: selection:account.bank.statement,state:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:243 +#: code:addons/account/static/src/xml/account_reconciliation.xml:253 #, python-format msgid "New" msgstr "" @@ -6438,23 +6410,26 @@ msgid "New Transactions" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1121 +#: code:addons/account/models/account_move.py:1111 #, python-format msgid "New expected payment date: " msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_date_deadline +#: model:ir.model.fields,field_description:account.field_account_payment__activity_date_deadline msgid "Next Activity Deadline" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_summary +#: model:ir.model.fields,field_description:account.field_account_payment__activity_summary msgid "Next Activity Summary" msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_type_id +#: model:ir.model.fields,field_description:account.field_account_payment__activity_type_id msgid "Next Activity Type" msgstr "" @@ -6481,14 +6456,14 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:67 -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:137 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:68 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:143 #, python-format msgid "No Title" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:897 +#: code:addons/account/models/account_invoice.py:912 #, python-format msgid "No account was found to create the invoice, be sure you have installed a chart of account." msgstr "" @@ -6550,7 +6525,7 @@ msgstr "" #. module: account #. openerp-web #: selection:account.invoice.line,display_type:0 -#: code:addons/account/static/src/xml/account_reconciliation.xml:308 +#: code:addons/account/static/src/xml/account_reconciliation.xml:310 #: model:ir.model.fields,field_description:account.field_account_account_template__note #: model_terms:ir.ui.view,arch_db:account.view_invoice_line_form #, python-format @@ -6712,7 +6687,7 @@ msgid "Only a draft payment can be posted." msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:185 +#: code:addons/account/models/chart_template.py:197 #, python-format msgid "Only administrators can load a charf of accounts" msgstr "" @@ -6730,14 +6705,14 @@ msgid "Open" msgstr "" #. module: account -#: code:addons/account/models/account_reconcile_model.py:274 +#: code:addons/account/models/account_reconcile_model.py:276 #, python-format msgid "Open Balance" msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:704 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:723 #: code:addons/account/static/src/xml/account_reconciliation.xml:137 #, python-format msgid "Open balance" @@ -6760,7 +6735,7 @@ msgid "Opening Journal" msgstr "" #. module: account -#: code:addons/account/models/company.py:343 +#: code:addons/account/models/company.py:365 #: model:ir.model.fields,field_description:account.field_res_company__account_opening_move_id #, python-format msgid "Opening Journal Entry" @@ -6777,7 +6752,7 @@ msgid "Opening Unit Numbers" msgstr "" #. module: account -#: code:addons/account/models/account.py:164 +#: code:addons/account/models/account.py:169 #, python-format msgid "Opening balance" msgstr "" @@ -6808,7 +6783,7 @@ msgid "Operation Templates" msgstr "" #. module: account -#: code:addons/account/models/account_bank_statement.py:653 +#: code:addons/account/models/account_bank_statement.py:666 #, python-format msgid "Operation not allowed. Since your statement line already received a number (%s), 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 "" @@ -6838,19 +6813,19 @@ msgid "Options" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:696 +#: code:addons/account/models/account_invoice.py:711 #, python-format msgid "Or set an email alias to allow draft vendor bills to be created upon reception of an email." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:692 +#: code:addons/account/models/account_invoice.py:707 #, python-format msgid "Or share the email %s to your vendors: bills will be created automatically upon mail reception." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:694 +#: code:addons/account/models/account_invoice.py:709 #, python-format msgid "Or share the emails %s to your vendors: bills will be created automatically upon mail reception." msgstr "" @@ -6912,6 +6887,7 @@ msgstr "" #. module: account #: selection:account.invoice,activity_state:0 +#: selection:account.payment,activity_state:0 #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Overdue" msgstr "" @@ -6995,8 +6971,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:286 -#: code:addons/account/static/src/xml/account_reconciliation.xml:303 +#: code:addons/account/static/src/xml/account_reconciliation.xml:288 +#: code:addons/account/static/src/xml/account_reconciliation.xml:305 #: 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__partner_id @@ -7339,7 +7315,7 @@ msgid "Percentage of balance" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1975 +#: code:addons/account/models/account_invoice.py:2018 #, python-format msgid "Percentages on the Payment Terms lines must be between 0 and 100." msgstr "" @@ -7356,11 +7332,12 @@ msgstr "" #. module: account #: selection:account.invoice,activity_state:0 +#: selection:account.payment,activity_state:0 msgid "Planned" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1172 +#: code:addons/account/models/account_invoice.py:1187 #, python-format msgid "Please add at least one invoice line." msgstr "" @@ -7378,25 +7355,26 @@ msgid "Please check that the field 'Transfer Account' is set on the company." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:301 +#: code:addons/account/models/account_invoice.py:1309 #, python-format msgid "Please define a sequence for the credit notes" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:306 +#: code:addons/account/models/account_invoice.py:1314 +#: code:addons/account/models/account_move.py:297 #, python-format msgid "Please define a sequence on the journal." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1170 +#: code:addons/account/models/account_invoice.py:1185 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" #. module: account -#: code:addons/account/models/company.py:340 +#: code:addons/account/models/company.py:357 #, python-format msgid "Please install a chart of accounts or create a miscellaneous journal before proceeding." msgstr "" @@ -7406,31 +7384,6 @@ msgstr "" msgid "Please use the following communication for your payment :" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Plus Bank" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Plus Fixed Assets" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Plus Net Profit" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Plus Non-Current Assets" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Plus Other Income" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__access_url msgid "Portal Access URL" @@ -7510,7 +7463,6 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_prepayments -#: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Prepayments" msgstr "" @@ -7607,24 +7559,19 @@ msgstr "" msgid "Profit" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "Profit & Loss" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_journal__profit_account_id msgid "Profit Account" msgstr "" #. module: account -#: code:addons/account/models/account_reconcile_model.py:378 +#: code:addons/account/models/account_reconcile_model.py:380 #, python-format msgid "Programmation Error: Can't call _get_invoice_matching_query() for different rules than 'invoice_matching'" msgstr "" #. module: account -#: code:addons/account/models/account_reconcile_model.py:489 +#: code:addons/account/models/account_reconcile_model.py:505 #, python-format msgid "Programmation Error: Can't call _get_wo_suggestion_query() for different rules than 'writeoff_suggestion'" msgstr "" @@ -7724,7 +7671,6 @@ msgid "Receivable Account" msgstr "" #. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Receivable Accounts" msgstr "" @@ -7836,14 +7782,14 @@ msgid "Record transactions in foreign currencies" msgstr "" #. module: account -#: code:addons/account/models/account.py:930 +#: code:addons/account/models/account.py:937 #, python-format msgid "Recursion found for tax '%s'." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:285 +#: code:addons/account/static/src/xml/account_reconciliation.xml:287 #, python-format msgid "Ref" msgstr "" @@ -7854,7 +7800,7 @@ msgid "Ref." msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:42 +#: code:addons/account/controllers/portal.py:40 #: model:ir.model.fields,field_description:account.field_account_bank_statement__name #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__ref #: model:ir.model.fields,field_description:account.field_account_move__ref @@ -8002,7 +7948,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:290 +#: code:addons/account/static/src/xml/account_reconciliation.xml:292 #, python-format msgid "Residual" msgstr "" @@ -8030,6 +7976,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__activity_user_id +#: model:ir.model.fields,field_description:account.field_account_payment__activity_user_id msgid "Responsible User" msgstr "" @@ -8077,7 +8024,7 @@ msgid "Reversal date" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:399 +#: code:addons/account/models/account_move.py:390 #, python-format msgid "Reversal of: %s" msgstr "" @@ -8219,19 +8166,19 @@ msgid "Sample Invoice" msgstr "" #. module: account -#: code:addons/account/models/company.py:462 +#: code:addons/account/models/company.py:485 #, python-format msgid "Sample invoice" msgstr "" #. module: account -#: code:addons/account/models/company.py:468 +#: code:addons/account/models/company.py:491 #, python-format msgid "Sample invoice line name" msgstr "" #. module: account -#: code:addons/account/models/company.py:475 +#: code:addons/account/models/company.py:498 #, python-format msgid "Sample invoice line name 2" msgstr "" @@ -8450,7 +8397,7 @@ msgid "Send Email" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:607 +#: code:addons/account/models/account_invoice.py:622 #, python-format msgid "Send Invoice" msgstr "" @@ -8514,7 +8461,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:239 +#: code:addons/account/static/src/xml/account_reconciliation.xml:249 #, python-format msgid "Set" msgstr "" @@ -8621,6 +8568,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter +#: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Show all records which has next action date is before today" msgstr "" @@ -8664,7 +8612,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:764 +#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:780 #, python-format msgid "Some fields are undefined" msgstr "" @@ -8810,7 +8758,7 @@ msgid "States Count" msgstr "" #. module: account -#: code:addons/account/controllers/portal.py:43 +#: code:addons/account/controllers/portal.py:41 #: model:ir.model.fields,field_description:account.field_account_bank_statement__state #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__state #: model:ir.model.fields,field_description:account.field_account_invoice__state @@ -8826,6 +8774,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_invoice__activity_state +#: model:ir.model.fields,help:account.field_account_payment__activity_state msgid "Status based on activities\n" "Overdue: Due date is already passed\n" "Today: Activity date is today\n" @@ -8862,7 +8811,7 @@ msgstr "" #. module: account #: selection:account.reconcile.model.template,rule_type:0 -#: code:addons/account/models/chart_template.py:933 +#: code:addons/account/models/chart_template.py:982 #, python-format msgid "Suggest a write-off." msgstr "" @@ -8879,16 +8828,6 @@ msgstr "" msgid "Supplier Payments" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "TOTAL ASSETS" -msgstr "" - -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_form -msgid "TOTAL EQUITY" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_account__tag_ids #: model:ir.model.fields,field_description:account.field_account_tax__tag_ids @@ -8925,8 +8864,8 @@ msgid "Tax" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:279 -#: code:addons/account/models/chart_template.py:281 +#: code:addons/account/models/chart_template.py:291 +#: code:addons/account/models/chart_template.py:293 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -9379,13 +9318,13 @@ msgid "The 'Internal Type' is used for features available on different types of msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1059 +#: code:addons/account/models/account_move.py:1051 #, python-format msgid "The account %s (%s) is deprecated." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:521 +#: code:addons/account/models/account_invoice.py:536 #, python-format msgid "The account selected for payment does not belong to the same company as this invoice." msgstr "" @@ -9401,6 +9340,13 @@ msgstr "" msgid "The accounting journal where automatic exchange differences will be registered" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:585 +#, python-format +msgid "The amount %s is not a valid partial amount" +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 @@ -9408,7 +9354,7 @@ msgid "The amount expressed in an optional other currency if it is a multi-curre msgstr "" #. module: account -#: code:addons/account/models/account_move.py:696 +#: code:addons/account/models/account_move.py:687 #, python-format msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited." msgstr "" @@ -9420,13 +9366,13 @@ msgid "The amount of a cash transaction cannot be 0." msgstr "" #. module: account -#: code:addons/account/models/account.py:932 +#: code:addons/account/models/account.py:939 #, python-format msgid "The application scope of taxes in a group must be either the same as the group or left empty." msgstr "" #. module: account -#: code:addons/account/models/account.py:551 +#: code:addons/account/models/account.py:558 #, python-format msgid "The bank account of a bank journal must belong to the same company (%s)." msgstr "" @@ -9451,7 +9397,7 @@ msgid "The bank statement used for bank reconciliation" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1260 +#: code:addons/account/models/account_invoice.py:1274 #, python-format msgid "The cash rounding cannot be computed because the difference must be added on the biggest tax found and no tax are specified.\n" "Please set up a tax or change the cash rounding method." @@ -9483,13 +9429,19 @@ msgid "The commercial entity that will be used on Journal Entries for this invoi msgstr "" #. module: account -#: code:addons/account/models/account.py:542 +#: code:addons/account/models/account_bank_statement.py:335 +#, python-format +msgid "The currency of the bank statement line must be different than the statement currency." +msgstr "" + +#. module: account +#: code:addons/account/models/account.py:549 #, python-format msgid "The currency of the journal should be the same than the default credit account." msgstr "" #. module: account -#: code:addons/account/models/account.py:544 +#: code:addons/account/models/account.py:551 #, python-format msgid "The currency of the journal should be the same than the default debit account." msgstr "" @@ -9500,7 +9452,7 @@ msgid "The currency used to enter statement" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1981 +#: code:addons/account/models/account_invoice.py:2024 #, python-format msgid "The day of the month used for this term must be stricly positive." msgstr "" @@ -9524,7 +9476,7 @@ msgid "The expense is accounted for when a vendor bill is validated, except in a msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:891 +#: code:addons/account/models/account_invoice.py:906 #, python-format msgid "The field Vendor is required, please complete it to validate the Vendor Bill." msgstr "" @@ -9535,7 +9487,7 @@ msgid "The fiscal position determines the taxes/accounts used for this contact." msgstr "" #. module: account -#: code:addons/account/models/account.py:555 +#: code:addons/account/models/account.py:562 #, python-format msgid "The holder of a journal's bank account must be the company (%s)." msgstr "" @@ -9556,13 +9508,7 @@ msgid "The journal entry containing the initial balance of all this company's ac msgstr "" #. module: account -#: model:ir.model.fields,help:account.field_account_financial_year_op__fiscalyear_last_day -#: model:ir.model.fields,help:account.field_account_financial_year_op__fiscalyear_last_month -msgid "The last day of the month will be taken if the chosen day doesn't exist." -msgstr "" - -#. module: account -#: code:addons/account/models/account_invoice.py:1892 +#: code:addons/account/models/account_invoice.py:1935 #, python-format msgid "The last line of a Payment Term should have the Balance type." msgstr "" @@ -9573,7 +9519,7 @@ msgid "The last line's computation type should be \"Balance\" to ensure that the msgstr "" #. module: account -#: code:addons/account/models/company.py:145 +#: code:addons/account/models/company.py:161 #, python-format msgid "The lock date for advisors is irreversible and can't be removed." msgstr "" @@ -9589,7 +9535,7 @@ msgid "The name that will be used on account move lines" msgstr "" #. module: account -#: code:addons/account/models/company.py:149 +#: code:addons/account/models/company.py:165 #, python-format msgid "The new lock date for advisors must be set after the previous lock date." msgstr "" @@ -9605,7 +9551,7 @@ msgid "The next sequence number will be used for the next invoice." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1983 +#: code:addons/account/models/account_invoice.py:2026 #, python-format msgid "The number of days used for a payment term cannot be negative." msgstr "" @@ -9632,7 +9578,7 @@ msgid "The partner has at least one unreconciled debit and credit since last tim msgstr "" #. module: account -#: code:addons/account/models/account.py:648 +#: code:addons/account/models/account.py:655 #, python-format msgid "The partners of the journal's company and the related bank account mismatch." msgstr "" @@ -9718,13 +9664,13 @@ msgid "The residual amount on a journal item expressed in the company currency." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:681 +#: code:addons/account/models/account_move.py:672 #, 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:1763 +#: code:addons/account/models/account_invoice.py:1806 #, python-format msgid "The selected unit of measure has to be in the same category as the product unit of measure." msgstr "" @@ -9758,7 +9704,7 @@ msgid "There are currently no invoices and payments for your account." msgstr "" #. module: account -#: code:addons/account/models/company.py:248 +#: code:addons/account/models/company.py:264 #, python-format msgid "There are still unposted entries in the period you want to lock. You should either post or delete them." msgstr "" @@ -9782,7 +9728,7 @@ msgid "There is no journal items in draft state to post." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1566 +#: code:addons/account/models/account_move.py:1559 #, python-format msgid "There is no tax cash basis journal defined for this company: \"%s\" \n" "Configure it in Accounting/Configuration/Settings" @@ -9811,7 +9757,7 @@ msgid "These types are defined according to your country. The type contains more msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1439 +#: code:addons/account/models/account_invoice.py:1481 #, python-format msgid "This %s has been created from: %s
Reason: %s" msgstr "" @@ -9900,13 +9846,13 @@ msgid "This is the accounting dashboard" msgstr "" #. module: account -#: code:addons/account/models/account.py:620 +#: code:addons/account/models/account.py:627 #, python-format msgid "This journal already contains items, therefore you cannot modify its company." msgstr "" #. module: account -#: code:addons/account/models/account.py:629 +#: code:addons/account/models/account.py:636 #, python-format msgid "This journal already contains items, therefore you cannot modify its short name." msgstr "" @@ -9936,7 +9882,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:294 +#: code:addons/account/static/src/xml/account_reconciliation.xml:296 #, python-format msgid "This payment is registered but not reconciled." msgstr "" @@ -9983,7 +9929,7 @@ msgid "To pay" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:909 +#: code:addons/account/models/account_move.py:901 #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" @@ -9997,11 +9943,13 @@ msgstr "" #. module: account #: selection:account.invoice,activity_state:0 +#: selection:account.payment,activity_state:0 msgid "Today" msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter +#: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Today Activities" msgstr "" @@ -10129,7 +10077,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:304 +#: code:addons/account/static/src/xml/account_reconciliation.xml:306 #, python-format msgid "Transaction" msgstr "" @@ -10172,6 +10120,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_account_type__type #: model:ir.model.fields,field_description:account.field_account_bank_statement__journal_type #: model:ir.model.fields,field_description:account.field_account_invoice__type +#: model:ir.model.fields,field_description:account.field_account_invoice_line__invoice_type #: model:ir.model.fields,field_description:account.field_account_invoice_report__type #: model:ir.model.fields,field_description:account.field_account_invoice_send__message_type #: model:ir.model.fields,field_description:account.field_account_journal__type @@ -10189,13 +10138,13 @@ msgid "UP" msgstr "" #. module: account -#: code:addons/account/models/account.py:398 +#: code:addons/account/models/account.py:405 #, python-format msgid "Undefined Yet" msgstr "" #. module: account -#: code:addons/account/models/company.py:363 +#: code:addons/account/models/company.py:386 #, python-format msgid "Undistributed Profits/Losses" msgstr "" @@ -10217,7 +10166,7 @@ msgid "Unit of Measure" msgstr "" #. module: account -#: code:addons/account/report/account_aged_partner_balance.py:207 +#: code:addons/account/report/account_aged_partner_balance.py:220 #, python-format msgid "Unknown Partner" msgstr "" @@ -10485,8 +10434,8 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:488 -#: code:addons/account/models/account_invoice.py:1315 +#: code:addons/account/models/account_invoice.py:500 +#: code:addons/account/models/account_invoice.py:1357 #: model:ir.model.fields,field_description:account.field_account_invoice__vendor_bill_id #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_tree @@ -10496,13 +10445,13 @@ msgid "Vendor Bill" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:489 +#: code:addons/account/models/account_invoice.py:501 #, python-format msgid "Vendor Bill - %s" msgstr "" #. module: account -#: code:addons/account/models/chart_template.py:410 +#: code:addons/account/models/chart_template.py:419 #: model:ir.actions.act_window,name:account.action_vendor_bill_template #, python-format msgid "Vendor Bills" @@ -10511,7 +10460,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/models/account_invoice.py:490 +#: code:addons/account/models/account_invoice.py:502 #: code:addons/account/models/account_payment.py:772 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document #, python-format @@ -10519,13 +10468,13 @@ msgid "Vendor Credit Note" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:491 +#: code:addons/account/models/account_invoice.py:503 #, python-format msgid "Vendor Credit Note - %s" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1317 +#: code:addons/account/models/account_invoice.py:1359 #, python-format msgid "Vendor Credit note" msgstr "" @@ -10577,18 +10526,13 @@ msgstr "" msgid "View" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_partner_property_form -msgid "View accounts detail" -msgstr "" - #. module: account #: selection:res.partner,invoice_warn:0 msgid "Warning" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:778 +#: code:addons/account/models/account_invoice.py:793 #, python-format msgid "Warning for %s" msgstr "" @@ -10599,8 +10543,8 @@ msgid "Warning on the Invoice" msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1682 -#: code:addons/account/models/account_invoice.py:1762 +#: code:addons/account/models/account_invoice.py:1725 +#: code:addons/account/models/account_invoice.py:1805 #, python-format msgid "Warning!" msgstr "" @@ -10616,14 +10560,14 @@ msgid "Warnings in Invoices" msgstr "" #. module: account -#: code:addons/account/models/company.py:518 +#: code:addons/account/models/company.py:541 #, python-format msgid "We cannot find a chart of accounts for this company, you should configure it. \n" "Please go to Account Configuration and select or install a fiscal localization." msgstr "" #. module: account -#: code:addons/account/models/company.py:457 +#: code:addons/account/models/company.py:480 #, python-format msgid "We cannot find any journal for this company. You should create one.\n" "Please go to Configuration > Journals." @@ -10680,8 +10624,8 @@ msgid "With tax" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:979 -#: code:addons/account/models/account_move.py:999 +#: code:addons/account/models/account_move.py:971 +#: code:addons/account/models/account_move.py:991 #, python-format msgid "Write-Off" msgstr "" @@ -10692,18 +10636,13 @@ msgstr "" msgid "Write-off Amount" msgstr "" -#. module: account -#: model_terms:ir.ui.view,arch_db:account.view_account_reconcile_model_form -msgid "Counterpart Values" -msgstr "" - #. module: account #: sql_constraint:account.move.line:0 msgid "Wrong credit or debit value in accounting entry !" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:907 +#: code:addons/account/models/account_move.py:899 #, python-format msgid "You are trying to reconcile some entries that are already reconciled." msgstr "" @@ -10720,7 +10659,7 @@ msgid "You can find a contact by its Name, TIN, Email or Internal Reference." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1940 +#: code:addons/account/models/account_invoice.py:1983 #, python-format msgid "You can not delete payment terms as other records still reference it. However, you can archive it." msgstr "" @@ -10732,7 +10671,7 @@ msgid "You can not have an overlap between two fiscal years, please correct the msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1784 +#: code:addons/account/models/account_invoice.py:1827 #, python-format msgid "You can only delete an invoice line if the invoice is in draft state." msgstr "" @@ -10749,37 +10688,37 @@ msgid "You can set here the default communication that will appear on customer i msgstr "" #. module: account -#: code:addons/account/models/account_move.py:370 +#: code:addons/account/models/account_move.py:361 #, python-format msgid "You cannot add/modify entries prior to and inclusive of the lock date %s" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:372 +#: code:addons/account/models/account_move.py:363 #, python-format msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role" msgstr "" #. module: account -#: code:addons/account/models/company.py:267 +#: code:addons/account/models/company.py:283 #, python-format msgid "You cannot change the currency of the company since some journal items already exist" msgstr "" #. module: account -#: code:addons/account/models/account.py:310 +#: code:addons/account/models/account.py:317 #, python-format msgid "You cannot change the owner company of an account that already contains journal items." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:688 +#: code:addons/account/models/account_move.py:679 #, python-format msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' fields." msgstr "" #. module: account -#: code:addons/account/models/company.py:171 +#: code:addons/account/models/company.py:187 #, python-format msgid "You cannot define stricter conditions on advisors than on users. Please make sure that the lock date on advisor is set before the lock date for users." msgstr "" @@ -10791,32 +10730,32 @@ msgid "You cannot delete a payment that is already posted." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:729 +#: code:addons/account/models/account_invoice.py:744 #, 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:727 +#: code:addons/account/models/account_invoice.py:742 #, python-format msgid "You cannot delete an invoice which is not draft or cancelled. You should create a credit note instead." msgstr "" #. module: account -#: code:addons/account/models/res_config_settings.py:146 +#: code:addons/account/models/res_config_settings.py:147 #, python-format msgid "You cannot disable this setting because some of your taxes are cash basis. Modify your taxes first before disabling this setting." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1146 +#: code:addons/account/models/account_move.py:1136 #, 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:1148 +#: code:addons/account/models/account_move.py:1138 #, 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." @@ -10829,20 +10768,20 @@ msgid "You cannot have a receivable/payable account that is not reconcilable. (a msgstr "" #. module: account -#: code:addons/account/models/account.py:71 +#: code:addons/account/models/account.py:76 #, python-format msgid "You cannot have more than one account with \"Current Year Earnings\" as type. (accounts: %s)" msgstr "" #. module: account -#: code:addons/account/models/company.py:160 +#: code:addons/account/models/company.py:176 #, python-format msgid "You cannot lock a period that is not finished yet. Please make sure that the lock date for advisors is not set after the last day of the previous month." msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:741 +#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:760 #, python-format msgid "You cannot mix items from receivable and payable accounts." msgstr "" @@ -10854,20 +10793,20 @@ msgid "You cannot modify a journal entry linked to a posted payment." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:331 +#: code:addons/account/models/account_move.py:322 #, python-format msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:909 +#: code:addons/account/models/account_invoice.py:924 #, python-format msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first." msgstr "" #. module: account -#: code:addons/account/models/account.py:327 +#: code:addons/account/models/account.py:334 #, python-format msgid "You cannot perform this action on an account that contains journal items." msgstr "" @@ -10879,44 +10818,44 @@ msgid "You cannot put/take money in/out for a bank statement which is closed." msgstr "" #. module: account -#: code:addons/account/models/account.py:644 +#: code:addons/account/models/account.py:651 #, python-format msgid "You cannot remove the bank account from the journal once set." msgstr "" #. module: account -#: code:addons/account/models/account.py:332 +#: code:addons/account/models/account.py:339 #, python-format msgid "You cannot remove/deactivate an account which is set on a customer or vendor." msgstr "" #. module: account -#: code:addons/account/models/account.py:320 +#: code:addons/account/models/account.py:327 #, python-format msgid "You cannot set a currency on this account as it already has some journal entries having a different foreign currency." msgstr "" #. module: account -#: code:addons/account/models/account.py:294 +#: code:addons/account/models/account.py:301 #, python-format msgid "You cannot switch an account to prevent the reconciliation if some partial reconciliations are still pending." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1112 +#: code:addons/account/models/account_move.py:1102 #, python-format msgid "You cannot use a deprecated account." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1069 +#: code:addons/account/models/account_move.py:1061 #, 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:76 -#: code:addons/account/models/account_invoice.py:895 +#: code:addons/account/models/account_invoice.py:910 #, python-format msgid "You cannot validate an invoice with a negative total amount. You should create a credit note instead." msgstr "" @@ -10941,13 +10880,13 @@ msgid "You have to define an 'Internal Transfer Account' in your cash register's msgstr "" #. module: account -#: code:addons/account/models/account.py:142 +#: code:addons/account/models/account.py:147 #, python-format msgid "You must first define an opening move." msgstr "" #. module: account -#: code:addons/account/models/account_invoice.py:1683 +#: code:addons/account/models/account_invoice.py:1726 #, python-format msgid "You must first select a partner." msgstr "" @@ -10960,19 +10899,19 @@ msgid "You reconciled" msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1624 +#: code:addons/account/models/account_move.py:1617 #, 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:1626 +#: code:addons/account/models/account_move.py:1619 #, 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:1628 +#: code:addons/account/models/account_move.py:1621 #, 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 "" @@ -11062,7 +11001,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:318 +#: code:addons/account/static/src/xml/account_reconciliation.xml:320 #, python-format msgid "have been reconciled automatically." msgstr "" @@ -11117,7 +11056,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/xml/account_reconciliation.xml:319 +#: code:addons/account/static/src/xml/account_reconciliation.xml:321 #, python-format msgid "statement lines" msgstr "" diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index af1c2b7aed3..25710f7572c 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -44,6 +44,7 @@ # Ali Alrehawi , 2018 # Osoul , 2018 # Mustafa Rawi , 2018 +# Lucas Perais , 2018 # jahzar , 2018 # msgid "" @@ -455,7 +456,9 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid " Statements" -msgstr "كشف حساب" +msgstr "" +"كشف حساب" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index fc178d8f107..61a1987d143 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -1213,7 +1213,7 @@ msgstr "Přidat dobropis" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__add_sign msgid "Add Sign" -msgstr "" +msgstr "Přidat podpis" #. module: account #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step @@ -1868,7 +1868,7 @@ msgstr "Připojit soubor" #: model:ir.model.fields,field_description:account.field_account_invoice__message_attachment_count #: model:ir.model.fields,field_description:account.field_account_payment__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__attachment_ids @@ -1927,7 +1927,7 @@ msgstr "Automatické rozpoznání" #: model:ir.model.fields,field_description:account.field_account_reconcile_model__auto_reconcile #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__auto_reconcile msgid "Auto-validate" -msgstr "" +msgstr "Automatické ověření" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form @@ -1990,7 +1990,7 @@ msgstr "ÚČET" #. module: account #: selection:res.partner,trust:0 msgid "Bad Debtor" -msgstr "" +msgstr "Špatný dlužník" #. module: account #: selection:account.payment.term.line,value:0 @@ -2058,6 +2058,9 @@ msgid "" "account if this is a Customer Invoice or Vendor Credit Note, otherwise a " "Partner bank account number." msgstr "" +"Číslo bankovního účtu, na které bude faktura uhrazena. Bankovní účet " +"společnosti, pokud se jedná o fakturaci zákazníka nebo kreditní poznámku " +"prodávajícího, jinak číslo bankovního účtu partnera." #. module: account #: model:ir.actions.act_window,name:account.action_account_bank_journal_form @@ -2113,7 +2116,7 @@ msgstr "Předvolba bankovního vyúčtování" #: model:ir.model.fields,field_description:account.field_res_company__account_bank_reconciliation_start #: model:ir.model.fields,field_description:account.field_res_config_settings__account_bank_reconciliation_start msgid "Bank Reconciliation Threshold" -msgstr "" +msgstr "Bankovní vyrovnávací prah" #. module: account #: model:ir.model,name:account.model_account_bank_statement @@ -3917,7 +3920,7 @@ msgstr "Smazat emaily" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__auto_delete_message msgid "Delete Message Copy" -msgstr "" +msgstr "Odstranit kopii zprávy" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete @@ -4265,6 +4268,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found and replaces the author_id field in the chatter." msgstr "" +"E-mailová adresa odesílatele. Toto pole je nastaveno, pokud nebyl nalezen " +"žádný odpovídající partner a nahrazuje pole autor_id v chatu." #. module: account #: model:ir.model.fields,field_description:account.field_res_company__invoice_is_email @@ -5569,6 +5574,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}${object.state == 'draft' " "and '_draft' or ''}" msgstr "" +"Invoice_${(object.number or '').replace('/','_')}${object.state == 'draft' " +"and '_draft' or ''}" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_report_search diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index 26908a8d5ad..215029ffb79 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -13,8 +13,8 @@ # Martin Aavastik , 2018 # Helen Sulaoja , 2018 # Egon Raamat , 2018 -# Eneli Õigus , 2018 # Rivo Zängov , 2018 +# Eneli Õigus , 2018 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" "PO-Revision-Date: 2018-08-24 09:14+0000\n" -"Last-Translator: Rivo Zängov , 2018\n" +"Last-Translator: Eneli Õigus , 2018\n" "Language-Team: Estonian (https://www.transifex.com/odoo/teams/41243/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2764,7 +2764,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:137 #, python-format msgid "Choose counterpart or Create Write-off" -msgstr "" +msgstr "Vali vastaspool või kanna summa mingile kontole" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_refund__filter_refund diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 6e53329394a..c1e4efccfbb 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -21,9 +21,9 @@ # Federico Castellano , 2018 # Paolo Valier, 2018 # David Minneci , 2018 -# efraimbiffi , 2018 # Martin Trigaux, 2018 # Lorenzo Battistini , 2018 +# efraimbiffi , 2018 # Léonie Bouchat , 2018 # Sergio Zanchetta , 2018 # @@ -160,7 +160,7 @@ msgstr "45 giorni" #: code:addons/account/models/account.py:686 #, python-format msgid ": Refund" -msgstr ": rettifica" +msgstr ": rimborso" #. module: account #: model:mail.template,body_html:account.mail_template_data_payment_receipt @@ -587,7 +587,7 @@ msgstr "Vista" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "Subtotal" -msgstr "Subtotale" +msgstr "Imponibile" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document @@ -695,7 +695,7 @@ msgstr "Origine:" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "Subtotal" -msgstr "Subtotale" +msgstr "Imponibile" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_journal @@ -1199,7 +1199,7 @@ msgstr "Contabilità" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form msgid "Accounting App Options" -msgstr "Opzioni app di contabilità" +msgstr "Opzioni applicazione contabilità" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__accounting_date @@ -1222,7 +1222,7 @@ msgstr "Registrazioni contabili" #. module: account #: model:ir.actions.act_window,name:account.open_account_journal_dashboard_kanban msgid "Accounting Overview" -msgstr "Quadro generale contabilità" +msgstr "Bacheca Contabilità" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_partner_property_form @@ -1326,7 +1326,7 @@ msgstr "Aggiungi una banca" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_journal_form msgid "Add a journal" -msgstr "Aggiungi un registro" +msgstr "Aggiungere un registro" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form @@ -1511,9 +1511,9 @@ msgid "" "and will be created in 'Posted' status." msgstr "" "Le registrazioni create in modo manuale si trovano solitamente nello stato " -"\"Non generata\". È possibile disattivare tale stato impostando l'opzione " +"\"Non registrato\". È possibile disattivare tale stato impostando l'opzione " "che si trova nel relativo registro. In questo caso, le registrazioni " -"verranno create automaticamente dal sistema, con stato \"Generata\", " +"verranno create automaticamente dal sistema, con stato \"Registrato\", " "all'atto di validazione del documento (fatture, estratti conto bancari...)." #. module: account @@ -2028,7 +2028,7 @@ msgstr "Avatar Autore" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Auto-Complete" -msgstr "Autocompletamento" +msgstr "Autocompilazione" #. module: account #: model:ir.model.fields,help:account.field_account_invoice__vendor_bill_id @@ -2399,7 +2399,7 @@ msgstr "Fatturazione" #. module: account #: model:res.groups,name:account.group_account_manager msgid "Billing Manager" -msgstr "Gestione fatturazione" +msgstr "Responsabile fatturazione" #. module: account #: model:ir.actions.server,name:account.action_invoice_tree2 @@ -3348,17 +3348,17 @@ msgstr "Creazione di un conto corrente bancario" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_bank_journal_form msgid "Create a bank account" -msgstr "Crea un conto bancario" +msgstr "Creare un conto bancario" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_out_refund msgid "Create a credit note" -msgstr "Creazione di una nota di credito" +msgstr "Creare una nota di credito" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_tree1 msgid "Create a customer invoice" -msgstr "Crea una fattura cliente" +msgstr "Creare una fattura cliente" #. module: account #: selection:account.invoice.refund,filter_refund:0 @@ -3384,12 +3384,12 @@ msgstr "Crea un nuovo cash log" #: model_terms:ir.actions.act_window,help:account.action_account_fiscal_position_form #: model_terms:ir.actions.act_window,help:account.action_account_fiscal_position_template_form msgid "Create a new fiscal position" -msgstr "Crea una nuova posizione fiscale" +msgstr "Creare una nuova posizione fiscale" #. module: account #: model_terms:ir.actions.act_window,help:account.action_incoterms_tree msgid "Create a new incoterm" -msgstr "Crea un nuovo incoterm" +msgstr "Creare un nuovo Incoterm" #. module: account #: model_terms:ir.actions.act_window,help:account.product_product_action_purchasable @@ -3409,12 +3409,12 @@ msgstr "Crea un nuovo prodotto vendibile" #. module: account #: model_terms:ir.actions.act_window,help:account.action_tax_form msgid "Create a new tax" -msgstr "Crea una nuova imposta" +msgstr "Creare una nuova imposta" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_in_refund msgid "Create a vendor credit note" -msgstr "Creazione di una nota di credito fornitore" +msgstr "Creare una nota di credito fornitore" #. module: account #: model_terms:ir.ui.view,arch_db:account.tax_adjustments_wizard @@ -3439,8 +3439,7 @@ msgid "" "Create invoices, register payments and keep track of the discussions with " "your customers." msgstr "" -"Crea fatture, registra pagamenti e tieni traccia delle conversazioni con i " -"clienti." +"Creazione fatture, registrazione pagamenti e conversazioni con i clienti." #. module: account #. openerp-web @@ -3963,7 +3962,7 @@ msgstr "Dicembre" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal__refund_sequence msgid "Dedicated Credit Note Sequence" -msgstr "Sequenza riservata a note di credito" +msgstr "Sequenza dedicata per note di credito" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__invoice_reference_type @@ -6662,7 +6661,7 @@ msgstr "Valuta principale dell'azienda" #: model:ir.ui.menu,name:account.account_reports_management_menu #: model:ir.ui.menu,name:account.menu_finance_entries_management msgid "Management" -msgstr "Gestione" +msgstr "Amministrazione" #. module: account #: model:account.payment.method,name:account.account_payment_method_manual_in @@ -7216,7 +7215,7 @@ msgid "" "Note that the easiest way to create a credit note is to do it directly\n" " from the customer invoice." msgstr "" -"Si noti che il modo più semplice per creare una nota di credito è di\n" +"Da evidenziare che il modo più semplice per creare una nota di credito è di\n" " farlo direttamente dalla fattura cliente." #. module: account @@ -7225,8 +7224,8 @@ msgid "" "Note that the easiest way to create a vendor credit note it to do it " "directly from the vendor bill." msgstr "" -"Si noti che il modo più semplice per creare una nota di credito fornitore è " -"di farlo direttamente dalla fattura." +"Da evidenziare che il modo più semplice per creare una nota di credito " +"fornitore è di farlo direttamente dalla fattura." #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__note @@ -7385,7 +7384,7 @@ msgstr "" #: code:addons/account/models/account_payment.py:599 #, python-format msgid "Only a draft payment can be posted." -msgstr "Un pagamento può essere generato solo se è in bozza." +msgstr "Un pagamento può essere registrato solo se è in bozza." #. module: account #: code:addons/account/models/chart_template.py:185 @@ -7422,7 +7421,7 @@ msgstr "Saldo di apertura" #: code:addons/account/static/src/xml/account_reconciliation.xml:137 #, python-format msgid "Open balance" -msgstr "Saldo di apertura" +msgstr "Apri saldo" #. module: account #: model:ir.model,name:account.model_account_financial_year_op @@ -7450,7 +7449,7 @@ msgstr "Registrazione contabile di apertura" #. module: account #: model:ir.model.fields,field_description:account.field_account_financial_year_op__opening_move_posted msgid "Opening Move Posted" -msgstr "Movimento di apertura generato" +msgstr "Movimento di apertura registrato" #. module: account #: model:ir.model.fields,help:account.field_account_cashbox_line__number @@ -7845,13 +7844,13 @@ msgstr "Metodo di pagamento" #: model:ir.model.fields,field_description:account.field_account_payment__payment_method_id #: model:ir.model.fields,field_description:account.field_account_register_payments__payment_method_id msgid "Payment Method Type" -msgstr "Tipo di metodo di pagamento" +msgstr "Tipologia metodo di pagamento" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_bank_journal_form #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form msgid "Payment Method Types" -msgstr "Tipi di metodo di pagamento" +msgstr "Tipologie metodo di pagamento" #. module: account #. openerp-web @@ -7883,7 +7882,7 @@ msgstr "Documento in casso:" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__reference msgid "Payment Ref." -msgstr "Rif. di pagamento" +msgstr "Rif. per pagamento" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__payment_reference @@ -7918,7 +7917,7 @@ msgstr "Riga termini di pagamento" #: model:ir.model.fields,field_description:account.field_account_payment_method__payment_type #: model:ir.model.fields,field_description:account.field_account_register_payments__payment_type msgid "Payment Type" -msgstr "Tipo di pagamento" +msgstr "Tipo pagamento" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_payment_term_form @@ -8110,7 +8109,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "Please use the following communication for your payment :" -msgstr "Usa la seguente comunicazione per il pagamento:" +msgstr "Usare la seguente causale per il pagamento:" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -8185,7 +8184,7 @@ msgstr "Registrazioni contabili generate" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Posted Journal Items" -msgstr "Movimenti contabili generati" +msgstr "Movimenti contabili registrati" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template__bank_account_code_prefix @@ -8248,7 +8247,7 @@ msgstr "Prezzo" #: model_terms:ir.ui.view,arch_db:account.account_invoice_send_wizard_form #: model_terms:ir.ui.view,arch_db:account.portal_invoice_page msgid "Print" -msgstr "Stampa" +msgstr "Stampare" #. module: account #: model:ir.model.fields,help:account.field_account_common_journal_report__amount_currency @@ -8462,7 +8461,7 @@ msgstr "Crediti" #: selection:account.payment,payment_type:0 #: selection:account.register.payments,payment_type:0 msgid "Receive Money" -msgstr "Ricevi denaro" +msgstr "Ricevere denaro" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment__partner_bank_account_id @@ -8507,7 +8506,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line__reconciled #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Reconciled" -msgstr "Riconciliato" +msgstr "Riconciliata" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__reconciled_invoice_ids @@ -8659,7 +8658,7 @@ msgstr "ID documento collegato" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__model msgid "Related Document Model" -msgstr "Modello Documento correlato" +msgstr "Modello documento collegato" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_ids @@ -9141,7 +9140,7 @@ msgstr "Selezionare una controparte o scegliere una contropartita" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Select an old vendor bill" -msgstr "Selezionare una precedente fattura fornitore" +msgstr "Selezionare una fattura fornitore precedente" #. module: account #: model:ir.model.fields,help:account.field_account_payment_term_line__value @@ -9208,7 +9207,7 @@ msgstr "Invia fattura" #: selection:account.payment,payment_type:0 #: selection:account.register.payments,payment_type:0 msgid "Send Money" -msgstr "Invia denaro" +msgstr "Inviare denaro" #. module: account #: model:ir.actions.act_window,name:account.account_send_payment_receipt_by_email_action @@ -9395,18 +9394,18 @@ msgstr "Mostrare registro nella bacheca" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_included msgid "Show line subtotals with taxes (B2C)" -msgstr "" +msgstr "Mostra gli importi riga con imposte (B2C)" #. module: account #: model:res.groups,comment:account.group_show_line_subtotals_tax_included msgid "Show line subtotals with taxes included (B2C)" -msgstr "Mostra righe dei subtotali includendo le imposte (B2C)" +msgstr "Mostra gli importi riga imposte incluse (B2C)" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_excluded #: model:res.groups,comment:account.group_show_line_subtotals_tax_excluded msgid "Show line subtotals without taxes (B2B)" -msgstr "Mostra righe dei subtotali escludendo le imposte (B2B)" +msgstr "Mostra gli importi riga imposte escluse (B2B)" #. module: account #. openerp-web @@ -9624,7 +9623,7 @@ msgstr "Oggetto..." #: model:ir.model.fields,field_description:account.field_account_cashbox_line__subtotal #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "Subtotal" -msgstr "Subtotale" +msgstr "Imponibile" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__subtype_id @@ -9879,7 +9878,7 @@ msgstr "Metodo di arrotondamento per il calcolo imposte" #. module: account #: model:res.groups,name:account.group_show_line_subtotals_tax_excluded msgid "Tax display B2B" -msgstr "Visualizzazione delle Imposte B2B" +msgstr "Visualizzare imposte B2B" #. module: account #: model:res.groups,name:account.group_show_line_subtotals_tax_included @@ -11148,13 +11147,13 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.view_move_form #: model_terms:ir.ui.view,arch_db:account.view_move_line_tree msgid "Total Credit" -msgstr "Totale Avere" +msgstr "Totale avere" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_move_form #: model_terms:ir.ui.view,arch_db:account.view_move_line_tree msgid "Total Debit" -msgstr "Totale Dare" +msgstr "Totale dare" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner__total_invoiced @@ -11271,7 +11270,7 @@ msgstr "Operazioni" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__total_entry_encoding msgid "Transactions Subtotal" -msgstr "Subtotale operazioni" +msgstr "Imponibile operazioni" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__destination_journal_id @@ -11355,7 +11354,7 @@ msgstr "Partner sconosciuto" #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Unpaid Invoices" -msgstr "fatture non pagate" +msgstr "Fatture non pagate" #. module: account #: selection:account.move,state:0 @@ -11372,7 +11371,7 @@ msgstr "Registrazioni contabili non generate" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unposted Journal Items" -msgstr "Movimenti contabili non generati" +msgstr "Movimenti contabili non registrati" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__message_unread @@ -11737,7 +11736,7 @@ msgstr "Fornitori" #: code:addons/account/static/src/xml/account_payment.xml:82 #, python-format msgid "View" -msgstr "Vista" +msgstr "Visualizza" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_partner_property_form @@ -12009,7 +12008,7 @@ msgstr "" #: code:addons/account/models/account_payment.py:583 #, python-format msgid "You cannot delete a payment that is already posted." -msgstr "Impossibile eliminare un pagamento già generato." +msgstr "Impossibile eliminare un pagamento già registrato." #. module: account #: code:addons/account/models/account_invoice.py:729 @@ -12106,7 +12105,8 @@ msgstr "Non puoi abbinare movimenti da conti cliente e fornitore." #, python-format msgid "You cannot modify a journal entry linked to a posted payment." msgstr "" -"Impossibile modificare una registrazione collegata a un pagamento generato." +"Impossibile modificare una registrazione collegata a un pagamento " +"registrato." #. module: account #: code:addons/account/models/account_move.py:331 @@ -12205,7 +12205,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.invoice_form #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "You have" -msgstr "Hai" +msgstr "Ci sono" #. module: account #: code:addons/account/models/account_payment.py:622 @@ -12371,15 +12371,13 @@ msgstr "es. commissioni bancarie" #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "for this customer. You can allocate them to mark this invoice as paid." msgstr "" -"per questo cliente. Puoi allocarli per contrassegnare la fattura come " -"pagata." +"per questo cliente. Puoi assegnarli per impostare la fattura come pagata." #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "for this supplier. You can allocate them to mark this bill as paid." msgstr "" -"per questo cliente. Puoi allocarli per contrassegnare la fattura come " -"pagata." +"per questo fornitore. Puoi assegnarli per impostare la fattura come pagata." #. module: account #. openerp-web @@ -12418,12 +12416,12 @@ msgstr "del mese prossimo" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "outstanding debits" -msgstr "Crediti aperti" +msgstr "debiti in sospeso" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "outstanding payments" -msgstr "pagamenti aperti" +msgstr "pagamenti in sospeso" #. module: account #. openerp-web diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index eccbb635a01..5d615f4f048 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -2703,7 +2703,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form #: model_terms:ir.ui.view,arch_db:account.onboarding_sale_tax_step msgid "Choose a default sales tax for your products." -msgstr "" +msgstr "プロダクトのデフォルト販売税を選択してください。" #. module: account #. openerp-web @@ -8508,7 +8508,7 @@ msgstr "販売税" #. module: account #: model:ir.actions.act_window,name:account.action_open_account_onboarding_sale_tax msgid "Sales tax" -msgstr "" +msgstr "販売税" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__user_id @@ -8862,7 +8862,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.onboarding_sale_tax_step msgid "Set taxes" -msgstr "" +msgstr "税を設定" #. module: account #: model:ir.model.fields,help:account.field_account_chart_template__visible diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index 60fd3598cd8..4627741cf23 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -3,16 +3,18 @@ # * account # # Translators: +# Jan Pedro Tumusok , 2018 # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 -# Jan Pedro Tumusok , 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jan Pedro Tumusok , 2018\n" +"PO-Revision-Date: 2018-08-24 09:14+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +35,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits msgid "# of Digits" -msgstr "# tall" +msgstr "# sifre" #. module: account #: model:mail.template,report_name:account.mail_template_data_payment_receipt @@ -1184,7 +1186,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "Add a line" -msgstr "" +msgstr "Legg til linje" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_form @@ -1687,7 +1689,7 @@ msgstr "Analytiske linjer" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form msgid "Analytics" -msgstr "" +msgstr "Analyse" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__no_auto_thread @@ -2949,7 +2951,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration @@ -4343,7 +4345,7 @@ msgstr "Ekstern referanse" #: code:addons/account/static/src/xml/account_reconciliation.xml:333 #, python-format msgid "External link" -msgstr "" +msgstr "Ekstern link" #. module: account #: model:account.incoterms,name:account.incoterm_FAS @@ -6154,7 +6156,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__layout msgid "Layout" -msgstr "" +msgstr "Layout" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_position_form @@ -7288,7 +7290,7 @@ msgstr "Partner melding" #. module: account #: model:ir.model.fields,field_description:account.field_account_group__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line__parent_state diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index d36f18c1a2f..9d6af1f3e6e 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -3273,7 +3273,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_direct_costs msgid "Cost of Revenue" -msgstr "Kosten van de omzet" +msgstr "Inkoopwaarde van de omzet" #. module: account #: code:addons/account/models/chart_template.py:192 @@ -3560,7 +3560,7 @@ msgstr "Credit" #. module: account #: model:account.account.type,name:account.data_account_type_credit_card msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line__credit_cash_basis @@ -3679,17 +3679,17 @@ msgstr "Verschil wisselkoers" #: model:account.account.type,name:account.data_account_type_current_assets #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Current Assets" -msgstr "Huidige activa" +msgstr "Vlottende activa" #. module: account #: model:account.account.type,name:account.data_account_type_current_liabilities msgid "Current Liabilities" -msgstr "Huidige passiva" +msgstr "Kort vreemd vermogen" #. module: account #: model:account.account.type,name:account.data_unaffected_earnings msgid "Current Year Earnings" -msgstr "Huidige jaaromzet" +msgstr "Huidige jaarwinst" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__starred @@ -4512,7 +4512,7 @@ msgstr "Boekingsregels" #: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Equity" -msgstr "Vermogen" +msgstr "Eigen vermogen" #. module: account #: code:addons/account/models/res_config_settings.py:145 @@ -6863,7 +6863,7 @@ msgstr "Berichten" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Cost of Revenue" -msgstr "Min kosten van de omzet" +msgstr "Min inkoopwaarde van de omzet" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -6873,7 +6873,7 @@ msgstr "Min creditcard rekeningen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Current Liabilities" -msgstr "Huidige passiva" +msgstr "Min kort vreemd vermogen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -6883,7 +6883,7 @@ msgstr "Min kosten" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Non-Current Liabilities" -msgstr "Minus huidige passiva" +msgstr "Min lang vreemd vermogen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -7161,7 +7161,7 @@ msgstr "Langlopende activa" #. module: account #: model:account.account.type,name:account.data_account_type_non_current_liabilities msgid "Non-current Liabilities" -msgstr "Langlopende passiva" +msgstr "Lang vreemd vermogen" #. module: account #: selection:account.tax,type_tax_use:0 @@ -7751,7 +7751,7 @@ msgstr "Relatiesoort" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__needaction_partner_ids msgid "Partners with Need Action" -msgstr "Relaties met Nodige Actie" +msgstr "Relaties met benodigde actie" #. module: account #: code:addons/account/models/account_journal_dashboard.py:95 @@ -8218,7 +8218,7 @@ msgstr "Prefix van de transfer rekeningen" #: model:account.account.type,name:account.data_account_type_prepayments #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Prepayments" -msgstr "Voorafbetalingen" +msgstr "Vooruitbetalingen" #. module: account #: model:ir.model,name:account.model_account_reconcile_model diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index feda92849c0..fff60638e96 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -3,16 +3,18 @@ # * account # # Translators: -# Martin Trigaux, 2018 -# Dorin Hongu , 2018 # Cozmin Candea , 2018 +# Martin Trigaux, 2018 +# Sorin Trifu , 2018 +# Dorin Hongu , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Cozmin Candea , 2018\n" +"PO-Revision-Date: 2018-08-24 09:14+0000\n" +"Last-Translator: Dorin Hongu , 2018\n" "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1405,7 +1407,7 @@ msgstr "Permite reconcilierea facturilor și plaților" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_product_margin msgid "Allow Product Margin" -msgstr "" +msgstr "Permite Marja Produsului" #. module: account #: model:ir.model.fields,field_description:account.field_account_account__reconcile @@ -1415,12 +1417,12 @@ msgstr "Permite reconciliere" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_check_printing msgid "Allow check printing and deposits" -msgstr "" +msgstr "Permie tiparire cec si depozite" #. module: account #: model:res.groups,name:account.group_cash_rounding msgid "Allow the cash rounding management" -msgstr "" +msgstr "Permite gestiune rotunjire numerar " #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form @@ -1522,19 +1524,19 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_amount_max #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_amount_max msgid "Amount Max Parameter" -msgstr "" +msgstr "Parametru Suma Max" #. module: account #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_amount_min #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_amount_min msgid "Amount Min Parameter" -msgstr "" +msgstr "Parametru Suma Min" #. module: account #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_nature #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_nature msgid "Amount Nature" -msgstr "" +msgstr "Natura Sumei" #. module: account #: selection:account.reconcile.model,match_nature:0 @@ -3070,7 +3072,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:54 #, python-format msgid "Congrats, you're all done!" -msgstr "" +msgstr "Felicitări, ai terminat!" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_invoice_onboarding_panel @@ -4342,7 +4344,7 @@ msgstr "Eroare!" #: code:addons/account/models/chart_template.py:412 #, python-format msgid "Exchange Difference" -msgstr "" +msgstr "Diferență curs" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__currency_exchange_journal_id @@ -4768,7 +4770,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:63 #, python-format msgid "Go to bank statement(s)" -msgstr "" +msgstr "Mergi la extrase bancă" #. module: account #: code:addons/account/models/account_invoice.py:758 @@ -6314,7 +6316,7 @@ msgstr "Încarcă mai mult ... (" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_lock_date msgid "Lock Date" -msgstr "" +msgstr "Dată blocare" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__period_lock_date @@ -6949,7 +6951,7 @@ msgstr "Note" #: code:addons/account/static/src/xml/account_reconciliation.xml:37 #, python-format msgid "Nothing to do!" -msgstr "" +msgstr "Nimic de făcut!" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__notification_ids @@ -7572,12 +7574,12 @@ msgstr "" #. module: account #: model:ir.actions.report,name:account.action_report_payment_receipt msgid "Payment Receipt" -msgstr "" +msgstr "Încasare" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document msgid "Payment Receipt:" -msgstr "" +msgstr "Încasare" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__reference @@ -11009,7 +11011,7 @@ msgstr "Folosește domeniul activ" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__anglo_saxon_accounting msgid "Use anglo-saxon accounting" -msgstr "" +msgstr "Utilizare contabilitate anglo-saxonă " #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_batch_payment @@ -11717,7 +11719,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:55 #, python-format msgid "You reconciled" -msgstr "" +msgstr "Ai reconciliat" #. module: account #: code:addons/account/models/account_move.py:1624 diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index fce521ef88a..30486e427fd 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -854,7 +854,7 @@ msgstr "І'мя власника рахунку" #. module: account #: model:ir.model,name:account.model_account_invoice_send msgid "Account Invoice Send" -msgstr "" +msgstr "Рахунок-фактуру надіслано" #. module: account #: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__journal_id @@ -8222,7 +8222,7 @@ msgstr "Купівля" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Purchase Representative" -msgstr "" +msgstr "Представник закупівель" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 78637cac472..c0958b21a60 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -290,6 +290,8 @@ class AccountAccount(models.Model): Note that it is disallowed if some lines are partially reconciled. ''' + if not self.ids: + return None partial_lines_count = self.env['account.move.line'].search_count([ ('account_id', 'in', self.ids), ('full_reconcile_id', '=', False), diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index ef4e32c8af2..f11ae1319c3 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -504,6 +504,9 @@ class AccountInvoice(models.Model): @api.model def create(self, vals): + if not vals.get('journal_id') and vals.get('type'): + vals['journal_id'] = self.with_context(type=vals.get('type'))._default_journal().id + onchanges = { '_onchange_partner_id': ['account_id', 'payment_term_id', 'fiscal_position_id', 'partner_bank_id'], '_onchange_journal_id': ['currency_id'], @@ -1473,9 +1476,11 @@ class AccountInvoice(models.Model): values = self._prepare_refund(invoice, date_invoice=date_invoice, date=date, description=description, journal_id=journal_id) refund_invoice = self.create(values) - invoice_type = {'out_invoice': ('customer invoices credit note'), - 'in_invoice': ('vendor bill credit note')} - message = _("This %s has been created from: %s
Reason: %s") % (invoice_type[invoice.type], invoice.id, invoice.number, description) + if invoice.type == 'out_invoice': + message = _("This customer invoice credit note has been created from: %s
Reason: %s") % (invoice.id, invoice.number, description) + else: + message = _("This vendor bill credit note has been created from: %s
Reason: %s") % (invoice.id, invoice.number, description) + refund_invoice.message_post(body=message) new_invoices += refund_invoice return new_invoices @@ -1796,6 +1801,7 @@ class AccountInvoiceLine(models.Model): else: price_unit = self.product_id.lst_price self.price_unit = self.product_id.uom_id._compute_price(price_unit, self.uom_id) + self._set_currency() if self.product_id.uom_id.category_id.id != self.uom_id.category_id.id: warning = { diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py index 73da6d70183..f4753ef4796 100644 --- a/addons/account/models/account_journal_dashboard.py +++ b/addons/account/models/account_journal_dashboard.py @@ -320,10 +320,10 @@ class account_journal(models.Model): action_name = 'action_view_bank_statement_tree' elif self.type == 'sale': action_name = 'action_invoice_tree1' - self = self.with_context(use_domain=[('type', '=', 'out_invoice')]) + self = self.with_context(use_domain=[('type', 'in', ['out_invoice', 'out_refund'])]) elif self.type == 'purchase': action_name = 'action_vendor_bill_template' - self = self.with_context(use_domain=[('type', '=', 'in_invoice')]) + self = self.with_context(use_domain=[('type', 'in', ['in_invoice', 'in_refund'])]) else: action_name = 'action_move_journal_line' diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index b724a2be893..7b038433905 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1457,6 +1457,9 @@ class AccountPartialReconcile(models.Model): ''' return tax.cash_basis_base_account_id or line.account_id + def _get_amount_tax_cash_basis(self, amount, line): + return line.company_id.currency_id.round(amount) + def create_tax_cash_basis_entry(self, percentage_before_rec): self.ensure_one() move_date = self.debit_move_id.date @@ -1471,7 +1474,7 @@ class AccountPartialReconcile(models.Model): percentage_after = line._get_matched_percentage()[move.id] #amount is the current cash_basis amount minus the one before the reconciliation amount = line.balance * percentage_after - line.balance * percentage_before - rounded_amt = line.company_id.currency_id.round(amount) + rounded_amt = self._get_amount_tax_cash_basis(amount, line) if float_is_zero(rounded_amt, precision_rounding=line.company_id.currency_id.rounding): continue if line.tax_line_id and line.tax_line_id.tax_exigibility == 'on_payment': @@ -1486,7 +1489,7 @@ class AccountPartialReconcile(models.Model): 'analytic_account_id': line.analytic_account_id.id, 'analytic_tag_ids': line.analytic_tag_ids.ids, 'tax_exigible': True, - 'amount_currency': self.amount_currency and line.currency_id.round(-line.amount_currency * amount / line.balance) or 0.0, + 'amount_currency': line.amount_currency and line.currency_id.round(-line.amount_currency * amount / line.balance) or 0.0, 'currency_id': line.currency_id.id, 'move_id': newly_created_move.id, 'partner_id': line.partner_id.id, @@ -1501,7 +1504,7 @@ class AccountPartialReconcile(models.Model): 'analytic_tag_ids': line.analytic_tag_ids.ids, 'tax_line_id': line.tax_line_id.id, 'tax_exigible': True, - 'amount_currency': self.amount_currency and line.currency_id.round(line.amount_currency * amount / line.balance) or 0.0, + 'amount_currency': line.amount_currency and line.currency_id.round(line.amount_currency * amount / line.balance) or 0.0, 'currency_id': line.currency_id.id, 'move_id': newly_created_move.id, 'partner_id': line.partner_id.id, diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index 0941a34fb2f..621b49e6a54 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -84,7 +84,8 @@ class AccountReconcileModel(models.Model): amount = fields.Float(string='Write-off Amount', digits=0, required=True, default=100.0, help="Fixed amount will count as a debit if it is negative, as a credit if it is positive.") tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict') analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null') - analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic Tags') + analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Analytic Tags', + relation='account_reconcile_model_analytic_tag_rel') # Second part fields. has_second_line = fields.Boolean(string='Add a second line', default=False) @@ -104,7 +105,8 @@ class AccountReconcileModel(models.Model): second_amount = fields.Float(string='Second Write-off Amount', digits=0, required=True, default=100.0, help="Fixed amount will count as a debit if it is negative, as a credit if it is positive.") second_tax_id = fields.Many2one('account.tax', string='Second Tax', ondelete='restrict', domain=[('type_tax_use', '=', 'purchase')]) second_analytic_account_id = fields.Many2one('account.analytic.account', string='Second Analytic Account', ondelete='set null') - second_analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Second Analytic Tags') + second_analytic_tag_ids = fields.Many2many('account.analytic.tag', string='Second Analytic Tags', + relation='account_reconcile_model_second_analytic_tag_rel') @api.onchange('name') def onchange_name(self): @@ -392,17 +394,17 @@ class AccountReconcileModel(models.Model): aml.date_maturity AS aml_date_maturity, aml.amount_residual AS aml_amount_residual, aml.amount_residual_currency AS aml_amount_residual_currency, - CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE - ELSE - TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - OR ( - move.ref IS NOT NULL - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != '' - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - ) - END AS communication_flag + + -- Determine a matching or not with the statement line communication using the move.name or move.ref. + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + OR + ( + move.ref IS NOT NULL + AND + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + ) AS communication_flag FROM account_bank_statement_line st_line LEFT JOIN account_journal journal ON journal.id = st_line.journal_id LEFT JOIN jnl_precision ON jnl_precision.journal_id = journal.id @@ -427,24 +429,30 @@ class AccountReconcileModel(models.Model): -- if there is a partner, propose all aml of the partner, otherwise propose only the ones -- matching the statement line communication - AND CASE WHEN line_partner.partner_id != 0 THEN + AND + ( + ( + line_partner.partner_id != 0 + AND aml.partner_id = line_partner.partner_id - ELSE - ( - CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE - ELSE - TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - OR ( - move.ref IS NOT NULL - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != '' - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - ) - END + ) + OR + ( + line_partner.partner_id = 0 + AND + ( + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + OR + ( + move.ref IS NOT NULL + AND + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + ) ) - END - + ) + ) AND ( ( diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 1bed913ba37..8d7a48424fe 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -4,6 +4,7 @@ from odoo.exceptions import AccessError from odoo import api, fields, models, _ from odoo import SUPERUSER_ID from odoo.exceptions import UserError +from odoo.http import request import logging @@ -163,7 +164,14 @@ class AccountChartTemplate(models.Model): of accounts had been created for it yet. """ self.ensure_one() - company = self.env.user.company_id + # do not use `request.env` here, it can cause deadlocks + if request and request.session.uid: + current_user = self.env['res.users'].browse(request.uid) + company = current_user.company_id + else: + # fallback to company of current user, most likely __system__ + # (won't work well for multi-company) + company = self.env.user.company_id # If we don't have any chart of account on this company, install this chart of account if not company.chart_template_id: self.load_for_current_company(15.0, 15.0) @@ -177,7 +185,14 @@ class AccountChartTemplate(models.Model): rights. """ self.ensure_one() - company = self.env.user.company_id + # do not use `request.env` here, it can cause deadlocks + if request and request.session.uid: + current_user = self.env['res.users'].browse(request.uid) + company = current_user.company_id + else: + # fallback to company of current user, most likely __system__ + # (won't work well for multi-company) + company = self.env.user.company_id # Ensure everything is translated to the company's language, not the user's one. self = self.with_context(lang=company.partner_id.lang) if not self.env.user._is_admin(): @@ -197,7 +212,7 @@ class AccountChartTemplate(models.Model): prop_values.extend(['account.journal,%s' % (journal_id,) for journal_id in existing_journals.ids]) accounting_props = self.env['ir.property'].search([('value_reference', 'in', prop_values)]) if accounting_props: - accounting_props.unlink() + accounting_props.sudo().unlink() # delete account, journal, tax, fiscal position and reconciliation model models_to_delete = ['account.reconcile.model', 'account.fiscal.position', 'account.tax', 'account.move', 'account.journal'] diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index efb437ea246..69f3fca8bc8 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -11,11 +11,13 @@ Tax display B2B Show line subtotals without taxes (B2B) + Tax display B2C Show line subtotals with taxes included (B2C) + diff --git a/addons/account/tests/__init__.py b/addons/account/tests/__init__.py index 33408802fd7..9da1f5fb668 100644 --- a/addons/account/tests/__init__.py +++ b/addons/account/tests/__init__.py @@ -8,6 +8,7 @@ from . import test_account_validate_account_move from . import test_account_invoice_rounding from . import test_bank_statement_reconciliation from . import test_fiscal_position +from . import test_invoice_onchange from . import test_reconciliation_widget from . import test_payment from . import test_product_id_change diff --git a/addons/account/tests/test_account_fiscal_year.py b/addons/account/tests/test_account_fiscal_year.py index 85785473ee2..7fe5e6a966e 100644 --- a/addons/account/tests/test_account_fiscal_year.py +++ b/addons/account/tests/test_account_fiscal_year.py @@ -72,8 +72,15 @@ class TestFiscalPosition(AccountingTestCase): self.check_compute_fiscal_year( company, - '2016-03-01', '2016-02-29', + '2015-03-01', + '2016-02-29', + ) + + self.check_compute_fiscal_year( + company, + '2016-03-01', + '2016-03-01', '2017-02-28', ) diff --git a/addons/account/tests/test_account_supplier_invoice.py b/addons/account/tests/test_account_supplier_invoice.py index d6584ab6138..d1a6ef46902 100644 --- a/addons/account/tests/test_account_supplier_invoice.py +++ b/addons/account/tests/test_account_supplier_invoice.py @@ -24,6 +24,7 @@ class TestAccountSupplierInvoice(AccountingTestCase): 'account_id': invoice_account, 'type': 'in_invoice', }) + self.assertEquals(invoice.journal_id.type, 'purchase') self.env['account.invoice.line'].create({'product_id': self.env.ref('product.product_product_4').id, 'quantity': 1.0, @@ -79,6 +80,7 @@ class TestAccountSupplierInvoice(AccountingTestCase): 'account_id': invoice_account, 'type': 'in_invoice', }) + self.assertEquals(invoice.journal_id.type, 'purchase') invoice_line = self.env['account.invoice.line'].create({'product_id': self.env.ref('product.product_product_4').id, 'quantity': 5.0, diff --git a/addons/account/tests/test_invoice_onchange.py b/addons/account/tests/test_invoice_onchange.py new file mode 100644 index 00000000000..3a1402de503 --- /dev/null +++ b/addons/account/tests/test_invoice_onchange.py @@ -0,0 +1,33 @@ +from odoo.addons.account.tests.account_test_classes import AccountingTestCase +from odoo.tests import tagged +from odoo.tests.common import Form + + +@tagged('post_install', '-at_install') +class TestInvoiceOnchange(AccountingTestCase): + + def setUp(self): + super(TestInvoiceOnchange, self).setUp() + self.invoice_line_onchange = self.env['account.invoice.line']._onchange_spec() + self.half_currency = self.env['res.currency'].create({ + 'name': 'HALF', 'symbol': '$HALF', + 'rate_ids': [(0, 0, {'name': '1980-01-01', 'rate': 2})], + }) + self.apples_product = self.env['product.product'].create(dict( + self.env['product.product'].default_get(self.env['product.product']._fields), + lst_price=10, name='apples', + )) + + def test_invoice_currency_onchange(self): + self_ctx = self.env['account.invoice'].with_context(type='out_invoice') + with Form(self_ctx, view='account.invoice_form') as invoice_form: + invoice_form.partner_id = self.env.user.partner_id + with invoice_form.invoice_line_ids.new() as invoice_line_form: + invoice_line_form.product_id = self.apples_product + # Check onchange keep price_unit if currency not changed + self.assertEqual(invoice_line_form.price_unit, 10) + invoice_form.currency_id = self.half_currency + with invoice_form.invoice_line_ids.new() as invoice_line_form: + invoice_line_form.product_id = self.apples_product + # Check onchange gives converted price with custom currency + self.assertEqual(invoice_line_form.price_unit, 20) diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index c59135a23c0..f369ae22e19 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -906,7 +906,7 @@ % - @@ -939,7 +939,7 @@ % - @@ -1387,7 +1387,7 @@ -
-
+
+
Description: -

+

-
+
Invoice Date: -

+

-
+
Due Date: -

+

-
+
Source: -

+

-
+
Customer Code: -

+

-
+
Reference: -

+

- +
@@ -75,7 +75,7 @@ - + @@ -92,7 +92,7 @@ - @@ -130,17 +130,17 @@
+
- + - + - @@ -151,13 +151,13 @@ - - +
Subtotal
+ +
Total diff --git a/addons/account_check_printing/i18n/nb.po b/addons/account_check_printing/i18n/nb.po index ef123287fcd..eb9f55ff6df 100644 --- a/addons/account_check_printing/i18n/nb.po +++ b/addons/account_check_printing/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -156,7 +158,7 @@ msgstr "" #. module: account_check_printing #: model:ir.model,name:account_check_printing.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks__create_uid diff --git a/addons/account_check_printing/models/account_payment.py b/addons/account_check_printing/models/account_payment.py index 51870ebeeb3..28e9f285c1d 100644 --- a/addons/account_check_printing/models/account_payment.py +++ b/addons/account_check_printing/models/account_payment.py @@ -51,7 +51,7 @@ class AccountPayment(models.Model): @api.onchange('amount','currency_id') def _onchange_amount(self): res = super(AccountPayment, self)._onchange_amount() - self.check_amount_in_words = self.currency_id.amount_to_text(self.amount) + self.check_amount_in_words = self.currency_id.amount_to_text(self.amount) if self.currency_id else '' return res def _check_communication(self, payment_method_id, communication): diff --git a/addons/account_facturx/data/facturx_templates.xml b/addons/account_facturx/data/facturx_templates.xml index 303de923ee7..393c2fa8c20 100644 --- a/addons/account_facturx/data/facturx_templates.xml +++ b/addons/account_facturx/data/facturx_templates.xml @@ -25,7 +25,13 @@ - + , 2018 # Jan Horzinka , 2018 # Michal Veselý , 2018 -# J. Podhorecky , 2018 +# trendspotter , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: J. Podhorecky , 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: trendspotter , 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +155,7 @@ msgstr "Přidružený partner" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__balance diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po index 016e03e9e59..505102d44e3 100644 --- a/addons/analytic/i18n/nb.po +++ b/addons/analytic/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -442,7 +444,7 @@ msgstr "Overordnet" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_distribution__tag_id diff --git a/addons/attachment_indexation/i18n/attachment_indexation.pot b/addons/attachment_indexation/i18n/attachment_indexation.pot new file mode 100644 index 00000000000..723566dc04b --- /dev/null +++ b/addons/attachment_indexation/i18n/attachment_indexation.pot @@ -0,0 +1,57 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * attachment_indexation +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server saas~12.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-12-24 10:57+0000\n" +"PO-Revision-Date: 2018-12-24 10:57+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: attachment_indexation +#. openerp-web +#: code:addons/attachment_indexation/static/src/js/attachment_indexation.js:77 +#, python-format +msgid "%s (%s)" +msgstr "" + +#. module: attachment_indexation +#: model:ir.model,name:attachment_indexation.model_ir_attachment +msgid "Attachment" +msgstr "" + +#. module: attachment_indexation +#. openerp-web +#: code:addons/attachment_indexation/static/src/js/attachment_indexation.js:20 +#, python-format +msgid "Attachment(s)" +msgstr "" + +#. module: attachment_indexation +#. openerp-web +#: code:addons/attachment_indexation/static/src/js/attachment_indexation.js:180 +#, python-format +msgid "Do you really want to delete this attachment ?" +msgstr "" + +#. module: attachment_indexation +#. openerp-web +#: code:addons/attachment_indexation/static/src/js/attachment_indexation.js:193 +#, python-format +msgid "Uploading Error" +msgstr "" + +#. module: attachment_indexation +#. openerp-web +#: code:addons/attachment_indexation/static/src/js/attachment_indexation.js:155 +#, python-format +msgid "Uploading..." +msgstr "" + diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot index 9256acf041b..6e423bc5390 100644 --- a/addons/auth_ldap/i18n/auth_ldap.pot +++ b/addons/auth_ldap/i18n/auth_ldap.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~11.5\n" +"Project-Id-Version: Odoo Server saas~12.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" +"POT-Creation-Date: 2018-12-24 10:57+0000\n" +"PO-Revision-Date: 2018-12-24 10:57+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -133,7 +133,7 @@ msgid "Login Information" msgstr "" #. module: auth_ldap -#: code:addons/auth_ldap/models/res_company_ldap.py:201 +#: code:addons/auth_ldap/models/res_company_ldap.py:202 #, python-format msgid "No local user found for LDAP login and not configured to create one" msgstr "" @@ -197,3 +197,4 @@ msgstr "" #: model:ir.model,name:auth_ldap.model_res_users msgid "Users" msgstr "" + diff --git a/addons/auth_ldap/i18n/nb.po b/addons/auth_ldap/i18n/nb.po index c3f7bc3f014..07514110029 100644 --- a/addons/auth_ldap/i18n/nb.po +++ b/addons/auth_ldap/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +47,7 @@ msgstr "" #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_ldap #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__create_user diff --git a/addons/auth_ldap/models/res_company_ldap.py b/addons/auth_ldap/models/res_company_ldap.py index 7f36b1ba2dc..7c809f3aaeb 100644 --- a/addons/auth_ldap/models/res_company_ldap.py +++ b/addons/auth_ldap/models/res_company_ldap.py @@ -192,7 +192,7 @@ class CompanyLDAP(models.Model): elif conf['create_user']: _logger.debug("Creating new Odoo user \"%s\" from LDAP" % login) values = self._map_ldap_attributes(conf, login, ldap_entry) - SudoUser = self.env['res.users'].sudo() + SudoUser = self.env['res.users'].sudo().with_context(no_reset_password=True) if conf['user']: values['active'] = True return SudoUser.browse(conf['user'][0]).copy(default=values).id diff --git a/addons/auth_oauth/i18n/nb.po b/addons/auth_oauth/i18n/nb.po index 9a5fa916147..1d99aaf8c34 100644 --- a/addons/auth_oauth/i18n/nb.po +++ b/addons/auth_oauth/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +80,7 @@ msgstr "Klient-ID" #. module: auth_oauth #: model:ir.model,name:auth_oauth.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider__create_uid diff --git a/addons/auth_password_policy/i18n/nb.po b/addons/auth_password_policy/i18n/nb.po index 37b7fc0bebd..46b634cc99e 100644 --- a/addons/auth_password_policy/i18n/nb.po +++ b/addons/auth_password_policy/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-10-08 07:10+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +23,7 @@ msgstr "" #. module: auth_password_policy #: model:ir.model,name:auth_password_policy.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_password_policy #: model:ir.model.fields,field_description:auth_password_policy.field_res_config_settings__minlength diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po index 1239e014243..70e9804747c 100644 --- a/addons/auth_signup/i18n/nb.po +++ b/addons/auth_signup/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -349,7 +351,7 @@ msgstr "Lukk" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_signup #: model_terms:ir.ui.view,arch_db:auth_signup.reset_password @@ -407,7 +409,7 @@ msgstr "Tillat tilbakestilling av passord fra innloggingssiden" #. module: auth_signup #: model:ir.model,name:auth_signup.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: auth_signup #: code:addons/auth_signup/controllers/main.py:115 @@ -573,6 +575,9 @@ msgid "" "list view and click on 'Portal Access Management' option in the dropdown " "menu *Action*." msgstr "" +"For å sende invitasjoner i B2B modus, åpne en kontrakt, eller velg flere i " +"listevisning, og klikk på 'Tilgangsadministrasjon for Portal' i " +"nedtrekksmenyen *Handling\"." #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users diff --git a/addons/barcodes/i18n/nb.po b/addons/barcodes/i18n/nb.po index d54cec1204f..af3487dc6dd 100644 --- a/addons/barcodes/i18n/nb.po +++ b/addons/barcodes/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan , 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +89,7 @@ msgstr "" #. module: barcodes #: selection:barcode.rule,encoding:0 msgid "Any" -msgstr "" +msgstr "Noen" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin @@ -229,7 +231,7 @@ msgstr "" #. module: barcodes #: model:ir.model,name:barcodes.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature__id diff --git a/addons/barcodes/i18n/nl.po b/addons/barcodes/i18n/nl.po index d70b6cbb386..916e031d71e 100644 --- a/addons/barcodes/i18n/nl.po +++ b/addons/barcodes/i18n/nl.po @@ -4,15 +4,16 @@ # # Translators: # Martin Trigaux, 2018 -# Erwin van der Ploeg , 2018 # Yenthe Van Ginneken , 2018 +# Erwin van der Ploeg , 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Yenthe Van Ginneken , 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Erwin van der Ploeg , 2018\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -162,7 +163,7 @@ msgstr "Aangemaakt op" #. module: barcodes #: selection:barcode.rule,type:0 msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: barcodes #. openerp-web diff --git a/addons/barcodes/i18n/uk.po b/addons/barcodes/i18n/uk.po index 4ba581de392..f874a894b88 100644 --- a/addons/barcodes/i18n/uk.po +++ b/addons/barcodes/i18n/uk.po @@ -69,7 +69,7 @@ msgstr "" #. module: barcodes #: model_terms:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "Add a new barcode nomenclature" -msgstr "" +msgstr "Додати нову номенклатуру штрих-коду" #. module: barcodes #: selection:barcode.rule,type:0 @@ -100,7 +100,7 @@ msgstr "Будь-який" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin msgid "Barcode Event Mixin" -msgstr "" +msgstr "Мікс подій штрих-коду" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_nomenclature @@ -208,21 +208,21 @@ msgstr "Кодування" #: code:addons/barcodes/static/src/js/barcode_form_view.js:326 #, python-format msgid "Error: Barcode command is undefined" -msgstr "" +msgstr "Помилка: команда штрих-коду невизначена" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/barcode_form_view.js:63 #, python-format msgid "Error: Document not editable" -msgstr "" +msgstr "Помилка: документ не редагується" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/barcode_form_view.js:362 #, python-format msgid "Error: No last scanned barcode" -msgstr "" +msgstr "Помилка: немає останнього відсканованого штрих-коду" #. module: barcodes #. openerp-web @@ -232,7 +232,7 @@ msgstr "" #: code:addons/barcodes/static/src/js/barcode_form_view.js:139 #, python-format msgid "Error: Pager not available" -msgstr "" +msgstr "Помилка: сторінка не доступна" #. module: barcodes #: model:ir.model,name:barcodes.model_ir_http @@ -283,7 +283,7 @@ msgstr "Ніколи" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_res_company__nomenclature_id msgid "Nomenclature" -msgstr "" +msgstr "Номенклатура" #. module: barcodes #: selection:barcode.rule,type:0 diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js index 7b9b29aa4c8..ca5baa90b49 100644 --- a/addons/barcodes/static/src/js/barcode_field.js +++ b/addons/barcodes/static/src/js/barcode_field.js @@ -4,6 +4,7 @@ odoo.define('barcodes.field', function(require) { var AbstractField = require('web.AbstractField'); var basicFields = require('web.basic_fields'); var fieldRegistry = require('web.field_registry'); +var is_special_key = require('barcodes.BarcodeEvents').BarcodeEvents.is_special_key; // Field in which the user can both type normally and scan barcodes @@ -41,7 +42,9 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({ _onKeypress: function (e) { /* only simulate a keypress if it has been previously prevented */ if (e.dispatched_by_barcode_reader !== true) { - e.preventDefault(); + if (!is_special_key(e)) { + e.preventDefault(); + } return; } var character = String.fromCharCode(e.which); diff --git a/addons/base_address_extended/data/base_address_extended_data.xml b/addons/base_address_extended/data/base_address_extended_data.xml index 1e76cb4c5df..42a5a779589 100644 --- a/addons/base_address_extended/data/base_address_extended_data.xml +++ b/addons/base_address_extended/data/base_address_extended_data.xml @@ -4,5 +4,8 @@ + + + diff --git a/addons/base_address_extended/tests/test_street_fields.py b/addons/base_address_extended/tests/test_street_fields.py index cf5598b624f..f4e37c08cc5 100644 --- a/addons/base_address_extended/tests/test_street_fields.py +++ b/addons/base_address_extended/tests/test_street_fields.py @@ -12,6 +12,7 @@ class TestStreetFields(TransactionCase): self.env.ref('base.be').write({'street_format': '%(street_name)s, %(street_number)s/%(street_number2)s'}) self.env.ref('base.us').write({'street_format': '%(street_number)s/%(street_number2)s %(street_name)s'}) self.env.ref('base.ch').write({'street_format': 'header %(street_name)s, %(street_number)s - %(street_number2)s trailer'}) + self.env.ref('base.mx').write({'street_format': '%(street_name)s %(street_number)s/%(street_number2)s'}) def create_and_assert(self, partner_name, country_id, street, street_name, street_number, street_number2): partner = self.Partner.create({'name': partner_name + '-1', 'street': street, 'country_id': country_id}) @@ -39,6 +40,7 @@ class TestStreetFields(TransactionCase): self.create_and_assert('Test00', self.env.ref('base.us').id, '40/2b Chaussee de Namur', 'Chaussee de Namur', '40', '2b') self.create_and_assert('Test01', self.env.ref('base.us').id, '40 Chaussee de Namur', 'Chaussee de Namur', '40', '') self.create_and_assert('Test02', self.env.ref('base.us').id, 'Chaussee de Namur', 'de Namur', 'Chaussee', '') + self.create_and_assert('Test03', self.env.ref('base.mx').id, 'Av. Miguel Hidalgo y Costilla 601', 'Av.', 'Miguel Hidalgo y Costilla 601', '') def test_01_header_trailer(self): self.create_and_assert('Test10', self.env.ref('base.ch').id, 'header Chaussee de Namur, 40 - 2b trailer', 'Chaussee de Namur', '40', '2b') diff --git a/addons/base_address_extended/views/base_address_extended.xml b/addons/base_address_extended/views/base_address_extended.xml index 6fc3d098868..7d2a7770ea9 100644 --- a/addons/base_address_extended/views/base_address_extended.xml +++ b/addons/base_address_extended/views/base_address_extended.xml @@ -19,13 +19,15 @@ - - -
-