[freeside-commits] branch FREESIDE_4_BRANCH updated. aad18afa8a584e61dd963d8ad80fd2a9e16520a5

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  aad18afa8a584e61dd963d8ad80fd2a9e16520a5 (commit)
      from  0f503d6064c0f7a7a2dae5a74701390a757f49ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aad18afa8a584e61dd963d8ad80fd2a9e16520a5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed May 17 09:47:34 2017 -0700

    fix prospect state dropdown, RT#76043, fallout from #76000

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 36ee7b6..5ff320b 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -204,11 +204,20 @@ Example:
      'enable_censustract' => 1,
 &>
 
-% unless ( $prospect_main ) {
-  <SCRIPT TYPE="text/javascript">
+<SCRIPT TYPE="text/javascript">
+% if ( $prospect_main ) { # && ! $opt{is_optional} ) {
+
+    changeSelect(document.getElementById('country'), <% $cust_location->country || $countrydefault |js_string %>);
+
+    country_changed( document.getElementById('country'),
+                     fix_state_factory( <% $cust_location->state || $statedefault |js_string %>,
+                                        ''
+                                      )
+                   );
+% } else {
     locationnum_changed(document.getElementById('locationnum'));
-  </SCRIPT>
 % }
+</SCRIPT>
 
 <%init>
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/tr-select-cust_location.html |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)