Pricing Rule: if multiple rules, ask to resolve conflict #565
Pricing Rule: If rule for price applied, discount rule against price list should not be applied #565
Merge branch 'develop' of github.com:frappe/erpnext into develop
Fixes in pricing rule testcases #565
Merge branch 'develop' of github.com:frappe/erpnext into develop