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

fix: linting issues

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-12 11:14:03 +05:30
parent 1094319e3e
commit 1e8b8b5b29
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,16 +10,15 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_accounting_dimensions, get_accounting_dimensions,
get_dimension_with_children, get_dimension_with_children,
) )
from erpnext.accounts.report.utils import ( from erpnext.accounts.report.utils import (
get_journal_entries, get_journal_entries,
get_party_details, get_party_details,
get_payment_entries, get_payment_entries,
get_query_columns,
get_taxes_query, get_taxes_query,
get_values_for_columns,
) )
from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
def execute(filters=None): def execute(filters=None):
return _execute(filters) return _execute(filters)
@ -34,7 +33,7 @@ def _execute(filters=None, additional_table_columns=None):
if filters.get("include_payments"): if filters.get("include_payments"):
if not filters.get("supplier"): if not filters.get("supplier"):
frappe.throw(_("Please select a supplier for fetching payments.")) frappe.throw(_("Please select a supplier for fetching payments."))
invoice_list += get_payments(filters, additional_query_columns) invoice_list += get_payments(filters, additional_table_columns)
columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns( columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns(
invoice_list, additional_table_columns, include_payments invoice_list, additional_table_columns, include_payments
@ -63,7 +62,7 @@ def _execute(filters=None, additional_table_columns=None):
project = list(set(invoice_po_pr_map.get(inv.name, {}).get("project", []))) project = list(set(invoice_po_pr_map.get(inv.name, {}).get("project", [])))
row = [ row = [
inv.doctype, inv.doctype,
inv.name, inv.name,
inv.posting_date, inv.posting_date,
inv.supplier, inv.supplier,

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

@ -11,16 +11,15 @@ from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_accounting_dimensions, get_accounting_dimensions,
get_dimension_with_children, get_dimension_with_children,
) )
from erpnext.accounts.report.utils import ( from erpnext.accounts.report.utils import (
get_journal_entries, get_journal_entries,
get_party_details, get_party_details,
get_payment_entries, get_payment_entries,
get_query_columns,
get_taxes_query, get_taxes_query,
get_values_for_columns,
) )
from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns
def execute(filters=None): def execute(filters=None):
return _execute(filters) return _execute(filters)
@ -35,7 +34,7 @@ def _execute(filters, additional_table_columns=None):
if filters.get("include_payments"): if filters.get("include_payments"):
if not filters.get("customer"): if not filters.get("customer"):
frappe.throw(_("Please select a customer for fetching payments.")) frappe.throw(_("Please select a customer for fetching payments."))
invoice_list += get_payments(filters, additional_query_columns) invoice_list += get_payments(filters, additional_table_columns)
columns, income_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns( columns, income_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns(
invoice_list, additional_table_columns, include_payments invoice_list, additional_table_columns, include_payments