Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: col names for party types

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-24 12:20:58 +05:30
parent 38b501e004
commit 2f6d0bdcee
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,6 @@ def get_result(
"transaction_date": posting_date, "transaction_date": posting_date,
"transaction_type": voucher_type, "transaction_type": voucher_type,
"ref_no": name, "ref_no": name,
"party_type": party_map.get(party, {}).get("party_type"),
} }
) )
out.append(row) out.append(row)
@ -149,12 +148,7 @@ def get_columns(filters):
columns = [ columns = [
{"label": _(frappe.unscrub(pan)), "fieldname": pan, "fieldtype": "Data", "width": 90}, {"label": _(frappe.unscrub(pan)), "fieldname": pan, "fieldtype": "Data", "width": 90},
{ {
"label": _("Party Type"), "label": _(filters.get("party_type")),
"fieldname": "party_type",
"width": 180,
},
{
"label": _("Party"),
"fieldname": "party", "fieldname": "party",
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"options": "party_type", "options": "party_type",
@ -176,8 +170,13 @@ def get_columns(filters):
"fieldtype": "Link", "fieldtype": "Link",
"width": 180, "width": 180,
}, },
{"label": _("Entity Type"), "fieldname": "entity_type", "fieldtype": "Data", "width": 180}, {"label": _("Entity Type"), "fieldname": "entity_type", "fieldtype": "Data", "width": 120},
{"label": _("Rate %"), "fieldname": "rate", "fieldtype": "Percent", "width": 90}, {
"label": _("TDS Rate %") if filters.get("party_type") == "Supplier" else _("TCS Rate %"),
"fieldname": "rate",
"fieldtype": "Percent",
"width": 90,
},
{ {
"label": _("Total Amount"), "label": _("Total Amount"),
"fieldname": "total_amount", "fieldname": "total_amount",
@ -185,7 +184,7 @@ def get_columns(filters):
"width": 90, "width": 90,
}, },
{ {
"label": _("Tax Amount"), "label": _("TDS Amount") if filters.get("party_type") == "Supplier" else _("TCS Amount"),
"fieldname": "tax_amount", "fieldname": "tax_amount",
"fieldtype": "Float", "fieldtype": "Float",
"width": 90, "width": 90,
@ -196,13 +195,13 @@ def get_columns(filters):
"fieldtype": "Date", "fieldtype": "Date",
"width": 90, "width": 90,
}, },
{"label": _("Transaction Type"), "fieldname": "transaction_type", "width": 90}, {"label": _("Transaction Type"), "fieldname": "transaction_type", "width": 100},
{ {
"label": _("Reference No."), "label": _("Reference No."),
"fieldname": "ref_no", "fieldname": "ref_no",
"fieldtype": "Dynamic Link", "fieldtype": "Dynamic Link",
"options": "transaction_type", "options": "transaction_type",
"width": 90, "width": 180,
}, },
] ]
) )