mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-06 15:00:27 +00:00
refactor: update labels for tax withholding reports columns to improve clarity
This commit is contained in:
@@ -252,17 +252,11 @@ def get_columns(filters):
|
|||||||
"width": 60,
|
"width": 60,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": _("Total Amount"),
|
"label": _("Taxable Amount"),
|
||||||
"fieldname": "total_amount",
|
"fieldname": "total_amount",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"width": 120,
|
"width": 120,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": _("Base Total"),
|
|
||||||
"fieldname": "base_total",
|
|
||||||
"fieldtype": "Float",
|
|
||||||
"width": 120,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": _("TDS Amount") if filters.get("party_type") == "Supplier" else _("TCS Amount"),
|
"label": _("TDS Amount") if filters.get("party_type") == "Supplier" else _("TCS Amount"),
|
||||||
"fieldname": "tax_amount",
|
"fieldname": "tax_amount",
|
||||||
@@ -270,10 +264,16 @@ def get_columns(filters):
|
|||||||
"width": 120,
|
"width": 120,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": _("Grand Total"),
|
"label": _("Grand Total (Company Currency)"),
|
||||||
|
"fieldname": "base_total",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"width": 150,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": _("Grand Total (Transaction Currency)"),
|
||||||
"fieldname": "grand_total",
|
"fieldname": "grand_total",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"width": 120,
|
"width": 170,
|
||||||
},
|
},
|
||||||
{"label": _("Transaction Type"), "fieldname": "transaction_type", "width": 130},
|
{"label": _("Transaction Type"), "fieldname": "transaction_type", "width": 130},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ def get_columns(filters):
|
|||||||
"width": 120,
|
"width": 120,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": _("Total Amount"),
|
"label": _("Total Taxable Amount"),
|
||||||
"fieldname": "total_amount",
|
"fieldname": "total_amount",
|
||||||
"fieldtype": "Float",
|
"fieldtype": "Float",
|
||||||
"width": 120,
|
"width": 120,
|
||||||
|
|||||||
Reference in New Issue
Block a user