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

[freeside.git] / httemplate / view / cust_main.cgi

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index b1bc7f5..3cd7d2b 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -5,7 +5,6 @@
              'nobr'  => 1,
           }
 &>
-<BR>
 
 % my @part_tag = $cust_main->part_tag;
 % if ( $conf->config('cust_tag-location') eq 'top' && @part_tag ) {
@@ -36,6 +35,14 @@ function areyousure(href, message) {
   if (confirm(message) == true)
     window.location.href = href;
 }
+function areyousure_popup(message, action, actionlabel) {
+  if (confirm(message) == true) {
+<% include('/elements/popup_link_onclick.html',
+     'js_action' => 'action',
+     'js_actionlabel' => 'actionlabel',
+   ) %>
+  }
+}
 </SCRIPT>
 
 <br>
@@ -47,9 +54,6 @@ function areyousure(href, message) {
 % if ( $view eq 'basics' ) {
 
 % my $br = 0;
-% if ( $curuser->access_right('Order customer package') && $conf->exists('cust_main-enable_order_package') ) {
-  | <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &>
-% }
 
 % if ( $conf->config('cust_main-external_links') ) {
     <% $br++ ? ' | ' : '' %>
@@ -221,13 +225,10 @@ my $cust_main = qsearchs( {
 });
 die "Customer not found!" unless $cust_main;
 
-my $title = encode_entities($cust_main->name);
-$title = '#'. $cust_main->display_custnum. " $title";
-#  if $conf->exists('cust_main-title-display_custnum');
-$title = mt("Customer")." ".$title;
+my $title = mt("Customer").' #'. $cust_main->display_custnum. ': '.
+            encode_entities($cust_main->name);
 
-my @agentnums = $curuser->agentnums;
-if (scalar(@agentnums) > 1 ) {
+if ( $curuser->num_agents ) {
   $title = encode_entities($cust_main->agent->agent). " $title";
 }