CRM-16462 - update select2 elements on billing block

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index 504a067afbf48a6c9a6abe81142d8495191f1a26..abf23e86f688c0941f448761d21503eedd9af1de 100644 (file)
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -161,9 +161,6 @@
           if ($('#billingcheckbox').prop('checked')) {
             $(orig_id + ' option').prop('selected', false);
             $(orig_id + ' option[value="' + $(id).val() + '"]').prop('selected', true);
-          }
-
-          if (orig_id == '#billing_country_id-5') {
             $(orig_id).change();
           }
         });
@@ -186,6 +183,7 @@
             orig_id = select_ids[id];
             $(orig_id + ' option').prop('selected', false);
             $(orig_id + ' option[value="' + $(id).val() + '"]').prop('selected', true);
+            $(orig_id).change();
           }
         } else {
           $('.billing_name_address-group').show(200);