fix: Meter Reading Rate delete records

navariltd · Oct 17, 2024 · fd2ad42 · fd2ad42
1 parent 4bf26b1
commit fd2ad42
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/utility_billing/utility_billing/doctype/meter_reading/meter_reading.js b/utility_billing/utility_billing/doctype/meter_reading/meter_reading.js
@@ -12,7 +12,6 @@ frappe.ui.form.on("Meter Reading", {
 				filters: {
 					is_sales_item: 1,
 					has_variants: 0,
-					["item_group"]: ["in", ["Water", "Sewerage"]],
 				},
 			};
 		};

diff --git a/utility_billing/utility_billing/doctype/meter_reading_rate/meter_reading_rate.json b/utility_billing/utility_billing/doctype/meter_reading_rate/meter_reading_rate.json
@@ -84,14 +84,26 @@
   }
  ],
  "index_web_pages_for_search": 1,
- "istable": 1,
  "links": [],
- "modified": "2024-10-17 06:25:22.454232",
+ "modified": "2024-10-17 07:30:33.471183",
  "modified_by": "Administrator",
  "module": "Utility Billing",
  "name": "Meter Reading Rate",
  "owner": "Administrator",
- "permissions": [],
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

diff --git a/utility_billing/utility_billing/doctype/utility_service_request/utility_service_request.js b/utility_billing/utility_billing/doctype/utility_service_request/utility_service_request.js
@@ -37,6 +37,14 @@ frappe.ui.form.on("Utility Service Request", {
 				},
 			};
 		};
+
+		frm.set_query("customer_group", function () {
+			return {
+				filters: {
+					is_group: 0,
+				},
+			};
+		});
 	},
 
 	customer: function (frm) {

diff --git a/utility_billing/utility_billing/doctype/utility_service_request/utility_service_request.json b/utility_billing/utility_billing/doctype/utility_service_request/utility_service_request.json
@@ -322,7 +322,7 @@
   {
    "fieldname": "tab_6_tab",
    "fieldtype": "Tab Break",
-   "label": "Connection Details & Coordinates"
+   "label": "Coordinates"
   },
   {
    "fieldname": "request_status",
@@ -347,7 +347,7 @@
    "link_fieldname": "utility_service_request"
   }
  ],
- "modified": "2024-10-17 05:39:08.749229",
+ "modified": "2024-10-17 07:25:21.020260",
  "modified_by": "Administrator",
  "module": "Utility Billing",
  "name": "Utility Service Request",