Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index dbb93a9..ee98b23 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -24,9 +24,17 @@
if($(this).prop("checked")) {
var me = this;
+ // uncheck other shipping or billing addresses:
+ if ( $(this).is('input[data-fieldname=customer_address]') ) {
+ $('input[data-fieldname=customer_address]').not(this).prop('checked', false);
+ } else {
+ $('input[data-fieldname=shipping_address_name]').not(this).prop('checked', false);
+ }
+
return frappe.call({
type: "POST",
method: "erpnext.shopping_cart.cart.update_cart_address",
+ freeze: true,
args: {
address_fieldname: $(this).attr("data-fieldname"),
address_name: $(this).attr("data-address-name")