From 8c4ade656af083f8f54145b383e92ed9b2253a6d Mon Sep 17 00:00:00 2001 From: Ali <010109ali@gmail.com> Date: Fri, 17 Apr 2026 10:28:24 +0000 Subject: [PATCH] push from mvp --- taxes_az/fixtures/client_script.json | 4 ++-- .../single_declaration_bolme2_hisse2.json | 13 +++++++------ .../single_declaration_bolme4_hisse1.json | 13 +++++++------ .../single_declaration_bolme4_hisse2.json | 17 +++++++++-------- .../single_declaration_bolme4_hisse3.json | 15 ++++++++------- ...ated_to_salaried_and_non_salaried_work.json | 18 +++++++++--------- 6 files changed, 42 insertions(+), 38 deletions(-) diff --git a/taxes_az/fixtures/client_script.json b/taxes_az/fixtures/client_script.json index 7503ad7..2432d68 100644 --- a/taxes_az/fixtures/client_script.json +++ b/taxes_az/fixtures/client_script.json @@ -1423,10 +1423,10 @@ "doctype": "Client Script", "dt": "Single declaration related to salaried and non-salaried work", "enabled": 1, - "modified": "2026-04-01 16:09:06.631947", + "modified": "2026-04-16 23:17:59.468106", "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});", + "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: '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 ];\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" }, { diff --git a/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json index 8821a5d..f629bb3 100644 --- a/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json +++ b/taxes_az/taxes_az/doctype/single_declaration_bolme2_hisse2/single_declaration_bolme2_hisse2.json @@ -10,7 +10,7 @@ "1ciay", "2ciay", "3c\u00fcay", - "r\u00fcb\u00fczr\u0259ortasay" + "r\u00fcb\u00fczr\u0259c\u0259mi" ], "fields": [ { @@ -42,23 +42,24 @@ "read_only": 1 }, { - "fieldname": "r\u00fcb\u00fczr\u0259ortasay", + "fieldname": "r\u00fcb\u00fczr\u0259c\u0259mi", "fieldtype": "Data", "in_list_view": 1, - "label": "R\u00fcb \u00fczr\u0259 orta say", + "label": "R\u00fcb \u00fczr\u0259 c\u0259mi", "read_only": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-19 14:11:55.389995", - "modified_by": "Administrator", + "modified": "2026-04-03 22:21:00.258545", + "modified_by": "nihad_m@jeysoft.az", "module": "Taxes Az", "name": "Single Declaration-Bolme2_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_bolme4_hisse1/single_declaration_bolme4_hisse1.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json index 6277a52..450fe47 100644 --- a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json +++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse1/single_declaration_bolme4_hisse1.json @@ -22,28 +22,28 @@ }, { "fieldname": "1ciay", - "fieldtype": "Data", + "fieldtype": "Currency", "in_list_view": 1, "label": "1-ci Ay", "read_only": 1 }, { "fieldname": "2ciay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "2-ci Ay", "read_only": 1 }, { "fieldname": "3c\u00fcay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "3-c\u00fc Ay", "read_only": 1 }, { "fieldname": "r\u00fcb", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "R\u00fcb", "read_only": 1 @@ -52,13 +52,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-19 14:34:52.428413", + "modified": "2026-04-17 14:22:26.951151", "modified_by": "Administrator", "module": "Taxes Az", "name": "Single Declaration-Bolme4_Hisse1", "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_bolme4_hisse2/single_declaration_bolme4_hisse2.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json index 7f8774b..e38a61a 100644 --- a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json +++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse2/single_declaration_bolme4_hisse2.json @@ -18,32 +18,32 @@ "fieldtype": "Select", "in_list_view": 1, "label": "G\u00f6st\u0259ricil\u0259r", - "options": "\u0130\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131na c\u0259lb edil\u0259n g\u0259lirl\u0259r\nHesablama (c\u0259mi)\nHesablanm\u0131\u015f i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131 (c\u0259mi)\nS\u0131\u011fortaed\u0259nin hesab\u0131na i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131\nS\u0131\u011fortaolunan\u0131n hesab\u0131na i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131\nDig\u0259r m\u0259nb\u0259l\u0259r" + "options": "\u0130\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131na c\u0259lb edil\u0259n g\u0259lirl\u0259r\nHesablanm\u0131\u015f i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131 (c\u0259mi)\nS\u0131\u011fortaed\u0259nin hesab\u0131na i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131\nS\u0131\u011fortaolunan\u0131n hesab\u0131na i\u015fsizlikd\u0259n s\u0131\u011forta haqq\u0131" }, { "fieldname": "1ciay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "1-ci Ay", "read_only": 1 }, { "fieldname": "2ciay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "2-ci Ay", "read_only": 1 }, { "fieldname": "3c\u00fcay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "3-c\u00fc Ay", "read_only": 1 }, { "fieldname": "r\u00fcb", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "R\u00fcb", "read_only": 1 @@ -52,13 +52,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-19 14:39:04.726449", - "modified_by": "Administrator", + "modified": "2026-04-16 23:17:25.178190", + "modified_by": "nihad_m@jeysoft.az", "module": "Taxes Az", "name": "Single Declaration-Bolme4_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_bolme4_hisse3/single_declaration_bolme4_hisse3.json b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json index bc521dc..6289c4e 100644 --- a/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json +++ b/taxes_az/taxes_az/doctype/single_declaration_bolme4_hisse3/single_declaration_bolme4_hisse3.json @@ -22,28 +22,28 @@ }, { "fieldname": "1ciay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "1-ci Ay", "read_only": 1 }, { "fieldname": "2ciay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "2-ci Ay", "read_only": 1 }, { "fieldname": "3c\u00fcay", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "3-c\u00fc Ay", "read_only": 1 }, { "fieldname": "r\u00fcb", - "fieldtype": "Data", + "fieldtype": "Float", "in_list_view": 1, "label": "R\u00fcb", "read_only": 1 @@ -52,13 +52,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-19 14:40:24.934943", - "modified_by": "Administrator", + "modified": "2026-04-16 23:37:40.355469", + "modified_by": "nihad_m@jeysoft.az", "module": "Taxes Az", "name": "Single Declaration-Bolme4_Hisse3", "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_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 1805cdd..b0a6a8b 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 @@ -13,7 +13,7 @@ "b\u0259yanedil\u0259c\u0259km\u0259lumat\u0131myoxdur", "section_break_afgw", "b\u0259yannam\u0259ninn\u00f6v\u00fc", - "hesabatd\u00f6vr\u00fc", + "r\u00fcb", "il", "aray\u0131\u015fhesabat\u0131", "f\u0259aliyy\u0259tn\u00f6v\u00fcn\u00fcnkodu", @@ -122,12 +122,6 @@ "label": "B\u0259yannam\u0259nin n\u00f6v\u00fc", "options": "Cari\nD\u0259qiql\u0259\u015fdirilmi\u015f\nL\u0259\u011fv olma\nL\u0259\u011fv olman\u0131n d\u0259qiql\u0259\u015fdirilmi\u015fi\nK\u00f6n\u00fcll\u00fc a\u00e7\u0131qlama" }, - { - "fieldname": "hesabatd\u00f6vr\u00fc", - "fieldtype": "Select", - "label": "Hesabat d\u00f6vr\u00fc", - "options": "1. R\u00fcb\n2. R\u00fcb\n3. R\u00fcb\n4. R\u00fcb" - }, { "fieldname": "il", "fieldtype": "Int", @@ -635,12 +629,18 @@ "fieldtype": "Select", "label": "MDSS \u00fczr\u0259", "options": "0112 Muzdla i\u015fl\u0259y\u0259nl\u0259ri i\u015f\u0259 g\u00f6t\u00fcr\u0259n s\u0131\u011fortaed\u0259nl\u0259r\n0200 M\u00fc\u0259lliflik qonorar\u0131 \u00f6d\u0259y\u0259n h\u00fcquqi v\u0259 fiziki \u015f\u0259xsl\u0259r\n0300 V\u0259kill\u0259r kollegiyas\u0131n\u0131n \u00fczvl\u0259ri, s\u0259rb\u0259st auditorlar, s\u0259rb\u0259st m\u00fchasibl\u0259r, s\u0259rb\u0259st mediatorlar\n0500 M\u00fclki h\u00fcquqi xarakterli m\u00fcqavil\u0259l\u0259rl\u0259 i\u015fl\u0259y\u0259nl\u0259r" + }, + { + "fieldname": "r\u00fcb", + "fieldtype": "Select", + "label": "R\u00fcb", + "options": "1. R\u00fcb\n2. R\u00fcb\n3. R\u00fcb\n4. R\u00fcb" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-03-30 19:43:15.446689", - "modified_by": "Administrator", + "modified": "2026-04-15 19:20:33.687947", + "modified_by": "nihad_m@jeysoft.az", "module": "Taxes Az", "name": "Single declaration related to salaried and non-salaried work", "owner": "Administrator",