(cherry picked from commit b8c41e3030) # Conflicts: # erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
b8c41e3030