Merge branch 'version-15' into version-15-hotfix

frappe · Oct 30, 2024 · 853c9df · 853c9df
2 parents a9b85d3 + 61c51b8
commit 853c9df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hrms/__init__.py b/hrms/__init__.py
@@ -1,6 +1,6 @@
 import frappe
 
-__version__ = "15.6.0"
+__version__ = "15.33.2"
 
 
 def refetch_resource(cache_key: str | list, user=None):

diff --git a/hrms/overrides/employee_payment_entry.py b/hrms/overrides/employee_payment_entry.py
@@ -19,9 +19,9 @@
 class EmployeePaymentEntry(PaymentEntry):
 	def get_valid_reference_doctypes(self):
 		if self.party_type == "Customer":
-			return ("Sales Order", "Sales Invoice", "Journal Entry", "Dunning")
+			return ("Sales Order", "Sales Invoice", "Journal Entry", "Dunning", "Payment Entry")
 		elif self.party_type == "Supplier":
-			return ("Purchase Order", "Purchase Invoice", "Journal Entry")
+			return ("Purchase Order", "Purchase Invoice", "Journal Entry", "Payment Entry")
 		elif self.party_type == "Shareholder":
 			return ("Journal Entry",)
 		elif self.party_type == "Employee":