Version-15 to Staging

one_fm/accommodation/doctype/accommodation/accommodation.py

@@ -6,6 +6,7 @@
 import frappe
 import functools
 from frappe.model.document import Document
+from frappe import _
 
 class Accommodation(Document):
 	def autoname(self):
@@ -59,3 +60,38 @@ def accommodation_contact_update(doc, method):
 	link_name = doc.get_link_for('Accommodation')
 	if link_name and doc.one_fm_doc_contact_field:
 		frappe.db.set_value('Accommodation', link_name, doc.one_fm_doc_contact_field, doc.name)
+
+
+def validate_contact(doc, method):
+	if doc.has_value_changed("first_name") or doc.has_value_changed("last_name"):
+
+		base_name = f"{doc.first_name or ''} {doc.last_name or ''}".strip()
+
+		if base_name and base_name != doc.name:
+			new_name = make_unique_name(base_name)
+
+			if new_name != doc.name:
+				frappe.rename_doc("Contact", doc.name, new_name, force=True)
+				doc.name = new_name
+				doc.db_set("last_name", doc.last_name)
+				doc.db_set("first_name", doc.first_name)
+
+				# Notify frontend to redirect to the new URL
+				frappe.msgprint(
+					_("The contact has been renamed. Redirecting to the new page..."),
+					indicator="green"
+				)
+				frappe.local.response["location"] = frappe.utils.get_url(f"/app/contact/{new_name}")
+
+
+def make_unique_name(base_name, count=0):
+	"""
+    Generates a unique name by appending a counter if necessary.
+    """
+
+	unique_name = f"{base_name}-{count}" if count > 0 else base_name
+
+	if frappe.db.exists("Contact", unique_name):
+		return make_unique_name(base_name, count + 1)
+
+	return unique_name

one_fm/after_migrate/execute.py

@@ -425,4 +425,4 @@ def run_command(command, cwd=None, shell=True):
     except subprocess.CalledProcessError as e:
         print(f"An error occurred while running the command: {e}")
         print(f"Output: {e.stdout}")
-        print(f"Error: {e.stderr}")
+        print(f"Error: {e.stderr}")

one_fm/api/v1/leave_application.py

@@ -376,6 +376,11 @@ def proof_document_required_for_leave_type(leave_type):
 def leave_approver_action(leave_id: str,status: str) -> dict:
     try:
         doc = frappe.get_doc("Leave Application",{"name":leave_id})
+        has_leave_approver_role = "Leave Approver" in frappe.get_roles(frappe.session.user)
+
+        if not has_leave_approver_role:
+            return response("error", 403, {}, "You are not allowed to approve leave applications")
+
         if doc:
             if not doc.leave_approver in [frappe.session.user, 'administrator']:
                 return response("error", 401, {}, "Unauthorised.")

one_fm/fixtures/workflow.json

