[freeside-commits] freeside/httemplate/search cust_bill.cgi, 1.27, NONE cust_main-otaker.cgi, 1.4, 1.5 cust_main-payinfo.html, 1.3, NONE cust_main-quickpay.html, 1.6, NONE cust_main.cgi, 1.61, 1.62 cust_pay.html, 1.2, NONE cust_pkg_report.cgi, 1.3, 1.4 report_cust_bill.html, 1.2, 1.3 report_cust_credit.html, 1.6, 1.7 report_cust_pay.html, 1.10, 1.11 report_prepaid_income.html, 1.3, 1.4 report_tax.html, 1.9, 1.10 sqlradius.html, 1.4, 1.5 svc_acct.html, 1.3, NONE svc_domain.cgi, 1.17, 1.18 svc_domain.html, 1.3, NONE svc_external.cgi, 1.2, 1.3

Ivan,,, ivan at wavetail.420.am
Sun May 14 09:47:33 PDT 2006 

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv14201/httemplate/search

Modified Files:
	cust_main-otaker.cgi cust_main.cgi cust_pkg_report.cgi 
	report_cust_bill.html report_cust_credit.html 
	report_cust_pay.html report_prepaid_income.html 
	report_tax.html sqlradius.html svc_domain.cgi svc_external.cgi 
Removed Files:
	cust_bill.cgi cust_main-payinfo.html cust_main-quickpay.html 
	cust_pay.html svc_acct.html svc_domain.html 
Log Message:
first part of ACL and re-skinning work and some other small stuff

