X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_prepaid_income.html;h=90b72f60b6d81dacabb0bfeffaf263fc7bcf907c;hb=d54109cc3035ce63ab0f6c2ec94317e378887d49;hp=d707bd81b7fe167b2eb5da3d85135753749025cc;hpb=b528a04c4f4ae1addb1cb22e0489f7c5dc5941b8;p=freeside.git

diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index d707bd81b..90b72f60b 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -2,18 +2,18 @@
 
 <% include('/elements/init_calendar.html') %>
 
-<FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
+<FORM ACTION="prepaid_income.html" METHOD="GET">
 
 <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
 
   <TR>
-    <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left">
+    <TH CLASS="background" COLSPAN=2 ALIGN="left">
       <FONT SIZE="+1">Search options</FONT>
     </TH>
   </TR>
 
   <TR>
-    <TD>As of </TD>
+    <TD ALIGN="right">As of </TD>
     <TD>
       <INPUT TYPE="text" NAME="date" ID="date_text" VALUE="now">
       <IMG SRC="../images/calendar.png" ID="date_button" STYLE="cursor: pointer" TITLE="Select date">
@@ -30,7 +30,20 @@
   </TR>
 
   <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
-
+  
+  <& /elements/tr-select-cust_main-status.html,
+      label => mt('Customer Status') &>
+  <& /elements/tr-select.html,
+      label => 'Invoice Status',
+      field => 'mode',
+      options => [ qw(billed paid) ] &>
+  <TR>
+    <TD ALIGN="right">
+      <INPUT TYPE="checkbox" NAME="include_monthly" VALUE=1>
+    </TD>
+    <TD ALIGN="left"><% emt('Include packages with period <= 1 month') %>
+    </TD>
+  </TR>
   <TR>
     <TD COLSPAN=2>&nbsp;</TD>
   </TR>
@@ -44,7 +57,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "date_text",
-    ifFormat:   "%m/%d/%Y",
+    ifFormat:   "<% $date_format %>",
     button:     "date_button",
     align:      "BR"
   });
@@ -58,4 +71,7 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
 
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
 </%init>