feat: oustanding

Author: fproldan

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -889,7 +889,15 @@ 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:
+					outstanding_amount = frappe.get_value("Sales Commission", d.reference_name, "outstanding_amount")
 					if cancel:
+						outstanding_amount += d.allocated_amount
+					else:
+						outstanding_amount -= d.allocated_amount
+
+					frappe.db.set_value("Sales Commission", d.reference_name, "outstanding_amount", outstanding_amount)
+
+					if outstanding_amount > 0:
 						frappe.db.set_value("Sales Commission", d.reference_name, "status", "Unpaid")
 					else:
 						frappe.db.set_value("Sales Commission", d.reference_name, "status", "Paid")
@@ -1460,7 +1468,7 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 	elif reference_doctype != "Journal Entry":
 		if ref_doc.doctype == "Sales Commission":
 			total_amount = ref_doc.total_commission_amount
-			outstanding_amount = ref_doc.total_commission_amount
+			outstanding_amount = ref_doc.get("outstanding_amount")
 			exchange_rate = 1
 		if ref_doc.doctype == "Expense Claim":
 				total_amount = flt(ref_doc.total_sanctioned_amount) + flt(ref_doc.total_taxes_and_charges)
@@ -1497,7 +1505,7 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 		elif reference_doctype == "Gratuity":
 			outstanding_amount = ref_doc.amount - flt(ref_doc.paid_amount)
 		elif reference_doctype == "Sales Commission":
-			outstanding_amount = ref_doc.total_commission_amount
+			outstanding_amount = ref_doc.get("outstanding_amount")
 		else:
 			outstanding_amount = flt(total_amount) - flt(ref_doc.advance_paid)
 	else:

erpnext/payroll/doctype/sales_commission/sales_commission.js

@@ -72,9 +72,12 @@ frappe.ui.form.on('Sales Commission', {
 					create_additional_salary(frm);
 				}).addClass("btn-primary");
 			} else {
-				frm.add_custom_button(__("Create Payment Entry"), function () {
-					create_payment_entry(frm);
-				}).addClass("btn-primary");
+				if (frm.doc.status == "Unpaid") {
+					frm.add_custom_button(__("Create Payment Entry"), function () {
+						create_payment_entry(frm);
+					}).addClass("btn-primary");
+				}
+				
 			}
 		}
 	},

erpnext/payroll/doctype/sales_commission/sales_commission.json

@@ -33,6 +33,7 @@
   "section_break_17",
   "total_contribution",
   "total_commission_amount",
+  "outstanding_amount",
   "remarks",
   "column_break_21",
   "commission_rate",
@@ -258,12 +259,18 @@
    "fieldtype": "Dynamic Link",
    "label": "Filtro",
    "options": "commission_against"
+  },
+  {
+   "fieldname": "outstanding_amount",
+   "fieldtype": "Currency",
+   "label": "Outstanding Amount",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-04 08:47:23.231953",
+ "modified": "2024-11-04 11:23:05.322965",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Sales Commission",

erpnext/payroll/doctype/sales_commission/sales_commission.py

@@ -178,6 +178,7 @@ def calculate_total_contribution_and_total_commission_amount(self):
 
 		self.total_contribution = total_contribution
 		self.total_commission_amount = total_commission_amount
+		self.outstanding_amount = total_commission_amount
 
 	@frappe.whitelist()
 	def payout_entry(self, mode_of_payment=None, reference_no=None, reference_date=None):
@@ -241,25 +242,22 @@ def make_payment_entry(self, mode_of_payment, paid_from, paid_to, reference_no,
 		doc.party = self.employee
 		doc.paid_from = paid_from
 		doc.paid_to = paid_to
-		doc.paid_amount = self.total_commission_amount
-		doc.received_amount = self.total_commission_amount
+		doc.paid_amount = self.outstanding_amount
+		doc.received_amount = self.outstanding_amount
 		doc.source_exchange_rate = 1
 		doc.target_exchange_rate = 1
 		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")
 
 	def add_references(self, doc):
 		reference = {
 			'reference_doctype': 'Sales Commission',
 			'reference_name': self.name,
 			'due_date': self.to_date,
 			'total_amount': self.total_commission_amount,
-			'outstanding_amount': self.total_commission_amount,
-			'allocated_amount': self.total_commission_amount,
+			'outstanding_amount': self.outstanding_amount,
+			'allocated_amount': self.outstanding_amount,
 		}
 		doc.append("references", reference)