--- cust_main-quickpay.html DELETED ---

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main.cgi,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- cust_main.cgi	12 Apr 2006 12:36:39 -0000	1.61
+++ cust_main.cgi	14 May 2006 16:47:30 -0000	1.62
@@ -220,14 +220,13 @@
   eidiot "No matching customers found!\n";
 } else { 
 %>
-<!-- mason kludge -->
-<%
+<%= include('/elements/header.html', "Customer Search Results", '' ) %>
 
-  $total ||= scalar(@cust_main);
-  print header("Customer Search Results",menubar(
-    'Main Menu', popurl(2)
-  )), "$total matching customers found ";
+  <% $total ||= scalar(@cust_main); %>
+
+  <%= $total %> matching customers found
 
+  <%
   #begin pager
   my $pager = '';
   if ( $total != scalar(@cust_main) && $maxrecords ) {
@@ -368,12 +367,14 @@
     my $pcompany = $company
       ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
       : '<FONT SIZE=-1>&nbsp;</FONT>';
-    print <<END;
+    %>
+
     <TR>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$custnum</FONT></A></TD>
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$last, $first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pcompany</TD>
-END
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= $custnum %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$last, $first" %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pcompany %></TD>
+
+    <%
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
       my($ship_last,$ship_first,$ship_company)=(
         $cust_main->ship_last || $cust_main->getfield('last'),
@@ -383,15 +384,18 @@
       my $pship_company = $ship_company
         ? qq!<A HREF="$view"><FONT SIZE=-1>$ship_company</FONT></A>!
         : '<FONT SIZE=-1>&nbsp;</FONT>';
-      print <<END;
-      <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$ship_last, $ship_first</FONT></A></TD>
-      <TD ROWSPAN=$rowspan>$pship_company</A></TD>
-END
-    }
+      %>
 
-    foreach my $addl_col ( @addl_cols ) {
-      print "<TD ROWSPAN=$rowspan ALIGN=right><FONT SIZE=-1>";
-      if ( $addl_col eq 'tickets' ) {
+      <TD ROWSPAN=<%= $rowspan || 1 %>><A HREF="<%= $view %>"><FONT SIZE=-1><%= "$ship_last, $ship_first" %></FONT></A></TD>
+      <TD ROWSPAN=<%= $rowspan || 1 %>><%= $pship_company %></A></TD>
+
+    <% }
+
+    foreach my $addl_col ( @addl_cols ) { %>
+
+      <TD ROWSPAN=<%= $rowspan || 1 %> ALIGN=right><FONT SIZE=-1>
+
+      <% if ( $addl_col eq 'tickets' ) {
         if ( @custom_priorities ) {
           print &itable('', 0);
           foreach my $priority ( @custom_priorities, '' ) {
@@ -461,10 +465,14 @@
     }
     print "</TR>";
   }
+
+  %>
  
-  print "</TABLE>$pager</BODY></HTML>";
+  </TABLE><%= $pager %>
 
-}
+  <%= include('/elements/footer.html') %>
+
+<% }
 
 #undef $cache; #does this help?
 

Index: cust_main-otaker.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main-otaker.cgi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cust_main-otaker.cgi	6 Mar 2005 03:04:29 -0000	1.4
+++ cust_main-otaker.cgi	14 May 2006 16:47:30 -0000	1.5
@@ -1,28 +1,23 @@
-<HTML>
-  <HEAD>
-    <TITLE>Customer Search</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <FONT SIZE=7>
-      Customer Search
-    </FONT>
-    <BR>
-    <FORM ACTION="cust_main.cgi" METHOD="GET">
-      Search for <B>Order taker</B>: 
-      <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
-      <% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
-           or die dbh->errstr;
-         $sth->execute() or die $sth->errstr;
-#         my @otakers = map { $_->[0] } @{$sth->selectall_arrayref};
-      %>
-      <SELECT NAME="otaker">
-      <% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
-        <OPTION><%= $otaker->[0] %></OTAKER>
-      <% } %>
-      </SELECT>
-      <P><INPUT TYPE="submit" VALUE="Search">
+<%= include('/elements/header.html', 'Customer Search' ) %>
 
-    </FORM>
-  </BODY>
-</HTML>
+<FORM ACTION="cust_main.cgi" METHOD="GET">
+
+Search for <B>Order taker</B>: 
+  <INPUT TYPE="hidden" NAME="otaker_on" VALUE="TRUE">
 
+<% my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_main")
+     or die dbh->errstr;
+   $sth->execute() or die $sth->errstr;
+   #my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
+%>
+<SELECT NAME="otaker">
+<% my $otaker; while ( $otaker = $sth->fetchrow_arrayref ) { %>
+  <OPTION><%= $otaker->[0] %>
+<% } %>
+</SELECT>
+
+<P><INPUT TYPE="submit" VALUE="Search">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>

Index: sqlradius.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/sqlradius.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sqlradius.html	6 Mar 2005 03:04:29 -0000	1.4
+++ sqlradius.html	14 May 2006 16:47:30 -0000	1.5
@@ -1,9 +1,5 @@
-<%= include( '/elements/header.html', 'Search RADIUS sessions', '', '', '
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-') %>
+<%= include( '/elements/header.html', 'Search RADIUS sessions' ) %>
+
 <FORM NAME="OneTrueForm" ACTION="sqlradius.cgi" METHOD="GET">
 <% #include( '/elements/table.html' ) %>
 <%= ntable('#cccccc') %>
@@ -47,48 +43,10 @@
   </TR>
 <% } %>
 
-<TR>
-  <TD ALIGN="right">From: </TD>
-  <TD>
-    <INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date">
-  </TD>
-  <SCRIPT TYPE="text/javascript">
-    Calendar.setup({
-      inputField: "beginning_text",
-      ifFormat:   "%m/%d/%Y",
-      button:     "beginning_button",
-      align:      "BR"
-    });
-  </SCRIPT>
-</TR>
-<TR>
-  <TD></TD>
-  <TD><i>m/d/y</i></TD>
-</TR>
-<TR>
-  <TD ALIGN="right">To: </TD>
-  <TD>
-    <INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor:pointer" TITLE="Select date">
-  </TD>
-  <SCRIPT TYPE="text/javascript">
-    Calendar.setup({
-      inputField: "ending_text",
-      ifFormat:   "%m/%d/%Y",
-      button:     "ending_button",
-      align:      "BR"
-    });
-  </SCRIPT>
-</TR>
-<TR>
-  <TD></TD>
-  <TD><i>m/d/y</i>
-  <BR><FONT SIZE="-1">(leave one or both dates blank for an open-ended search)</FONT>
-  </TD>
-</TR>
+<%= include( '/elements/tr-input-beginning_ending.html' ) %>
+
 </TABLE>
 <BR><INPUT TYPE="submit" VALUE="View sessions">
 </FORM>
-</BODY>
-</HTML>
-
 
+<%= include('/elements/footer.html') %>

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_domain.cgi,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- svc_domain.cgi	14 Jul 2005 10:52:46 -0000	1.17
+++ svc_domain.cgi	14 May 2006 16:47:30 -0000	1.18
@@ -61,7 +61,7 @@
   $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
 };
 
-%><%= include ('elements/search.html',
+%><%= include( 'elements/search.html',
                  'title'             => "Domain Search Results",
                  'name'              => 'domains',
                  'query'             => $sql_query,

Index: report_prepaid_income.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_prepaid_income.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- report_prepaid_income.html	6 Mar 2005 03:04:29 -0000	1.3
+++ report_prepaid_income.html	14 May 2006 16:47:30 -0000	1.4
@@ -1,13 +1,13 @@
-<HTML>
-  <HEAD>
-    <TITLE>Prepaid Income (Unearned Revenue) Report</TITLE>
-    <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-    <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Prepaid Income (Unearned Revenue) Report</H1>
+<%= include('/elements/header.html', 'Prepaid Income (Unearned Revenue) Report',
+  '',
+  '',
+  '<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
+  '
+) %>
+
     <FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
     <TABLE>
       <TR>
@@ -32,8 +32,6 @@
   });
 </SCRIPT>
 
-    <INPUT TYPE="submit" VALUE="Generate report">
-  </BODY>
-</HTML>
-    <TABLE>
+<INPUT TYPE="submit" VALUE="Generate report">
 
+<%= include('/elements/footer.html') %>

Index: report_cust_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_pay.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- report_cust_pay.html	22 Dec 2005 04:01:16 -0000	1.10
+++ report_cust_pay.html	14 May 2006 16:47:30 -0000	1.11
@@ -1,38 +1,43 @@
-<HTML>
-  <HEAD>
-    <TITLE>Payment report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Payment report criteria</H1>
-    <FORM ACTION="cust_pay.cgi" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">Payments of type: </TD>
-        <TD><SELECT NAME="payby">
-              <OPTION VALUE="">all</OPTION>
-              <OPTION VALUE="CARD">credit card (all)</OPTION>
-              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
-              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
-              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
-              <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
-              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
-              <OPTION VALUE="BILL">check</OPTION>
-              <OPTION VALUE="PREP">prepaid card</OPTION>
-              <OPTION VALUE="CASH">cash</OPTION>
-              <OPTION VALUE="WEST">Western Union</OPTION>
-              <OPTION VALUE="MCRD">manual credit card</OPTION>
-            </SELECT>
-        </TD>
-      </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+<%= include('/elements/header.html', 'Payment report' ) %>
+
+<FORM ACTION="cust_pay.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+
+<TABLE>
+
+  <TR>
+    <TD ALIGN="right">Payments of type: </TD>
+    <TD>
+      <SELECT NAME="payby">
+        <OPTION VALUE="">all</OPTION>
+        <OPTION VALUE="CARD">credit card (all)</OPTION>
+        <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
+        <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
+        <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
+        <OPTION VALUE="CARD-Maestro">credit card (Maestro/Switch/Solo)</OPTION>
+        <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
+        <OPTION VALUE="BILL">check</OPTION>
+        <OPTION VALUE="PREP">prepaid card</OPTION>
+        <OPTION VALUE="CASH">cash</OPTION>
+        <OPTION VALUE="WEST">Western Union</OPTION>
+        <OPTION VALUE="MCRD">manual credit card</OPTION>
+      </SELECT>
+    </TD>
+  </TR>
+
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'for agent: ',
+             )
+  %>
+
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>

