nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into version-14-fix-task

Browse Source
This commit is contained in:
ShamilNK
2023-01-17 17:44:53 +05:30
committed by GitHub
parent cf439301f6 9fa4c1a3bd
commit f3184dcd10
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View File

@@ -259,9 +259,7 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
if tax_deducted: if tax_deducted:
net_total = inv.tax_withholding_net_total net_total = inv.tax_withholding_net_total
if ldc: if ldc:
tax_amount = get_tds_amount_from_ldc( tax_amount = get_tds_amount_from_ldc(ldc, parties, tax_details, posting_date, net_total)
ldc, parties, pan_no, tax_details, posting_date, net_total
)
else: else:
tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0 tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
@@ -538,7 +536,7 @@ def get_invoice_total_without_tcs(inv, tax_details):
return inv.grand_total - tcs_tax_row_amount 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 tds_amount = 0
limit_consumed = frappe.db.get_value( limit_consumed = frappe.db.get_value(
"Purchase Invoice", "Purchase Invoice",

7
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@@ -4,6 +4,7 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt
def execute(filters=None): def execute(filters=None):
@@ -65,6 +66,12 @@ def get_result(
else: else:
total_amount_credited += entry.credit 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: if tds_deducted:
row = { row = {
"pan" "pan"

4
erpnext/assets/doctype/asset/asset.json
View File

@@ -513,7 +513,7 @@
{ {
"group": "Repair", "group": "Repair",
"link_doctype": "Asset Repair", "link_doctype": "Asset Repair",
"link_fieldname": "asset_name" "link_fieldname": "asset"
}, },
{ {
"group": "Value", "group": "Value",
@@ -521,7 +521,7 @@
"link_fieldname": "asset" "link_fieldname": "asset"
} }
], ],
"modified": "2022-12-05 16:21:30.024060", "modified": "2023-01-16 23:35:37.423100",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset", "name": "Asset",