Merge branch 'develop' into misc_asset_fixes
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index b834d14..1bce43f 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -259,9 +259,7 @@
if tax_deducted:
net_total = inv.tax_withholding_net_total
if ldc:
- tax_amount = get_tds_amount_from_ldc(
- ldc, parties, pan_no, tax_details, posting_date, net_total
- )
+ tax_amount = get_tds_amount_from_ldc(ldc, parties, tax_details, posting_date, net_total)
else:
tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
@@ -538,7 +536,7 @@
return inv.grand_total - tcs_tax_row_amount
-def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total):
+def get_tds_amount_from_ldc(ldc, parties, tax_details, posting_date, net_total):
tds_amount = 0
limit_consumed = frappe.db.get_value(
"Purchase Invoice",
diff --git a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
index 9883890..bfe2a0f 100644
--- a/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
+++ b/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
@@ -4,6 +4,7 @@
import frappe
from frappe import _
+from frappe.utils import flt
def execute(filters=None):
@@ -65,6 +66,12 @@
else:
total_amount_credited += entry.credit
+ ## Check if ldc is applied and show rate as per ldc
+ actual_rate = (tds_deducted / total_amount_credited) * 100
+
+ if flt(actual_rate) < flt(rate):
+ rate = actual_rate
+
if tds_deducted:
row = {
"pan"