Index: report_cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_credit.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- report_cust_credit.html	22 Dec 2005 04:01:16 -0000	1.6
+++ report_cust_credit.html	14 May 2006 16:47:30 -0000	1.7
@@ -1,36 +1,38 @@
-<HTML>
-  <HEAD>
-    <TITLE>Credit report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Credit report criteria</H1>
-    <FORM ACTION="cust_credit.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <TR>
-        <TD ALIGN="right">Credits by employee: </TD>
+<%= include('/elements/header.html', 'Credit report' ) %>
+
+<FORM ACTION="cust_credit.html" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
+
+<TABLE>
+  <TR>
+    <TD ALIGN="right">Credits by employee: </TD>
+
 <%
   my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_credit")
     or die dbh->errstr;
   $sth->execute or die $sth->errstr;
   my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
 %>
-        <TD><SELECT NAME="otaker">
-              <OPTION VALUE="">all</OPTION>
-              <% foreach my $otaker ( @otakers ) { %>
-                <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
-              <% } %>
-            </SELECT>
-        </TD>
-      </TR>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+
+    <TD><SELECT NAME="otaker">
+          <OPTION VALUE="">all</OPTION>
+          <% foreach my $otaker ( @otakers ) { %>
+            <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
+          <% } %>
+        </SELECT>
+    </TD>
+  </TR>
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'for agent: ',
+             )
+  %>
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>

