fix: Issues while cancel/amending Purchase Invoice with TDS enabled

(cherry picked from commit f7c9258) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
frappe · Nov 1, 2022 · 8888957 · 8888957
1 parent a9660bf
commit 8888957
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -569,6 +569,10 @@ frappe.ui.form.on("Purchase Invoice", {
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
 			return erpnext.queries.warehouse(frm.doc);
 		});
+
+		if (frm.is_new()) {
+			frm.clear_table("tax_withheld_vouchers");
+		}
 	},
 
 	is_subcontracted: function(frm) {

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -67,6 +67,9 @@ def onload(self):
 		supplier_tds = frappe.db.get_value("Supplier", self.supplier, "tax_withholding_category")
 		self.set_onload("supplier_tds", supplier_tds)
 
+		if self.is_new():
+			self.set("tax_withheld_vouchers", [])
+
 	def before_save(self):
 		if not self.on_hold:
 			self.release_date = ""
@@ -1373,7 +1376,12 @@ def on_cancel(self):
 			"GL Entry",
 			"Stock Ledger Entry",
 			"Repost Item Valuation",
+<<<<<<< HEAD
 			"Purchase Invoice",
+=======
+			"Payment Ledger Entry",
+			"Tax Withheld Vouchers",
+>>>>>>> f7c9258770 (fix: Issues while cancel/amending Purchase Invoice with TDS enabled)
 		)
 
 		self.update_advance_tax_references(cancel=1)