pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] l10n_kz: remove duplicate expression

Browse Source 
Report line `l10n_kz_tr_line_300_00_017` has two expressions with a duplicate expression label, which shouldn't happen. This commit merges them, with taxes being allocated into the same expression.

closes odoo/odoo#113437

X-original-commit: e758e616929e8050ebbf152207b1f45f74b8919e
Signed-off-by: John Laterre (jol) <jol@odoo.com>
This commit is contained in:
aliya
2023-02-23 11:33:52 +01:00
parent d3584c69d0
commit 7e0bfb5efd
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_kz/data/tax_report.xml
+2 -7
View File
@@ -345,15 +345,10 @@
<field name="name">300.00.017. Exempted imports of goods</field>
<field name="code">L10N_KZ_300_00_017</field>
<field name="expression_ids">
<record id="l10n_kz_tr_expression_300_00_017_net_eeu" model="account.report.expression">
<record id="l10n_kz_tr_expression_300_00_017_net" model="account.report.expression">
<field name="label">net</field>
<field name="engine">tax_tags</field>
<field name="formula">Exempted imports of goods EEU net</field>
</record>
<record id="l10n_kz_tr_expression_300_00_017_net_other" model="account.report.expression">
<field name="label">net</field>
<field name="engine">tax_tags</field>
<field name="formula">Exempted imports of goods non-EEU net</field>
<field name="formula">Exempted imports of goods net</field>
</record>
</field>
</record>
addons/l10n_kz/data/template/account.tax-kz.csv
+4 -4
View File
@@ -131,15 +131,15 @@
"","","","","","","","","","tax","invoice","","",""
"","","","","","","","","","base","refund","+Turnover exempt from VAT net","",""
"","","","","","","","","","tax","refund","","",""
"l10n_kz_tax_vat_exempt_purchase_import","Exempt EX","tax_group_vat_exempt","0.0","percent","purchase","Import VAT Exempt","","","base","invoice","+Exempted imports of goods non-EEU net","","Экспорт/Импорт Без НДС"
"l10n_kz_tax_vat_exempt_purchase_import","Exempt EX","tax_group_vat_exempt","0.0","percent","purchase","Import VAT Exempt","","","base","invoice","+Exempted imports of goods net","","Экспорт/Импорт Без НДС"
"","","","","","","","","","tax","invoice","","",""
"","","","","","","","","","base","refund","+Exempted imports of goods non-EEU net","",""
"","","","","","","","","","base","refund","+Exempted imports of goods net","",""
"","","","","","","","","","tax","refund","","",""
"l10n_kz_tax_vat_exempt_sale_eeu","Exempt EEU","tax_group_vat_exempt","0.0","percent","sale","Euroasian Economic Union VAT Exempt","","","base","invoice","+Turnover exempt from VAT net","","ЕАЭС Без НДС"
"","","","","","","","","","tax","invoice","","",""
"","","","","","","","","","base","refund","+Turnover exempt from VAT net","",""
"","","","","","","","","","tax","refund","","",""
"l10n_kz_tax_vat_exempt_purchase_eeu","Exempt EEU","tax_group_vat_exempt","0.0","percent","purchase","Euroasian Economic Union VAT Exempt","","","base","invoice","+Exempted imports of goods EEU net","","ЕАЭС Без НДС"
"l10n_kz_tax_vat_exempt_purchase_eeu","Exempt EEU","tax_group_vat_exempt","0.0","percent","purchase","Euroasian Economic Union VAT Exempt","","","base","invoice","+Exempted imports of goods net","","ЕАЭС Без НДС"
"","","","","","","","","","tax","invoice","","",""
"","","","","","","","","","base","refund","+Exempted imports of goods EEU net","",""
"","","","","","","","","","base","refund","+Exempted imports of goods net","",""
"","","","","","","","","","tax","refund","","",""
1 id name tax_group_id amount amount_type type_tax_use description price_include tax_scope repartition_line_ids/repartition_type repartition_line_ids/document_type repartition_line_ids/tag_ids repartition_line_ids/account_id name@ru
131 tax invoice
132 base refund +Turnover exempt from VAT net
133 tax refund
134 l10n_kz_tax_vat_exempt_purchase_import Exempt EX tax_group_vat_exempt 0.0 percent purchase Import VAT Exempt base invoice +Exempted imports of goods non-EEU net +Exempted imports of goods net Экспорт/Импорт Без НДС
135 tax invoice
136 base refund +Exempted imports of goods non-EEU net +Exempted imports of goods net
137 tax refund
138 l10n_kz_tax_vat_exempt_sale_eeu Exempt EEU tax_group_vat_exempt 0.0 percent sale Euroasian Economic Union VAT Exempt base invoice +Turnover exempt from VAT net ЕАЭС Без НДС
139 tax invoice
140 base refund +Turnover exempt from VAT net
141 tax refund
142 l10n_kz_tax_vat_exempt_purchase_eeu Exempt EEU tax_group_vat_exempt 0.0 percent purchase Euroasian Economic Union VAT Exempt base invoice +Exempted imports of goods EEU net +Exempted imports of goods net ЕАЭС Без НДС
143 tax invoice
144 base refund +Exempted imports of goods EEU net +Exempted imports of goods net
145 tax refund
addons/l10n_kz/i18n/l10n_kz.pot
+1 -2
View File
@@ -132,8 +132,7 @@ msgid ""
msgstr ""
#. module: l10n_kz
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net_eeu
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net_other
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net
#: model:account.report.line,name:l10n_kz.l10n_kz_tr_line_300_00_017
msgid "300.00.017. Exempted imports of goods"
msgstr ""
addons/l10n_kz/i18n/ru.po
+1 -2
View File
@@ -147,8 +147,7 @@ msgstr ""
"основании декларации ф. 320.00), в том числе:"
#. module: l10n_kz
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net_eeu
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net_other
#: model:account.report.expression,report_line_name:l10n_kz.l10n_kz_tr_expression_300_00_017_net
#: model:account.report.line,name:l10n_kz.l10n_kz_tr_line_300_00_017
msgid "300.00.017. Exempted imports of goods"
msgstr "300.00.017. Освобожденный импорт товаров"