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

return list(filter()) not filter() (#14191)

Browse Source 
filter constructs an iterator that is iterable only once
This commit is contained in:
neckos 2018-05-23 17:15:34 +03:00 committed by Nabin Hait
parent 225af4a4cb
commit 7663bb91c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -305,8 +305,8 @@ def filter_pricing_rules(args, pricing_rules):
if pricing_rules: if pricing_rules:
stock_qty = flt(args.get('qty')) * args.get('conversion_factor', 1) stock_qty = flt(args.get('qty')) * args.get('conversion_factor', 1)
pricing_rules = filter(lambda x: (flt(stock_qty)>=flt(x.min_qty) pricing_rules = list(filter(lambda x: (flt(stock_qty)>=flt(x.min_qty)
and (flt(stock_qty)<=x.max_qty if x.max_qty else True)), pricing_rules) and (flt(stock_qty)<=x.max_qty if x.max_qty else True)), pricing_rules))
# add variant_of property in pricing rule # add variant_of property in pricing rule
for p in pricing_rules: for p in pricing_rules:
@ -319,7 +319,7 @@ def filter_pricing_rules(args, pricing_rules):
if pricing_rules: if pricing_rules:
max_priority = max([cint(p.priority) for p in pricing_rules]) max_priority = max([cint(p.priority) for p in pricing_rules])
if max_priority: if max_priority:
pricing_rules = filter(lambda x: cint(x.priority)==max_priority, pricing_rules) pricing_rules = list(filter(lambda x: cint(x.priority)==max_priority, pricing_rules))
# apply internal priority # apply internal priority
all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory", all_fields = ["item_code", "item_group", "brand", "customer", "customer_group", "territory",