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

fix: port option for additional_conditions in item wise sales register (#35187)

Browse Source 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
This commit is contained in:
Smit Vora 2023-05-15 13:24:39 +05:30 committed by GitHub
parent 0c8276ec82
commit 2a609616d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,14 +19,19 @@ def execute(filters=None):
return _execute(filters) return _execute(filters)
def _execute(filters=None, additional_table_columns=None, additional_query_columns=None): def _execute(
filters=None,
additional_table_columns=None,
additional_query_columns=None,
additional_conditions=None,
):
if not filters: if not filters:
filters = {} filters = {}
columns = get_columns(additional_table_columns, filters) columns = get_columns(additional_table_columns, filters)
company_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency") company_currency = frappe.get_cached_value("Company", filters.get("company"), "default_currency")
item_list = get_items(filters, additional_query_columns) item_list = get_items(filters, additional_query_columns, additional_conditions)
if item_list: if item_list:
itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency) itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)
@ -328,7 +333,7 @@ def get_columns(additional_table_columns, filters):
return columns return columns
def get_conditions(filters): def get_conditions(filters, additional_conditions=None):
conditions = "" conditions = ""
for opts in ( for opts in (
@ -341,6 +346,9 @@ def get_conditions(filters):
if filters.get(opts[0]): if filters.get(opts[0]):
conditions += opts[1] conditions += opts[1]
if additional_conditions:
conditions += additional_conditions
if filters.get("mode_of_payment"): if filters.get("mode_of_payment"):
conditions += """ and exists(select name from `tabSales Invoice Payment` conditions += """ and exists(select name from `tabSales Invoice Payment`
where parent=`tabSales Invoice`.name where parent=`tabSales Invoice`.name
@ -376,8 +384,8 @@ def get_group_by_conditions(filters, doctype):
return "ORDER BY `tab{0}`.{1}".format(doctype, frappe.scrub(filters.get("group_by"))) return "ORDER BY `tab{0}`.{1}".format(doctype, frappe.scrub(filters.get("group_by")))
def get_items(filters, additional_query_columns): def get_items(filters, additional_query_columns, additional_conditions=None):
conditions = get_conditions(filters) conditions = get_conditions(filters, additional_conditions)
if additional_query_columns: if additional_query_columns:
additional_query_columns = ", " + ", ".join(additional_query_columns) additional_query_columns = ", " + ", ".join(additional_query_columns)