4 files changed, 11 insertions, 13 deletions
diff --git a/httemplate/elements/footer-cust_main.html b/httemplate/elements/footer-cust_main.html
new file mode 100644
index 000000000..c9a9cc215
--- /dev/null
+++ b/httemplate/elements/footer-cust_main.html
@@ -0,0 +1,2 @@
+</DIV>
+<& /elements/footer.html &>
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index c7238e6a8..e35d7f1cf 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,13 +1,6 @@
-<& /elements/header.html, mt('Invoice View'), menubar(
-  emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
-) &>
+<& /elements/header-cust_main.html, view=>'payment_history', custnum=>$custnum &>
 
-<SCRIPT TYPE="text/javascript">
-function areyousure(href, message) {
-  if (confirm(message) == true)
-    window.location.href = href;
-}
-</SCRIPT>
+<h2>Invoice #<% $invnum %></h2>
 
 % if ( !$cust_bill->closed ) { # otherwise allow no changes
 %   my $can_delete = $conf->exists('deleteinvoices')
@@ -187,7 +180,7 @@ function change_invoice_mode(obj) {
   <PRE><% join('', $cust_bill->print_text(\%opt) ) |h %></PRE>
 % } 
 
-<& /elements/footer.html &>
+<& /elements/footer-cust_main.html &>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 2254df489..2e8d74625 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -148,8 +148,7 @@
 %   }
 % }
 
-</DIV>
-<& /elements/footer.html &>
+<& /elements/footer-cust_main.html &>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index d9190ee28..d12ec172f 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -688,7 +688,11 @@ sub entry2link {
 
       # the menu head: always a link back to this page
       $cgi->param('show', $entry->{show});
-      $target = $cgi->self_url;
+
+      #$target = $cgi->self_url;
+      #XXX support installs outside /freeside in 4.x
+      $target = "/freeside/view/cust_main.cgi?show=$show;custnum=". $cust_main->custnum;
+
       $cgi->param('show', $show);
 
       my $a = qq[ <A HREF="$target"];