X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=7a19f8b3833103556581b9b96e05298c2247d72d;hb=1cde870268b03197da75f089669d60a7ba3c5617;hp=1cd6e0970820d2fe8b6a1dc62178d3c13684a36c;hpb=c16ef0145a0049c3f20377e2c5076087e999cde0;p=freeside.git

diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index 1cd6e0970..7a19f8b38 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -23,20 +23,6 @@
 
 %   }
 
-%   if ( $curuser->access_right('Add customer note') &&
-%        ! $conf->exists('cust_main-disable_notes')
-%      ) {
-
-  <& /elements/popup_link-cust_main.html,
-                'label'       => emt('Add customer note'),
-                'action'      => $p. 'edit/cust_main_note.cgi',
-                'actionlabel' => emt('Enter customer note'),
-                'cust_main'   => $cust_main,
-                'width'       => 616,
-                'height'      => 538, #575
-  &>
-
-%   }
 <BR>
 
 % # actually display notes
@@ -49,19 +35,6 @@
 % if( $curuser->access_right('View attachments') ) {
 % # List attachments
 <& notes/attachments.html, 'cust_main' => $cust_main &>
-% # "Attach file" link
-% if(! $conf->config('disable_cust_attachment')
-%  and $curuser->access_right('Add attachment')) {
-<& /elements/popup_link-cust_main.html,
-              'label'       => emt('Attach file'),
-              'action'      => $p.'edit/cust_main_attach.cgi',
-              'actionlabel' => emt('Upload file'),
-              'cust_main'   => $cust_main,
-              'width'       => 480,
-              'height'      => 296,
-&>
-% }
-
 %   if ($cgi->param('show_deleted')) {
 <A HREF="<% $p.'view/cust_main.cgi?custnum=' . $cust_main->custnum .
            ($view ? ";show=$view" : '') . '#notes' 
@@ -77,15 +50,8 @@
 % if ( $curuser->access_right('View email logs')
 %      and FS::cust_msg->count("custnum = $custnum")) {
 <BR>
-%   if (!$cgi->param('order_by')) {
-%     my $order_by = '_date';
-%     $order_by .= ' DESC' if $curuser->option('history_order') eq 'newest';
-%     $cgi->param('order_by', $order_by);
-%   }
-<& /search/cust_msg.html,
-  nohtmlheader  => 1,
-  html_init     => mt('Mail sent to this customer: '),
-&>
+<& notes/email.html, 'cust_main' => $cust_main &>
+<BR>
 % }
 <%init>