@@ -1474,7 +1474,7 @@
     "workflow_builder_id": null
    },
    {
-    "allow_edit": "Purchase Manager",
+    "allow_edit": "Procurement Manager",
     "avoid_status_override": 0,
     "doc_status": "0",
     "is_optional_state": 0,
@@ -1489,7 +1489,7 @@
     "workflow_builder_id": null
    },
    {
-    "allow_edit": "Finance PO Approver",
+    "allow_edit": "Procurement Manager",
     "avoid_status_override": 0,
     "doc_status": "0",
     "is_optional_state": 0,
@@ -1504,7 +1504,7 @@
     "workflow_builder_id": null
    },
    {
-    "allow_edit": "Purchase User",
+    "allow_edit": "Procurement Manager",
     "avoid_status_override": 0,
     "doc_status": "0",
     "is_optional_state": 0,
@@ -1519,7 +1519,7 @@
     "workflow_builder_id": null
    },
    {
-    "allow_edit": "Purchase User",
+    "allow_edit": "Procurement Manager",
     "avoid_status_override": 0,
     "doc_status": "1",
     "is_optional_state": 0,

one_fm/hiring/doctype/hiring_settings/hiring_settings.json

@@ -16,6 +16,12 @@
   "performance_profile_resource",
   "performance_profile_guid",
   "job_offer_section",
+  "auto_email_job_offer",
+  "job_offer_workflow_state",
+  "auto_email_hiring_method",
+  "job_offer_print_format",
+  "job_offer_email_template",
+  "column_break_vjwl",
   "notify_finance_department_for_job_offer_salary_advance",
   "default_terms_and_conditions",
   "job_applicaion_section",
@@ -143,11 +149,57 @@
    "fieldtype": "Link",
    "label": "Default Terms and Conditions",
    "options": "Terms and Conditions"
+  },
+  {
+   "default": "0",
+   "description": "If Checked, then the system will Email Job Offer Automatically on Workflow State and Hiring Method",
+   "fieldname": "auto_email_job_offer",
+   "fieldtype": "Check",
+   "label": "Auto Email Job Offer"
+  },
+  {
+   "fieldname": "column_break_vjwl",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "auto_email_job_offer",
+   "description": "Email Job Offer based on the Hiring Method selected here",
+   "fieldname": "auto_email_hiring_method",
+   "fieldtype": "Select",
+   "label": "Auto Email Hiring Method",
+   "mandatory_depends_on": "auto_email_job_offer",
+   "options": "\nBulk Recruitment\nA la carte Recruitment\nAll Recruitment"
+  },
+  {
+   "depends_on": "auto_email_job_offer",
+   "description": "Email Job Offer on the selected workflow state",
+   "fieldname": "job_offer_workflow_state",
+   "fieldtype": "Link",
+   "label": "Auto Email Job Offer Workflow State",
+   "mandatory_depends_on": "auto_email_job_offer",
+   "options": "Workflow State"
+  },
+  {
+   "depends_on": "auto_email_job_offer",
+   "description": "Selected Email Template will be used in Job Offer Auto Email. If not selected any default message will send to the candidate.",
+   "fieldname": "job_offer_email_template",
+   "fieldtype": "Link",
+   "label": "Job Offer Email Template",
+   "options": "Email Template"
+  },
+  {
+   "depends_on": "auto_email_job_offer",
+   "description": "Selected Print Format will use to attach in the email",
+   "fieldname": "job_offer_print_format",
+   "fieldtype": "Link",
+   "label": "Job Offer Print Format",
+   "mandatory_depends_on": "auto_email_job_offer",
+   "options": "Print Format"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2024-02-27 08:29:05.173163",
+ "modified": "2024-12-30 17:44:45.951842",
  "modified_by": "Administrator",
  "module": "Hiring",
  "name": "Hiring Settings",

one_fm/hiring/doctype/hiring_settings/hiring_settings.py

@@ -3,8 +3,25 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
+import frappe
 from frappe.model.document import Document
 
 class HiringSettings(Document):
 	pass
+
+
+def get_job_offer_auto_email_settings():
+	"""
+		Retrieves the job offer auto-email settings from the 'Hiring Settings' doctype.
+
+		The function fetches specific fields related to automatic job offer emails,
+		such as whether auto-emailing is enabled, the workflow state to trigger the email,
+		the hiring method, and the email template to use.
+
+		Returns:
+			dict: A dictionary containing the values of the specified fields from the 'Hiring Settings' doctype.
+	"""
+	fields = [
+		'auto_email_job_offer', 'job_offer_workflow_state', 'auto_email_hiring_method', 'job_offer_email_template'
+	]
+	return frappe.db.get_value('Hiring Settings', None, fields, as_dict=1)

one_fm/hooks.py

@@ -117,7 +117,8 @@
     "Task": "public/js/doctype_js/task.js",
     "HD Ticket": "public/js/doctype_js/hd_ticket.js",
     "Appraisal": "public/js/doctype_js/appraisal.js",
-    "Employee Performance Feedback":"public/js/doctype_js/employee_performance_feedback.js"
+    "Employee Performance Feedback":"public/js/doctype_js/employee_performance_feedback.js",
+    "Contact": "public/js/doctype_js/contact.js"
 }
 doctype_list_js = {
 	"Job Applicant" : "public/js/doctype_js/job_applicant_list.js",
@@ -249,7 +250,7 @@
 		"after_insert":[
       					"one_fm.overrides.hd_ticket.send_google_chat_notification",
                   		"one_fm.overrides.hd_ticket.notify_ticket_raiser_of_receipt"
-                    	], 
+                    	],
 		"on_change": "one_fm.overrides.hd_ticket.notify_issue_raiser_about_priority",
 		"on_update": "one_fm.overrides.hd_ticket.apply_ticket_escalation"
 	},
@@ -262,7 +263,11 @@
 	"Job Applicant": {
 		"validate": "one_fm.utils.validate_job_applicant",
 		"onload": "one_fm.utils.validate_pam_file_number_and_pam_designation",
-		"on_update": "one_fm.one_fm.utils.send_notification_to_grd_or_recruiter"
+		"on_update": [
+			"one_fm.one_fm.utils.send_notification_to_grd_or_recruiter",
+			"one_fm.utils.on_update_job_applicant"
+		]
+
 	},
 	"Warehouse": {
 		"autoname": "one_fm.utils.warehouse_naming_series",
@@ -306,7 +311,8 @@
 		]
 	},
 	"Contact": {
-		"on_update": "one_fm.accommodation.doctype.accommodation.accommodation.accommodation_contact_update"
+		"on_update": "one_fm.accommodation.doctype.accommodation.accommodation.accommodation_contact_update",
+        "validate": "one_fm.accommodation.doctype.accommodation.accommodation.validate_contact",
 	},
 	"Project": {
 		"validate": [
@@ -376,7 +382,7 @@
 		"after_insert": [
 			"one_fm.utils.assign_issue",
 			"one_fm.api.doc_methods.issue.notify_issue_raiser"
-			
+
 		],
     "on_update": "one_fm.utils.notify_on_close",
 	},
@@ -508,7 +514,9 @@
     "Payroll Entry": "one_fm.overrides.payroll_entry.PayrollEntryOverride",
     "Salary Slip": "one_fm.overrides.salary_slip.SalarySlipOverride",
     "Interview Feedback": "one_fm.overrides.interview_feedback.InterviewFeedbackOverride",
-
+    "Leave Allocation": "one_fm.overrides.leave_allocation.LeaveAllocationOverride",
+    "Interview": "one_fm.overrides.interview.InterviewOverride",
+
     # "User": "one_fm.overrides.user.UserOverride"
 }
 

one_fm/one_fm/custom/designation_skill.json

@@ -47,9 +47,6 @@
    "non_negative": 0,
    "options": "",
    "owner": "Administrator",
-   "parent": null,
-   "parentfield": null,
-   "parenttype": null,
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,