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

feat: add cols for supplier inv details

Browse Source
This commit is contained in:
Gursheen Anand 2023-10-19 17:55:24 +05:30
parent 75441017c6
commit 6d5ccde864
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
View File

@ -47,6 +47,7 @@ def get_result(
out = [] out = []
for name, details in gle_map.items(): for name, details in gle_map.items():
tax_amount, total_amount, grand_total, base_total = 0, 0, 0, 0 tax_amount, total_amount, grand_total, base_total = 0, 0, 0, 0
bill_no, bill_date = "", ""
tax_withholding_category = tax_category_map.get(name) tax_withholding_category = tax_category_map.get(name)
rate = tax_rate_map.get(tax_withholding_category) rate = tax_rate_map.get(tax_withholding_category)
@ -72,6 +73,8 @@ def get_result(
# back calcalute total amount from rate and tax_amount # back calcalute total amount from rate and tax_amount
if rate: if rate:
total_amount = grand_total = base_total = tax_amount / (rate / 100) total_amount = grand_total = base_total = tax_amount / (rate / 100)
elif voucher_type == "Purchase Invoice":
total_amount, grand_total, base_total, bill_no, bill_date = net_total_map.get(name)
else: else:
total_amount, grand_total, base_total = net_total_map.get(name) total_amount, grand_total, base_total = net_total_map.get(name)
else: else:
@ -107,6 +110,8 @@ 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,
"supplier_invoice_no": bill_no,
"supplier_invoice_date": bill_date,
} }
) )
out.append(row) out.append(row)
@ -183,6 +188,28 @@ def get_columns(filters):
columns.extend( columns.extend(
[ [
{"label": _("Entity Type"), "fieldname": "entity_type", "fieldtype": "Data", "width": 100}, {"label": _("Entity Type"), "fieldname": "entity_type", "fieldtype": "Data", "width": 100},
]
)
if filters.party_type == "Supplier":
columns.extend(
[
{
"label": _("Supplier Invoice No"),
"fieldname": "supplier_invoice_no",
"fieldtype": "Data",
"width": 120,
},
{
"label": _("Supplier Invoice Date"),
"fieldname": "supplier_invoice_date",
"fieldtype": "Date",
"width": 120,
},
]
)
columns.extend(
[
{ {
"label": _("TDS Rate %") if filters.get("party_type") == "Supplier" else _("TCS Rate %"), "label": _("TDS Rate %") if filters.get("party_type") == "Supplier" else _("TCS Rate %"),
"fieldname": "rate", "fieldname": "rate",
@ -352,6 +379,8 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None):
"base_tax_withholding_net_total", "base_tax_withholding_net_total",
"grand_total", "grand_total",
"base_total", "base_total",
"bill_no",
"bill_date",
], ],
"Sales Invoice": ["base_net_total", "grand_total", "base_total"], "Sales Invoice": ["base_net_total", "grand_total", "base_total"],
"Payment Entry": [ "Payment Entry": [
@ -370,7 +399,13 @@ def get_doc_info(vouchers, doctype, tax_category_map, net_total_map=None):
for entry in entries: for entry in entries:
tax_category_map.update({entry.name: entry.tax_withholding_category}) tax_category_map.update({entry.name: entry.tax_withholding_category})
if doctype == "Purchase Invoice": if doctype == "Purchase Invoice":
value = [entry.base_tax_withholding_net_total, entry.grand_total, entry.base_total] value = [
entry.base_tax_withholding_net_total,
entry.grand_total,
entry.base_total,
entry.bill_no,
entry.bill_date,
]
elif doctype == "Sales Invoice": elif doctype == "Sales Invoice":
value = [entry.base_net_total, entry.grand_total, entry.base_total] value = [entry.base_net_total, entry.grand_total, entry.base_total]
elif doctype == "Payment Entry": elif doctype == "Payment Entry":