Index: openacs-4/packages/invoices/www/invoice-customer-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-customer-reports.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/invoice-customer-reports.adp	13 Apr 2006 12:15:30 -0000	1.1
+++ openacs-4/packages/invoices/www/invoice-customer-reports.adp	13 Apr 2006 12:53:57 -0000	1.2
@@ -9,8 +9,8 @@
   @export_vars;noquote@
   <table>
     <tr>
-      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@"></td>
-      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@"</td>
+      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@" id=sel1><input type='reset' value=' ... ' onclick="return showCalendar('sel1', 'y-m-d');"></td>
+      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@" id=sel2><input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"></td></td>
       <td><input type=submit name="submit" value="#invoices.ok#"></td>
     </tr>
     <if @clear_p@ eq 1>
Index: openacs-4/packages/invoices/www/invoice-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-list.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/invoices/www/invoice-list.adp	2 Apr 2006 22:08:02 -0000	1.5
+++ openacs-4/packages/invoices/www/invoice-list.adp	13 Apr 2006 12:53:57 -0000	1.6
@@ -9,8 +9,8 @@
   @export_vars;noquote@
   <table>
     <tr>
-      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@"></td>
-      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@"</td>
+      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@" id=sel1><input type='reset' value=' ... ' onclick="return showCalendar('sel1', 'y-m-d');"></td>
+      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@" id=sel2><input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"></td></td>
       <td><input type=submit name="submit" value="#invoices.ok#"></td>
     </tr>
     <if @clear_p@ eq 1>
Index: openacs-4/packages/invoices/www/offer-first-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-first-reports.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/www/offer-first-reports.adp	13 Apr 2006 12:13:12 -0000	1.2
+++ openacs-4/packages/invoices/www/offer-first-reports.adp	13 Apr 2006 12:53:57 -0000	1.3
@@ -10,8 +10,8 @@
   @export_vars;noquote@
   <table>
     <tr>
-      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@"></td>
-      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@"</td>
+      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@" id=sel1><input type='reset' value=' ... ' onclick="return showCalendar('sel1', 'y-m-d');"></td>
+      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@" id=sel2><input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"></td></td>
       <td><input type=submit name="submit" value="#invoices.ok#"></td>
     </tr>
     <if @clear_p@ eq 1>
Index: openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp	31 Aug 2005 17:05:21 -0000	1.2
+++ openacs-4/packages/invoices-portlet/www/invoices-list-portlet.adp	13 Apr 2006 12:55:17 -0000	1.3
@@ -1,2 +1,34 @@
+<table width="100%">
+<tr>
+<td>
+<form action="@current_url@">
+  @export_vars;noquote@
+  <table>
+    <tr>
+      <td>#invoices.iv_invoice_start_date# <input type=text name="start_date" size=12 value="@start_date@" id=sel1><input type='reset' value=' ... ' onclick="return showCalendar('sel1', 'y-m-d');"></td>
+      <td>#invoices.iv_invoice_end_date# <input type=text name="end_date" size=12 value="@end_date@" id=sel2><input type='reset' value=' ... ' onclick="return showCalendar('sel2', 'y-m-d');"></td></td>
+      <td><input type=submit name="submit" value="#invoices.ok#"></td>
+    </tr>
+    <if @clear_p@ eq 1>
+      <tr>
+        <td><a href="@clear_link@">#invoices.clear#</a></td>
+      </tr>
+    </if>
+  </table>
+</form>
+</td>
 
-<include src="../lib/invoice-list" row_list=@row_list@ organization_id="@organization_id@" base_url="@base_url@">
\ No newline at end of file
+<td align=right>
+<form action="/invoices/invoice-search">
+  <table>
+    <tr>
+      <td>#invoices.iv_invoice_invoice_nr# <input type=text name="invoice_nr" size=10></td>
+      <td><input type=submit name="submit" value="#invoices.ok#"></td>
+    </tr>
+  </table>
+</form>
+</td>
+</tr>
+</table>
+
+<include src="/packages/invoices/lib/invoice-list" row_list="@row_list@" organization_id="@organization_id@" base_url="@base_url@" page="@page@" orderby="@orderby@" page_num="@page_num@" start_date="@start_date@" end_date="@end_date@">