--- svc_acct.html DELETED ---

--- cust_main-payinfo.html DELETED ---

--- svc_domain.html DELETED ---

--- cust_bill.cgi DELETED ---

Index: cust_pkg_report.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg_report.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cust_pkg_report.cgi	22 Dec 2005 04:01:16 -0000	1.3
+++ cust_pkg_report.cgi	14 May 2006 16:47:30 -0000	1.4
@@ -1,23 +1,22 @@
-<HTML>
-  <HEAD>
-    <TITLE>Packages</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Packages</H1>
-    <FORM ACTION="cust_pkg.cgi" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
-      Return packages with next bill date:<BR><BR>
-      <TABLE>
-        <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-        <%= include( '/elements/tr-select-agent.html',
-                       $cgi->param('agentnum'),
-                   )
-        %>
-      </TABLE>
-      <BR><INPUT TYPE="submit" VALUE="Get Report">
+<%= include('/elements/header.html', 'Packages' ) %>
 
-    </FORM>
+<FORM ACTION="cust_pkg.cgi" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="bill">
 
-  </BODY>
-</HTML>
+Return packages with next bill date:
+<BR><BR>
 
+  <TABLE>
+    <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+    <%= include( '/elements/tr-select-agent.html',
+                   $cgi->param('agentnum'),
+               )
+    %>
+  </TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>

Index: report_cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_bill.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- report_cust_bill.html	22 Dec 2005 04:01:16 -0000	1.2
+++ report_cust_bill.html	14 May 2006 16:47:30 -0000	1.3
@@ -1,28 +1,28 @@
-  <HEAD>
-    <TITLE>Invoice report criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Invoice report criteria</H1>
-    <FORM ACTION="cust_bill.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
-    <TABLE>
-      <%= include( '/elements/tr-select-agent.html',
-                     $cgi->param('agentnum'),
-                     'label' => 'Invoices for agent: ',
-                 )
-      %>
-      <%= include( '/elements/tr-input-beginning_ending.html' ) %>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
-        <TD>Show only open invoices</TD>
-      </TR>
-      <TR>
-        <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
-        <TD>Show only the single most recent invoice per-customer</TD>
-      </TR>
-    </TABLE>
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
-  </BODY>
-</HTML>
+<%= include('/elements/header.html', 'Invoice report criteria' ) %>
+
+<FORM ACTION="cust_bill.html" METHOD="GET">
+<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
 
