5 files changed, 34 insertions, 21 deletions
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index fac126f92..c5ee9203c 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -262,6 +262,15 @@ $views{$conf->config('cust_main-custom_title') || emt('Custom')} =  'custom'
 my %viewname = reverse %views;
 
 my $view =  $cgi->param('show') || $curuser->default_customer_view;
+
+if ($view eq 'last') {
+  # something took us away from the page and is now bouncing back
+  $view = get_page_pref('last_view', $custnum);
+} else {
+  # remember which view is open so we _can_ bounce back
+  set_page_pref('last_view', $custnum, $view);
+}
+
 $view = 'basics' if $view eq 'jumbo';
 
 my $ie_compat = $conf->config('ie-compatibility_mode');
diff --git a/httemplate/view/cust_main/menu.html b/httemplate/view/cust_main/menu.html
index ab2d69d34..9e194f42d 100644
--- a/httemplate/view/cust_main/menu.html
+++ b/httemplate/view/cust_main/menu.html
@@ -131,8 +131,6 @@
 
 </style>
 
-<& /elements/one_time_charge_link.html, form_only=>1 &>
-
 <ul id="customer_menu">
 % foreach my $submenu (@processed_menu) {
   <li>
@@ -358,12 +356,7 @@ my @menu = (
     {
       # it's just a popup, but there's some freaky CCH tax stuff in it
       label       => 'One-time charge',
-      content     => sub {
-                      include( '/elements/one_time_charge_link.html',
-                        custnum => shift->custnum,
-                        no_form => 1,
-                      );
-                     },
+      url         => "edit/quick-charge.html?custnum=$custnum",
       acl         => 'One-time charge',
     },
     {
diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html
index e167e2625..0a5305ed5 100644
--- a/httemplate/view/cust_main/packages/package.html
+++ b/httemplate/view/cust_main/packages/package.html
@@ -350,14 +350,8 @@ sub pkg_change_link {
 sub onetime_change_link {
   my $cust_pkg = shift;
   my $pkgnum = $cust_pkg->pkgnum;
-  include( '/elements/popup_link-cust_pkg.html',
-    'action'      => $p. "edit/quick-charge.html?change_pkgnum=$pkgnum",
-    'label'       => emt('Modify one-time charge'),
-    'actionlabel' => emt('Modify'),
-    'cust_pkg'    => $cust_pkg,
-    'width'       => 690,
-    'height'      => 440,
-  );
+  '<A HREF="' . $fsurl . "edit/quick-charge.html?change_pkgnum=$pkgnum" .
+  '">' . emt('Modify one-time charge') . '</A>'
 }
 
 sub pkg_change_location_link {
diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index 39055f49a..352f5ea9d 100644
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -105,9 +105,22 @@ function clearhint_search_cust_svc(obj, str) {
         </TD>
       </TR>
 
-%   } 
+%   }
+
+% } #foreach part_svc
+
+% if ($cust_pkg->get('cancel')) {
+%   foreach my $svc (sort { $a->{'svcpart'} <=> $b->{'svcpart'} } 
+%                      $cust_pkg->uncancel_svc_summary('summarize_size' => $opt{'cust_pkg-large_pkg_size'})
+%   ) {
+%     next unless $svc->{'reprovisionable'};
+      <TR>
+        <TD ALIGN="right" VALIGN="top"><% $svc->{'svc'} |h %></TD>
+        <TD STYLE="padding-bottom:0px; font-style: italic"><% $svc->{'label'} |h %></TD>
+      </TR>
+%   }
+% }
 
-% } 
 
     </TABLE>
   </TD>
diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html
index 5646fb973..7221d53cd 100755
--- a/httemplate/view/quotation.html
+++ b/httemplate/view/quotation.html
@@ -23,9 +23,13 @@ function areyousure(href, message) {
 
 %   if ( $curuser->access_right('One-time charge') ) {
       <% $inrow ? ' | ' : '' %>
-      <& /elements/one_time_charge_link.html,
-             map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
-        &>
+%     my $query = 'quotationnum=' . $quotation->get('quotationnum');
+%     if ($quotation->custnum) {
+%       $query .= ';custnum=' . $quotation->custnum;
+%     } else {
+%       $query .= ';prospectnum=' . $quotation->prospectnum;
+%     }
+      <A HREF="<% $fsurl . 'edit/quick-charge.html?' . $query %>"><% emt('One-time charge') %></A>
 %     $inrow++;
 %   }