From 4f892cbbd05a8bbc0293258ebdb577ff6fe5e9cc Mon Sep 17 00:00:00 2001 From: Katulos <123748719+Katulos@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:30:43 +0000 Subject: [PATCH] Debug tax --- l10n_ru/data/template/account.account-ru.csv | 2 +- l10n_ru/data/template/account.group-ru.csv | 1 + l10n_ru/data/template/account.tax-ru.csv | 50 +++++++++---------- .../data/template/account.tax.group-ru.csv | 2 +- l10n_ru/i18n/l10n_ru.pot | 11 +++- l10n_ru/models/__init__.py | 2 +- .../{template_ru.py => chart_template.py} | 3 +- 7 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 l10n_ru/data/template/account.group-ru.csv rename l10n_ru/models/{template_ru.py => chart_template.py} (95%) diff --git a/l10n_ru/data/template/account.account-ru.csv b/l10n_ru/data/template/account.account-ru.csv index 188709e..78b8cb1 100644 --- a/l10n_ru/data/template/account.account-ru.csv +++ b/l10n_ru/data/template/account.account-ru.csv @@ -1,4 +1,4 @@ -"id","code","name","name@ru","reconcile","account_type" +"id","code","name","name@ru_RU","reconcile","account_type" "ru_acc_000","000","Auxiliary account","Вспомогательный счет","True","expense" "ru_acc_001","001","Leased fixed assets","Арендованные основные средства","True","expense" "ru_acc_002","002","Inventory accepted for safekeeping","Товарно-материальные ценности, принятые на ответственное хранение","True","expense" diff --git a/l10n_ru/data/template/account.group-ru.csv b/l10n_ru/data/template/account.group-ru.csv new file mode 100644 index 0000000..f97876c --- /dev/null +++ b/l10n_ru/data/template/account.group-ru.csv @@ -0,0 +1 @@ +"id","code_prefix_start","code_prefix_end","name","name@ru_RU" diff --git a/l10n_ru/data/template/account.tax-ru.csv b/l10n_ru/data/template/account.tax-ru.csv index c421172..584cf40 100644 --- a/l10n_ru/data/template/account.tax-ru.csv +++ b/l10n_ru/data/template/account.tax-ru.csv @@ -1,25 +1,25 @@ -"id","tax_group_id","name","name@ru","description","description@ru","invoice_label","invoice_label@ru","type_tax_use","amount","amount_type","sequence","price_include","active" -"purchase_vat_0", "tax_group_vat_0","VAT 0%","НДС 0%","","","VAT 0%","НДС 0%","purchase","0.0","percent","","True","False" -"sale_vat_0", "tax_group_vat_0","VAT 0%","НДС 0%","","","VAT 0%","НДС 0%","sale","0.0","percent","","True","False" -"purchase_vat_5", "tax_group_vat_5","VAT 5%","НДС 5%","","","VAT 5%","НДС 5%","purchase","5.0","percent","","True","False" -"sale_vat_5", "tax_group_vat_5","VAT 5%","НДС 5%","","","VAT 5%","НДС 5%","sale","5.0","percent","","True","False" -"purchase_vat_10", "tax_group_vat_10","VAT 10%","НДС 10%","","","VAT 10%","НДС 10%","purchase","10.0","percent","","True","False" -"sale_vat_10", "tax_group_vat_10","VAT 10%","НДС 10%","","","VAT 10%","НДС 10%","sale","10.0","percent","","True","False" -"purchase_vat_15", "tax_group_vat_15","VAT 15%","НДС 15%","","","VAT 15%","НДС 15%","purchase","15.0","percent","","True","False" -"sale_vat_15", "tax_group_vat_15","VAT 15%","НДС 15%","","","VAT 15%","НДС 15%","sale","15.0","percent","","True","False" -"purchase_vat_20", "tax_group_vat_20","VAT 20%","НДС 20%","","","VAT 20%","НДС 20%","purchase","20.0","percent","","True","True" -"sale_vat_20", "tax_group_vat_20","VAT 20%","НДС 20%","","","VAT 20%","НДС 20%","sale","20.0","percent","","True","True" -"sale_asts_8","tax_group_asts_8","ASTS 8%","АУСН 8%","","","ASTS 8%","АУСН 8%","sale", "8.0","division","","True","False" -"sale_asts_20","tax_group_asts_20","ASTS 20%","АУСН 20%","","","ASTS 20%","АУСН 20%","sale", "20.0","division","","True","False" -"sale_sts_6","tax_group_asts_6","STS 6%","УСН 6%","","","STS 6%","УСН 6%","sale", "6.0","division","","True","True" -"sale_sts_15","tax_group_asts_15","STS 15%","УСН 15%","","","STS 15%","УСН 15%","sale", "15.0","division","","True","False" -"sale_uat_0","tax_group_uat_0","UAT 0%","ЕСХН 0%","","","UAT 0%","ЕСХН 0%","sale", "0.0","division","","True","False" -"sale_uat_1","tax_group_uat_1","UAT 1%","ЕСХН 1%","","","UAT 1%","ЕСХН 1%","sale", "1.0","division","","True","False" -"sale_uat_2","tax_group_uat_2","UAT 2%","ЕСХН 2%","","","UAT 2%","ЕСХН 2%","sale", "2.0","division","","True","False" -"sale_uat_3","tax_group_uat_3","UAT 3%","ЕСХН 3%","","","UAT 3%","ЕСХН 3%","sale", "3.0","division","","True","False" -"sale_uat_4","tax_group_uat_4","UAT 4%","ЕСХН 4%","","","UAT 4%","ЕСХН 4%","sale", "4.0","division","","True","False" -"sale_uat_5","tax_group_uat_5","UAT 5%","ЕСХН 5%","","","UAT 5%","ЕСХН 5%","sale", "5.0","division","","True","False" -"sale_uat_6","tax_group_uat_6","UAT 6%","ЕСХН 6%","","","UAT 6%","ЕСХН 6%","sale", "6.0","division","","True","False" -"sale_pts_0","tax_group_pts_0","PTS 0%","ПСН 0%","","","PTS 0%","ПСН 0%","sale", "0.0","division","","True","False" -"sale_set_4","tax_group_set_4","SET 4%","НПД 4%","","","SET 4%","НПД 4%","sale", "4.0","division","","True","False" -"sale_set_6","tax_group_set_6","SET 6%","НПД 6%","","","SET 6%","НПД 6%","sale", "6.0","division","","True","False" +"id","tax_group_id","name","name@ru_RU","description","description@ru_RU","invoice_label","invoice_label@ru_RU","type_tax_use","amount","amount_type","sequence","price_include","active" +"purchase_vat_0","tax_group_vat_0","VAT 0%","НДС 0%","","","VAT 0%","НДС 0%","purchase","0.0","percent","","True","False" +"sale_vat_0","tax_group_vat_0","VAT 0%","НДС 0%","","","VAT 0%","НДС 0%","sale","0.0","percent","","True","False" +"purchase_vat_5","tax_group_vat_5","VAT 5%","НДС 5%","","","VAT 5%","НДС 5%","purchase","5.0","percent","","True","False" +"sale_vat_5","tax_group_vat_5","VAT 5%","НДС 5%","","","VAT 5%","НДС 5%","sale","5.0","percent","","True","False" +"purchase_vat_10","tax_group_vat_10","VAT 10%","НДС 10%","","","VAT 10%","НДС 10%","purchase","10.0","percent","","True","False" +"sale_vat_10","tax_group_vat_10","VAT 10%","НДС 10%","","","VAT 10%","НДС 10%","sale","10.0","percent","","True","False" +"purchase_vat_15","tax_group_vat_15","VAT 15%","НДС 15%","","","VAT 15%","НДС 15%","purchase","15.0","percent","","True","False" +"sale_vat_15","tax_group_vat_15","VAT 15%","НДС 15%","","","VAT 15%","НДС 15%","sale","15.0","percent","","True","False" +"purchase_vat_20","tax_group_vat_20","VAT 20%","НДС 20%","","","VAT 20%","НДС 20%","purchase","20.0","percent","","True","True" +"sale_vat_20","tax_group_vat_20","VAT 20%","НДС 20%","","","VAT 20%","НДС 20%","sale","20.0","percent","","True","True" +"sale_asts_8","tax_group_asts_8","ASTS 8%","АУСН 8%","","","ASTS 8%","АУСН 8%","sale","8.0","division","","True","False" +"sale_asts_20","tax_group_asts_20","ASTS 20%","АУСН 20%","","","ASTS 20%","АУСН 20%","sale","20.0","division","","True","False" +"sale_sts_6","tax_group_sts_6","STS 6%","УСН 6%","","","STS 6%","УСН 6%","sale","6.0","division","","True","False" +"sale_sts_15","tax_group_sts_15","STS 15%","УСН 15%","","","STS 15%","УСН 15%","sale","15.0","division","","True","False" +"sale_uat_0","tax_group_uat_0","UAT 0%","ЕСХН 0%","","","UAT 0%","ЕСХН 0%","sale","0.0","division","","True","False" +"sale_uat_1","tax_group_uat_1","UAT 1%","ЕСХН 1%","","","UAT 1%","ЕСХН 1%","sale","1.0","division","","True","False" +"sale_uat_2","tax_group_uat_2","UAT 2%","ЕСХН 2%","","","UAT 2%","ЕСХН 2%","sale","2.0","division","","True","False" +"sale_uat_3","tax_group_uat_3","UAT 3%","ЕСХН 3%","","","UAT 3%","ЕСХН 3%","sale","3.0","division","","True","False" +"sale_uat_4","tax_group_uat_4","UAT 4%","ЕСХН 4%","","","UAT 4%","ЕСХН 4%","sale","4.0","division","","True","False" +"sale_uat_5","tax_group_uat_5","UAT 5%","ЕСХН 5%","","","UAT 5%","ЕСХН 5%","sale","5.0","division","","True","False" +"sale_uat_6","tax_group_uat_6","UAT 6%","ЕСХН 6%","","","UAT 6%","ЕСХН 6%","sale","6.0","division","","True","False" +"sale_pts_0","tax_group_pts_0","PTS 0%","ПСН 0%","","","PTS 0%","ПСН 0%","sale","0.0","division","","True","False" +"sale_set_4","tax_group_set_4","SET 4%","НПД 4%","","","SET 4%","НПД 4%","sale","4.0","division","","True","False" +"sale_set_6","tax_group_set_6","SET 6%","НПД 6%","","","SET 6%","НПД 6%","sale","6.0","division","","True","False" diff --git a/l10n_ru/data/template/account.tax.group-ru.csv b/l10n_ru/data/template/account.tax.group-ru.csv index a69aa7a..139057b 100644 --- a/l10n_ru/data/template/account.tax.group-ru.csv +++ b/l10n_ru/data/template/account.tax.group-ru.csv @@ -1,4 +1,4 @@ -"id","name","country_id","name@ru" +"id","name","country_id","name@ru_RU" "tax_group_vat_0","VAT 0%","base.ru","НДС 0%" "tax_group_vat_5","VAT 5%","base.ru","НДС 5%" "tax_group_vat_5","VAT 7%","base.ru","НДС 7%" diff --git a/l10n_ru/i18n/l10n_ru.pot b/l10n_ru/i18n/l10n_ru.pot index ad841a4..498fee3 100644 --- a/l10n_ru/i18n/l10n_ru.pot +++ b/l10n_ru/i18n/l10n_ru.pot @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 17.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -12,3 +12,12 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: l10n_ru +#: model:ir.model,name:l10n_ru.model_account_chart_template +msgid "Account Chart Template" +msgstr "" + +#. module: l10n_ru +#: model:account.account.tag,name:l10n_ru.acc_tag_vat +msgid "VAT" +msgstr "" diff --git a/l10n_ru/models/__init__.py b/l10n_ru/models/__init__.py index e6f3e30..60b21b5 100644 --- a/l10n_ru/models/__init__.py +++ b/l10n_ru/models/__init__.py @@ -1 +1 @@ -from . import template_ru +from . import chart_template diff --git a/l10n_ru/models/template_ru.py b/l10n_ru/models/chart_template.py similarity index 95% rename from l10n_ru/models/template_ru.py rename to l10n_ru/models/chart_template.py index a270361..9215e48 100644 --- a/l10n_ru/models/template_ru.py +++ b/l10n_ru/models/chart_template.py @@ -1,4 +1,4 @@ -from odoo import models +from odoo import _, models from odoo.addons.account.models.chart_template import template @@ -9,6 +9,7 @@ class AccountChartTemplate(models.AbstractModel): @template("ru") def _get_ru_template_data(self): return { + "name": _("Chart of Accounts"), "code_digits": "1", "use_storno_accounting": True, "display_invoice_amount_total_words": True,