X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Ftop_misc.html;h=d8141b5a7cad6aaac7e4292399e64bd904b1a0b7;hb=5fa459e35a04b69cbdc6b5b938eabcbc1bac6c74;hp=f2f584fc514c3092028ec726f222bebae6e7d53d;hpb=c6782ab85ea83e0c78d85b8975985aac9d467f9d;p=freeside.git

diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index f2f584fc5..d8141b5a7 100644
--- a/httemplate/edit/cust_main/top_misc.html
+++ b/httemplate/edit/cust_main/top_misc.html
@@ -40,6 +40,10 @@
     var agentnum = what.value;
     var f = what.form;
     if ( ship_locked_agents[agentnum] ) {
+%     # For this agent, the service location (except address2)
+%     # should be locked to the agent's location.
+%     # Set the ship_ fields to those values (just for display) and
+%     # then disable them.
       for(var x in ship_locked_agents[agentnum]) {
         f['ship_'+x].value = ship_locked_agents[agentnum][x];
         f['ship_'+x].disabled = true;
@@ -47,19 +51,24 @@
       f['same'].checked = false;
       f['same'].disabled = true;
     } else {
+%     # Unlock the ship_ location fields.  If they were previously
+%     # disabled, then they contain some agent's address, which is 
+%     # no longer meaningful.  So set them back to the customer's 
+%     # current location.
       for(var i=0; i<ship_fields.length; i++) {
         x = ship_fields[i];
-        f['ship_'+x].value = '';
+        if ( f['ship_'+x].disabled )  {
+          f['ship_'+x].value  = f['old_ship_'+x].value;
+        }
         f['ship_'+x].disabled = false;
       }
-      f['same'].checked = true;
       f['same'].disabled = false;
     }
     samechanged(f['same']);
   }
-  window.onload = function() {
-    agent_changed(document.getElementById('agentnum'));
-  }
+  <&| /elements/onload.js &>
+  agent_changed(document.getElementById('agentnum'))
+  </&>
  
 </SCRIPT>
 
@@ -120,6 +129,11 @@
              'label'       => emt("Class"),
 &>
 
+%#sales person
+<& /elements/tr-select-sales.html,
+     'curr_value' => $cust_main->salesnum,
+&>
+
 %# referral (advertising source)
 %my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
 %if ( $custnum && ! $conf->exists('editreferrals') ) {