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

fix: review changes

Browse Source
This commit is contained in:
thefalconx33 2019-12-16 15:03:27 +05:30
parent 5b622eace1
commit f195ccd85f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/portal/product_configurator/utils.py
View File

@ -301,6 +301,8 @@ def get_items(filters=None, search=None):
if isinstance(filters, dict): if isinstance(filters, dict):
filters = [['Item', fieldname, '=', value] for fieldname, value in filters.items()] filters = [['Item', fieldname, '=', value] for fieldname, value in filters.items()]
enabled_items_filter = get_conditions({ 'disabled': 0 }, 'and')
show_in_website_condition = '' show_in_website_condition = ''
if products_settings.hide_variants: if products_settings.hide_variants:
show_in_website_condition = get_conditions({'show_in_website': 1 }, 'and') show_in_website_condition = get_conditions({'show_in_website': 1 }, 'and')
@ -336,12 +338,9 @@ def get_items(filters=None, search=None):
filter_condition = get_conditions(filters, 'and') filter_condition = get_conditions(filters, 'and')
where_conditions = ' and '.join( where_conditions = ' and '.join(
[condition for condition in [show_in_website_condition, search_condition, filter_condition] if condition] [condition for condition in [enabled_items_filter, show_in_website_condition, \
search_condition, filter_condition] if condition]
) )
if where_conditions:
where_conditions += ' and disabled = 0'
else:
where_conditions += 'disabled = 0'
left_joins = [] left_joins = []
for f in filters: for f in filters: