From 86c9178a833a22ce9f0267abd6a20745c3168b2a Mon Sep 17 00:00:00 2001 From: Ali <010109ali@gmail.com> Date: Tue, 6 Jan 2026 20:01:48 +0400 Subject: [PATCH] bug fixes --- .../property_tax_return/property_tax_return.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/taxes_az/taxes_az/doctype/property_tax_return/property_tax_return.js b/taxes_az/taxes_az/doctype/property_tax_return/property_tax_return.js index 064bdf6..6056a87 100644 --- a/taxes_az/taxes_az/doctype/property_tax_return/property_tax_return.js +++ b/taxes_az/taxes_az/doctype/property_tax_return/property_tax_return.js @@ -173,8 +173,12 @@ function toggle_vergi_hesab_1ci_tables(frm, is_tam_il, is_il_erzinde) { // Hide vergi_hesab_1ci_1 if tam_il is checked frm.set_df_property('vergi_hesab_1ci_1', 'hidden', is_tam_il ? 1 : 0); + // Hide vergi_hesab_4cu_1 if tam_il is checked (показывать только для İl Ərzində) + frm.set_df_property('vergi_hesab_4cu_1', 'hidden', is_tam_il ? 1 : 0); + frm.refresh_field('vergi_hesab_1ci'); frm.refresh_field('vergi_hesab_1ci_1'); + frm.refresh_field('vergi_hesab_4cu_1'); } function filter_vergi_hesab_5ci_rows(frm, is_tam_il, is_il_erzinde) { @@ -766,12 +770,12 @@ function calculate_509_1(frm) { return; } - // Get value from field 501 (manatla from vergi_hesab_1ci) - let value_501 = 0; + // Get value from field 501.1 (manatla from vergi_hesab_1ci) + let value_501_1 = 0; (frm.doc.vergi_hesab_1ci || []).forEach(row => { - // Точное совпадение: после "501" должна быть точка с пробелом - if (row.göstəricilər && row.göstəricilər.startsWith('501. ')) { - value_501 = flt(row.manatla); + // Точное совпадение: после "501.1" должен быть пробел (не 501.1.1) + if (row.göstəricilər && row.göstəricilər.startsWith('501.1 ')) { + value_501_1 = flt(row.manatla); } }); @@ -784,8 +788,8 @@ function calculate_509_1(frm) { } }); - // Calculate: ((501 + 504) / 2) * 1% - let result = ((value_501 + value_504) / 2) * 0.01; + // Calculate: ((501.1 + 504) / 2) * 1% + let result = ((value_501_1 + value_504) / 2) * 0.01; // Set value to field 509.1 (manatla in vergi_hesab_5ci) (frm.doc.vergi_hesab_5ci || []).forEach(row => {