From e48f14cb7cf4ad0cf190138eb65b0d4b05cb17da Mon Sep 17 00:00:00 2001
From: Ali <010109ali@gmail.com>
Date: Tue, 28 Oct 2025 15:08:35 +0400
Subject: [PATCH] added umumi601 and umumi602 and their calculations

---
 .../land_tax_declaration.js                   | 49 ++++++++++++++++++-
 .../land_tax_declaration.json                 | 19 ++++++-
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.js b/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.js
index d462697..91f1e78 100644
--- a/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.js
+++ b/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.js
@@ -1,4 +1,8 @@
 frappe.ui.form.on('Land tax declaration', {
+    refresh: function(frm) {
+        recalculate_totals(frm);
+    },
+    
     il: function(frm) {
         if (frm.doc.il) {
             reload_assets_for_year(frm, frm.doc.il);
@@ -6,6 +10,49 @@ frappe.ui.form.on('Land tax declaration', {
     }
 });
 
+frappe.ui.form.on('Land tax declaration Elave 1', {
+    vergiməbləğimanatla: function(frm, cdt, cdn) {
+        recalculate_totals(frm);
+    },
+    
+    bəyannaməsətrininkoduvəadı: function(frm, cdt, cdn) {
+        recalculate_totals(frm);
+    },
+    
+    əlavə_1_add: function(frm) {
+        recalculate_totals(frm);
+    },
+    
+    əlavə_1_remove: function(frm) {
+        recalculate_totals(frm);
+    }
+});
+
+function recalculate_totals(frm) {
+    if (!frm.doc.əlavə_1 || !Array.isArray(frm.doc.əlavə_1)) {
+        frm.set_value('601umumi', 0);
+        frm.set_value('602umumi', 0);
+        return;
+    }
+    
+    let total_601 = 0;
+    let total_602 = 0;
+    
+    frm.doc.əlavə_1.forEach(function(row) {
+        let code = row.bəyannaməsətrininkoduvəadı || '';
+        let tax = parseFloat(row.vergiməbləğimanatla) || 0;
+        
+        if (code.startsWith('600.1')) {
+            total_601 += tax;
+        } else if (code.startsWith('600.2')) {
+            total_602 += tax;
+        }
+    });
+    
+    frm.set_value('601umumi', total_601);
+    frm.set_value('602umumi', total_602);
+}
+
 function reload_assets_for_year(frm, year) {
     frm.clear_table('əlavə_1');
     frm.clear_table('əlavə_2');
@@ -16,6 +63,7 @@ function reload_assets_for_year(frm, year) {
         load_industrial_assets_for_year(frm, 'əlavə_2', year)
     ]).then(() => {
         frm.refresh_fields();
+        recalculate_totals(frm);
     }).catch((error) => {
         console.error('Error loading assets:', error);
     });
@@ -200,7 +248,6 @@ function calculate_agricultural_tax_for_row_silent(row, asset, total_area, group
         agricultural_purpose_name = agricultural_purposes[asset.agricultural_purpose].purpose_name;
     }
     
-    // Для неиспользуемых земель не нужны остальные поля
     if (agricultural_purpose_name !== 'Təyinatı üzrə istifadə edilməyən kənd təsərrüfatı torpaqları üzrə hesablanmış vergi məbləği') {
         if (!asset.cadastral_district_name || !asset.quality_groups || !asset.agricultural_land_purpose) {
             callback();
diff --git a/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.json b/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.json
index 11c6638..12d49a1 100644
--- a/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.json
+++ b/taxes_az/taxes_az/doctype/land_tax_declaration/land_tax_declaration.json
@@ -55,6 +55,8 @@
   "vergim\u0259bl\u0259\u011fimanatla2",
   "600k\u0259ndt\u0259s\u0259rr\u00fcfat\u0131t\u0259yinatl\u0131torpaqsah\u0259l\u0259ri\u00fczr\u0259c\u0259mi",
   "vergim\u0259bl\u0259\u011fimanatla3",
+  "601umumi",
+  "602umumi",
   "\u0259lav\u0259_2_tab",
   "html_ybie",
   "section_break_hnrj",
@@ -366,11 +368,23 @@
    "fieldtype": "Float",
    "label": "\u00dcmumi sah\u0259",
    "precision": "2"
+  },
+  {
+   "fieldname": "601umumi",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "602umumi",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-09-16 11:29:30.443609",
+ "modified": "2025-10-28 15:07:19.669667",
  "modified_by": "Administrator",
  "module": "Taxes Az",
  "name": "Land tax declaration",
@@ -389,7 +403,8 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}