Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
May 15, 2023
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
317fefc
fix: port option for additional_conditions in item wise sales register
vorasmit May 6, 2023
5e1e5de
Merge branch 'develop' into port-additional-conditions
deepeshgarg007 May 14, 2023
140d72e
Merge branch 'develop' into port-additional-conditions
deepeshgarg007 May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,19 @@ def execute(filters=None):
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:
filters = {}
columns = get_columns(additional_table_columns, filters)

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:
itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)

Expand Down Expand Up @@ -328,7 +333,7 @@ def get_columns(additional_table_columns, filters):
return columns


def get_conditions(filters):
def get_conditions(filters, additional_conditions=None):
conditions = ""

for opts in (
Expand All @@ -341,6 +346,9 @@ def get_conditions(filters):
if filters.get(opts[0]):
conditions += opts[1]

if additional_conditions:
conditions += additional_conditions

if filters.get("mode_of_payment"):
conditions += """ and exists(select name from `tabSales Invoice Payment`
where parent=`tabSales Invoice`.name
Expand Down Expand Up @@ -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")))


def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
def get_items(filters, additional_query_columns, additional_conditions=None):
conditions = get_conditions(filters, additional_conditions)

if additional_query_columns:
additional_query_columns = ", " + ", ".join(additional_query_columns)
Expand Down