From c632a91db61eb4ed86143fefd1ec6ebccc0ad526 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Tue, 24 Mar 2009 04:36:16 +0000
Subject: more DTRT with usage on service transfer between packages and
 recharges  RT #2884, #5040

---
 httemplate/edit/part_svc.cgi              | 9 ++++++++-
 httemplate/misc/process/recharge_svc.html | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index e0fb615b1..deb3c80f9 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -131,7 +131,14 @@ that field.
 %
 %      #yucky kludge
 %      my @fields = defined( dbdef->table($layer) )
-%                      ? grep { $_ ne 'svcnum' } fields($layer)
+%                      ? grep {
+%                               $_ ne 'svcnum' &&
+%                               ( !FS::part_svc->svc_table_fields($layer)
+%                                     ->{$_}->{disable_part_svc_column}   ||
+%                                 $part_svc->part_svc_column($_)->columnflag
+%                               )
+%                             }
+%                             fields($layer)
 %                      : ();
 %      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
 %      $part_svc->svcpart($clone) if $clone; #haha, undone below
diff --git a/httemplate/misc/process/recharge_svc.html b/httemplate/misc/process/recharge_svc.html
index 147b9533a..4b7155f5d 100755
--- a/httemplate/misc/process/recharge_svc.html
+++ b/httemplate/misc/process/recharge_svc.html
@@ -27,7 +27,7 @@
 %                                $description, $part_pkg->taxclass);
 %
 %    if ($part_pkg->option('recharge_reset', 1)) {
-%      $error ||= $svc_acct->set_usage(\%rhash);
+%      $error ||= $svc_acct->set_usage(\%rhash, 'null' => 1);
 %    }else{
 %      $error ||= $svc_acct->recharge(\%rhash);
 %    }
-- 
cgit v1.2.1