Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hrms/controllers/employee_boarding_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def on_submit(self):
# create the project for the given employee onboarding
project_name = _(self.doctype) + " : "
if self.doctype == "Employee Onboarding":
project_name += self.job_applicant
project_name += self.job_applicant or self.employee_name
else:
project_name += self.employee

Expand Down
4 changes: 4 additions & 0 deletions hrms/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,12 @@
after_install = "hrms.install.after_install"
after_migrate = "hrms.setup.update_select_perm_after_install"

setup_wizard_requires = "assets/hrms/js/setup_wizard.js"
setup_wizard_stages = "hrms.setup_wizard.get_setup_stages"
setup_wizard_complete = "hrms.subscription_utils.update_erpnext_access"

extend_bootinfo = "hrms.utils.extend_bootinfo"

# Uninstallation
# ------------

Expand Down
29 changes: 6 additions & 23 deletions hrms/hr/doctype/employee_onboarding/employee_onboarding.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@

frappe.ui.form.on("Employee Onboarding", {
setup: function (frm) {
frm.set_query("job_applicant", function () {
return {
filters: {
status: "Accepted",
},
};
});

frm.set_query("job_offer", function () {
return {
filters: {
job_applicant: frm.doc.job_applicant,
status: "Accepted",
docstatus: 1,
},
};
Expand Down Expand Up @@ -91,20 +83,11 @@ frappe.ui.form.on("Employee Onboarding", {
}
},

job_applicant: function (frm) {
if (frm.doc.job_applicant) {
frappe.db.get_value(
"Employee",
{ job_applicant: frm.doc.job_applicant },
"name",
(r) => {
if (r.name) {
frm.set_value("employee", r.name);
} else {
frm.set_value("employee", "");
}
},
);
job_offer: function (frm) {
if (frm.doc.job_offer) {
frappe.db.get_value("Employee", { job_offer: frm.doc.job_offer }, "name", (r) => {
frm.set_value("employee", r && r.name ? r.name : "");
});
} else {
frm.set_value("employee", "");
}
Expand Down
19 changes: 10 additions & 9 deletions hrms/hr/doctype/employee_onboarding/employee_onboarding.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"job_applicant",
"job_offer",
"job_applicant",
"employee_onboarding_template",
"column_break_7",
"company",
Expand All @@ -29,13 +29,6 @@
"amended_from"
],
"fields": [
{
"fieldname": "job_applicant",
"fieldtype": "Link",
"label": "Job Applicant",
"options": "Job Applicant",
"reqd": 1
},
{
"fieldname": "job_offer",
"fieldtype": "Link",
Expand All @@ -44,7 +37,15 @@
"reqd": 1
},
{
"fetch_from": "job_applicant.applicant_name",
"depends_on": "eval:doc.job_applicant",
"fetch_from": "job_offer.job_applicant",
"fieldname": "job_applicant",
"fieldtype": "Link",
"label": "Job Applicant",
"options": "Job Applicant"
},
{
"fetch_from": "job_offer.applicant_name",
"fieldname": "employee_name",
"fieldtype": "Data",
"in_list_view": 1,
Expand Down
13 changes: 7 additions & 6 deletions hrms/hr/doctype/employee_onboarding/employee_onboarding.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class EmployeeOnboarding(EmployeeBoardingController):
employee_name: DF.Data
employee_onboarding_template: DF.Link | None
holiday_list: DF.Link | None
job_applicant: DF.Link
job_applicant: DF.Link | None
job_offer: DF.Link
notify_users_by_email: DF.Check
project: DF.Link | None
Expand All @@ -53,16 +53,16 @@ def validate(self):

def set_employee(self):
if not self.employee:
self.employee = frappe.db.get_value("Employee", {"job_applicant": self.job_applicant}, "name")
self.employee = frappe.db.get_value("Employee", {"job_offer": self.job_offer}, "name")

def validate_duplicate_employee_onboarding(self):
emp_onboarding = frappe.db.exists(
"Employee Onboarding", {"job_applicant": self.job_applicant, "docstatus": ("!=", 2)}
"Employee Onboarding", {"job_offer": self.job_offer, "docstatus": ("!=", 2)}
)
if emp_onboarding and emp_onboarding != self.name:
frappe.throw(
_("Employee Onboarding: {0} already exists for Job Applicant: {1}").format(
frappe.bold(emp_onboarding), frappe.bold(self.job_applicant)
_("Employee Onboarding: {0} already exists for Job Offer: {1}").format(
frappe.bold(emp_onboarding), frappe.bold(self.job_offer)
)
)

Expand Down Expand Up @@ -106,7 +106,8 @@ def make_employee(source_name: str, target_doc: str | Document | None = None) ->
doc.validate_employee_creation()

def set_missing_values(source, target):
target.personal_email = frappe.db.get_value("Job Applicant", source.job_applicant, "email_id")
target.personal_email = frappe.db.get_value("Job Offer", source.job_offer, "applicant_email")
target.job_offer = source.job_offer
target.status = "Active"

doc = get_mapped_doc(
Expand Down
9 changes: 4 additions & 5 deletions hrms/hr/doctype/job_offer/job_offer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"applicant_name",
"applicant_email",
"column_break_3",
"status",
"offer_date",
"designation",
"company",
"status",
"section_break_4",
"job_offer_term_template",
"offer_terms",
Expand All @@ -29,13 +29,13 @@
],
"fields": [
{
"depends_on": "eval:doc.job_applicant",
"fieldname": "job_applicant",
"fieldtype": "Link",
"label": "Job Applicant",
"link_filters": "[[\"Job Applicant\",\"status\",\"!=\",\"Rejected\"]]",
"options": "Job Applicant",
"print_hide": 1,
"reqd": 1
"print_hide": 1
},
{
"fetch_from": "job_applicant.applicant_name",
Expand All @@ -44,7 +44,6 @@
"in_global_search": 1,
"in_list_view": 1,
"label": "Applicant Name",
"read_only": 1,
"reqd": 1
},
{
Expand All @@ -54,7 +53,7 @@
"in_global_search": 1,
"label": "Applicant Email Address",
"options": "Email",
"read_only": 1
"reqd": 1
},
{
"fieldname": "column_break_3",
Expand Down
33 changes: 21 additions & 12 deletions hrms/hr/doctype/job_offer/job_offer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class JobOffer(Document):
from hrms.hr.doctype.job_offer_term.job_offer_term import JobOfferTerm

amended_from: DF.Link | None
applicant_email: DF.Data | None
applicant_email: DF.Data
applicant_name: DF.Data
company: DF.Link
designation: DF.Link
job_applicant: DF.Link
job_applicant: DF.Link | None
job_offer_term_template: DF.Link | None
letter_head: DF.Link | None
offer_date: DF.Date
Expand All @@ -38,18 +38,27 @@ class JobOffer(Document):
# end: auto-generated types

def onload(self):
employee = frappe.db.get_value("Employee", {"job_applicant": self.job_applicant}, "name") or ""
employee = frappe.db.get_value("Employee", {"job_offer": self.name}, "name") or ""
self.set_onload("employee", employee)

def validate(self):
self.validate_vacancies()
job_offer = frappe.db.exists(
"Job Offer", {"job_applicant": self.job_applicant, "docstatus": ["!=", 2]}
self.validate_duplicate_job_offer()

def validate_duplicate_job_offer(self):
duplicate = frappe.db.exists(
"Job Offer",
{
"applicant_email": self.applicant_email,
"docstatus": ["!=", 2],
"status": ["not in", ["Rejected", "Cancelled"]],
"name": ["!=", self.name],
},
)
if job_offer and job_offer != self.name:
if duplicate:
frappe.throw(
_("Job Offer: {0} is already for Job Applicant: {1}").format(
frappe.bold(job_offer), frappe.bold(self.job_applicant)
_("Job Offer {0} already exists for {1}").format(
get_link_to_form("Job Offer", duplicate), frappe.bold(self.applicant_email)
)
)

Expand Down Expand Up @@ -86,7 +95,7 @@ def on_discard(self):


def update_job_applicant(status, job_applicant):
if status in ("Accepted", "Rejected"):
if job_applicant and status in ("Accepted", "Rejected"):
frappe.set_value("Job Applicant", job_applicant, "status", status)


Expand Down Expand Up @@ -123,9 +132,9 @@ def get_staffing_plan_detail(designation, company, offer_date):
@frappe.whitelist()
def make_employee(source_name: str, target_doc: str | Document | None = None):
def set_missing_values(source, target):
target.personal_email, target.first_name = frappe.db.get_value(
"Job Applicant", source.job_applicant, ["email_id", "applicant_name"]
)
target.personal_email = source.applicant_email
target.first_name = source.applicant_name
target.job_offer = source.name

doc = get_mapped_doc(
"Job Offer",
Expand Down
Loading
Loading