Skip to content

Commit 8c3353c

Browse files
authored
Merge pull request #2358 from acsone/ou-13-upd-20200628-sbi
Merge upstream until 0916a03
2 parents dae6189 + 2a5774b commit 8c3353c

File tree

6,543 files changed

+1126877
-328637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,543 files changed

+1126877
-328637
lines changed

.tx/config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,11 @@ file_filter = addons/hr_holidays/i18n/<lang>.po
302302
source_file = addons/hr_holidays/i18n/hr_holidays.pot
303303
source_lang = en
304304

305+
[odoo-13.hr_holidays_calendar]
306+
file_filter = addons/hr_holidays_calendar/i18n/<lang>.po
307+
source_file = addons/hr_holidays_calendar/i18n/hr_holidays_calendar.pot
308+
source_lang = en
309+
305310
[odoo-13.hr_maintenance]
306311
file_filter = addons/hr_maintenance/i18n/<lang>.po
307312
source_file = addons/hr_maintenance/i18n/hr_maintenance.pot

addons/account/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ def _auto_install_l10n(cr, registry):
1616
country_code = env.company.country_id.code
1717
if country_code:
1818
#auto install localization module(s) if available
19+
to_install_l10n = env['ir.module.module'].search_count([('name', 'like', 'l10n_'), ('state', '=', 'to install')])
1920
module_list = []
20-
if country_code in SYSCOHADA_LIST:
21+
if to_install_l10n:
22+
# We don't install a CoA if one was passed in the command line
23+
# or has been selected to install
24+
pass
25+
elif country_code in SYSCOHADA_LIST:
2126
#countries using OHADA Chart of Accounts
2227
module_list.append('l10n_syscohada')
2328
elif country_code == 'GB':
@@ -35,9 +40,8 @@ def _auto_install_l10n(cr, registry):
3540
module_list.append('l10n_generic_coa')
3641
if country_code == 'US':
3742
module_list.append('account_plaid')
38-
module_list.append('l10n_us_check_printing')
39-
if country_code == 'CA':
40-
module_list.append('l10n_ca_check_printing')
43+
if country_code in ['US', 'CA']:
44+
module_list.append('account_check_printing')
4145
if country_code in ['US', 'AU', 'NZ', 'CA', 'CO', 'EC', 'ES', 'FR', 'IN', 'MX', 'GB']:
4246
module_list.append('account_yodlee')
4347
if country_code in SYSCOHADA_LIST + [

addons/account/i18n/account.pot

Lines changed: 103 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: Odoo Server 13.0\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2019-12-05 12:32+0000\n"
10-
"PO-Revision-Date: 2019-12-05 12:32+0000\n"
9+
"POT-Creation-Date: 2020-04-27 09:21+0000\n"
10+
"PO-Revision-Date: 2020-04-27 09:21+0000\n"
1111
"Last-Translator: \n"
1212
"Language-Team: \n"
1313
"MIME-Version: 1.0\n"
@@ -773,6 +773,12 @@ msgstr ""
773773
msgid "A selected statement line was already reconciled with an account move."
774774
msgstr ""
775775

776+
#. module: account
777+
#: code:addons/account/models/account.py:0
778+
#, python-format
779+
msgid "A tag defined to be used on taxes must always have a country set."
780+
msgstr ""
781+
776782
#. module: account
777783
#: model:ir.model.constraint,message:account.constraint_account_fiscal_position_tax_tax_src_dest_uniq
778784
msgid "A tax fiscal position could be defined only one time on same taxes."
@@ -1222,11 +1228,19 @@ msgstr ""
12221228
msgid "Accounts Mapping of Fiscal Position"
12231229
msgstr ""
12241230

1231+
#. module: account
1232+
#: code:addons/account/wizard/account_accrual_accounting.py:0
1233+
#, python-format
1234+
msgid ""
1235+
"Accrual Adjusting Entries ({percent}%% recognized) have been created for "
1236+
"this invoice on {date}"
1237+
msgstr ""
1238+
12251239
#. module: account
12261240
#: code:addons/account/wizard/account_accrual_accounting.py:0
12271241
#: code:addons/account/wizard/account_accrual_accounting.py:0
12281242
#, python-format
1229-
msgid "Accrual Adjusting Entry (%s recognized) for invoice: %s"
1243+
msgid "Accrual Adjusting Entry (%s%% recognized) for invoice: %s"
12301244
msgstr ""
12311245

12321246
#. module: account
@@ -1762,6 +1776,7 @@ msgid "Analytic Acc."
17621776
msgstr ""
17631777

17641778
#. module: account
1779+
#: model:ir.model,name:account.model_account_analytic_account
17651780
#: model:ir.model.fields,field_description:account.field_account_invoice_report__analytic_account_id
17661781
#: model:ir.model.fields,field_description:account.field_account_move_line__analytic_account_id
17671782
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__analytic_account_id
@@ -1807,6 +1822,7 @@ msgid "Analytic Lines"
18071822
msgstr ""
18081823

18091824
#. module: account
1825+
#: model:ir.model,name:account.model_account_analytic_tag
18101826
#: model:ir.model.fields,field_description:account.field_account_move_line__analytic_tag_ids
18111827
#: model:ir.model.fields,field_description:account.field_account_reconcile_model__analytic_tag_ids
18121828
#: model:ir.model.fields,field_description:account.field_res_config_settings__group_analytic_tags
@@ -2188,6 +2204,7 @@ msgstr ""
21882204

21892205
#. module: account
21902206
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
2207+
#: model_terms:ir.ui.view,arch_db:account.view_account_bank_journal_form
21912208
msgid "Bank Statements"
21922209
msgstr ""
21932210

@@ -2958,6 +2975,7 @@ msgstr ""
29582975
#: model:ir.model.fields,field_description:account.field_account_accrual_accounting_wizard__company_id
29592976
#: model:ir.model.fields,field_description:account.field_account_bank_statement__company_id
29602977
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__company_id
2978+
#: model:ir.model.fields,field_description:account.field_account_cash_rounding__company_id
29612979
#: model:ir.model.fields,field_description:account.field_account_common_journal_report__company_id
29622980
#: model:ir.model.fields,field_description:account.field_account_common_report__company_id
29632981
#: model:ir.model.fields,field_description:account.field_account_financial_year_op__company_id
@@ -5524,6 +5542,13 @@ msgstr ""
55245542
msgid "Indicates that this journal item is a tax line"
55255543
msgstr ""
55265544

5545+
#. module: account
5546+
#. openerp-web
5547+
#: code:addons/account/static/src/xml/account_payment.xml:0
5548+
#, python-format
5549+
msgid "Info"
5550+
msgstr ""
5551+
55275552
#. module: account
55285553
#: model_terms:ir.ui.view,arch_db:account.view_move_line_form
55295554
msgid "Information"
@@ -7010,6 +7035,12 @@ msgstr ""
70107035
msgid "No attachment was provided"
70117036
msgstr ""
70127037

7038+
#. module: account
7039+
#: code:addons/account/models/account_bank_statement.py:0
7040+
#, python-format
7041+
msgid "No default debit and credit account defined on journal %s (ids: %s)."
7042+
msgstr ""
7043+
70137044
#. module: account
70147045
#: code:addons/account/models/account_reconcile_model.py:0
70157046
#, python-format
@@ -7088,6 +7119,7 @@ msgstr ""
70887119
#. module: account
70897120
#: model:ir.model.fields.selection,name:account.selection__account_invoice_report__invoice_payment_state__not_paid
70907121
#: model:ir.model.fields.selection,name:account.selection__account_move__invoice_payment_state__not_paid
7122+
#: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter
70917123
msgid "Not Paid"
70927124
msgstr ""
70937125

@@ -7375,6 +7407,7 @@ msgstr ""
73757407

73767408
#. module: account
73777409
#: code:addons/account/models/account.py:0
7410+
#: code:addons/account/models/account.py:0
73787411
#, python-format
73797412
msgid "Opening balance"
73807413
msgstr ""
@@ -7752,6 +7785,7 @@ msgid "Payment Method Type"
77527785
msgstr ""
77537786

77547787
#. module: account
7788+
#: model_terms:ir.ui.view,arch_db:account.view_account_bank_journal_form
77557789
#: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
77567790
msgid "Payment Method Types"
77577791
msgstr ""
@@ -8150,6 +8184,13 @@ msgid ""
81508184
"Preset to create journal entries during a invoices and payments matching"
81518185
msgstr ""
81528186

8187+
#. module: account
8188+
#. openerp-web
8189+
#: code:addons/account/static/src/xml/account_reconciliation.xml:0
8190+
#, python-format
8191+
msgid "Presets config"
8192+
msgstr ""
8193+
81538194
#. module: account
81548195
#: model_terms:ir.ui.view,arch_db:account.view_move_form
81558196
msgid "Preview"
@@ -9308,10 +9349,13 @@ msgid ""
93089349
msgstr ""
93099350

93109351
#. module: account
9352+
#. openerp-web
9353+
#: code:addons/account/static/src/xml/account_reconciliation.xml:0
93119354
#: model:ir.actions.act_window,name:account.action_account_config
93129355
#: model:ir.actions.act_window,name:account.action_open_settings
93139356
#: model:ir.ui.menu,name:account.menu_account_config
93149357
#: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
9358+
#, python-format
93159359
msgid "Settings"
93169360
msgstr ""
93179361

@@ -9651,11 +9695,6 @@ msgstr ""
96519695
msgid "Supplier Rank"
96529696
msgstr ""
96539697

9654-
#. module: account
9655-
#: model:ir.actions.act_window,name:account.res_partner_action_supplier
9656-
msgid "Suppliers"
9657-
msgstr ""
9658-
96599698
#. module: account
96609699
#: model:ir.actions.server,name:account.action_move_switch_invoice_to_credit_note
96619700
msgid "Switch into refund/credit note"
@@ -10877,7 +10916,9 @@ msgstr ""
1087710916
#. module: account
1087810917
#: code:addons/account/models/account_payment.py:0
1087910918
#, python-format
10880-
msgid "There is more than one receivable/payable account in the concerned invoices. You cannot group payments in that case."
10919+
msgid ""
10920+
"There is more than one receivable/payable account in the concerned invoices."
10921+
" You cannot group payments in that case."
1088110922
msgstr ""
1088210923

1088310924
#. module: account
@@ -11702,6 +11743,7 @@ msgid "Vendor Taxes"
1170211743
msgstr ""
1170311744

1170411745
#. module: account
11746+
#: model:ir.actions.act_window,name:account.res_partner_action_supplier
1170511747
#: model:ir.ui.menu,name:account.menu_account_supplier
1170611748
#: model:ir.ui.menu,name:account.menu_finance_payables
1170711749
#: model_terms:ir.ui.view,arch_db:account.res_partner_view_search
@@ -11958,6 +12000,46 @@ msgid ""
1195812000
"invoice when making the payment."
1195912001
msgstr ""
1196012002

12003+
#. module: account
12004+
#: code:addons/account/models/account.py:0
12005+
#, python-format
12006+
msgid ""
12007+
"You can't change the company of your account since there are some journal "
12008+
"items linked to it."
12009+
msgstr ""
12010+
12011+
#. module: account
12012+
#: code:addons/account/models/account.py:0
12013+
#, python-format
12014+
msgid ""
12015+
"You can't change the company of your journal since there are some journal "
12016+
"entries linked to it."
12017+
msgstr ""
12018+
12019+
#. module: account
12020+
#: code:addons/account/models/account.py:0
12021+
#, python-format
12022+
msgid ""
12023+
"You can't change the company of your tax since there are some journal items "
12024+
"linked to it."
12025+
msgstr ""
12026+
12027+
#. module: account
12028+
#: code:addons/account/models/account_analytic_line.py:0
12029+
#, python-format
12030+
msgid ""
12031+
"You can't set a different company on your analytic account since there are "
12032+
"some journal items linked to it."
12033+
msgstr ""
12034+
12035+
#. module: account
12036+
#: code:addons/account/models/account_analytic_line.py:0
12037+
#, python-format
12038+
msgid ""
12039+
"You can't set a different company on your analytic tags since there are some"
12040+
" journal items linked to it."
12041+
msgstr ""
12042+
1196112043
#. module: account
1196212044
#: code:addons/account/models/account_move.py:0
1196312045
#, python-format
@@ -12195,6 +12277,12 @@ msgid ""
1219512277
"credit note or refund."
1219612278
msgstr ""
1219712279

12280+
#. module: account
12281+
#: code:addons/account/models/account_move.py:0
12282+
#, python-format
12283+
msgid "You don't have the access rights to post an invoice."
12284+
msgstr ""
12285+
1219812286
#. module: account
1219912287
#: model_terms:ir.ui.view,arch_db:account.view_move_form
1220012288
msgid "You have"
@@ -12265,6 +12353,12 @@ msgid ""
1226512353
"to differences between exchange rates."
1226612354
msgstr ""
1226712355

12356+
#. module: account
12357+
#: code:addons/account/models/account_cash_rounding.py:33
12358+
#, python-format
12359+
msgid "Please set a positive rounding value."
12360+
msgstr ""
12361+
1226812362
#. module: account
1226912363
#: model_terms:ir.ui.view,arch_db:account.view_account_position_form
1227012364
msgid "Zip Range"
@@ -12482,38 +12576,3 @@ msgstr ""
1248212576
#: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
1248312577
msgid "→ Count"
1248412578
msgstr ""
12485-
12486-
#. module: account
12487-
#: code:addons/account/models/account.py:0
12488-
#, python-format
12489-
msgid "You can't change the company of your account since there are some journal items linked to it."
12490-
msgstr ""
12491-
12492-
#. module: account
12493-
#: code:addons/account/models/account.py:0
12494-
#, python-format
12495-
msgid "You can't change the company of your journal since there are some journal entries linked to it."
12496-
msgstr ""
12497-
12498-
#. module: account
12499-
#: code:addons/account/models/account.py:0
12500-
#, python-format
12501-
msgid "You can't change the company of your tax since there are some journal items linked to it."
12502-
msgstr ""
12503-
12504-
#. module: account
12505-
#: code:addons/account/models/account_analytic_line.py:0
12506-
#, python-format
12507-
msgid "You can't set a different company on your analytic account since there are some journal items linked to it."
12508-
msgstr ""
12509-
12510-
#. module: account
12511-
#: code:addons/account/models/account_analytic_line.py:0
12512-
#, python-format
12513-
msgid "You can't set a different company on your analytic tags since there are some journal items linked to it."
12514-
12515-
#. module: account
12516-
#: code:addons/account/models/account.py:56
12517-
#, python-format
12518-
msgid "A tag defined to be used on taxes must always have a country set."
12519-
msgstr ""

0 commit comments

Comments
 (0)