ali
/
taxes_az
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixes

This commit is contained in:
Ali 2026-01-06 20:01:48 +04:00
parent e0bdb39662
commit 86c9178a83
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
taxes_az/taxes_az/doctype/property_tax_return/property_tax_return.js
View File

@ -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 // Hide vergi_hesab_1ci_1 if tam_il is checked
frm.set_df_property('vergi_hesab_1ci_1', 'hidden', is_tam_il ? 1 : 0); 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');
frm.refresh_field('vergi_hesab_1ci_1'); 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) { function filter_vergi_hesab_5ci_rows(frm, is_tam_il, is_il_erzinde) {
@ -766,12 +770,12 @@ function calculate_509_1(frm) {
return; return;
} }
// Get value from field 501 (manatla from vergi_hesab_1ci) // Get value from field 501.1 (manatla from vergi_hesab_1ci)
let value_501 = 0; let value_501_1 = 0;
(frm.doc.vergi_hesab_1ci || []).forEach(row => { (frm.doc.vergi_hesab_1ci || []).forEach(row => {
// Точное совпадение: после "501" должна быть точка с пробелом // Точное совпадение: после "501.1" должен быть пробел (не 501.1.1)
if (row.göstəricilər && row.göstəricilər.startsWith('501. ')) { if (row.göstəricilər && row.göstəricilər.startsWith('501.1 ')) {
value_501 = flt(row.manatla); value_501_1 = flt(row.manatla);
} }
}); });
@ -784,8 +788,8 @@ function calculate_509_1(frm) {
} }
}); });
// Calculate: ((501 + 504) / 2) * 1% // Calculate: ((501.1 + 504) / 2) * 1%
let result = ((value_501 + value_504) / 2) * 0.01; let result = ((value_501_1 + value_504) / 2) * 0.01;
// Set value to field 509.1 (manatla in vergi_hesab_5ci) // Set value to field 509.1 (manatla in vergi_hesab_5ci)
(frm.doc.vergi_hesab_5ci || []).forEach(row => { (frm.doc.vergi_hesab_5ci || []).forEach(row => {