Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / edit / cust_main / top_misc.html

diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index b7e86ba..e25506f 100644 (file)
--- a/httemplate/edit/cust_main/top_misc.html
+++ b/httemplate/edit/cust_main/top_misc.html
@@ -20,7 +20,9 @@
        <% $cust_main->residential_commercial eq 'Commercial' ? 'CHECKED' : '' %>
   ></TD>
 </TR>
+
 <SCRIPT TYPE="text/javascript">
+
   function rescom_changed(what) {
     if ( what.checked == (what.value == 'Commercial' ) ) {
       document.getElementById('company_row').style.display = '';
@@ -33,11 +35,16 @@
     }
   }
 
+
   var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
   var ship_fields = ['address1', 'city', 'state', 'zip', 'country', 
     'latitude', 'longitude', 'district'];
+
   function agent_changed(what) {
     var agentnum = what.value;
+
+%   # unlock/lock service location
+
     var f = what.form;
     if ( ship_locked_agents[agentnum] ) {
 %     # For this agent, the service location (except address2)
@@ -65,10 +72,15 @@
       f['same'].disabled = false;
     }
     samechanged(f['same']);
+
+%   # update sales dropdown
+    salesnum_agentnum_changed(what);
+
   }
-  window.onload = function() {
-    agent_changed(document.getElementById('agentnum'));
-  }
+
+  <&| /elements/onload.js &>
+  agent_changed(document.getElementById('agentnum'))
+  </&>
  
 </SCRIPT>
 
@@ -129,6 +141,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') ) {
@@ -137,9 +154,10 @@
 
 % } else { 
 
-   <& /elements/tr-select-part_referral.html,
-                'curr_value' => $refnum
-   &>
+  <& /elements/tr-select-part_referral.html,
+                'curr_value' => $refnum,
+                'label'      => "<B>${r}".emt('Advertising source')."</B>"
+  &>
 % }