fuck embedded iframes and their stupid display problems with scrolling. also make...

diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi
index 9689ca6..5127c72 100755 (executable)
--- a/httemplate/edit/process/cust_main_note.cgi
+++ b/httemplate/edit/process/cust_main_note.cgi
@@ -2,17 +2,11 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_main_note.cgi?'. $cgi->query_string ) %>
 %} else {
-%    
 <% header('Note ' . ($notenum ? 'updated' : 'added') ) %>
     <SCRIPT TYPE="text/javascript">
-      parent.cust_main_notes.location.reload();
-      try{parent.cust_main_notes.cClick()}
-      catch(err){}
-      try{parent.cClick()}
-      catch(err){}
+      window.top.location.reload();
     </SCRIPT>
     </BODY></HTML>
-%
 % }
 <%init>
 

diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 4c97c9f..f7b4ddb 100755 (executable)
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -6,7 +6,9 @@
 
   <TR>
     <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
-    <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+%   if ( $conf->exists('cust_main_note-display_times') ) {
+      <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+%   }
     <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
     <TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
   </TR>