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 220d08f..97efd4a 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 @@ -521,31 +521,22 @@ function update_child_table_values(frm, table_name, data_map) { // Update the 'ayla' field in vergi_hesab_4cu_1 based on earliest Asset function update_vergi_hesab_4cu_1(frm, company) { - if (frm.doc.il_erzinde) { - // Расчет месяцев для İl Ərzində режима - frappe.call({ - method: 'taxes_az.taxes_az.doctype.property_tax_return.property_tax_return.calculate_months_for_vergi_hesab_4cu_1', - args: { - company: company, - year: frm.doc.il - }, - callback: function(r) { - if (r.message !== undefined && frm.doc.vergi_hesab_4cu_1 && frm.doc.vergi_hesab_4cu_1.length > 0) { - // Обновить первую строку - const first_row = frm.doc.vergi_hesab_4cu_1[0]; - frappe.model.set_value(first_row.doctype, first_row.name, 'ayla', r.message); - frm.refresh_field('vergi_hesab_4cu_1'); - } + // Расчет месяцев для обоих режимов (Tam İl и İl Ərzində) + frappe.call({ + method: 'taxes_az.taxes_az.doctype.property_tax_return.property_tax_return.calculate_months_for_vergi_hesab_4cu_1', + args: { + company: company, + year: frm.doc.il + }, + callback: function(r) { + if (r.message !== undefined && frm.doc.vergi_hesab_4cu_1 && frm.doc.vergi_hesab_4cu_1.length > 0) { + // Обновить первую строку + const first_row = frm.doc.vergi_hesab_4cu_1[0]; + frappe.model.set_value(first_row.doctype, first_row.name, 'ayla', r.message); + frm.refresh_field('vergi_hesab_4cu_1'); } - }); - } else { - // Очистить поле ayla если tam_il - if (frm.doc.vergi_hesab_4cu_1 && frm.doc.vergi_hesab_4cu_1.length > 0) { - const first_row = frm.doc.vergi_hesab_4cu_1[0]; - frappe.model.set_value(first_row.doctype, first_row.name, 'ayla', 0); - frm.refresh_field('vergi_hesab_4cu_1'); } - } + }); } // ==================== MINIMUM ASSET VALUE VALIDATION ====================