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

Merge pull request #2097 from nabinhait/hotfix

Browse Source 
Escaped item group value in pricing rule condition
This commit is contained in:
Nabin Hait 2014-08-21 19:19:34 +05:30
commit d67cbdf725
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

@ -169,8 +169,8 @@ def get_pricing_rules(args):
if parent_groups: if parent_groups:
if allow_blank: parent_groups.append('') if allow_blank: parent_groups.append('')
condition = " ifnull("+field+", '') in ('" + "', '".join(parent_groups)+"')" condition = " ifnull("+field+", '') in ('" + \
"', '".join([d.replace("'", "\\'").replace('"', '\\"') for d in parent_groups])+"')"
return condition return condition
@ -201,7 +201,7 @@ def get_pricing_rules(args):
and ifnull({transaction_type}, 0) = 1 {conditions} and ifnull({transaction_type}, 0) = 1 {conditions}
order by priority desc, name desc""".format( order by priority desc, name desc""".format(
item_group_condition=item_group_condition, item_group_condition=item_group_condition,
transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1) transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1, debug=1)
def filter_pricing_rules(args, pricing_rules): def filter_pricing_rules(args, pricing_rules):
# filter for qty # filter for qty