Merge pull request #2322 from frappe/version-15-hotfix

Author: ruchamahabal

frontend/src/views/Login.vue

@@ -32,6 +32,21 @@
 							Login
 						</Button>
 					</form>
+
+					<template v-if="authProviders.data?.length">
+						<div class="text-center text-sm text-gray-600 my-4">or</div>
+						<div class="space-y-4">
+							<a
+								v-for="provider in authProviders.data"
+								:key="provider.name"
+								class="flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base p-2 rounded"
+								:href="provider.auth_url"
+							>
+								<img class="h-4 w-4" :src="provider.icon" :alt="provider.provider_name" />
+								<span>Login with {{ provider.provider_name }}</span>
+							</a>
+						</div>
+					</template>
 				</div>
 			</div>
 
@@ -88,7 +103,7 @@
 <script setup>
 import { IonPage, IonContent } from "@ionic/vue"
 import { inject, reactive, ref } from "vue"
-import { Input, Button, ErrorMessage, Dialog } from "frappe-ui"
+import { Input, Button, ErrorMessage, Dialog, createResource } from "frappe-ui"
 
 import FrappeHRLogo from "@/components/icons/FrappeHRLogo.vue"
 
@@ -141,4 +156,9 @@ async function submit(e) {
 		errorMessage.value = error.messages.join("\n")
 	}
 }
+
+const authProviders = createResource({
+	url: "hrms.api.oauth.oauth_providers",
+	auto: true,
+})
 </script>

hrms/api/oauth.py

@@ -0,0 +1,33 @@
+import frappe
+
+
+@frappe.whitelist(allow_guest=True)
+def oauth_providers():
+	from frappe.utils.html_utils import get_icon_html
+	from frappe.utils.oauth import get_oauth2_authorize_url, get_oauth_keys
+	from frappe.utils.password import get_decrypted_password
+
+	out = []
+	providers = frappe.get_all(
+		"Social Login Key",
+		filters={"enable_social_login": 1},
+		fields=["name", "client_id", "base_url", "provider_name", "icon"],
+		order_by="name",
+	)
+
+	for provider in providers:
+		client_secret = get_decrypted_password("Social Login Key", provider.name, "client_secret")
+		if not client_secret:
+			continue
+
+		if provider.client_id and provider.base_url and get_oauth_keys(provider.name):
+			out.append(
+				{
+					"name": provider.name,
+					"provider_name": provider.provider_name,
+					"auth_url": get_oauth2_authorize_url(provider.name, "/hrms"),
+					"icon": provider.icon,
+				}
+			)
+
+	return out

hrms/hr/doctype/employee_advance/employee_advance.py

@@ -33,6 +33,7 @@ def validate(self):
 
 	def on_cancel(self):
 		self.ignore_linked_doctypes = "GL Entry"
+		self.check_linked_payment_entry()
 		self.set_status(update=True)
 
 	def on_update(self):
@@ -175,6 +176,16 @@ def set_pending_amount(self):
 			)
 		).run()[0][0] or 0.0
 
+	def check_linked_payment_entry(self):
+		from erpnext.accounts.utils import (
+			remove_ref_doc_link_from_pe,
+			update_accounting_ledgers_after_reference_removal,
+		)
+
+		if frappe.db.get_single_value("HR Settings", "unlink_payment_on_cancellation_of_employee_advance"):
+			remove_ref_doc_link_from_pe(self.doctype, self.name)
+			update_accounting_ledgers_after_reference_removal(self.doctype, self.name)
+
 
 @frappe.whitelist()
 def make_bank_entry(dt, dn):

hrms/hr/doctype/employee_advance/test_employee_advance.py

@@ -2,7 +2,7 @@
 # See license.txt
 
 import frappe
-from frappe.tests.utils import FrappeTestCase
+from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import flt, nowdate
 
 import erpnext
@@ -26,9 +26,10 @@
 class TestEmployeeAdvance(FrappeTestCase):
 	def setUp(self):
 		frappe.db.delete("Employee Advance")
+		self.update_company_in_fiscal_year()
 
 	def test_paid_amount_and_status(self):
