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

chore: change column format for report

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-21 11:00:19 +05:30
parent 33f8f7d7b3
commit 1c033ce635
2 changed files with 168 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@ -148,11 +148,27 @@ def _execute(filters=None, additional_table_columns=None):
def get_columns(invoice_list, additional_table_columns, include_payments=False): def get_columns(invoice_list, additional_table_columns, include_payments=False):
"""return columns based on filters""" """return columns based on filters"""
columns = [ columns = [
_("Voucher Type") + ":Data:120", {
_("Voucher No") + ":Dynamic Link/voucher_type:120", "label": _("Voucher Type"),
_("Posting Date") + ":Date:80", "fieldname": "voucher_type",
_("Supplier Id") + "::120", "width": 120,
_("Supplier Name") + "::120", },
{
"label": _("Voucher"),
"fieldname": "voucher_no",
"fieldtype": "Dynamic Link",
"options": "voucher_type",
"width": 120,
},
{"label": _("Posting Date"), "fieldname": "posting_date", "fieldtype": "Date", "width": 80},
{
"label": _("Supplier"),
"fieldname": "supplier_id",
"fieldtype": "Link",
"options": "Supplier",
"width": 120,
},
{"label": _("Supplier Name"), "fieldname": "supplier_name", "fieldtype": "Data", "width": 120},
] ]
if additional_table_columns and not include_payments: if additional_table_columns and not include_payments:
@ -160,23 +176,64 @@ def get_columns(invoice_list, additional_table_columns, include_payments=False):
if not include_payments: if not include_payments:
columns += [ columns += [
_("Supplier Group") + ":Link/Supplier Group:120", {
_("Tax Id") + "::50", "label": _("Supplier Group"),
_("Payable Account") + ":Link/Account:120", "fieldname": "supplier_group",
_("Mode of Payment") + ":Link/Mode of Payment:80", "fieldtype": "Link",
_("Project") + ":Link/Project:80", "options": "Supplier Group",
_("Bill No") + "::120", "width": 120,
_("Bill Date") + ":Date:80", },
_("Purchase Order") + ":Link/Purchase Order:100", {"label": _("Tax Id"), "fieldname": "tax_id", "fieldtype": "Data", "width": 80},
_("Purchase Receipt") + ":Link/Purchase Receipt:100", {
"label": _("Payable Account"),
"fieldname": "payable_account",
"fieldtype": "Link",
"options": "Account",
"width": 100,
},
{
"label": _("Mode Of Payment"),
"fieldname": "mode_of_payment",
"fieldtype": "Data",
"width": 120,
},
{
"label": _("Project"),
"fieldname": "project",
"fieldtype": "Link",
"options": "Project",
"width": 80,
},
{"label": _("Bill No"), "fieldname": "bill_no", "fieldtype": "Data", "width": 120},
{"label": _("Bill Date"), "fieldname": "bill_date", "fieldtype": "Date", "width": 80},
{
"label": _("Purchase Order"),
"fieldname": "purchase_order",
"fieldtype": "Link",
"options": "Purchase Order",
"width": 100,
},
{
"label": _("Purchase Receipt"),
"fieldname": "purchase_receipt",
"fieldtype": "Link",
"options": "Purchase Receipt",
"width": 100,
},
{"fieldname": "currency", "label": _("Currency"), "fieldtype": "Data", "width": 80}, {"fieldname": "currency", "label": _("Currency"), "fieldtype": "Data", "width": 80},
] ]
else: else:
columns += [ columns += [
_("Payable Account") + ":Link/Account:120", {
_("Debit") + ":Currency/currency:120", "fieldname": "payable_account",
_("Credit") + ":Currency/currency:120", "label": _("Payable Account"),
_("Balance") + ":Currency/currency:120", "fieldtype": "Link",
"options": "Account",
"width": 120,
},
{"fieldname": "debit", "label": _("Debit"), "fieldtype": "Currency", "width": 120},
{"fieldname": "credit", "label": _("Credit"), "fieldtype": "Currency", "width": 120},
{"fieldname": "balance", "label": _("Balance"), "fieldtype": "Currency", "width": 120},
] ]
account_columns, accounts = get_account_columns(invoice_list, include_payments) account_columns, accounts = get_account_columns(invoice_list, include_payments)
@ -185,18 +242,52 @@ def get_columns(invoice_list, additional_table_columns, include_payments=False):
columns columns
+ account_columns[0] + account_columns[0]
+ account_columns[1] + account_columns[1]
+ [_("Net Total") + ":Currency/currency:120"] + [
{
"label": _("Net Total"),
"fieldname": "net_total",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
}
]
+ account_columns[2] + account_columns[2]
+ [_("Total Tax") + ":Currency/currency:120"] + [
{
"label": _("Total Tax"),
"fieldname": "total_tax",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
}
]
) )
if not include_payments: if not include_payments:
columns += [ columns += [
_("Grand Total") + ":Currency/currency:120", {
_("Rounded Total") + ":Currency/currency:120", "label": _("Grand Total"),
_("Outstanding Amount") + ":Currency/currency:120", "fieldname": "grand_total",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
},
{
"label": _("Rounded Total"),
"fieldname": "rounded_total",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
},
{
"label": _("Outstanding Amount"),
"fieldname": "outstanding_amount",
"fieldtype": "Currency",
"options": "currency",
"width": 120,
},
] ]
columns += [_("Remarks") + "::120"] columns += [{"label": _("Remarks"), "fieldname": "remarks", "fieldtype": "Data", "width": 120}]
return columns, accounts[0], accounts[2], accounts[1] return columns, accounts[0], accounts[2], accounts[1]
@ -205,6 +296,10 @@ def get_account_columns(invoice_list, include_payments):
tax_accounts = [] tax_accounts = []
unrealized_profit_loss_accounts = [] unrealized_profit_loss_accounts = []
expense_columns = []
tax_columns = []
unrealized_profit_loss_account_columns = []
if invoice_list: if invoice_list:
expense_accounts = frappe.db.sql_list( expense_accounts = frappe.db.sql_list(
"""select distinct expense_account """select distinct expense_account
@ -237,15 +332,39 @@ def get_account_columns(invoice_list, include_payments):
tuple(inv.name for inv in invoice_list), tuple(inv.name for inv in invoice_list),
) )
expense_columns = [(account + ":Currency/currency:120") for account in expense_accounts] for account in expense_accounts:
unrealized_profit_loss_account_columns = [ expense_columns.append(
(account + ":Currency/currency:120") for account in unrealized_profit_loss_accounts {
] "label": account,
tax_columns = [ "fieldname": frappe.scrub(account),
(account + ":Currency/currency:120") "fieldtype": "Currency",
for account in tax_accounts "options": "currency",
if account not in expense_accounts "width": 120,
] }
)
for account in tax_accounts:
if account not in expense_accounts:
tax_columns.append(
{
"label": account,
"fieldname": frappe.scrub(account),
"fieldtype": "Currency",
"options": "currency",
"width": 120,
}
)
for account in unrealized_profit_loss_accounts:
unrealized_profit_loss_account_columns.append(
{
"label": account,
"fieldname": frappe.scrub(account),
"fieldtype": "Currency",
"options": "currency",
"width": 120,
}
)
columns = [expense_columns, unrealized_profit_loss_account_columns, tax_columns] columns = [expense_columns, unrealized_profit_loss_account_columns, tax_columns]
accounts = [expense_accounts, unrealized_profit_loss_accounts, tax_accounts] accounts = [expense_accounts, unrealized_profit_loss_accounts, tax_accounts]
@ -284,7 +403,9 @@ def get_invoices(filters, additional_query_columns):
query = query.select(col) query = query.select(col)
if filters.get("supplier"): if filters.get("supplier"):
query = query.where(pi.supplier == filters.supplier) query = query.where(pi.supplier == filters.supplier)
query = get_conditions(filters, query, [pi, invoice_item]) query = get_conditions(
filters, query, doctype="Purchase Invoice", child_doctype="Purchase Invoice Item"
)
if filters.get("include_payments"): if filters.get("include_payments"):
party_account = get_party_account( party_account = get_party_account(
"Supplier", filters.get("supplier"), filters.get("company"), include_advance=True "Supplier", filters.get("supplier"), filters.get("company"), include_advance=True

18
erpnext/accounts/report/sales_register/sales_register.py
View File

@ -260,10 +260,16 @@ def get_columns(invoice_list, additional_table_columns, include_payments=False):
] ]
else: else:
columns += [ columns += [
_("Receivable Account") + ":Link/Account:120", {
_("Debit") + ":Currency/currency:120", "fieldname": "receivable_account",
_("Credit") + ":Currency/currency:120", "label": _("Receivable Account"),
_("Balance") + ":Currency/currency:120", "fieldtype": "Link",
"options": "Account",
"width": 120,
},
{"fieldname": "debit", "label": _("Debit"), "fieldtype": "Currency", "width": 120},
{"fieldname": "credit", "label": _("Credit"), "fieldtype": "Currency", "width": 120},
{"fieldname": "balance", "label": _("Balance"), "fieldtype": "Currency", "width": 120},
] ]
account_columns, accounts = get_account_columns(invoice_list, include_payments) account_columns, accounts = get_account_columns(invoice_list, include_payments)
@ -442,7 +448,9 @@ def get_invoices(filters, additional_query_columns):
query = query.select(col) query = query.select(col)
if filters.get("customer"): if filters.get("customer"):
query = query.where(si.customer == filters.customer) query = query.where(si.customer == filters.customer)
query = get_conditions(filters, query, [si, invoice_item, invoice_payment]) query = get_conditions(
filters, query, doctype="Sales Invoice", child_doctype="Sales Invoice Item"
)
invoices = query.run(as_dict=True) invoices = query.run(as_dict=True)
return invoices return invoices