chore: resolved conflicts

pateljannat · pateljannat · commit 66f19d06b005 · 2025-12-24T15:54:55.000+05:30
diff --git a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
@@ -44,6 +44,8 @@ def validate_payment(self):
 			)
 			if not payment:
 				frappe.throw(_("Payment is required to enroll in this batch."))
+			else:
+				self.payment = payment
 
 	def validate_self_enrollment(self):
 		batch_details = frappe.db.get_value(

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ def validate_payment(self):`
`44`	`44`	`)`
`45`	`45`	`if not payment:`
`46`	`46`	`frappe.throw(_("Payment is required to enroll in this batch."))`
	`47`	`+ else:`
	`48`	`+ self.payment = payment`
`47`	`49`
`48`	`50`	`def validate_self_enrollment(self):`
`49`	`51`	`batch_details = frappe.db.get_value(`