+<TABLE>
+  <%= include( '/elements/tr-select-agent.html',
+                 $cgi->param('agentnum'),
+                 'label' => 'Invoices for agent: ',
+             )
+  %>
+  <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+  <TR>
+    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
+    <TD>Show only open invoices</TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="newest_percust" VALUE="1"></TD>
+    <TD>Show only the single most recent invoice per-customer</TD>
+  </TR>
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="Get Report">
+
+</FORM>
+
+<%= include('/elements/footer.html') %>

Index: svc_external.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_external.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svc_external.cgi	31 Jan 2006 04:26:54 -0000	1.2
+++ svc_external.cgi	14 May 2006 16:47:30 -0000	1.3
@@ -38,17 +38,18 @@
 }
 
 if ( scalar(@svc_external) == 1 ) {
-  print $cgi->redirect(popurl(2). "view/svc_external.cgi?". $svc_external[0]->svcnum);
-  #exit;
+
+  %><%= $cgi->redirect(popurl(2). "view/svc_external.cgi?". $svc_external[0]->svcnum) %><%
+
 } elsif ( scalar(@svc_external) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  eidiot "No matching external services found!\n";
-} else {
-%>
-<!-- mason kludge -->
-<%= include("/elements/header.html","External Search Results",'') %>
+
+  %><%= include('/elements/header.html', 'External Search Results' ) %>
+
+  No matching external services found
+
+<% } else {
+
+  %><%= include('/elements/header.html', 'External Search Results', '') %>
 
     <%= scalar(@svc_external) %> matching external services found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>

Index: report_tax.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- report_tax.html	26 Jan 2006 15:27:10 -0000	1.9
+++ report_tax.html	14 May 2006 16:47:30 -0000	1.10
@@ -1,40 +1,35 @@
-<HTML>
-  <HEAD>
-    <TITLE>Tax Report Criteria</TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#e8e8e8">
-    <H1>Tax Report Criteria</H1>
-    <FORM ACTION="report_tax.cgi" METHOD="GET">
+<%= include('/elements/header.html', 'Tax Report' ) %>
 
-    <TABLE>
+<FORM ACTION="report_tax.cgi" METHOD="GET">
 
-     <%= include( '/elements/tr-select-agent.html' ) %>
+<TABLE>
 
-     <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+ <%= include( '/elements/tr-select-agent.html' ) %>
 
-     <% my $conf = new FS::Conf;
-        if ( $conf->exists('enable_taxclasses') ) {
-     %>
-       <TR>
-         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
-         <TD>Show tax classes</TD>
-       </TR>
-     <% } %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
 
-     <% my @pkg_class = qsearch('pkg_class', {});
-        if ( @pkg_class ) {
-     %>
-       <TR>
-         <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
-         <TD>Show package classes</TD>
-       </TR>
-     <% } %>
+ <% my $conf = new FS::Conf;
+    if ( $conf->exists('enable_taxclasses') ) {
+ %>
+   <TR>
+     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
+     <TD>Show tax classes</TD>
+   </TR>
+ <% } %>
 
-    </TABLE>
+ <% my @pkg_class = qsearch('pkg_class', {});
+    if ( @pkg_class ) {
+ %>
+   <TR>
+     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
+     <TD>Show package classes</TD>
+   </TR>
+ <% } %>
 
-    <BR><INPUT TYPE="submit" VALUE="Get Report">
-    </FORM>
+</TABLE>
 
-  </BODY>
-</HTML>
+<BR><INPUT TYPE="submit" VALUE="Get Report">
 
+</FORM>
+
+<%= include('/elements/footer.html') %>

--- cust_pay.html DELETED ---

More information about the freeside-commits mailing list