[freeside-commits] freeside/httemplate/edit/process bulk-cust_main_county.html, 1.1, 1.1.6.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/process
In directory wavetail.420.am:/tmp/cvs-serv28536/edit/process

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	bulk-cust_main_county.html 
Log Message:
bulk tax changes, RT#6445

Index: bulk-cust_main_county.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/process/bulk-cust_main_county.html,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- bulk-cust_main_county.html	12 Oct 2008 00:54:18 -0000	1.1
+++ bulk-cust_main_county.html	30 Oct 2009 00:02:51 -0000	1.1.6.1
@@ -1,6 +1,6 @@
 % if ( $error ) { #better to redirect back to 
 %# <% $cgi->redirect("$url?". $cgi->query_string ) %>
-  <% include('/elements/header-popup.html', 'Error adding taxes' ) %>
+  <% include('/elements/header-popup.html', "Error ${action}ing taxes" ) %>
 
   <FONT SIZE="+1" COLOR="#ff0000">Error: <% $error |h %></FONT>
   <BR><BR>
@@ -9,7 +9,7 @@
   </HTML>
 
 % } else {
-  <% include('/elements/header-popup.html', 'Taxes added') %>
+  <% include('/elements/header-popup.html', "Taxes ${action}ed") %>
 
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();
@@ -24,13 +24,16 @@
   or die 'Guru Meditation #69'; #??? should have been passed in
 my @taxnum = split(',', $1);
 
+$cgi->param('action') =~ /^(add|edit)$/ or die "unknown action";
+my $action = $1;
+
 my $error = '';
 foreach my $taxnum ( @taxnum ) {
 
   my $cust_main_county = qsearchs('cust_main_county', { 'taxnum' => $taxnum } )
     or die "unknown taxnum: $taxnum";
 
-  if ( $cust_main_county->tax == 0 ) { #let's replace
+  if ( $action eq 'edit' || $cust_main_county->tax == 0 ) { #let's replace
 
     foreach (qw( taxname tax exempt_amount setuptax recurtax )) {
       $cust_main_county->set( $_ => scalar($cgi->param($_)) )