diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 5796fc0..d04d6a0 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -835,9 +835,7 @@
 			return
 
 		cumulated_tax_fraction = 0
-		total_inclusive_tax_amount_per_qty = 0
 		for i, tax in enumerate(self.get("taxes")):
-
 			tax.tax_fraction_for_current_item = self.get_current_tax_fraction(tax)
 			if i==0:
 				tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 3299ecc..8e72dc6 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -992,9 +992,6 @@
 			order by account asc""", (payment_entry.name), as_dict=1)
 
 		for i, gle in enumerate(gl_entries):
-			print(gle.account, gle.debit, gle.credit)
-
-		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_gle[i][0], gle.account)
 			self.assertEqual(expected_gle[i][1], gle.debit)
 			self.assertEqual(expected_gle[i][2], gle.credit)
@@ -1011,8 +1008,8 @@
 			['_Test Account Cost for Goods Sold - _TC', 30000, 0],
 			['_Test Account Excise Duty - _TC', 0, 3000],
 			['Creditors - _TC', 0, 27000],
-			['TDS Payable - _TC', 0, 3000],
 			['TDS Payable - _TC', 3000, 0]
+			['TDS Payable - _TC', 0, 3000],
 		]
 
 		gl_entries = frappe.db.sql("""select account, debit, credit
@@ -1021,9 +1018,6 @@
 			order by account asc""", (purchase_invoice.name), as_dict=1)
 
 		for i, gle in enumerate(gl_entries):
-			print(gle.account, gle.debit, gle.credit)
-
-		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_gle[i][0], gle.account)
 			self.assertEqual(expected_gle[i][1], gle.debit)
 			self.assertEqual(expected_gle[i][2], gle.credit)
