diff --git a/addons/account/i18n/af.po b/addons/account/i18n/af.po
index b2f44fe1eaa..4590907a2d4 100644
--- a/addons/account/i18n/af.po
+++ b/addons/account/i18n/af.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-27 14:47+0000\n"
-"PO-Revision-Date: 2018-04-27 14:47+0000\n"
+"POT-Creation-Date: 2018-07-27 11:55+0000\n"
+"PO-Revision-Date: 2018-07-27 11:55+0000\n"
"Last-Translator: D VA, 2018\n"
"Language-Team: Afrikaans (https://www.transifex.com/odoo/teams/41243/af/)\n"
"MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgid "%d transactions were automatically reconciled."
msgstr "%d transaksies is automaties gerekonsilieer."
#. module: account
-#: code:addons/account/models/account.py:794
+#: code:addons/account/models/account.py:809
#, python-format
msgid "%s (Copy)"
msgstr "%s (Kopie)"
@@ -151,7 +151,7 @@ msgid ": General ledger"
msgstr ": Algemene grootboek"
#. module: account
-#: code:addons/account/models/account.py:539
+#: code:addons/account/models/account.py:554
#, python-format
msgid ": Refund"
msgstr ""
@@ -987,19 +987,19 @@ msgid "A Cash transaction can't have a 0 amount."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1731
+#: code:addons/account/models/account_invoice.py:1699
#, python-format
msgid "A Payment Terms should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1734
+#: code:addons/account/models/account_invoice.py:1702
#, python-format
msgid "A Payment Terms should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:707
+#: code:addons/account/models/account.py:722
#, python-format
msgid "A bank account can only belong to one journal."
msgstr ""
@@ -1050,7 +1050,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:881
+#: code:addons/account/models/account_move.py:891
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
@@ -1063,14 +1063,14 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:880
-#: code:addons/account/models/account_bank_statement.py:883
+#: code:addons/account/models/account_bank_statement.py:881
+#: code:addons/account/models/account_bank_statement.py:884
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:891
+#: code:addons/account/models/account_bank_statement.py:892
#, python-format
msgid "A selected statement line was already reconciled with an account move."
msgstr ""
@@ -1095,8 +1095,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:501
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:503
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:521
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:523
#: code:addons/account/static/src/xml/account_reconciliation.xml:170
#: code:addons/account/static/src/xml/account_reconciliation.xml:228
#: code:addons/account/static/src/xml/account_reconciliation.xml:253
@@ -1450,7 +1450,6 @@ msgid ""
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
#: model:ir.ui.menu,name:account.account_account_menu
msgid "Accounting"
msgstr ""
@@ -1613,16 +1612,6 @@ msgstr ""
msgid "Adjustment Type"
msgstr ""
-#. module: account
-#: selection:tax.adjustments.wizard,adjustment_type:0
-msgid "Adjustment in favor of the Estate"
-msgstr ""
-
-#. module: account
-#: selection:tax.adjustments.wizard,adjustment_type:0
-msgid "Adjustment in your favor"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
#: model:ir.ui.view,arch_db:account.view_tax_form
@@ -2029,6 +2018,16 @@ msgstr ""
msgid "Applicability"
msgstr ""
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on credit journal item"
+msgstr ""
+
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on debit journal item"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_auto_apply
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_auto_apply
@@ -2123,7 +2122,7 @@ msgid "Automated Entries"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:354
+#: code:addons/account/models/company.py:411
#: code:addons/account/wizard/setup_wizards.py:79
#, python-format
msgid "Automatic Balancing Line"
@@ -2169,7 +2168,7 @@ msgid "Awaiting payments"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:189
+#: code:addons/account/models/chart_template.py:194
#, python-format
msgid "BILL"
msgstr ""
@@ -2211,7 +2210,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:749
+#: code:addons/account/models/chart_template.py:758
#: model:ir.model.fields,field_description:account.field_account_journal_bank_id
#: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count
#: model:ir.model.fields,field_description:account.field_res_users_bank_account_count
@@ -2225,7 +2224,7 @@ msgid "Bank & Cash"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:163
+#: code:addons/account/models/company.py:226
#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard_bank_account_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_bank_account_id
#: model:ir.model.fields,field_description:account.field_account_invoice_partner_bank_id
@@ -2308,7 +2307,7 @@ msgid "Bank Statement"
msgstr "Bankstaat"
#. module: account
-#: code:addons/account/models/account_bank_statement.py:935
+#: code:addons/account/models/account_bank_statement.py:937
#, python-format
msgid "Bank Statement %s"
msgstr ""
@@ -2524,8 +2523,8 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:168
-#: code:addons/account/models/chart_template.py:192
+#: code:addons/account/models/chart_template.py:173
+#: code:addons/account/models/chart_template.py:197
#, python-format
msgid "CABA"
msgstr ""
@@ -2598,19 +2597,19 @@ msgid "Cannot create credit note for the draft/cancelled invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:195
+#: code:addons/account/models/account_move.py:197
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:227
+#: code:addons/account/models/account_move.py:229
#, python-format
msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:635
+#: code:addons/account/models/account_invoice.py:641
#, python-format
msgid ""
"Cannot find a chart of accounts for this company, You should configure it. \n"
@@ -2618,13 +2617,13 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:579
+#: code:addons/account/models/account.py:594
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:609
+#: code:addons/account/models/account.py:624
#, python-format
msgid ""
"Cannot generate an unused journal code. Please fill the 'Shortcode' field."
@@ -2633,7 +2632,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:749
+#: code:addons/account/models/chart_template.py:758
#, python-format
msgid "Cash"
msgstr "Kontant"
@@ -2654,7 +2653,7 @@ msgid "Cash Basis Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:192
+#: code:addons/account/models/chart_template.py:197
#, python-format
msgid "Cash Basis Tax Journal"
msgstr ""
@@ -2788,7 +2787,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:216
+#: code:addons/account/models/company.py:278
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:13
#: model:ir.actions.act_window,name:account.action_account_form
#: model:ir.ui.menu,name:account.menu_action_account_form
@@ -2879,7 +2878,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:150
+#: code:addons/account/models/chart_template.py:155
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#, python-format
msgid "Choose Accounting Template"
@@ -2889,7 +2888,7 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
-msgid "Choose counterpart"
+msgid "Choose counterpart or Create Write-off"
msgstr ""
#. module: account
@@ -3103,7 +3102,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:147
+#: code:addons/account/models/company.py:210
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:25
#, python-format
msgid "Company Data"
@@ -3147,7 +3146,7 @@ msgid "Complete Set of Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:570
+#: code:addons/account/models/account_invoice.py:575
#, python-format
msgid "Compose Email"
msgstr ""
@@ -3175,8 +3174,8 @@ msgid "Configuration"
msgstr "Instelling"
#. module: account
-#: code:addons/account/models/account_payment.py:622
-#: code:addons/account/models/account_payment.py:624
+#: code:addons/account/models/account_payment.py:643
+#: code:addons/account/models/account_payment.py:645
#, python-format
msgid "Configuration Error !"
msgstr ""
@@ -3189,7 +3188,7 @@ msgid "Configuration Steps:"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:460
+#: code:addons/account/models/account_invoice.py:462
#, python-format
msgid ""
"Configuration error!\n"
@@ -3304,7 +3303,7 @@ msgid "Cost of Revenue"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:862
+#: code:addons/account/models/chart_template.py:873
#, python-format
msgid ""
"Could not install new chart of account as there are already accounting "
@@ -3348,13 +3347,6 @@ msgstr "Skep Kliente"
msgid "Create Vendors"
msgstr "Skep Verkopers"
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
-#, python-format
-msgid "Create Write-off"
-msgstr ""
-
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
@@ -3366,13 +3358,13 @@ msgid "Create and post move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:285
+#: code:addons/account/models/account_journal_dashboard.py:288
#, python-format
msgid "Create cash statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:271
+#: code:addons/account/models/account_journal_dashboard.py:274
#, python-format
msgid "Create invoice/bill"
msgstr ""
@@ -3552,8 +3544,8 @@ msgid "Credit Move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:439
-#: code:addons/account/models/account_invoice.py:1228
+#: code:addons/account/models/account_invoice.py:441
+#: code:addons/account/models/account_invoice.py:1216
#: code:addons/account/wizard/account_invoice_refund.py:111
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
#: model:ir.model,name:account.model_account_invoice_refund
@@ -3569,7 +3561,7 @@ msgid "Credit Note"
msgstr "Kredietnota"
#. module: account
-#: code:addons/account/models/account_invoice.py:440
+#: code:addons/account/models/account_invoice.py:442
#, python-format
msgid "Credit Note - %s"
msgstr ""
@@ -3591,7 +3583,6 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Credit Notes"
msgstr ""
@@ -3664,8 +3655,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1589
-#: code:addons/account/models/account_move.py:1601
+#: code:addons/account/models/account_move.py:1609
+#: code:addons/account/models/account_move.py:1621
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3699,7 +3690,7 @@ msgstr "Klient"
#. module: account
#: selection:account.invoice,type:0 selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:656
+#: code:addons/account/models/account_payment.py:677
#, python-format
msgid "Customer Credit Note"
msgstr ""
@@ -3721,7 +3712,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:193
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
#: model:ir.ui.view,arch_db:account.account_planner
@@ -3730,7 +3721,7 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:654
+#: code:addons/account/models/account_payment.py:675
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -3844,7 +3835,7 @@ msgid "Deactivate setup bar on the dashboard"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:43
+#: code:addons/account/models/company.py:45
#, python-format
msgid ""
"Dear Sir/Madam,\n"
@@ -4230,7 +4221,7 @@ msgid "Draft Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:437
+#: code:addons/account/models/account_invoice.py:439
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
@@ -4302,7 +4293,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1170
+#: code:addons/account/models/account_invoice.py:1176
#, python-format
msgid ""
"Duplicated vendor reference detected. You probably encoded twice the same "
@@ -4320,15 +4311,15 @@ msgid "EU Digital Goods VAT"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:166
-#: code:addons/account/models/chart_template.py:181
-#: code:addons/account/models/chart_template.py:191
+#: code:addons/account/models/chart_template.py:171
+#: code:addons/account/models/chart_template.py:186
+#: code:addons/account/models/chart_template.py:196
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1041
+#: code:addons/account/models/account_move.py:1052
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
@@ -4395,7 +4386,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1006
+#: code:addons/account/models/account_move.py:1019
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -4433,7 +4424,7 @@ msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config_settings.py:131
+#: code:addons/account/models/res_config_settings.py:132
#, python-format
msgid "Error!"
msgstr "Fout!"
@@ -4444,7 +4435,7 @@ msgid "Excel template"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:191
+#: code:addons/account/models/chart_template.py:196
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -4636,7 +4627,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:189
+#: code:addons/account/models/company.py:251
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:17
#, python-format
msgid "Fiscal Year"
@@ -4728,7 +4719,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:201
+#: code:addons/account/report/account_aged_partner_balance.py:205
#: code:addons/account/report/account_balance.py:64
#: code:addons/account/report/account_general_ledger.py:114
#: code:addons/account/report/account_journal.py:100
@@ -4740,7 +4731,7 @@ msgid "Form content is missing, this report cannot be printed."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:93
+#: code:addons/account/models/account_invoice.py:96
#, python-format
msgid "Free Reference"
msgstr ""
@@ -4870,7 +4861,7 @@ msgid "Go to bank statement(s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:636
+#: code:addons/account/models/account_invoice.py:642
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -5054,7 +5045,7 @@ msgid "ID"
msgstr "ID"
#. module: account
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:193
#, python-format
msgid "INV"
msgstr ""
@@ -5340,7 +5331,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:672
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:700
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -5357,8 +5348,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:234
-#: code:addons/account/models/company.py:249
+#: code:addons/account/models/company.py:296
+#: code:addons/account/models/company.py:311
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:9
#, python-format
msgid "Initial Balances"
@@ -5432,7 +5423,7 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1226
+#: code:addons/account/models/account_invoice.py:1214
#: model:ir.model,name:account.model_account_invoice
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id
#: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id
@@ -5457,7 +5448,7 @@ msgid "Invoice #"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:438
+#: code:addons/account/models/account_invoice.py:440
#, python-format
msgid "Invoice - %s"
msgstr ""
@@ -5527,31 +5518,31 @@ msgid "Invoice for which this invoice is the credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:747
+#: code:addons/account/models/account_invoice.py:753
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:795
+#: code:addons/account/models/account_invoice.py:801
#, python-format
msgid "Invoice must be in draft or open state in order to be cancelled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:769
+#: code:addons/account/models/account_invoice.py:775
#, python-format
msgid "Invoice must be in draft state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:789
+#: code:addons/account/models/account_invoice.py:795
#, 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:781
+#: code:addons/account/models/account_invoice.py:787
#, python-format
msgid "Invoice must be validated in order to set it to register payment."
msgstr ""
@@ -5686,14 +5677,14 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1039
+#: code:addons/account/models/account_move.py:1050
#, python-format
msgid ""
"It is mandatory to specify an account and a journal to create a write-off."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:470
#, python-format
msgid ""
"It is not allowed to delete a payment that already created a journal entry "
@@ -5823,7 +5814,7 @@ msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:399
+#: code:addons/account/models/account_payment.py:414
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
#: model:ir.actions.act_window,name:account.action_account_moves_all_a
@@ -5964,7 +5955,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:502
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:522
#: code:addons/account/static/src/xml/account_reconciliation.xml:189
#: code:addons/account/static/src/xml/account_reconciliation.xml:230
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_name
@@ -6260,7 +6251,7 @@ msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:213
+#: code:addons/account/models/account_invoice.py:216
#, python-format
msgid "Less Payment"
msgstr ""
@@ -6349,7 +6340,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:190
+#: code:addons/account/models/chart_template.py:195
#, python-format
msgid "MISC"
msgstr ""
@@ -6586,7 +6577,7 @@ msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:190
+#: code:addons/account/models/chart_template.py:195
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -6652,7 +6643,7 @@ msgid "Move Reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1342
+#: code:addons/account/models/account_move.py:1362
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
@@ -6746,7 +6737,7 @@ msgid "New Transactions"
msgstr "Nuwe Transaksies"
#. module: account
-#: code:addons/account/models/account_move.py:1319
+#: code:addons/account/models/account_move.py:1339
#, python-format
msgid "New expected payment date: "
msgstr ""
@@ -6778,12 +6769,6 @@ msgstr ""
msgid "No Message"
msgstr "Geen Boodskap"
-#. module: account
-#: code:addons/account/models/account_invoice.py:1384
-#, python-format
-msgid "No appropriate payment method enabled on journal %s"
-msgstr ""
-
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
@@ -6925,7 +6910,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "Odoo Accounting has many free extra-features:"
+msgid "Odoo Accounting has many extra-features:"
msgstr ""
#. module: account
@@ -7035,13 +7020,13 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:464
+#: code:addons/account/models/account_payment.py:484
#, python-format
msgid "Only a draft payment can be posted."
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:855
+#: code:addons/account/models/chart_template.py:866
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -7065,7 +7050,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:662
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:664
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
msgid "Open balance"
@@ -7084,7 +7069,7 @@ msgid "Opening Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:277
+#: code:addons/account/models/company.py:339
#: model:ir.model.fields,field_description:account.field_account_opening_opening_move_id
#: model:ir.model.fields,field_description:account.field_res_company_account_opening_move_id
#, python-format
@@ -7138,7 +7123,7 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:1013
+#: code:addons/account/models/account_bank_statement.py:1014
#, python-format
msgid ""
"Operation not allowed. Since your statement line already received a number, "
@@ -7214,13 +7199,13 @@ msgid "Outstanding Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:128
+#: code:addons/account/models/account_invoice.py:131
#, python-format
msgid "Outstanding credits"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:131
+#: code:addons/account/models/account_invoice.py:134
#, python-format
msgid "Outstanding debits"
msgstr ""
@@ -7259,7 +7244,7 @@ msgid "Paid"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:426
+#: code:addons/account/models/account_payment.py:430
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -7632,7 +7617,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1807
+#: code:addons/account/models/account_invoice.py:1776
#, python-format
msgid "Percentages for Payment Terms Line must be between 0 and 100."
msgstr ""
@@ -7670,7 +7655,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1064
+#: code:addons/account/models/account_invoice.py:1070
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -7688,13 +7673,13 @@ msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1062
+#: code:addons/account/models/account_invoice.py:1068
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:273
+#: code:addons/account/models/company.py:336
#, python-format
msgid ""
"Please install a chart of accounts or create a miscellaneous journal before "
@@ -8139,7 +8124,7 @@ msgid "Ref."
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:74
+#: code:addons/account/controllers/portal.py:72
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
@@ -8916,7 +8901,7 @@ msgid "States Count"
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:75
+#: code:addons/account/controllers/portal.py:73
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
#: model:ir.model.fields,field_description:account.field_account_invoice_state
@@ -9000,8 +8985,8 @@ msgid "Tax"
msgstr "Belasting"
#. module: account
-#: code:addons/account/models/chart_template.py:833
-#: code:addons/account/models/chart_template.py:836
+#: code:addons/account/models/chart_template.py:842
+#: code:addons/account/models/chart_template.py:845
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -9445,13 +9430,13 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1189
+#: code:addons/account/models/account_move.py:1209
#, python-format
msgid "The account %s (%s) is deprecated !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1008
+#: code:addons/account/models/account_move.py:1021
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -9485,7 +9470,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:504
+#: code:addons/account/models/account_move.py:508
#, python-format
msgid ""
"The amount expressed in the secondary currency must be positive when account"
@@ -9493,7 +9478,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:789
+#: code:addons/account/models/account.py:804
#, python-format
msgid ""
"The application scope of taxes in a group must be either the same as the "
@@ -9513,7 +9498,7 @@ msgid "The bank statement used for bank reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1159
+#: code:addons/account/models/account_invoice.py:1165
#, 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"
@@ -9612,7 +9597,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:622
+#: code:addons/account/models/account_payment.py:643
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -9644,6 +9629,12 @@ msgid ""
"whole amount will be allocated."
msgstr ""
+#. module: account
+#: code:addons/account/models/company.py:94
+#, python-format
+msgid "The lock date for advisors is irreversible and can't be removed."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_move_line_move_id
msgid "The move of this entry line."
@@ -9662,6 +9653,13 @@ msgstr ""
msgid "The name that will be used on account move lines"
msgstr ""
+#. module: account
+#: code:addons/account/models/company.py:98
+#, python-format
+msgid ""
+"The new lock date for advisors must be set after the previous lock date."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
msgid "The next sequence number will be used for the next credit note."
@@ -9698,14 +9696,6 @@ msgid ""
"the invoices & payments matching was performed."
msgstr ""
-#. module: account
-#: code:addons/account/models/account_move.py:1010
-#, python-format
-msgid ""
-"The partner has to be the same on all lines for receivable and payable "
-"accounts!"
-msgstr ""
-
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_reference
msgid "The partner reference of this invoice."
@@ -9725,7 +9715,7 @@ msgid "The payment amount cannot be negative."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:467
+#: code:addons/account/models/account_payment.py:487
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -9744,7 +9734,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:489
+#: code:addons/account/models/account_move.py:493
#, python-format
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -9752,7 +9742,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1644
+#: code:addons/account/models/account_invoice.py:1612
#, python-format
msgid ""
"The selected unit of measure is not compatible with the unit of measure of "
@@ -9768,7 +9758,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:624
+#: code:addons/account/models/account_payment.py:645
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
@@ -9784,7 +9774,7 @@ msgid "There are currently no invoices and payments for your account."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:121
+#: code:addons/account/models/company.py:178
#, python-format
msgid ""
"There are still unposted entries in the period you want to lock. You should "
@@ -9806,7 +9796,7 @@ msgid "There is no journal items in draft state to post."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1714
+#: code:addons/account/models/account_move.py:1744
#, python-format
msgid ""
"There is no tax cash basis journal defined for this company: \"%s\" \n"
@@ -9843,7 +9833,7 @@ msgid "These users handle billing specifically."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1359
+#: code:addons/account/models/account_invoice.py:1337
#, python-format
msgid ""
"This %s has been created from: , 2017\n"
"Language-Team: Amharic (https://www.transifex.com/odoo/teams/41243/am/)\n"
"MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgid "%d transactions were automatically reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:794
+#: code:addons/account/models/account.py:809
#, python-format
msgid "%s (Copy)"
msgstr ""
@@ -147,7 +147,7 @@ msgid ": General ledger"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:539
+#: code:addons/account/models/account.py:554
#, python-format
msgid ": Refund"
msgstr ""
@@ -932,19 +932,19 @@ msgid "A Cash transaction can't have a 0 amount."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1731
+#: code:addons/account/models/account_invoice.py:1699
#, python-format
msgid "A Payment Terms should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1734
+#: code:addons/account/models/account_invoice.py:1702
#, python-format
msgid "A Payment Terms should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:707
+#: code:addons/account/models/account.py:722
#, python-format
msgid "A bank account can only belong to one journal."
msgstr ""
@@ -995,7 +995,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:881
+#: code:addons/account/models/account_move.py:891
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
@@ -1008,14 +1008,14 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:880
-#: code:addons/account/models/account_bank_statement.py:883
+#: code:addons/account/models/account_bank_statement.py:881
+#: code:addons/account/models/account_bank_statement.py:884
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:891
+#: code:addons/account/models/account_bank_statement.py:892
#, python-format
msgid "A selected statement line was already reconciled with an account move."
msgstr ""
@@ -1040,8 +1040,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:501
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:503
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:521
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:523
#: code:addons/account/static/src/xml/account_reconciliation.xml:170
#: code:addons/account/static/src/xml/account_reconciliation.xml:228
#: code:addons/account/static/src/xml/account_reconciliation.xml:253
@@ -1395,7 +1395,6 @@ msgid ""
msgstr ""
#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings_module_account_accountant
#: model:ir.ui.menu,name:account.account_account_menu
msgid "Accounting"
msgstr ""
@@ -1558,16 +1557,6 @@ msgstr ""
msgid "Adjustment Type"
msgstr ""
-#. module: account
-#: selection:tax.adjustments.wizard,adjustment_type:0
-msgid "Adjustment in favor of the Estate"
-msgstr ""
-
-#. module: account
-#: selection:tax.adjustments.wizard,adjustment_type:0
-msgid "Adjustment in your favor"
-msgstr ""
-
#. module: account
#: model:ir.ui.view,arch_db:account.view_account_tax_template_form
#: model:ir.ui.view,arch_db:account.view_tax_form
@@ -1974,6 +1963,16 @@ msgstr ""
msgid "Applicability"
msgstr ""
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on credit journal item"
+msgstr ""
+
+#. module: account
+#: selection:tax.adjustments.wizard,adjustment_type:0
+msgid "Applied on debit journal item"
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_fiscal_position_auto_apply
#: model:ir.model.fields,help:account.field_account_fiscal_position_template_auto_apply
@@ -2068,7 +2067,7 @@ msgid "Automated Entries"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:354
+#: code:addons/account/models/company.py:411
#: code:addons/account/wizard/setup_wizards.py:79
#, python-format
msgid "Automatic Balancing Line"
@@ -2114,7 +2113,7 @@ msgid "Awaiting payments"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:189
+#: code:addons/account/models/chart_template.py:194
#, python-format
msgid "BILL"
msgstr ""
@@ -2156,7 +2155,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:749
+#: code:addons/account/models/chart_template.py:758
#: model:ir.model.fields,field_description:account.field_account_journal_bank_id
#: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count
#: model:ir.model.fields,field_description:account.field_res_users_bank_account_count
@@ -2170,7 +2169,7 @@ msgid "Bank & Cash"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:163
+#: code:addons/account/models/company.py:226
#: model:ir.model.fields,field_description:account.field_account_bank_accounts_wizard_bank_account_id
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_bank_account_id
#: model:ir.model.fields,field_description:account.field_account_invoice_partner_bank_id
@@ -2253,7 +2252,7 @@ msgid "Bank Statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:935
+#: code:addons/account/models/account_bank_statement.py:937
#, python-format
msgid "Bank Statement %s"
msgstr ""
@@ -2469,8 +2468,8 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:168
-#: code:addons/account/models/chart_template.py:192
+#: code:addons/account/models/chart_template.py:173
+#: code:addons/account/models/chart_template.py:197
#, python-format
msgid "CABA"
msgstr ""
@@ -2543,19 +2542,19 @@ msgid "Cannot create credit note for the draft/cancelled invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:195
+#: code:addons/account/models/account_move.py:197
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:227
+#: code:addons/account/models/account_move.py:229
#, python-format
msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:635
+#: code:addons/account/models/account_invoice.py:641
#, python-format
msgid ""
"Cannot find a chart of accounts for this company, You should configure it. \n"
@@ -2563,13 +2562,13 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:579
+#: code:addons/account/models/account.py:594
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:609
+#: code:addons/account/models/account.py:624
#, python-format
msgid ""
"Cannot generate an unused journal code. Please fill the 'Shortcode' field."
@@ -2578,7 +2577,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:749
+#: code:addons/account/models/chart_template.py:758
#, python-format
msgid "Cash"
msgstr ""
@@ -2599,7 +2598,7 @@ msgid "Cash Basis Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:192
+#: code:addons/account/models/chart_template.py:197
#, python-format
msgid "Cash Basis Tax Journal"
msgstr ""
@@ -2733,7 +2732,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:216
+#: code:addons/account/models/company.py:278
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:13
#: model:ir.actions.act_window,name:account.action_account_form
#: model:ir.ui.menu,name:account.menu_action_account_form
@@ -2824,7 +2823,7 @@ msgid "Children Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:150
+#: code:addons/account/models/chart_template.py:155
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#, python-format
msgid "Choose Accounting Template"
@@ -2834,7 +2833,7 @@ msgstr ""
#. openerp-web
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
-msgid "Choose counterpart"
+msgid "Choose counterpart or Create Write-off"
msgstr ""
#. module: account
@@ -3048,7 +3047,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:147
+#: code:addons/account/models/company.py:210
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:25
#, python-format
msgid "Company Data"
@@ -3092,7 +3091,7 @@ msgid "Complete Set of Taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:570
+#: code:addons/account/models/account_invoice.py:575
#, python-format
msgid "Compose Email"
msgstr ""
@@ -3120,8 +3119,8 @@ msgid "Configuration"
msgstr "ማስተካከያዎች"
#. module: account
-#: code:addons/account/models/account_payment.py:622
-#: code:addons/account/models/account_payment.py:624
+#: code:addons/account/models/account_payment.py:643
+#: code:addons/account/models/account_payment.py:645
#, python-format
msgid "Configuration Error !"
msgstr ""
@@ -3134,7 +3133,7 @@ msgid "Configuration Steps:"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:460
+#: code:addons/account/models/account_invoice.py:462
#, python-format
msgid ""
"Configuration error!\n"
@@ -3249,7 +3248,7 @@ msgid "Cost of Revenue"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:862
+#: code:addons/account/models/chart_template.py:873
#, python-format
msgid ""
"Could not install new chart of account as there are already accounting "
@@ -3293,13 +3292,6 @@ msgstr ""
msgid "Create Vendors"
msgstr ""
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:131
-#, python-format
-msgid "Create Write-off"
-msgstr ""
-
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft credit note"
@@ -3311,13 +3303,13 @@ msgid "Create and post move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:285
+#: code:addons/account/models/account_journal_dashboard.py:288
#, python-format
msgid "Create cash statement"
msgstr ""
#. module: account
-#: code:addons/account/models/account_journal_dashboard.py:271
+#: code:addons/account/models/account_journal_dashboard.py:274
#, python-format
msgid "Create invoice/bill"
msgstr ""
@@ -3497,8 +3489,8 @@ msgid "Credit Move"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:439
-#: code:addons/account/models/account_invoice.py:1228
+#: code:addons/account/models/account_invoice.py:441
+#: code:addons/account/models/account_invoice.py:1216
#: code:addons/account/wizard/account_invoice_refund.py:111
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
#: model:ir.model,name:account.model_account_invoice_refund
@@ -3514,7 +3506,7 @@ msgid "Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:440
+#: code:addons/account/models/account_invoice.py:442
#, python-format
msgid "Credit Note - %s"
msgstr ""
@@ -3536,7 +3528,6 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
-#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
msgid "Credit Notes"
msgstr ""
@@ -3609,8 +3600,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1589
-#: code:addons/account/models/account_move.py:1601
+#: code:addons/account/models/account_move.py:1609
+#: code:addons/account/models/account_move.py:1621
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3644,7 +3635,7 @@ msgstr "ተባባሪ"
#. module: account
#: selection:account.invoice,type:0 selection:account.invoice.report,type:0
-#: code:addons/account/models/account_payment.py:656
+#: code:addons/account/models/account_payment.py:677
#, python-format
msgid "Customer Credit Note"
msgstr ""
@@ -3666,7 +3657,7 @@ msgid "Customer Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:193
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
#: model:ir.ui.view,arch_db:account.account_planner
@@ -3675,7 +3666,7 @@ msgid "Customer Invoices"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:654
+#: code:addons/account/models/account_payment.py:675
#, python-format
msgid "Customer Payment"
msgstr ""
@@ -3789,7 +3780,7 @@ msgid "Deactivate setup bar on the dashboard"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:43
+#: code:addons/account/models/company.py:45
#, python-format
msgid ""
"Dear Sir/Madam,\n"
@@ -4175,7 +4166,7 @@ msgid "Draft Credit Note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:437
+#: code:addons/account/models/account_invoice.py:439
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.portal_invoice_page
#: model:ir.ui.view,arch_db:account.report_invoice_document
@@ -4247,7 +4238,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1170
+#: code:addons/account/models/account_invoice.py:1176
#, python-format
msgid ""
"Duplicated vendor reference detected. You probably encoded twice the same "
@@ -4265,15 +4256,15 @@ msgid "EU Digital Goods VAT"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:166
-#: code:addons/account/models/chart_template.py:181
-#: code:addons/account/models/chart_template.py:191
+#: code:addons/account/models/chart_template.py:171
+#: code:addons/account/models/chart_template.py:186
+#: code:addons/account/models/chart_template.py:196
#, python-format
msgid "EXCH"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1041
+#: code:addons/account/models/account_move.py:1052
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
@@ -4340,7 +4331,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1006
+#: code:addons/account/models/account_move.py:1019
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -4378,7 +4369,7 @@ msgid "Equity"
msgstr ""
#. module: account
-#: code:addons/account/models/res_config_settings.py:131
+#: code:addons/account/models/res_config_settings.py:132
#, python-format
msgid "Error!"
msgstr "ስህተት!"
@@ -4389,7 +4380,7 @@ msgid "Excel template"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:191
+#: code:addons/account/models/chart_template.py:196
#, python-format
msgid "Exchange Difference"
msgstr ""
@@ -4581,7 +4572,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:189
+#: code:addons/account/models/company.py:251
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:17
#, python-format
msgid "Fiscal Year"
@@ -4673,7 +4664,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:201
+#: code:addons/account/report/account_aged_partner_balance.py:205
#: code:addons/account/report/account_balance.py:64
#: code:addons/account/report/account_general_ledger.py:114
#: code:addons/account/report/account_journal.py:100
@@ -4685,7 +4676,7 @@ msgid "Form content is missing, this report cannot be printed."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:93
+#: code:addons/account/models/account_invoice.py:96
#, python-format
msgid "Free Reference"
msgstr ""
@@ -4815,7 +4806,7 @@ msgid "Go to bank statement(s)"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:636
+#: code:addons/account/models/account_invoice.py:642
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -4999,7 +4990,7 @@ msgid "ID"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:188
+#: code:addons/account/models/chart_template.py:193
#, python-format
msgid "INV"
msgstr ""
@@ -5285,7 +5276,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:672
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:700
#, python-format
msgid "Incorrect Operation"
msgstr ""
@@ -5302,8 +5293,8 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/models/company.py:234
-#: code:addons/account/models/company.py:249
+#: code:addons/account/models/company.py:296
+#: code:addons/account/models/company.py:311
#: code:addons/account/static/src/xml/account_dashboard_setup_bar.xml:9
#, python-format
msgid "Initial Balances"
@@ -5377,7 +5368,7 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1226
+#: code:addons/account/models/account_invoice.py:1214
#: model:ir.model,name:account.model_account_invoice
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id
#: model:ir.model.fields,field_description:account.field_account_move_line_invoice_id
@@ -5402,7 +5393,7 @@ msgid "Invoice #"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:438
+#: code:addons/account/models/account_invoice.py:440
#, python-format
msgid "Invoice - %s"
msgstr ""
@@ -5472,31 +5463,31 @@ msgid "Invoice for which this invoice is the credit note"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:747
+#: code:addons/account/models/account_invoice.py:753
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:795
+#: code:addons/account/models/account_invoice.py:801
#, python-format
msgid "Invoice must be in draft or open state in order to be cancelled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:769
+#: code:addons/account/models/account_invoice.py:775
#, python-format
msgid "Invoice must be in draft state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:789
+#: code:addons/account/models/account_invoice.py:795
#, 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:781
+#: code:addons/account/models/account_invoice.py:787
#, python-format
msgid "Invoice must be validated in order to set it to register payment."
msgstr ""
@@ -5631,14 +5622,14 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1039
+#: code:addons/account/models/account_move.py:1050
#, python-format
msgid ""
"It is mandatory to specify an account and a journal to create a write-off."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:450
+#: code:addons/account/models/account_payment.py:470
#, python-format
msgid ""
"It is not allowed to delete a payment that already created a journal entry "
@@ -5768,7 +5759,7 @@ msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:399
+#: code:addons/account/models/account_payment.py:414
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
#: model:ir.actions.act_window,name:account.action_account_moves_all_a
@@ -5909,7 +5900,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:502
+#: code:addons/account/static/src/js/reconciliation/reconciliation_renderer.js:522
#: code:addons/account/static/src/xml/account_reconciliation.xml:189
#: code:addons/account/static/src/xml/account_reconciliation.xml:230
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_name
@@ -6205,7 +6196,7 @@ msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:213
+#: code:addons/account/models/account_invoice.py:216
#, python-format
msgid "Less Payment"
msgstr ""
@@ -6294,7 +6285,7 @@ msgid "Loss Exchange Rate Account"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:190
+#: code:addons/account/models/chart_template.py:195
#, python-format
msgid "MISC"
msgstr ""
@@ -6531,7 +6522,7 @@ msgid "Miscellaneous"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:190
+#: code:addons/account/models/chart_template.py:195
#: model:ir.ui.view,arch_db:account.view_account_move_filter
#, python-format
msgid "Miscellaneous Operations"
@@ -6597,7 +6588,7 @@ msgid "Move Reconciled"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1342
+#: code:addons/account/models/account_move.py:1362
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
@@ -6691,7 +6682,7 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1319
+#: code:addons/account/models/account_move.py:1339
#, python-format
msgid "New expected payment date: "
msgstr ""
@@ -6723,12 +6714,6 @@ msgstr ""
msgid "No Message"
msgstr ""
-#. module: account
-#: code:addons/account/models/account_invoice.py:1384
-#, python-format
-msgid "No appropriate payment method enabled on journal %s"
-msgstr ""
-
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
@@ -6870,7 +6855,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "Odoo Accounting has many free extra-features:"
+msgid "Odoo Accounting has many extra-features:"
msgstr ""
#. module: account
@@ -6980,13 +6965,13 @@ msgid "Only One Chart Template Available"
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:464
+#: code:addons/account/models/account_payment.py:484
#, python-format
msgid "Only a draft payment can be posted."
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:855
+#: code:addons/account/models/chart_template.py:866
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -7010,7 +6995,7 @@ msgstr ""
#. module: account
#. openerp-web
-#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:662
+#: code:addons/account/static/src/js/reconciliation/reconciliation_model.js:664
#: code:addons/account/static/src/xml/account_reconciliation.xml:131
#, python-format
msgid "Open balance"
@@ -7029,7 +7014,7 @@ msgid "Opening Journal"
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:277
+#: code:addons/account/models/company.py:339
#: model:ir.model.fields,field_description:account.field_account_opening_opening_move_id
#: model:ir.model.fields,field_description:account.field_res_company_account_opening_move_id
#, python-format
@@ -7083,7 +7068,7 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:1013
+#: code:addons/account/models/account_bank_statement.py:1014
#, python-format
msgid ""
"Operation not allowed. Since your statement line already received a number, "
@@ -7159,13 +7144,13 @@ msgid "Outstanding Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:128
+#: code:addons/account/models/account_invoice.py:131
#, python-format
msgid "Outstanding credits"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:131
+#: code:addons/account/models/account_invoice.py:134
#, python-format
msgid "Outstanding debits"
msgstr ""
@@ -7204,7 +7189,7 @@ msgid "Paid"
msgstr "ተከፈል"
#. module: account
-#: code:addons/account/models/account_payment.py:426
+#: code:addons/account/models/account_payment.py:430
#, python-format
msgid "Paid Invoices"
msgstr ""
@@ -7577,7 +7562,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1807
+#: code:addons/account/models/account_invoice.py:1776
#, python-format
msgid "Percentages for Payment Terms Line must be between 0 and 100."
msgstr ""
@@ -7615,7 +7600,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1064
+#: code:addons/account/models/account_invoice.py:1070
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -7633,13 +7618,13 @@ msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1062
+#: code:addons/account/models/account_invoice.py:1068
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:273
+#: code:addons/account/models/company.py:336
#, python-format
msgid ""
"Please install a chart of accounts or create a miscellaneous journal before "
@@ -8084,7 +8069,7 @@ msgid "Ref."
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:74
+#: code:addons/account/controllers/portal.py:72
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_ref
#: model:ir.model.fields,field_description:account.field_account_bank_statement_name
#: model:ir.model.fields,field_description:account.field_account_move_line_ref
@@ -8861,7 +8846,7 @@ msgid "States Count"
msgstr ""
#. module: account
-#: code:addons/account/controllers/portal.py:75
+#: code:addons/account/controllers/portal.py:73
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
#: model:ir.model.fields,field_description:account.field_account_invoice_state
@@ -8945,8 +8930,8 @@ msgid "Tax"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:833
-#: code:addons/account/models/chart_template.py:836
+#: code:addons/account/models/chart_template.py:842
+#: code:addons/account/models/chart_template.py:845
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -9390,13 +9375,13 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1189
+#: code:addons/account/models/account_move.py:1209
#, python-format
msgid "The account %s (%s) is deprecated !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1008
+#: code:addons/account/models/account_move.py:1021
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -9430,7 +9415,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:504
+#: code:addons/account/models/account_move.py:508
#, python-format
msgid ""
"The amount expressed in the secondary currency must be positive when account"
@@ -9438,7 +9423,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:789
+#: code:addons/account/models/account.py:804
#, python-format
msgid ""
"The application scope of taxes in a group must be either the same as the "
@@ -9458,7 +9443,7 @@ msgid "The bank statement used for bank reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1159
+#: code:addons/account/models/account_invoice.py:1165
#, 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"
@@ -9557,7 +9542,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:622
+#: code:addons/account/models/account_payment.py:643
#, python-format
msgid "The journal %s does not have a sequence, please specify one."
msgstr ""
@@ -9589,6 +9574,12 @@ msgid ""
"whole amount will be allocated."
msgstr ""
+#. module: account
+#: code:addons/account/models/company.py:94
+#, python-format
+msgid "The lock date for advisors is irreversible and can't be removed."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_move_line_move_id
msgid "The move of this entry line."
@@ -9607,6 +9598,13 @@ msgstr ""
msgid "The name that will be used on account move lines"
msgstr ""
+#. module: account
+#: code:addons/account/models/company.py:98
+#, python-format
+msgid ""
+"The new lock date for advisors must be set after the previous lock date."
+msgstr ""
+
#. module: account
#: model:ir.model.fields,help:account.field_account_journal_refund_sequence_number_next
msgid "The next sequence number will be used for the next credit note."
@@ -9643,14 +9641,6 @@ msgid ""
"the invoices & payments matching was performed."
msgstr ""
-#. module: account
-#: code:addons/account/models/account_move.py:1010
-#, python-format
-msgid ""
-"The partner has to be the same on all lines for receivable and payable "
-"accounts!"
-msgstr ""
-
#. module: account
#: model:ir.model.fields,help:account.field_account_invoice_reference
msgid "The partner reference of this invoice."
@@ -9670,7 +9660,7 @@ msgid "The payment amount cannot be negative."
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:467
+#: code:addons/account/models/account_payment.py:487
#, python-format
msgid "The payment cannot be processed because the invoice is not open!"
msgstr ""
@@ -9689,7 +9679,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:489
+#: code:addons/account/models/account_move.py:493
#, python-format
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
@@ -9697,7 +9687,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1644
+#: code:addons/account/models/account_invoice.py:1612
#, python-format
msgid ""
"The selected unit of measure is not compatible with the unit of measure of "
@@ -9713,7 +9703,7 @@ msgid ""
msgstr ""
#. module: account
-#: code:addons/account/models/account_payment.py:624
+#: code:addons/account/models/account_payment.py:645
#, python-format
msgid "The sequence of journal %s is deactivated."
msgstr ""
@@ -9729,7 +9719,7 @@ msgid "There are currently no invoices and payments for your account."
msgstr ""
#. module: account
-#: code:addons/account/models/company.py:121
+#: code:addons/account/models/company.py:178
#, python-format
msgid ""
"There are still unposted entries in the period you want to lock. You should "
@@ -9751,7 +9741,7 @@ msgid "There is no journal items in draft state to post."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1714
+#: code:addons/account/models/account_move.py:1744
#, python-format
msgid ""
"There is no tax cash basis journal defined for this company: \"%s\" \n"
@@ -9788,7 +9778,7 @@ msgid "These users handle billing specifically."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1359
+#: code:addons/account/models/account_invoice.py:1337
#, python-format
msgid ""
"This %s has been created from: , 2017
# Abdulaziz Alayed
Vážený, vážená ${object.partner_id.name},
\n" +"Děkujeme za Vaši platbu.
Zde je Vás platební doklad ${(object.name or '').replace('/','-')} na částku ${format_amount(object.amount, object.currency_id)} zaslaný ${object.company_id.name}.
Pokud mátě nějaké dotazy, neváhejte nás kontaktovat.
\n" +"S přáním všeho dobrého\n" +"% if user and user.signature:\n" +"${user.signature | safe}\n" +"% endif\n" +"
\n" +"" #. module: account #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice @@ -255,6 +266,71 @@ msgid "" "\n" "" msgstr "" +"\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
| \n" +" Běží na Odoo.\n" +" | \n" +"
Vážený vážená, ${object.partner_id.name}\n" +"% set access_action = object.with_context(force_website=True).get_access_action()\n" +"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" +"% set access_url = object.get_mail_url()\n" +"\n" +"% if object.partner_id.parent_id:\n" +" (${object.partner_id.parent_id.name})\n" +"% endif\n" +",
\n" +"Zasíláme v příloze, vaší \n" +"% if object.number:\n" +"fakturu ${object.number}\n" +"% else:\n" +"invoice\n" +"% endif\n" +"% if object.origin:\n" +"(with reference: ${object.origin})\n" +"% endif\n" +"na čásktu ${format_amount(object.amount_total, object.currency_id)}\n" +"od společnosti ${object.company_id.name}.\n" +"
\n" +"\n" +"% if is_online:\n" +"Faktura je již zaplacená.
\n" +"% else:\n" +"Prosíme zaplaťte při nejbližší příležitosti.
\n" +"% endif\n" +"\n" +"S pozdravem,,
\n" +"\n" +"% if object.user_id and object.user_id.signature:\n" +" ${object.user_id.signature | safe}\n" +"% endif\n" +"
\n" +"${object.partner_id.name} گرامی,
\n" +"برای پرداخت متشکریم.
این رسید پرداخت شما است ${(object.name or '').replace('/','-')} به مقدار ${format_amount(object.amount, object.currency_id)} از ${object.company_id.name}.
اگر سوالی دارید لطفا با ما تماس بگیرید.
\n" +"آرزوی بهترینها,\n" +"% if user and user.signature:\n" +"${user.signature | safe}\n" +"% endif\n" +"
\n" +"" #. module: account #: model:mail.template,body_html:account.mail_template_data_notification_email_account_invoice @@ -259,6 +273,71 @@ msgid "" "\n" "" msgstr "" +"\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
| \n" +" با استفاده از اودو.\n" +" | \n" +"
گرامی ${object.partner_id.name}\n" +"% set access_action = object.with_context(force_website=True).get_access_action()\n" +"% set is_online = access_action and access_action['type'] == 'ir.actions.act_url'\n" +"% set access_url = object.get_mail_url()\n" +"\n" +"% if object.partner_id.parent_id:\n" +" (${object.partner_id.parent_id.name})\n" +"% endif\n" +",
\n" +"اینجا به پیوست \n" +"% if object.number:\n" +"فاکتور شما ${object.number}\n" +"% else:\n" +"invoice\n" +"% endif\n" +"% if object.origin:\n" +"(with reference: ${object.origin})\n" +"% endif\n" +"به مقدار ${format_amount(object.amount_total, object.currency_id)}\n" +"from ${object.company_id.name}.\n" +"
\n" +"\n" +"% if is_online:\n" +"این فاکتور قبلا پرداخت شده است.
\n" +"% else:\n" +"لطفا در زمان ممکن وجه فاکتور را پرداخت کنید.
\n" +"% endif\n" +"\n" +"با تشکر,
\n" +"\n" +"% if object.user_id and object.user_id.signature:\n" +" ${object.user_id.signature | safe}\n" +"% endif\n" +"
\n" +"\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
\n"
+"
| \n"
+" ||
| \n" +" Powered by Odoo.\n" +" | \n" +"