From 51fd779a223aeba6f47fccd5bb59729a0a86889d Mon Sep 17 00:00:00 2001
From: Ali <010109ali@gmail.com>
Date: Thu, 19 Mar 2026 15:02:39 +0000
Subject: [PATCH] push from mvp

---
 taxes_az/fixtures/client_script.json          | 154 ++++----
 .../__init__.py                               |   0
 .../single_declaration_bolme2_hisse1.json}    |  13 +-
 .../single_declaration_bolme2_hisse1.py}      |   2 +-
 .../__init__.py                               |   0
 .../single_declaration_bolme2_hisse2.json}    |   2 +-
 .../single_declaration_bolme2_hisse2.py}      |   2 +-
 .../__init__.py                               |   0
 .../single_declaration_bolme2_hisse3.json}    |   2 +-
 .../single_declaration_bolme2_hisse3.py}      |   2 +-
 .../__init__.py                               |   0
 .../single_declaration_bolme3.json}           |   2 +-
 .../single_declaration_bolme3.py}             |   2 +-
 .../__init__.py                               |   0
 .../single_declaration_bolme4_hisse1.json}    |   2 +-
 .../single_declaration_bolme4_hisse1.py       |   9 +
 .../__init__.py                               |   0
 .../single_declaration_bolme4_hisse2.json}    |   2 +-
 .../single_declaration_bolme4_hisse2.py       |   9 +
 .../__init__.py                               |   0
 .../single_declaration_bolme4_hisse3.json}    |   2 +-
 .../single_declaration_bolme4_hisse3.py       |   9 +
 .../__init__.py                               |   0
 .../single_declaration_elave1_hisse1.json}    |   2 +-
 .../single_declaration_elave1_hisse1.py       |   9 +
 .../__init__.py                               |   0
 .../single_declaration_elave1_hisse2.json     |  55 +++
 .../single_declaration_elave1_hisse2.py       |   9 +
 .../__init__.py                               |   0
 .../single_declaration_elave1_hisse3.json}    |   2 +-
 .../single_declaration_elave1_hisse3.py       |   9 +
 .../__init__.py                               |   0
 ...claration_elave4_icbari_tibbi_sigorta.json |  48 +++
 ...declaration_elave4_icbari_tibbi_sigorta.py |   9 +
 .../__init__.py                               |   0
 ...eclaration_elave4_issizlikden_sigorta.json |  48 +++
 ..._declaration_elave4_issizlikden_sigorta.py |   9 +
 .../__init__.py                               |   0
 .../single_declaration_elave4_mdss.json       |  48 +++
 .../single_declaration_elave4_mdss.py         |   9 +
 .../__init__.py                               |   0
 .../single_declaration_elave4_vergi.json      |  48 +++
 .../single_declaration_elave4_vergi.py        |   9 +
 ...ted_to_salaried_and_non_salaried_work.json | 344 +++++++++++++-----
 .../__init__.py                               |   0
 .../singledeclaration_elave1_hisse4.json      |  69 ++++
 .../singledeclaration_elave1_hisse4.py        |   9 +
 .../singledeclaration_elave2/__init__.py      |   0
 .../singledeclaration_elave2.json             |  69 ++++
 .../singledeclaration_elave2.py               |   9 +
 ...atedtosalariedandnon_salariedworkseh1_2.py |   9 -
 ...atedtosalariedandnon_salariedworkseh2_2.py |   9 -
 ...atedtosalariedandnon_salariedworkseh2_3.py |   9 -
 ...atedtosalariedandnon_salariedworkseh4_2.py |   9 -
 ...atedtosalariedandnon_salariedworkseh4_3.py |   9 -
 55 files changed, 847 insertions(+), 226 deletions(-)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh1 => single_declaration_bolme2_hisse1}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.json => single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.json} (84%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.py => single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.py} (69%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh1_2 => single_declaration_bolme2_hisse2}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.json => single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json} (96%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.py => single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.py} (69%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2 => single_declaration_bolme2_hisse3}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.json => single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.json} (96%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.py => single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.py} (69%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2_2 => single_declaration_bolme3}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.json => single_declaration_bolme3/single_declaration_bolme3.json} (98%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.py => single_declaration_bolme3/single_declaration_bolme3.py} (69%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh2_3 => single_declaration_bolme4_hisse1}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.json => single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json} (97%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.py
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh3 => single_declaration_bolme4_hisse2}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.json => single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json} (95%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.py
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4 => single_declaration_bolme4_hisse3}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.json => single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json} (95%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.py
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4_2 => single_declaration_elave1_hisse1}/__init__.py (100%)
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.json => single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.json} (96%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.py
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh4_3 => single_declaration_elave1_hisse2}/__init__.py (100%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.json
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/__init__.py
 rename taxes_az/taxes_az/doctype/{singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.json => single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.json} (95%)
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.json
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.json
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.json
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.json
 create mode 100644 taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.py
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.json
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.py
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave2/__init__.py
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.json
 create mode 100644 taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.py
 delete mode 100644 taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.py
 delete mode 100644 taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.py
 delete mode 100644 taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.py
 delete mode 100644 taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.py
 delete mode 100644 taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.py

diff --git a/taxes_az/fixtures/client_script.json b/taxes_az/fixtures/client_script.json
index aeb29c7..da2a779 100644
--- a/taxes_az/fixtures/client_script.json
+++ b/taxes_az/fixtures/client_script.json
@@ -87,83 +87,6 @@
   "script": "// Generated by Formula Editor\nfrappe.ui.form.on(\"Tax return withheld at source of payment\", {\n    \"ay\": async function(frm) {\n        // Вычисляем универсальные поля только когда меняется ay\n        await calculate_universal_fields(frm);\n    },\n    \"il\": async function(frm) {\n        // Вычисляем универсальные поля только когда меняется il\n        await calculate_universal_fields(frm);\n    },\n});\n\n\n    // Функция для обработки и выполнения формул\n        async function processFormula(frm, formula) {\n            try {\n                // Проверяем наличие вызовов отчетов\n                if (formula.includes(\"report(\")) {\n                    // Извлекаем все вызовы report() из формулы\n                    const reportRegex = /report\\(([^)]+)\\)/g;\n                    let match;\n                    let processedFormula = formula;\n                    \n                    // Массив для хранения промисов запросов к отчетам\n                    const reportPromises = [];\n                    const reportPlaceholders = [];\n                    \n                    // Находим все вызовы report() и заменяем их на плейсхолдеры\n                    while ((match = reportRegex.exec(formula)) !== null) {\n                        const fullMatch = match[0]; // report(fieldName)\n                        const fieldName = match[1]; // fieldName\n                        \n                        // Создаем уникальный плейсхолдер\n                        const placeholder = `__REPORT_PLACEHOLDER_${reportPromises.length}__`;\n                        \n                        // Ищем данные отчета в хранилище\n                        const reportFields = JSON.parse(frm.doc.report_fields_storage || \"{}\");\n                        const reportField = Object.values(reportFields).find(f => f.name === fieldName);\n                        \n                        if (reportField) {\n                            // Добавляем промис запроса к отчету\n                            reportPromises.push(\n                                getReportFieldValue(\n                                    frm,\n                                    reportField.report, \n                                    JSON.parse(reportField.filters_json || \"{}\"), \n                                    reportField.field_name, \n                                    reportField.aggregation || 'sum'\n                                )\n                            );\n                            \n                            // Запоминаем соответствие плейсхолдера и вызова\n                            reportPlaceholders.push({\n                                placeholder: placeholder,\n                                original: fullMatch\n                            });\n                            \n                            // Заменяем вызов отчета на плейсхолдер\n                            processedFormula = processedFormula.replace(fullMatch, placeholder);\n                        }\n                    }\n                    \n                    // Если нашли вызовы отчетов, ждем выполнения всех запросов\n                    if (reportPromises.length > 0) {\n                        const reportResults = await Promise.all(reportPromises);\n                        \n                        // Заменяем плейсхолдеры на результаты\n                        for (let i = 0; i < reportPlaceholders.length; i++) {\n                            // Убедимся, что результат - числовое значение\n                            const reportValue = reportResults[i] !== undefined ? Number(reportResults[i]) : 0;\n                            processedFormula = processedFormula.replace(\n                                reportPlaceholders[i].placeholder, \n                                reportValue\n                            );\n                        }\n                        \n                        // Теперь формула не содержит вызовов report(), обрабатываем её обычным способом\n                        let transformResult = transform_expression(processedFormula, false);\n                        \n                        // Если есть внешняя трансформация, применяем её\n                        let result;\n                        if (transformResult && transformResult.transformed) {\n                            result = eval(transformResult.transformed);\n                        } else {\n                            // Иначе просто вычисляем выражение\n                            result = eval(processedFormula);\n                        }\n                        \n                        // Возвращаем результат\n                        return isNaN(result) ? 0 : result;\n                    }\n                }\n                \n                // Стандартная обработка для формул без отчетов\n                let transformResult = transform_expression(formula, false);\n                let result = eval(transformResult.transformed);\n                return isNaN(result) ? 0 : result;\n            } catch (e) {\n                return 0;\n            }\n    }\n\n\n        // Функция для расчета универсальных полей\n        async function calculate_universal_fields(frm) {\n            \n        }\n    \n    // Функция для обработки квартала (rüb) и года (il)\n    function processQuarterDateField(docValues) {\n        // Проверяем, есть ли у нас значения rüb и il\n        if (docValues && docValues.rüb && docValues.il) {\n            // Получаем номер квартала (преобразуем из строки вида \"1 Rüb\" в число 1)\n            const quarterStr = docValues.rüb;\n            const quarterMatch = quarterStr.match(/(\\d+)/);\n            \n            if (!quarterMatch) {\n                return null;\n            }\n            \n            const quarterNum = parseInt(quarterMatch[1]);\n            \n            // Получаем год из поля il или используем текущий год\n            let year = docValues.il || new Date().getFullYear();\n            \n            // Определяем начальный и конечный месяц квартала\n            let startMonth, endMonth;\n            \n            switch(quarterNum) {\n                case 1:\n                    startMonth = 1; // Январь\n                    endMonth = 3;   // Март\n                    break;\n                case 2:\n                    startMonth = 4; // Апрель\n                    endMonth = 6;   // Июнь\n                    break;\n                case 3:\n                    startMonth = 7; // Июль\n                    endMonth = 9;   // Сентябрь\n                    break;\n                case 4:\n                    startMonth = 10; // Октябрь\n                    endMonth = 12;   // Декабрь\n                    break;\n                default:\n                    return null;\n            }\n            \n            // Определяем первый день квартала (1-е число начального месяца)\n            const firstDay = new Date(year, startMonth - 1, 1);\n            \n            // Последний день квартала (последнее число конечного месяца)\n            const lastDay = new Date(year, endMonth, 0);\n            \n            // Форматируем даты в формате YYYY-MM-DD\n            const firstDayStr = `${year}-${String(startMonth).padStart(2, '0')}-01`;\n            const lastDayStr = `${year}-${String(endMonth).padStart(2, '0')}-${String(lastDay.getDate()).padStart(2, '0')}`;            \n            \n            // Возвращаем объект с диапазоном дат\n            return {\n                start: firstDayStr,\n                end: lastDayStr\n            };\n        }\n        \n        // Если это не специальное поле или значение не распознано, возвращаем null\n        return null;\n    }\n    \n    // Функция для обработки специальных полей с азербайджанскими месяцами\n    function processAzerbayjanDateField(docValues) {\n        // Словарь для сопоставления названий месяцев с их номерами\n        const monthNames = {\n            \"Yanvar\": 1,\n            \"Fevral\": 2,\n            \"Mart\": 3,\n            \"Aprel\": 4,\n            \"May\": 5,\n            \"İyun\": 6,\n            \"İyul\": 7,\n            \"Avqust\": 8,\n            \"Sentyabr\": 9,\n            \"Oktyabr\": 10,\n            \"Noyabr\": 11,\n            \"Dekabr\": 12\n        };\n        \n        // Проверяем наличие квартала (rüb) и года (il)\n        if (docValues && docValues.rüb && docValues.il) {\n            // Вызываем специальную функцию для обработки квартала\n            return processQuarterDateField(docValues);\n        }\n        \n        // Проверяем, есть ли у нас значения ay и il\n        if (docValues && docValues.ay && monthNames[docValues.ay]) {\n            // Получаем номер месяца\n            const monthNum = monthNames[docValues.ay];\n            \n            // Получаем год из поля il или используем текущий год\n            let year = docValues.il || new Date().getFullYear();\n            \n            // Определяем первый день месяца (1-е число)\n            const firstDay = new Date(year, monthNum - 1, 1);\n            \n            // Последний день месяца (получаем последнее число месяца)\n            const lastDay = new Date(year, monthNum, 0);\n            \n            // Форматируем даты в формате YYYY-MM-DD\n            const firstDayStr = `${year}-${String(monthNum).padStart(2, '0')}-01`;\n            const lastDayStr = `${year}-${String(monthNum).padStart(2, '0')}-${String(lastDay.getDate()).padStart(2, '0')}`;            \n            \n            // Возвращаем объект с диапазоном дат\n            return {\n                start: firstDayStr,\n                end: lastDayStr\n            };\n        }\n        \n        // Если это не специальное поле или значение не распознано, возвращаем null\n        return null;\n    }\n    \n\n\n    function transform_expression(expression, for_child_table = false, table_name = null) {\n        let transformed = expression;\n        let needsAsync = false;\n        let reportCalls = [];\n\n        // === Обработка report(...) ===\n        const reportRegex = /report\\\\(([^)]+)\\\\)/g;\n        let match;\n        \n        // Находим все вызовы report() в выражении\n        while ((match = reportRegex.exec(expression)) !== null) {\n            const reportName = match[1]; // Имя поля отчета\n            const fullMatch = match[0]; // Полный текст match - \"report(xyz)\"\n            needsAsync = true;\n            \n            // Создаем уникальный плейсхолдер\n            const placeholder = `__REPORT_${reportCalls.length}__`;\n            \n            // Ищем соответствующее поле отчета по имени\n            \n        }\n\n        // === Обработка universal полей ===\n        \n\n        // === Обработка val() и row() ===\n\n        for (const prefix of tablePrefixes) {\n            const sumPattern = new RegExp(`sum\\\\\\\\(${prefix}_([^)]+)\\\\\\\\)`, 'g');\n            transformed = transformed.replace(sumPattern, (m, f) => \n                `(frm.doc[\"${prefix}\"] && frm.doc[\"${prefix}\"].reduce((s, r) => s + (parseFloat(r[\"${f}\"]) || 0), 0) || 0)`\n            );\n\n            const valPattern = new RegExp(`val\\\\\\\\(${prefix}_([^)]+)\\\\\\\\)`, 'g');\n            transformed = transformed.replace(valPattern, (m, f) => \n                `(frm.doc[\"${prefix}\"] && frm.doc[\"${prefix}\"].reduce((s, r) => s + (parseFloat(r[\"${f}\"]) || 0), 0) || 0)`\n            );\n        }\n\n        if (for_child_table) {\n            // ИСПРАВЛЕНО: корректная обработка row() в контексте табличной части\n            transformed = transformed.replace(/row\\\\(([^)]+)\\\\)/g, (m, f) => \n                `(parseFloat(row[\"${f}\"]) || 0)`\n            );\n\n            transformed = transformed.replace(/val\\\\(([^)]+)\\\\)/g, (m, f) => {\n                if (f.startsWith(table_name + '_')) {\n                    return `(parseFloat(row[\"${f.slice(table_name.length + 1)}\"]) || 0)`;\n                }\n                return `(parseFloat(frm.doc[\"${f}\"]) || 0)`;\n            });\n        } else {\n            transformed = transformed.replace(/val\\\\(([^)]+)\\\\)/g, (m, f) => \n                `(parseFloat(frm.doc[\"${f}\"]) || 0)`\n            );\n\n            transformed = transformed.replace(/row\\\\(([^)]+)\\\\)/g, () => \n                `0 /* ERROR: row() вне табличной части */`\n            );\n        }\n\n        transformed = transformed.replace(/(frm\\\\.doc\\\\[\"[^\"]+\"]|\\\\d+|row\\\\[\"[^\"]+\"])\\\\s*([+\\\\-])\\\\s*(\\\\d+(\\\\.\\\\d+)?)%/g, \n            (match, base, op, percent) => `${base} ${op} ((${base} * ${percent}) / 100)`\n        );\n\n        return { transformed, needsAsync, reportCalls };\n    }\n\n\n// Функция для получения индекса строки по её имени (name/cdn)\nfunction get_row_index(frm, tableName, rowName) {\n    \n    // Проверяем наличие таблицы\n    if (!frm.doc[tableName]) {\n        return -1;\n    }\n    \n    // Выводим все строки для отладки\n    frm.doc[tableName].forEach((row, idx) => {\n    });\n    \n    // Ищем индекс строки по имени\n    for (let i = 0; i < frm.doc[tableName].length; i++) {\n        if (frm.doc[tableName][i].name === rowName) {\n            return i;\n        }\n    }\n    return -1;\n}\n\n// Функция для доступа к полям конкретных строк таблицы\nfunction table_row(tableName, rowIndex, fieldName) {\n    // Проверяем наличие необходимых аргументов\n    if (!tableName || rowIndex === undefined || !fieldName) {\n        return 0;\n    }\n    \n    // Преобразуем rowIndex в число (на случай, если передана строка)\n    const rowIdx = parseInt(rowIndex) - 1; // Индексация с 1 для пользователя, но с 0 в массиве\n    \n    try {\n        // Проверяем наличие таблицы и строки\n        if (!frm.doc[tableName] || !frm.doc[tableName][rowIdx]) {\n            return 0;\n        }\n        \n        // Получаем значение поля\n        const value = frm.doc[tableName][rowIdx][fieldName];\n        \n        // Проверяем на NaN и возвращаем значение или 0\n        const numValue = parseFloat(value);\n        if (isNaN(numValue)) {\n            return 0;\n        }\n        return numValue;\n    } catch (error) {\n        return 0;\n    }\n}\n\n// Функция для обновления значения поля конкретной строки таблицы\nfunction set_table_row(frm, tableName, rowIndex, fieldName, value) {\n    // Проверяем наличие необходимых аргументов\n    if (!frm || !tableName || rowIndex === undefined || !fieldName) {\n        return false;\n    }\n    \n    // Преобразуем rowIndex в число (на случай, если передана строка)\n    const rowIdx = parseInt(rowIndex) - 1; // Индексация с 1 для пользователя, но с 0 в массиве\n    \n    try {\n        // Проверяем наличие таблицы и строки\n        if (!frm.doc[tableName] || !frm.doc[tableName][rowIdx]) {\n            return false;\n        }\n        \n        // Получаем строку таблицы\n        const row = frm.doc[tableName][rowIdx];\n        \n        // Получаем сетевое имя cdt и cdn для Frappe\n        const cdt = frm.fields_dict[tableName].grid.doctype;\n        const cdn = row.name;\n        \n        // Проверяем, является ли значение NaN, и если да, заменяем его на 0\n        let finalValue = value;\n        if (typeof value === 'number' && isNaN(value)) {\n            finalValue = 0;\n        }\n        \n        // Обновляем значение поля\n        frappe.model.set_value(cdt, cdn, fieldName, finalValue);\n        \n        return true;\n    } catch (error) {\n        return false;\n    }\n}\n\n// Функция для поиска строки таблицы по значению поля\nfunction find_table_row(frm, tableName, fieldName, value) {\n    // Проверяем наличие необходимых аргументов\n    if (!frm || !tableName || !fieldName) {\n        return -1;\n    }\n    \n    try {\n        // Проверяем наличие таблицы\n        if (!frm.doc[tableName]) {\n            return -1;\n        }\n        \n        // Ищем строку с указанным значением поля\n        for (let i = 0; i < frm.doc[tableName].length; i++) {\n            if (frm.doc[tableName][i][fieldName] == value) {\n                // Возвращаем индекс строки (начиная с 1 для пользователя)\n                return i + 1;\n            }\n        }\n        \n        // Если строка не найдена\n        return -1;\n    } catch (error) {\n        return -1;\n    }\n}",
   "view": "Form"
  },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 14:59:30.172369",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh2",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_2_table_1) {\r\n            frm.set_value('səhifə_2_table_1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İşçilərin ümumi sayı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Faktiki işə cəlb olunan işçilərin sayı', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_2_table_1', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_2_table_1'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 15:01:23.419475",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh2-2",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_2_table_2) {\r\n            frm.set_value('səhifə_2_table_2', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Gəlirlər, cəmi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'O cümlədən əmək haqqının tərkibinə daxil olmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləği', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Həyatın yığım sığortasına cəlb olunmuş məbləğə nisbətdə (vaxtından əvvəl müqaviləyə xitam verildiyi halda )', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_2_table_2', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_2_table_2'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 15:02:56.359773",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh2-3",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_2_table_3) {\r\n            frm.set_value('səhifə_2_table_3', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Muzdlu işlə əlaqəli ödəmə mənbəyində tutulan vergilər üzrə güzəşt və azadolmalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Məcburi dövlət sosial sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İşsizlikdən sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İcbari tibbi sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_2_table_3', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_2_table_3'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 15:19:16.732234",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh4",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_4_table_1) {\r\n            frm.set_value('səhifə_4_table_1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Məcburi dövlət sosial sığorta haqqına cəlb olunan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablama (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış məcburi dövlət sosial sığorta haqqı (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaedənin hesabına məcburi dövlət sosial sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlərə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləğinə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Həyatın yığım sığortasına cəlb olunmuş məbləğə nisbətdə (vaxtından əvvəl müqaviləyə xitam verildiyi halda)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın (işçinin) hesabına məcburi dövlət sosial sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlərə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləğinə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Digər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sanatoriya kurort yollayışlarının dəyərinin qismən ödənilməsi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Əmək zədəsi və peşə xəstəliyi üzrə müavinətlərin geri qaytarılması', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_4_table_1', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_4_table_1'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 15:06:32.642916",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh4-2",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_4_table_2) {\r\n            frm.set_value('səhifə_4_table_2', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İşsizlikdən sığorta haqqına cəlb edilən gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablama (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış işsizlikdən sığorta haqqı (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaedənin hesabına işsizlikdən sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın hesabına işsizlikdən sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Digər mənbələr', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_4_table_2', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_4_table_2'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-19 15:07:20.859678",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh4-3",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_4_table_3) {\r\n            frm.set_value('səhifə_4_table_3', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İcbari tibbi sığorta haqqına cəlb edilən gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış icbari tibbi sığorta haqqı, cəmi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortalının hesabına icbari tibbi sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın hesabına icbari tibbi sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_4_table_3', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_4_table_3'); \r\n    }\r\n});",
-  "view": "Form"
- },
- {
-  "docstatus": 0,
-  "doctype": "Client Script",
-  "dt": "Single declaration related to salaried and non-salaried work",
-  "enabled": 1,
-  "modified": "2025-08-20 14:47:49.005744",
-  "module": "Taxes Az",
-  "name": "SingleDeclarationRelatedToSalariedAndNon-SalariedWorkSeh3",
-  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_3_table_1) {\r\n            frm.set_value('səhifə_3_table_1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Muzdlu işlə əlaqədar hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'AR hüdudlarından kənarda muzdlu işlə əlaqədar hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'O cümlədən, rəsmi bəyan edilməklə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Yerli fiziki şəxslər üzrə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən yerli fiziki şəxslər üzrə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Xarici fiziki şəxslər üzrə hesablamalar (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Xarici fiziki şəxslər üzrə hesablamalar (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən xarici fiziki şəxslər üzrə hesablamalar (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən xarici fiziki şəxslər üzrə hesablamalar (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_3_table_1', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_3_table_1'); \r\n    }\r\n});",
-  "view": "Form"
- },
  {
   "docstatus": 0,
   "doctype": "Client Script",
@@ -1494,5 +1417,82 @@
   "name": "DefaultPropertTaxReturn",
   "script": "frappe.ui.form.on('Property tax return', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.vergi_hesab_4cu_1 ) {\r\n            frm.set_value('vergi_hesab_4cu_1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: '507 Müəssisə yarandığı aydan sonra ilin sonuna qədər olan ayların sayı'},\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('vergi_hesab_4cu_1', row);\r\n        });\r\n\r\n        frm.refresh_field('vergi_hesab_4cu_1'); \r\n    }\r\n});",
   "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 15:57:54.990918",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme4_Hisse1",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme4_hisse1) {\r\n            frm.set_value('bolme4_hisse1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Məcburi dövlət sosial sığorta haqqına cəlb olunan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablama (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış məcburi dövlət sosial sığorta haqqı (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaedənin hesabına məcburi dövlət sosial sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlərə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləğinə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Həyatın yığım sığortasına cəlb olunmuş məbləğə nisbətdə (vaxtından əvvəl müqaviləyə xitam verildiyi halda)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın (işçinin) hesabına məcburi dövlət sosial sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlərə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləğinə nisbətdə MDSS haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Digər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sanatoriya kurort yollayışlarının dəyərinin qismən ödənilməsi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Əmək zədəsi və peşə xəstəliyi üzrə müavinətlərin geri qaytarılması', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme4_hisse1', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme4_hisse1'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 15:59:26.594287",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme4_Hisse2",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme4_hisse2) {\r\n            frm.set_value('bolme4_hisse2', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İşsizlikdən sığorta haqqına cəlb edilən gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablama (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış işsizlikdən sığorta haqqı (cəmi)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaedənin hesabına işsizlikdən sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın hesabına işsizlikdən sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Digər mənbələr', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme4_hisse2', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme4_hisse2'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 15:59:52.309518",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme4_Hisse3",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme4_hisse3) {\r\n            frm.set_value('bolme4_hisse3', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İcbari tibbi sığorta haqqına cəlb edilən gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış icbari tibbi sığorta haqqı, cəmi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortalının hesabına icbari tibbi sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Sığortaolunanın hesabına icbari tibbi sığorta haqqı', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme4_hisse3', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme4_hisse3'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 16:09:09.095149",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme3",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.səhifə_3_table_1) {\r\n            frm.set_value('səhifə_3_table_1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Muzdlu işlə əlaqədar hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'AR hüdudlarından kənarda muzdlu işlə əlaqədar hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'O cümlədən, rəsmi bəyan edilməklə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Yerli fiziki şəxslər üzrə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən yerli fiziki şəxslər üzrə hesablamalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Xarici fiziki şəxslər üzrə hesablamalar (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Xarici fiziki şəxslər üzrə hesablamalar (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən xarici fiziki şəxslər üzrə hesablamalar (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'VM-nin 98.2-ci maddəsinə əsasən xarici fiziki şəxslər üzrə hesablamalar (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği (manatla)', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə ödənilmiş kompensasiya məbləği (ABŞ dolları ilə)', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('səhifə_3_table_1', row);\r\n        });\r\n\r\n        frm.refresh_field('səhifə_3_table_1'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 18:17:21.920889",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme2_hisse1",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme2_hisse1) {\r\n            frm.set_value('bolme2_hisse1', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'İşçilərin ümumi sayı', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Faktiki işə cəlb olunan işçilərin sayı', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme2_hisse1', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme2_hisse1'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 18:17:46.325877",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme2_hisse2",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme2_hisse2) {\r\n            frm.set_value('bolme2_hisse2', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Gəlirlər, cəmi', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Hesablanmış əmək haqqı və digər gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'O cümlədən əmək haqqının tərkibinə daxil olmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İstifadə edilməmiş əmək məzuniyyətinə görə hesablanmış kompensasiya məbləği', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Həyatın yığım sığortasına cəlb olunmuş məbləğə nisbətdə (vaxtından əvvəl müqaviləyə xitam verildiyi halda )', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme2_hisse2', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme2_hisse2'); \r\n    }\r\n});",
+  "view": "Form"
+ },
+ {
+  "docstatus": 0,
+  "doctype": "Client Script",
+  "dt": "Single declaration related to salaried and non-salaried work",
+  "enabled": 1,
+  "modified": "2026-02-26 18:18:09.244478",
+  "module": "Taxes Az",
+  "name": "Single Declaration-Bolme2_hisse3",
+  "script": "frappe.ui.form.on('Single declaration related to salaried and non-salaried work', {\r\n    onload: function(frm) {\r\n        if (!frm.doc.__islocal) return; \r\n\r\n        if (!frm.doc.bolme2_hisse3) {\r\n            frm.set_value('bolme2_hisse3', []); \r\n        }\r\n\r\n        const default_rows = [\r\n            { göstəricilər: 'Muzdlu işlə əlaqəli ödəmə mənbəyində tutulan vergilər üzrə güzəşt və azadolmalar', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'Məcburi dövlət sosial sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İşsizlikdən sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n            { göstəricilər: 'İcbari tibbi sığorta haqqına cəlb olunmayan gəlirlər', SahəAdı2: 'Məlumat' },\r\n        ];\r\n\r\n        default_rows.forEach(row => {\r\n            frm.add_child('bolme2_hisse3', row);\r\n        });\r\n\r\n        frm.refresh_field('bolme2_hisse3'); \r\n    }\r\n});",
+  "view": "Form"
  }
 ]
\ No newline at end of file
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.json b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.json
similarity index 84%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.json
index 4ee454b..3cdeae1 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.json
@@ -10,7 +10,8 @@
   "1ciay",
   "2ciay",
   "3c\u00fcay",
-  "r\u00fcb\u00fczr\u0259ortasay"
+  "r\u00fcb\u00fczr\u0259ortasay",
+  "test"
  ],
  "fields": [
   {
@@ -47,17 +48,23 @@
    "in_list_view": 1,
    "label": "R\u00fcb \u00fczr\u0259 orta say",
    "read_only": 1
+  },
+  {
+   "fieldname": "test",
+   "fieldtype": "Data",
+   "label": "test"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-08-19 14:09:10.985088",
+ "modified": "2026-02-26 17:45:30.997548",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2",
+ "name": "Single Declaration-Bolme2_hisse1",
  "owner": "Administrator",
  "permissions": [],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.py
similarity index 69%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.py
index 79b354f..da1aa05 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/singledeclarationrelatedtosalariedandnon_salariedworkseh2.py
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse1/single_declaration_bolme2_hisse1.py
@@ -5,5 +5,5 @@
 from frappe.model.document import Document
 
 
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh2(Document):
+class SingleDeclarationBolme2_hisse1(Document):
 	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.json b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json
similarity index 96%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json
index 2f908b5..8821a5d 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 14:11:55.389995",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2-2",
+ "name": "Single Declaration-Bolme2_hisse2",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.py
similarity index 69%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.py
index 305c962..2b17915 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.py
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.py
@@ -5,5 +5,5 @@
 from frappe.model.document import Document
 
 
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh1(Document):
+class SingleDeclarationBolme2_hisse2(Document):
 	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.json b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.json
similarity index 96%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.json
index e5621b8..7c1f813 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 14:13:11.938004",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2-3",
+ "name": "Single Declaration-Bolme2_hisse3",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.py b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.py
similarity index 69%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.py
index 286d97e..83e69ca 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.py
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse3/single_declaration_bolme2_hisse3.py
@@ -5,5 +5,5 @@
 from frappe.model.document import Document
 
 
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh3(Document):
+class SingleDeclarationBolme2_hisse3(Document):
 	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme3/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme3/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.json b/taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.json
similarity index 98%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.json
index 1b9ea2d..b843dc1 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/singledeclarationrelatedtosalariedandnon_salariedworkseh3.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.json
@@ -87,7 +87,7 @@
  "modified": "2025-08-20 15:59:47.022785",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh3",
+ "name": "Single Declaration-Bolme3",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.py b/taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.py
similarity index 69%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.py
index 1c80217..356acef 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.py
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme3/single_declaration_bolme3.py
@@ -5,5 +5,5 @@
 from frappe.model.document import Document
 
 
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh4(Document):
+class SingleDeclarationBolme3(Document):
 	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json
similarity index 97%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json
index 768f8c3..6277a52 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/singledeclarationrelatedtosalariedandnon_salariedworkseh4.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 14:34:52.428413",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4",
+ "name": "Single Declaration-Bolme4_Hisse1",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.py
new file mode 100644
index 0000000..2a9e057
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationBolme4_Hisse1(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh3/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json
similarity index 95%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json
index 68eb4a3..7f8774b 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 14:39:04.726449",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4-2",
+ "name": "Single Declaration-Bolme4_Hisse2",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.py
new file mode 100644
index 0000000..95f1a74
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationBolme4_Hisse2(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json
similarity index 95%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.json
rename to taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json
index b3f4ad7..bc521dc 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 14:40:24.934943",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4-3",
+ "name": "Single Declaration-Bolme4_Hisse3",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.py b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.py
new file mode 100644
index 0000000..6202452
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationBolme4_Hisse3(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/__init__.py
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.json b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.json
similarity index 96%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.json
rename to taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.json
index d5899db..8b0c80c 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1/singledeclarationrelatedtosalariedandnon_salariedworkseh1.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.json
@@ -79,7 +79,7 @@
  "modified": "2025-08-19 12:47:27.017222",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh1",
+ "name": "Single Declaration-Elave1_Hisse1",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.py
new file mode 100644
index 0000000..5e69760
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse1/single_declaration_elave1_hisse1.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationElave1_Hisse1(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/__init__.py
similarity index 100%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/__init__.py
rename to taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/__init__.py
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.json b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.json
new file mode 100644
index 0000000..9220b8d
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.json
@@ -0,0 +1,55 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-02-25 13:31:43.561567",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "i\u015f\u00e7inins\u0131\u011fortaolunan\u0131nsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+  "fin",
+  "il",
+  "kompensasiyam\u0259bl\u0259\u011fi"
+ ],
+ "fields": [
+  {
+   "fieldname": "i\u015f\u00e7inins\u0131\u011fortaolunan\u0131nsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7inin (s\u0131\u011fortaolunan\u0131n) soyad\u0131, ad\u0131, atas\u0131n\u0131n ad\u0131",
+   "options": "\u0130cbari tibbi s\u0131\u011forta haqq\u0131na c\u0259lb edil\u0259n g\u0259lirl\u0259r\nHesablanm\u0131\u015f icbari tibbi s\u0131\u011forta haqq\u0131, c\u0259mi\nS\u0131\u011fortal\u0131n\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131\nS\u0131\u011fortaolunan\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131"
+  },
+  {
+   "fieldname": "fin",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "F\u0130N"
+  },
+  {
+   "fieldname": "il",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130l"
+  },
+  {
+   "fieldname": "kompensasiyam\u0259bl\u0259\u011fi",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Kompensasiya m\u0259bl\u0259\u011fi"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 13:34:04.449877",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "Single Declaration-Elave1_Hisse2",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.py
new file mode 100644
index 0000000..bf42630
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse2/single_declaration_elave1_hisse2.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationElave1_Hisse2(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.json b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.json
similarity index 95%
rename from taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.json
rename to taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.json
index f990478..83904af 100644
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.json
@@ -55,7 +55,7 @@
  "modified": "2025-08-19 13:59:28.694937",
  "modified_by": "Administrator",
  "module": "Taxes Az",
- "name": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh1-2",
+ "name": "Single Declaration-Elave1_Hisse3",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.py b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.py
new file mode 100644
index 0000000..faa51a4
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave1_hisse3/single_declaration_elave1_hisse3.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationElave1_Hisse3(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.json b/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.json
new file mode 100644
index 0000000..cd99b87
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.json
@@ -0,0 +1,48 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-19 14:39:40.826367",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "g\u00f6st\u0259ricil\u0259r",
+  "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+  "c\u0259lbolunmayang\u0259lirl\u0259rmanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "g\u00f6st\u0259ricil\u0259r",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "G\u00f6st\u0259ricil\u0259r"
+  },
+  {
+   "fieldname": "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7il\u0259rin say\u0131 (n\u0259f\u0259rl\u0259)",
+   "read_only": 1
+  },
+  {
+   "fieldname": "c\u0259lbolunmayang\u0259lirl\u0259rmanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "C\u0259lb olunmayan g\u0259lirl\u0259r (manatla)",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 14:39:48.918370",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "Single Declaration-elave4-icbari tibbi sigorta",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.py
new file mode 100644
index 0000000..dfc8025
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_icbari_tibbi_sigorta/single_declaration_elave4_icbari_tibbi_sigorta.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationelave4icbaritibbisigorta(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.json b/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.json
new file mode 100644
index 0000000..179a06d
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.json
@@ -0,0 +1,48 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-19 14:36:38.184647",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "g\u00f6st\u0259ricil\u0259r",
+  "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+  "c\u0259lbolunmayang\u0259lirl\u0259rmanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "g\u00f6st\u0259ricil\u0259r",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "G\u00f6st\u0259ricil\u0259r"
+  },
+  {
+   "fieldname": "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7il\u0259rin say\u0131 (n\u0259f\u0259rl\u0259)",
+   "read_only": 1
+  },
+  {
+   "fieldname": "c\u0259lbolunmayang\u0259lirl\u0259rmanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "C\u0259lb olunmayan g\u0259lirl\u0259r (manatla)",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 14:38:34.377772",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "Single Declaration-elave4-issizlikden sigorta",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.py
new file mode 100644
index 0000000..b6f2b34
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_issizlikden_sigorta/single_declaration_elave4_issizlikden_sigorta.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationelave4issizlikdensigorta(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.json b/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.json
new file mode 100644
index 0000000..40ac7e3
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.json
@@ -0,0 +1,48 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-19 14:32:02.325805",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "g\u00f6st\u0259ricil\u0259r",
+  "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+  "c\u0259lbolunmayang\u0259lirl\u0259rmanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "g\u00f6st\u0259ricil\u0259r",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "G\u00f6st\u0259ricil\u0259r"
+  },
+  {
+   "fieldname": "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7il\u0259rin say\u0131 (n\u0259f\u0259rl\u0259)",
+   "read_only": 1
+  },
+  {
+   "fieldname": "c\u0259lbolunmayang\u0259lirl\u0259rmanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "C\u0259lb olunmayan g\u0259lirl\u0259r (manatla)",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 14:38:44.398960",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "Single Declaration-elave4-mdss",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.py
new file mode 100644
index 0000000..4ca3107
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_mdss/single_declaration_elave4_mdss.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationelave4mdss(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/__init__.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.json b/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.json
new file mode 100644
index 0000000..25af519
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.json
@@ -0,0 +1,48 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-02-25 14:13:28.175257",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "g\u00f6st\u0259ricil\u0259r",
+  "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+  "g\u0259lirvergisind\u0259nazadolanm\u0259bl\u0259\u011fmanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "g\u00f6st\u0259ricil\u0259r",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "G\u00f6st\u0259ricil\u0259r"
+  },
+  {
+   "fieldname": "i\u015f\u00e7il\u0259rinsay\u0131n\u0259f\u0259rl\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7il\u0259rin say\u0131 (n\u0259f\u0259rl\u0259)",
+   "read_only": 1
+  },
+  {
+   "fieldname": "g\u0259lirvergisind\u0259nazadolanm\u0259bl\u0259\u011fmanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "G\u0259lir vergisind\u0259n azad olan m\u0259bl\u0259\u011f (manatla)",
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 14:15:36.718587",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "Single Declaration-elave4-vergi",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.py b/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.py
new file mode 100644
index 0000000..56f24a3
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/single_declaration_elave4_vergi/single_declaration_elave4_vergi.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationelave4vergi(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/single_declaration_related_to_salaried_and_non_salaried_work/single_declaration_related_to_salaried_and_non_salaried_work.json b/taxes_az/taxes_az/doctype/single_declaration_related_to_salaried_and_non_salaried_work/single_declaration_related_to_salaried_and_non_salaried_work.json
index 95aa161..5ab89be 100644
--- a/taxes_az/taxes_az/doctype/single_declaration_related_to_salaried_and_non_salaried_work/single_declaration_related_to_salaried_and_non_salaried_work.json
+++ b/taxes_az/taxes_az/doctype/single_declaration_related_to_salaried_and_non_salaried_work/single_declaration_related_to_salaried_and_non_salaried_work.json
@@ -50,44 +50,71 @@
   "hiss\u02591",
   "section_break_yybc",
   "html_kytb",
-  "s\u0259hif\u0259_1_table_1",
-  "section_break_mtji",
-  "html_pyhc",
-  "s\u0259hif\u0259_1_table_2",
+  "hiss\u0259_1",
   "hiss\u02592",
   "html_mrgs",
+  "hiss\u0259_2",
   "hiss\u02593",
-  "html_hryh",
+  "section_break_mtji",
+  "html_pyhc",
+  "hiss\u0259_3",
   "hiss\u02594",
   "html_dleh",
-  "s\u0259hif\u0259_2_tab",
+  "hiss\u0259_4",
+  "\u0259lav\u02592",
+  "html_dhqi",
+  "table_cuov",
+  "\u0259lav\u02594",
+  "data_ssvq",
+  "vergi",
+  "html_mccc",
+  "vergi_",
+  "mdss",
+  "html_srpb",
+  "mdss_",
+  "i\u015fsizlikd\u0259ns\u0131\u011forta",
+  "section_break_qnbj",
+  "html_ejrb",
+  "issizlik",
+  "icbaritibbis\u0131\u011forta",
+  "section_break_raat",
+  "html_tkad",
+  "its",
+  "\u0259sashiss\u0259",
+  "html_hkmh",
+  "b\u00f6lm\u02592",
+  "html_twda",
+  "section_break_efyn",
   "html_amdk",
-  "s\u0259hif\u0259_2_table_1",
+  "bolme2_hisse1",
   "section_break_quem",
   "html_kdhv",
-  "s\u0259hif\u0259_2_table_2",
+  "bolme2_hisse2",
   "section_break_ktuc",
   "html_lizc",
-  "s\u0259hif\u0259_2_table_3",
-  "s\u0259hif\u0259_3_tab",
+  "bolme2_hisse3",
+  "b\u00f6lm\u02593",
+  "html_jwuk",
   "section_break_otnn",
   "html_vffg",
   "s\u0259hif\u0259_3_table_1",
-  "s\u0259hif\u0259_4_tab",
-  "html_srpb",
-  "s\u0259hif\u0259_4_table_1",
-  "section_break_qnbj",
-  "html_ejrb",
-  "s\u0259hif\u0259_4_table_2",
-  "section_break_raat",
-  "html_tkad",
-  "s\u0259hif\u0259_4_table_3"
+  "b\u00f6lm\u02594",
+  "html_nrly",
+  "section_break_qjzc",
+  "html_vqup",
+  "bolme4_hisse1",
+  "section_break_pbrn",
+  "html_xhcw",
+  "bolme4_hisse2",
+  "section_break_ffgj",
+  "html_krlz",
+  "bolme4_hisse3"
  ],
  "fields": [
   {
    "fieldname": "\u00fcmumi_m\u0259lumat_tab",
    "fieldtype": "Tab Break",
-   "label": "Vergi \u00f6d\u0259yicisi haqq\u0131nda \u00fcmumi m\u0259lumat"
+   "label": "\u00dcmumi m\u0259lumat"
   },
   {
    "fieldname": "b\u0259yannam\u0259ninn\u00f6v\u00fc",
@@ -227,21 +254,6 @@
    "fieldname": "section_break_afgw",
    "fieldtype": "Section Break"
   },
-  {
-   "fieldname": "s\u0259hif\u0259_2_tab",
-   "fieldtype": "Tab Break",
-   "label": "Muzdlu i\u015fd\u0259n g\u0259lir \u0259ld\u0259 ed\u0259n i\u015f\u00e7il\u0259rin say\u0131 v\u0259 g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_3_tab",
-   "fieldtype": "Tab Break",
-   "label": "Muzdlu i\u015fl\u0259 \u0259laq\u0259dar \u00f6d\u0259m\u0259 m\u0259nb\u0259yind\u0259 tutulan verginin hesablasnmas\u0131"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_4_tab",
-   "fieldtype": "Tab Break",
-   "label": "Muzdlu i\u015f\u0259 dair MDSS, i\u015fsizlikd\u0259n s\u0131\u011forta haqlar\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lir v\u0259 hesablamalar"
-  },
   {
    "fieldname": "vergi\u00f6d\u0259yicisininqrupu",
    "fieldtype": "Section Break",
@@ -304,7 +316,7 @@
   {
    "fieldname": "html_amdk",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130\u015f\u00e7il\u0259rin say\u0131</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 1 - \u0130\u015f\u00e7il\u0259rin say\u0131</p>"
   },
   {
    "fieldname": "section_break_ktuc",
@@ -313,7 +325,7 @@
   {
    "fieldname": "html_lizc",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Vergil\u0259r \u00fczr\u0259 g\u00fcz\u0259\u015ft v\u0259 azadolmalar, MDSS v\u0259 i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131na c\u0259lb edilm\u0259y\u0259n g\u0259lirl\u0259r</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 3 - Vergil\u0259r \u00fczr\u0259 g\u00fcz\u0259\u015ft v\u0259 azadolmalar, el\u0259c\u0259 d\u0259 m\u0259cburi d\u00f6vl\u0259t sosial s\u0131\u011forta v\u0259 i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131na c\u0259lb edilm\u0259y\u0259n g\u0259lirl\u0259r</p>"
   },
   {
    "fieldname": "section_break_quem",
@@ -322,12 +334,12 @@
   {
    "fieldname": "html_kdhv",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> G\u0259lirl\u0259r</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 2 - G\u0259lirl\u0259r</p>"
   },
   {
    "fieldname": "html_srpb",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Muzdlu i\u015fd\u0259n \u0259ld\u0259 edil\u0259n g\u0259lirl\u0259r il\u0259 \u0259laq\u0259dar M\u0259cburi D\u00f6vl\u0259t Sosial S\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> M\u0259cburi d\u00f6vl\u0259t sosial s\u0131\u011forta haqq\u0131na c\u0259lb olunmayan g\u0259lirl\u0259r bar\u0259d\u0259 m\u0259lumat</p>"
   },
   {
    "fieldname": "section_break_qnbj",
@@ -336,7 +348,7 @@
   {
    "fieldname": "html_ejrb",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131na c\u0259lb olunmayan g\u0259lirl\u0259r bar\u0259d\u0259 m\u0259lumat</p>"
   },
   {
    "fieldname": "section_break_raat",
@@ -345,47 +357,7 @@
   {
    "fieldname": "html_tkad",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130cbari tibbi s\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_1_table_1",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh1"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_1_table_2",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh1-2"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_2_table_1",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_2_table_2",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2-2"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_2_table_3",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh2-3"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_4_table_1",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_4_table_2",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4-2"
-  },
-  {
-   "fieldname": "s\u0259hif\u0259_4_table_3",
-   "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh4-3"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130cbari tibbi s\u0131\u011forta haqq\u0131na c\u0259lb olunmayan g\u0259lirl\u0259r bar\u0259d\u0259 m\u0259lumat</p>"
   },
   {
    "fieldname": "section_break_otnn",
@@ -394,12 +366,12 @@
   {
    "fieldname": "s\u0259hif\u0259_3_table_1",
    "fieldtype": "Table",
-   "options": "SingleDeclarationRelatedToSalariedAndNon-salariedWorkSeh3"
+   "options": "Single Declaration-Bolme3"
   },
   {
    "fieldname": "html_vffg",
    "fieldtype": "HTML",
-   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Verginin hesablanmas\u0131</p>"
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 1 - Verginin hesablanmas\u0131</p>"
   },
   {
    "fieldname": "html_gusf",
@@ -460,20 +432,214 @@
   },
   {
    "fieldname": "html_mrgs",
-   "fieldtype": "HTML"
-  },
-  {
-   "fieldname": "html_hryh",
-   "fieldtype": "HTML"
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> \u0130\u015f\u00e7il\u0259r \u00fczr\u0259 istifad\u0259 edilm\u0259mi\u015f \u0259m\u0259k m\u0259zuniyy\u0259tin\u0259 g\u00f6r\u0259 hesablanm\u0131\u015f kompensasiya m\u0259bl\u0259\u011fi</p>"
   },
   {
    "fieldname": "html_dleh",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> SSN-i v\u0259 (v\u0259 ya) F\u0130N-i m\u00f6vcud olmayan xarici \u0259m\u0259kda\u015flar (muzdlu i\u015fd\u0259n g\u0259lir ed\u0259nl\u0259r) bar\u0259d\u0259 m\u0259lumat</p>"
+  },
+  {
+   "fieldname": "hiss\u0259_1",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Elave1_Hisse1"
+  },
+  {
+   "fieldname": "hiss\u0259_2",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Elave1_Hisse2"
+  },
+  {
+   "fieldname": "hiss\u0259_3",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Elave1_Hisse3"
+  },
+  {
+   "fieldname": "hiss\u0259_4",
+   "fieldtype": "Table",
+   "options": "SingleDeclaration-Elave1_Hisse4"
+  },
+  {
+   "fieldname": "\u0259lav\u02594",
+   "fieldtype": "Tab Break",
+   "label": "\u018flav\u0259 4. \u0130\u015f\u00e7il\u0259rin muzdlu i\u015f\u0259 c\u0259lb olunmayan g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat"
+  },
+  {
+   "fieldname": "vergi",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018flav\u0259 4. \u0130\u015f\u00e7il\u0259rin muzdlu i\u015f\u0259 c\u0259lb olunmayan g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat",
+   "label": "Vergi"
+  },
+  {
+   "fieldname": "html_mccc",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> G\u0259lir vergisi \u00fczr\u0259 g\u00fcz\u0259\u015ft v\u0259 azadolmalar bar\u0259d\u0259 m\u0259lumat</p>"
+  },
+  {
+   "fieldname": "mdss",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018flav\u0259 4. \u0130\u015f\u00e7il\u0259rin muzdlu i\u015f\u0259 c\u0259lb olunmayan g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat",
+   "label": "MDSS"
+  },
+  {
+   "fieldname": "i\u015fsizlikd\u0259ns\u0131\u011forta",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018flav\u0259 4. \u0130\u015f\u00e7il\u0259rin muzdlu i\u015f\u0259 c\u0259lb olunmayan g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat",
+   "label": "\u0130\u015fsizlikd\u0259n s\u0131\u011forta"
+  },
+  {
+   "fieldname": "icbaritibbis\u0131\u011forta",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018flav\u0259 4. \u0130\u015f\u00e7il\u0259rin muzdlu i\u015f\u0259 c\u0259lb olunmayan g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat",
+   "label": "\u0130cbari tibbi s\u0131\u011forta"
+  },
+  {
+   "fieldname": "data_ssvq",
    "fieldtype": "HTML"
+  },
+  {
+   "fieldname": "\u0259sashiss\u0259",
+   "fieldtype": "Tab Break",
+   "label": "\u018fsas hiss\u0259"
+  },
+  {
+   "fieldname": "html_hkmh",
+   "fieldtype": "HTML"
+  },
+  {
+   "fieldname": "b\u00f6lm\u02592",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018fsas hiss\u0259",
+   "label": "B\u00f6lm\u0259 2"
+  },
+  {
+   "fieldname": "html_twda",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 20px;font-weight: bold;color: Black;\"> B\u00f6lm\u0259 2. Muzdlu i\u015fd\u0259n g\u0259lir \u0259ld\u0259 ed\u0259n i\u015f\u00e7il\u0259rin say\u0131 v\u0259 g\u0259lirl\u0259ri bar\u0259d\u0259 m\u0259lumat</p>"
+  },
+  {
+   "fieldname": "b\u00f6lm\u02593",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018fsas hiss\u0259",
+   "label": "B\u00f6lm\u0259 3"
+  },
+  {
+   "fieldname": "html_jwuk",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 20px;font-weight: bold;color: Black;\"> B\u00f6lm\u0259 3. Muzdlu i\u015fl\u0259 \u0259laq\u0259dar \u00f6d\u0259m\u0259 m\u0259nb\u0259yind\u0259 tutulan verginin hesablanmas\u0131</p>"
+  },
+  {
+   "fieldname": "b\u00f6lm\u02594",
+   "fieldtype": "Tab Break",
+   "js_parent_subtab": "\u018fsas hiss\u0259",
+   "label": "B\u00f6lm\u0259 4"
+  },
+  {
+   "fieldname": "html_nrly",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 20px;font-weight: bold;color: Black;\"> B\u00f6lm\u0259 4. Muzdlu i\u015f\u0259 dair m\u0259cburi d\u00f6vl\u0259t sosial s\u0131\u011forta, i\u015fsizlikd\u0259n s\u0131\u011forta, icbari tibbi s\u0131\u011forta haqlar\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+  },
+  {
+   "fieldname": "section_break_efyn",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_qjzc",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "html_vqup",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 1 - Muzdlu i\u015fd\u0259n \u0259ld\u0259 edil\u0259n g\u0259lirl\u0259r il\u0259 \u0259laq\u0259dar m\u0259cburi d\u00f6vl\u0259t sosial s\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+  },
+  {
+   "fieldname": "section_break_pbrn",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "html_xhcw",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 2 - \u0130\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+  },
+  {
+   "fieldname": "section_break_ffgj",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "html_krlz",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 15px;font-weight: bold;color: Black;\"> Hiss\u0259 3 - \u0130cbari tibbi s\u0131\u011forta haqq\u0131 \u00fczr\u0259 c\u0259lb edil\u0259n g\u0259lirl\u0259r v\u0259 hesablamalar</p>"
+  },
+  {
+   "fieldname": "vergi_",
+   "fieldtype": "Table",
+   "options": "Single Declaration-elave4-vergi"
+  },
+  {
+   "fieldname": "mdss_",
+   "fieldtype": "Table",
+   "options": "Single Declaration-elave4-mdss"
+  },
+  {
+   "fieldname": "issizlik",
+   "fieldtype": "Table",
+   "options": "Single Declaration-elave4-issizlikden sigorta"
+  },
+  {
+   "fieldname": "its",
+   "fieldtype": "Table",
+   "options": "Single Declaration-elave4-icbari tibbi sigorta"
+  },
+  {
+   "fieldname": "bolme4_hisse1",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme4_Hisse1"
+  },
+  {
+   "fieldname": "bolme4_hisse2",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme4_Hisse2"
+  },
+  {
+   "fieldname": "bolme4_hisse3",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme4_Hisse3"
+  },
+  {
+   "fieldname": "\u0259lav\u02592",
+   "fieldtype": "Tab Break",
+   "label": "\u018flav\u0259 2. Muzdlu i\u015fl\u0259 \u0259laq\u0259dar \u00f6d\u0259m\u0259 m\u0259nb\u0259yind\u0259 tutulan vergi \u00fczr\u0259 xarici \u0259m\u0259kda\u015flar bar\u0259d\u0259 m\u0259lumat"
+  },
+  {
+   "fieldname": "html_dhqi",
+   "fieldtype": "HTML",
+   "options": "<p style=\"text-align: center;font-size: 20px;font-weight: bold;color: Black;\"> Muzdlu i\u015fl\u0259 \u0259laq\u0259dar \u00f6d\u0259m\u0259 m\u0259nb\u0259yind\u0259 tutulan vergi \u00fczr\u0259 xarici \u0259m\u0259kda\u015flar bar\u0259d\u0259 m\u0259lumat</p>"
+  },
+  {
+   "fieldname": "bolme2_hisse1",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme2_hisse1"
+  },
+  {
+   "fieldname": "bolme2_hisse2",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme2_hisse2"
+  },
+  {
+   "fieldname": "bolme2_hisse3",
+   "fieldtype": "Table",
+   "options": "Single Declaration-Bolme2_hisse3"
+  },
+  {
+   "fieldname": "table_cuov",
+   "fieldtype": "Table",
+   "options": "SingleDeclaration-Elave2"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2026-02-23 17:34:17.199793",
+ "modified": "2026-02-26 18:29:52.170183",
  "modified_by": "Administrator",
  "module": "Taxes Az",
  "name": "Single declaration related to salaried and non-salaried work",
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/__init__.py b/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.json b/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.json
new file mode 100644
index 0000000..f7fbf73
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.json
@@ -0,0 +1,69 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-02-25 13:38:06.970590",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "i\u015f\u00e7inins\u0131\u011fortaolunan\u0131nsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+  "fin",
+  "v\u0259t\u0259nda\u015f\u0131oldu\u011fu\u00f6lk\u0259",
+  "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirinm\u0259bl\u0259\u011fimanatla",
+  "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirinm\u0259bl\u0259\u011fidollarla",
+  "vergim\u0259bl\u0259\u011fimanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "i\u015f\u00e7inins\u0131\u011fortaolunan\u0131nsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7inin (s\u0131\u011fortaolunan\u0131n) soyad\u0131, ad\u0131, atas\u0131n\u0131n ad\u0131",
+   "options": "\u0130cbari tibbi s\u0131\u011forta haqq\u0131na c\u0259lb edil\u0259n g\u0259lirl\u0259r\nHesablanm\u0131\u015f icbari tibbi s\u0131\u011forta haqq\u0131, c\u0259mi\nS\u0131\u011fortal\u0131n\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131\nS\u0131\u011fortaolunan\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131"
+  },
+  {
+   "fieldname": "fin",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "F\u0130N"
+  },
+  {
+   "fieldname": "v\u0259t\u0259nda\u015f\u0131oldu\u011fu\u00f6lk\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "V\u0259t\u0259nda\u015f\u0131 oldu\u011fu \u00f6lk\u0259"
+  },
+  {
+   "fieldname": "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirinm\u0259bl\u0259\u011fimanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Vergiy\u0259 c\u0259lb edil\u0259n g\u0259lirin m\u0259bl\u0259\u011fi (manatla)"
+  },
+  {
+   "fieldname": "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirinm\u0259bl\u0259\u011fidollarla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Vergiy\u0259 c\u0259lb edil\u0259n g\u0259lirin m\u0259bl\u0259\u011fi (dollarla)"
+  },
+  {
+   "fieldname": "vergim\u0259bl\u0259\u011fimanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Vergi m\u0259bl\u0259\u011fi (manatla)"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-25 13:44:02.535436",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "SingleDeclaration-Elave1_Hisse4",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.py b/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.py
new file mode 100644
index 0000000..11e02ba
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/singledeclaration_elave1_hisse4/singledeclaration_elave1_hisse4.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationElave1_Hisse4(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave2/__init__.py b/taxes_az/taxes_az/doctype/singledeclaration_elave2/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.json b/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.json
new file mode 100644
index 0000000..a8ef7bc
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.json
@@ -0,0 +1,69 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2026-02-26 18:21:08.306280",
+ "default_view": "List",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "i\u015f\u00e7ininsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+  "fin",
+  "miqrasiyafini",
+  "v\u0259t\u0259nda\u015foldu\u011fu\u00f6lk\u0259",
+  "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirmanatla",
+  "hesablanm\u0131\u015fg\u0259lirvergisimanatla"
+ ],
+ "fields": [
+  {
+   "fieldname": "fin",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "F\u0130N"
+  },
+  {
+   "fieldname": "i\u015f\u00e7ininsoyad\u0131ad\u0131atas\u0131n\u0131nad\u0131",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "\u0130\u015f\u00e7inin soyad\u0131, ad\u0131, atas\u0131n\u0131n ad\u0131",
+   "options": "\u0130cbari tibbi s\u0131\u011forta haqq\u0131na c\u0259lb edil\u0259n g\u0259lirl\u0259r\nHesablanm\u0131\u015f icbari tibbi s\u0131\u011forta haqq\u0131, c\u0259mi\nS\u0131\u011fortal\u0131n\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131\nS\u0131\u011fortaolunan\u0131n hesab\u0131na icbari tibbi s\u0131\u011forta haqq\u0131"
+  },
+  {
+   "fieldname": "miqrasiyafini",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Miqrasiya F\u0130N-i"
+  },
+  {
+   "fieldname": "v\u0259t\u0259nda\u015foldu\u011fu\u00f6lk\u0259",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "V\u0259t\u0259nda\u015f oldu\u011fu \u00f6lk\u0259"
+  },
+  {
+   "fieldname": "vergiy\u0259c\u0259lbedil\u0259ng\u0259lirmanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Vergiy\u0259 c\u0259lb edil\u0259n g\u0259lir (manatla)"
+  },
+  {
+   "fieldname": "hesablanm\u0131\u015fg\u0259lirvergisimanatla",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Hesablanm\u0131\u015f g\u0259lir vergisi (manatla)"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2026-02-26 18:27:00.228197",
+ "modified_by": "Administrator",
+ "module": "Taxes Az",
+ "name": "SingleDeclaration-Elave2",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.py b/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.py
new file mode 100644
index 0000000..1225724
--- /dev/null
+++ b/taxes_az/taxes_az/doctype/singledeclaration_elave2/singledeclaration_elave2.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2026, Jey Soft and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class SingleDeclarationElave2(Document):
+	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.py b/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.py
deleted file mode 100644
index 4191aa1..0000000
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2/singledeclarationrelatedtosalariedandnon_salariedworkseh1_2.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025, Jey Soft and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh12(Document):
-	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.py b/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.py
deleted file mode 100644
index c3f02fe..0000000
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2/singledeclarationrelatedtosalariedandnon_salariedworkseh2_2.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025, Jey Soft and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh22(Document):
-	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.py b/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.py
deleted file mode 100644
index 2633de1..0000000
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3/singledeclarationrelatedtosalariedandnon_salariedworkseh2_3.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025, Jey Soft and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh23(Document):
-	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.py b/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.py
deleted file mode 100644
index 79baf98..0000000
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2/singledeclarationrelatedtosalariedandnon_salariedworkseh4_2.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025, Jey Soft and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh42(Document):
-	pass
diff --git a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.py b/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.py
deleted file mode 100644
index aafb457..0000000
--- a/taxes_az/taxes_az/doctype/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3/singledeclarationrelatedtosalariedandnon_salariedworkseh4_3.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2025, Jey Soft and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class SingleDeclarationRelatedToSalariedAndNonsalariedWorkSeh43(Document):
-	pass