fix: commission status

fproldan · Nov 4, 2024 · 7315ed0 · 7315ed0
1 parent 7acbc89
commit 7315ed0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -91,6 +91,7 @@ def on_submit(self):
 			frappe.throw(_("Difference Amount must be zero"))
 		self.make_gl_entries()
 		self.update_expense_claim()
+		self.update_sales_commission()
 		self.update_outstanding_amounts()
 		self.update_advance_paid()
 		self.update_donation()
@@ -101,7 +102,7 @@ def on_cancel(self):
 		self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry', 'Sales Commission')
 		self.make_gl_entries(cancel=1)
 		self.update_expense_claim()
-		self.update_sales_commission()
+		self.update_sales_commission(cancel=1)
 		self.update_outstanding_amounts()
 		self.update_advance_paid()
 		self.update_donation(cancel=1)
@@ -884,13 +885,14 @@ def update_expense_claim(self):
 					else:
 						update_reimbursed_amount(doc, d.allocated_amount)
 
-	def update_sales_commission(self):
+	def update_sales_commission(self, cancel=0):
 		if self.payment_type in ("Pay") and self.party:
 			for d in self.get("references"):
 				if d.reference_doctype=="Sales Commission" and d.reference_name:
-					frappe.db.set_value("Sales Commission", d.reference_name, "status", "Unpaid")
-					frappe.db.set_value("Sales Commission", d.reference_name, "reference_doctype", "")
-					frappe.db.set_value("Sales Commission", d.reference_name, "reference_name", "")
+					if cancel:
+						frappe.db.set_value("Sales Commission", d.reference_name, "status", "Unpaid")
+					else:
+						frappe.db.set_value("Sales Commission", d.reference_name, "status", "Paid")
 
 	def update_donation(self, cancel=0):
 		if self.payment_type == "Receive" and self.party_type == "Donor" and self.party:

diff --git a/erpnext/payroll/doctype/sales_commission/sales_commission.py b/erpnext/payroll/doctype/sales_commission/sales_commission.py
@@ -248,9 +248,9 @@ def make_payment_entry(self, mode_of_payment, paid_from, paid_to, reference_no,
 		doc.set("references", [])
 		self.add_references(doc)
 		doc.submit()
-		self.db_set("reference_doctype", "Payment Entry")
-		self.db_set("reference_name", doc.name)
-		self.db_set("status", "Paid")
+		# self.db_set("reference_doctype", "Payment Entry")
+		# self.db_set("reference_name", doc.name)
+		# self.db_set("status", "Paid")
 
 	def add_references(self, doc):
 		reference = {