X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Frate_edit_excel.html;h=442d83acaad4ae4e484eb112f0e17cacd0ccf17e;hb=b4f0a47a6893de5f6b11f32307a0195f43a359fb;hp=7d32553010faa82deabe0b679bfa5b52e6f0a7fd;hpb=9f73c5d4c0954b3a03bfcb5e010fc288a7071209;p=freeside.git

diff --git a/httemplate/misc/rate_edit_excel.html b/httemplate/misc/rate_edit_excel.html
index 7d3255301..442d83aca 100644
--- a/httemplate/misc/rate_edit_excel.html
+++ b/httemplate/misc/rate_edit_excel.html
@@ -1,10 +1,14 @@
 <% include('/elements/header.html', 'Edit rates with Excel' ) %>
 
+% if ( $have_conn ) { 
+  <FONT COLOR="#FF0000">WARNING: This functionality does not yet preserve connection charges.</FONT><BR><BR>
+% }
+
 <% include( '/elements/form-file_upload.html',
               'name'      => 'RateImportForm',
               'action'    => 'process/rate_edit_excel.html',
               'num_files' => 1,
-              'fields'    => [ 'format' ], #?
+              'fields'    => [ 'format' ],
               'message'   => 'Rate edit successful',
               'url'       => $p."browse/rate_region.html",
           )
@@ -23,12 +27,22 @@
     <TH ALIGN="left" COLSPAN=2>2. Edit rates with Excel (or other .XLS-compatible application)</TH>
   </TR>
 
+  <TR>
+    <TD ALIGN="left" COLSPAN=2>
+      &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;To add rates, add four columns like an existing rate, with headers starting with "NEW: Rate Name" or "Rate Name".<BR>
+     &nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;<FONT SIZE="-2"><I>For rate addition, protection can be turned off in Excel via the Tools-&gt;Protection-&gt;Unprotect Sheet menu command.  Note that only new rates can be added; modified grayed out cells will not be imported.</I></FONT>
+    </TD>
+  </TR>
+
   <% include( '/elements/file-upload.html',
                 'field' => 'file',
-                'label' => '3. Upload edited rate file: '. ( '&nbsp'x4 ), #yuck
+                'label' => '3. Upload edited rate file: ',
+                'label_align' => 'left',
             )
   %>
 
+  <INPUT TYPE="hidden" NAME="format" VALUE="default">
+
   <TR>
     <TD COLSPAN=2 ALIGN="center" STYLE="padding-top:6px">
       <INPUT TYPE    = "submit"
@@ -48,4 +62,9 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+my $sth = dbh->prepare('SELECT COUNT(*) FROM rate_detail WHERE conn_charge > 0 OR conn_sec > 0 LIMIT 1')
+  or die dbh->errstr;
+$sth->execute or die $sth->errstr;
+my $have_conn = $sth->fetchrow_arrayref->[0];
+
 </%init>