ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve employee group backport conflicts

Browse Source
This commit is contained in:
Krishna Shirsath
2026-10-27 18:43:57 +05:30
parent fe5d271562
commit a9871869ad
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/crm/doctype/utils.py
-5
View File
@@ -32,13 +32,8 @@ def get_scheduled_employees_for_popup(communication_medium):
)
available_employee_groups = tuple([emp.employee_group for emp in available_employee_groups])
<<<<<<< HEAD
=======
if not available_employee_groups and medium and medium.catch_all:
available_employee_groups = (medium.catch_all,)
if not available_employee_groups:
return set()
>>>>>>> e302a8a (fix(employee-group): resolve current active call recipients)
member = frappe.qb.DocType("Employee Group Table")
employee = frappe.qb.DocType("Employee")
erpnext/setup/doctype/employee_group/test_employee_group.py
+7 -15
View File
@@ -1,11 +1,8 @@
# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
<<<<<<< HEAD
import unittest
=======
from unittest.mock import patch
>>>>>>> e302a8a (fix(employee-group): resolve current active call recipients)
import frappe
@@ -13,17 +10,14 @@ from erpnext.crm.doctype.utils import get_scheduled_employees_for_popup
from erpnext.setup.doctype.employee.test_employee import make_employee
<<<<<<< HEAD
class TestEmployeeGroup(unittest.TestCase):
pass
=======
class TestEmployeeGroup(ERPNextTestSuite):
def test_duplicate_member(self):
employee = make_employee("group_duplicate@example.com", company="_Test Company")
user = f"group-duplicate-{frappe.generate_hash(length=10)}@example.com"
employee = make_employee(user, company="_Test Company")
group = frappe.get_doc(
{
"doctype": "Employee Group",
"employee_group_name": "_Test Duplicate Employee Group",
"employee_group_name": f"Test Duplicate {frappe.generate_hash(length=10)}",
"employee_list": [{"employee": employee}, {"employee": employee}],
}
)
@@ -31,13 +25,12 @@ class TestEmployeeGroup(ERPNextTestSuite):
group.insert()
def test_popup_uses_current_active_employee_user(self):
employee = make_employee(
"group_member@example.com", company="_Test Company", first_name="Group", last_name="Member"
)
user = f"group-member-{frappe.generate_hash(length=10)}@example.com"
employee = make_employee(user, company="_Test Company", first_name="Group", last_name="Member")
group = frappe.get_doc(
{
"doctype": "Employee Group",
"employee_group_name": "_Test Popup Employee Group",
"employee_group_name": f"Test Popup {frappe.generate_hash(length=10)}",
"employee_list": [{"employee": employee}],
}
).insert()
@@ -47,14 +40,13 @@ class TestEmployeeGroup(ERPNextTestSuite):
with patch(
"erpnext.crm.doctype.utils.frappe.get_all", return_value=[frappe._dict(employee_group=group.name)]
):
self.assertEqual(get_scheduled_employees_for_popup("test-medium"), {"group_member@example.com"})
self.assertEqual(get_scheduled_employees_for_popup("test-medium"), {user})
frappe.db.set_value("Employee", employee, "user_id", "Administrator")
self.assertEqual(get_scheduled_employees_for_popup("test-medium"), {"Administrator"})
frappe.db.set_value("Employee", employee, "status", "Left")
self.assertEqual(get_scheduled_employees_for_popup("test-medium"), set())
>>>>>>> e302a8a (fix(employee-group): resolve current active call recipients)
def make_employee_group():