From 1c44bb09820e9f2fe0d80d64f005047a7ed04e3f Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Thu, 7 Nov 2019 12:38:05 +0530
Subject: [PATCH] fix(cart): return rule instead of rule_label_map
---
erpnext/shopping_cart/cart.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index a0ac791619..1236ade45f 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -505,7 +505,7 @@ def get_applicable_shipping_rules(party=None, quotation=None):
if shipping_rules:
rule_label_map = frappe.db.get_values("Shipping Rule", shipping_rules, "label")
# we need this in sorted order as per the position of the rule in the settings page
- return [[rule, rule_label_map.get(rule)] for rule in shipping_rules]
+ return [[rule, rule] for rule in shipping_rules]
def get_shipping_rules(quotation=None, cart_settings=None):
if not quotation:
@@ -563,4 +563,4 @@ def apply_coupon_code(applied_code,applied_referral_sales_partner):
frappe.throw(_("Please enter valid coupon code !!"))
else:
frappe.throw(_("Please enter coupon code !!"))
- return quotation
\ No newline at end of file
+ return quotation