Merge pull request #3657 from ONE-F-M/version-15

Version-15 to test-production

one_fm/one_fm/doctype/erf/erf.json

@@ -398,6 +398,7 @@
    "options": "ERF Tool Request Item"
   },
   {
+   "allow_on_submit": 1,
    "default": "0",
    "fieldname": "is_uniform_needed_for_this_job",
    "fieldtype": "Check",
@@ -614,6 +615,7 @@
    "label": "Create Event for Workshop"
   },
   {
+   "allow_on_submit": 1,
    "fieldname": "project_for_recruiter",
    "fieldtype": "Link",
    "label": "Project for Recruiter",
@@ -748,6 +750,7 @@
    "no_copy": 1
   },
   {
+   "allow_on_submit": 1,
    "fieldname": "is_uniform_needed_for_this_job_html",
    "fieldtype": "HTML",
    "label": "Is Uniform Needed for this Job HTML"
@@ -1018,7 +1021,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-04-25 13:07:35.047822",
+ "modified": "2024-09-19 14:13:31.692633",
  "modified_by": "Administrator",
  "module": "One Fm",
  "name": "ERF",

one_fm/purchase/doctype/request_for_material/request_for_material.py

@@ -115,12 +115,12 @@ def set_request_for_material_accepter_and_approver(self):
 		if not self.request_for_material_approver:
 			approver = False
 			if self.type == 'Project' and self.project:
-				approver = frappe.db.get_single_value("Operation Settings", "default_operation_manager")
-				if approver:
-					self.request_for_material_approver = approver
-					return
-				else:
-					approver = frappe.db.get_value('Project', self.project, 'account_manager')
+				approver = frappe.db.get_value('Project', self.project, 'account_manager')
+				if not approver:
+					approver = frappe.db.get_single_value("Operation Settings", "default_operation_manager")
+					if approver:
+						self.request_for_material_approver = approver
+						return
 			elif self.type in ['Individual', 'Department'] and self.employee:
 				approver = frappe.db.get_value('Employee', self.employee, 'reports_to')
 			elif self.type == 'Onboarding':