-		employee_name = make_employee("_T@employe.advance")
+		employee_name = make_employee("_T@employee.advance", "_Test Company")
 		advance = make_employee_advance(employee_name)
 
 		journal_entry = make_journal_entry_for_advance(advance)
@@ -44,7 +45,7 @@ def test_paid_amount_and_status(self):
 		self.assertRaises(EmployeeAdvanceOverPayment, journal_entry1.submit)
 
 	def test_paid_amount_on_pe_cancellation(self):
-		employee_name = make_employee("_T@employe.advance")
+		employee_name = make_employee("_T@employee.advance", "_Test Company")
 		advance = make_employee_advance(employee_name)
 
 		journal_entry = make_journal_entry_for_advance(advance)
@@ -159,14 +160,19 @@ def test_partly_claimed_and_returned_status(self):
 		self.assertTrue(advance.name in advances)
 
 	def test_repay_unclaimed_amount_from_salary(self):
-		employee_name = make_employee("_T@employe.advance")
+		employee_name = make_employee("_T@employee.advance", "_Test Company")
 		advance = make_employee_advance(employee_name, {"repay_unclaimed_amount_from_salary": 1})
 		journal_entry = make_journal_entry_for_advance(advance)
 		journal_entry.submit()
 
 		args = {"type": "Deduction"}
 		create_salary_component("Advance Salary - Deduction", **args)
-		make_salary_structure("Test Additional Salary for Advance Return", "Monthly", employee=employee_name)
+		make_salary_structure(
+			"Test Additional Salary for Advance Return",
+			"Monthly",
+			employee=employee_name,
+			company="_Test Company",
+		)
 
 		# additional salary for 700 first
 		advance.reload()
@@ -199,7 +205,7 @@ def test_repay_unclaimed_amount_from_salary(self):
 		self.assertEqual(advance.status, "Paid")
 
 	def test_payment_entry_against_advance(self):
-		employee_name = make_employee("[email protected]")
+		employee_name = make_employee("[email protected]", "_Test Company")
 		advance = make_employee_advance(employee_name)
 
 		pe = make_payment_entry(advance, 700)
@@ -218,7 +224,7 @@ def test_payment_entry_against_advance(self):
 		self.assertEqual(advance.paid_amount, 700)
 
 	def test_precision(self):
-		employee_name = make_employee("[email protected]")
+		employee_name = make_employee("[email protected]", "_Test Company")
 		advance = make_employee_advance(employee_name)
 		journal_entry = make_journal_entry_for_advance(advance)
 		journal_entry.submit()
@@ -257,7 +263,7 @@ def test_precision(self):
 		self.assertEqual(advance.status, "Partly Claimed and Returned")
 
 	def test_pending_amount(self):
-		employee_name = make_employee("[email protected]")
+		employee_name = make_employee("[email protected]", "_Test Company")
 
 		advance1 = make_employee_advance(employee_name)
 		make_payment_entry(advance1, 500)
@@ -271,6 +277,33 @@ def test_pending_amount(self):
 		# (1000 - 500) + (1000 - 700)
 		self.assertEqual(advance3.pending_amount, 800)
 
+	@change_settings("HR Settings", {"unlink_payment_on_cancellation_of_employee_advance": True})
+	def test_unlink_payment_entries(self):
+		employee_name = make_employee("[email protected]", "_Test Company")
+		self.assertTrue(frappe.db.exists("Employee", employee_name))
+
+		advance = make_employee_advance(employee_name)
+		self.assertTrue(advance)
+
+		advance_payment = make_payment_entry(advance, 1000)
+		self.assertTrue(advance_payment)
+		self.assertEqual(advance_payment.total_allocated_amount, 1000)
+
+		advance.reload()
+		advance.cancel()
+		advance_payment.reload()
+		self.assertEqual(advance_payment.unallocated_amount, 1000)
+		self.assertEqual(advance_payment.references, [])
+
+	def update_company_in_fiscal_year(self):
+		fy_entries = frappe.get_all("Fiscal Year")
+		for fy_entry in fy_entries:
+			fiscal_year = frappe.get_doc("Fiscal Year", fy_entry.name)
+			company_list = [fy_c.company for fy_c in fiscal_year.companies if fy_c.company]
+			if "_Test Company" not in company_list:
+				fiscal_year.append("companies", {"company": "_Test Company"})
+				fiscal_year.save()
+
 
 def make_journal_entry_for_advance(advance):
 	journal_entry = frappe.get_doc(make_bank_entry("Employee Advance", advance.name))

hrms/hr/doctype/hr_settings/hr_settings.json

@@ -49,7 +49,9 @@
   "exit_questionnaire_notification_template",
   "attendance_settings_section",
   "allow_employee_checkin_from_mobile_app",
-  "allow_geolocation_tracking"
+  "allow_geolocation_tracking",
+  "unlink_payment_section",
+  "unlink_payment_on_cancellation_of_employee_advance"
  ],
  "fields": [
   {
@@ -316,13 +318,24 @@
    "fieldname": "attendance_settings_section",
    "fieldtype": "Section Break",
    "label": "Attendance Settings"
+  },
+  {
+   "fieldname": "unlink_payment_section",
+   "fieldtype": "Section Break",
+   "label": "Unlink Payment"
+  },
+  {
+   "default": "0",
+   "fieldname": "unlink_payment_on_cancellation_of_employee_advance",
+   "fieldtype": "Check",
+   "label": " Unlink Payment on Cancellation of Employee Advance"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-06-26 15:20:17.802079",
+ "modified": "2024-09-29 12:49:16.175079",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",

hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py

@@ -182,7 +182,11 @@ def _get_months_passed(current_date, from_date, consider_current_month):
 					months_passed += 1
 
 			elif current_date.year > from_date.year:
-				months_passed = (12 - from_date.month) + current_date.month
+				months_passed = (
+					(12 - from_date.month)
+					+ (current_date.year - from_date.year - 1) * 12
+					+ current_date.month
+				)
 				if consider_current_month:
 					months_passed += 1
 
@@ -286,16 +290,7 @@ def create_assignment_for_multiple_employees(employees, data):
 	failed = []
 
 	for employee in employees:
-		assignment = frappe.new_doc("Leave Policy Assignment")
-		assignment.employee = employee
-		assignment.assignment_based_on = data.assignment_based_on or None
-		assignment.leave_policy = data.leave_policy
-		assignment.effective_from = getdate(data.effective_from) or None
-		assignment.effective_to = getdate(data.effective_to) or None
-		assignment.leave_period = data.leave_period or None
-		assignment.carry_forward = data.carry_forward
-		assignment.save()
-
+		assignment = create_assignment(employee, data)
 		savepoint = "before_assignment_submission"
 		try:
 			frappe.db.savepoint(savepoint)
@@ -313,6 +308,20 @@ def create_assignment_for_multiple_employees(employees, data):
 	return docs_name
 
 
+@frappe.whitelist()
+def create_assignment(employee, data):
+	assignment = frappe.new_doc("Leave Policy Assignment")
+	assignment.employee = employee
+	assignment.assignment_based_on = data.assignment_based_on or None
+	assignment.leave_policy = data.leave_policy
+	assignment.effective_from = getdate(data.effective_from) or None
+	assignment.effective_to = getdate(data.effective_to) or None
+	assignment.leave_period = data.leave_period or None
+	assignment.carry_forward = data.carry_forward
+	assignment.save()
+	return assignment
+
+
 def show_assignment_submission_status(failed):
 	frappe.clear_messages()
 	assignment_list = [get_link_to_form("Leave Policy Assignment", entry) for entry in failed]

hrms/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py

@@ -6,10 +6,13 @@
 from frappe.utils import add_months, get_first_day, get_year_ending, getdate
 
 from hrms.hr.doctype.leave_application.test_leave_application import get_employee, get_leave_period
+from hrms.hr.doctype.leave_period.test_leave_period import create_leave_period
 from hrms.hr.doctype.leave_policy.test_leave_policy import create_leave_policy
 from hrms.hr.doctype.leave_policy_assignment.leave_policy_assignment import (
+	create_assignment,
 	create_assignment_for_multiple_employees,
 )
+from hrms.hr.doctype.leave_type.test_leave_type import create_leave_type
 
 test_dependencies = ["Employee"]
 
@@ -20,6 +23,7 @@ def setUp(self):
 			"Leave Period",
 			"Leave Application",
 			"Leave Allocation",
+			"Leave Policy",
 			"Leave Policy Assignment",
 			"Leave Ledger Entry",
 		]:
@@ -117,6 +121,49 @@ def test_pro_rated_leave_allocation(self):
 		# pro-rated leave allocation for 9 months
 		self.assertEqual(allocation, 9)
 
+	# tests no of leaves for passed months if assignment is based on Leave Period / Joining Date
+	def test_get_leaves_for_passed_months(self):
+		first_day = get_first_day(getdate())
+		annual_allocation = 10
+		leave_type = create_leave_type(
+			leave_type_name="_Test Earned Leave", is_earned_leave=True, allocate_on_day="First Day"
+		)
+		leave_policy = create_leave_policy(leave_type=leave_type, annual_allocation=annual_allocation)
+		leave_policy.submit()
+
+		data = {
+			"assignment_based_on": "Joining Date",
+			"leave_policy": leave_policy.name,
+		}
+
+		self.employee.date_of_joining = add_months(first_day, -5)
+		self.employee.save()
+		assignment = create_assignment(self.employee.name, frappe._dict(data))
+		new_leaves_allocated = assignment.get_leaves_for_passed_months(
+			annual_allocation, leave_type, self.employee.date_of_joining
+		)
+		self.assertEqual(new_leaves_allocated, 5)
+
+		self.employee.date_of_joining = add_months(first_day, -35)
+		self.employee.save()
+		assignment = create_assignment(self.employee.name, frappe._dict(data))
+		new_leaves_allocated = assignment.get_leaves_for_passed_months(
+			annual_allocation, leave_type, self.employee.date_of_joining
+		)
+		self.assertEqual(new_leaves_allocated, 30)
+
+		leave_period = create_leave_period(add_months(first_day, -23), first_day)
+		data = {
+			"assignment_based_on": "Leave Period",
+			"leave_policy": leave_policy.name,
+			"leave_period": leave_period.name,
+		}
+		assignment = create_assignment(self.employee.name, frappe._dict(data))
+		new_leaves_allocated = assignment.get_leaves_for_passed_months(
+			annual_allocation, leave_type, self.employee.date_of_joining
+		)
+		self.assertEqual(new_leaves_allocated, 20)
+
 	def test_pro_rated_leave_allocation_for_custom_date_range(self):
 		leave_type = frappe.get_doc(
 			{

hrms/hr/doctype/leave_type/test_leave_type.py

@@ -8,13 +8,14 @@
 
 def create_leave_type(**args):
 	args = frappe._dict(args)
-	if frappe.db.exists("Leave Type", args.leave_type_name):
-		frappe.delete_doc("Leave Type", args.leave_type_name, force=True)
+	leave_type_name = args.leave_type_name or "_Test Leave Type"
+	if frappe.db.exists("Leave Type", leave_type_name):
+		frappe.delete_doc("Leave Type", leave_type_name, force=True)
 
 	leave_type = frappe.get_doc(
 		{
 			"doctype": "Leave Type",
-			"leave_type_name": args.leave_type_name or "_Test Leave Type",
+			"leave_type_name": leave_type_name,
 			"include_holiday": args.include_holidays or 1,
 			"allow_encashment": args.allow_encashment or 0,
 			"is_earned_leave": args.is_earned_leave or 0,
@@ -26,6 +27,7 @@ def create_leave_type(**args):
 			"earning_component": "Leave Encashment",
 			"max_leaves_allowed": args.max_leaves_allowed,
 			"maximum_carry_forwarded_leaves": args.maximum_carry_forwarded_leaves,
+			"allocate_on_day": args.allocate_on_day or "Last Day",
 		}
 	)