Index: openacs-4/packages/invoices/lib/invoice-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/invoice-list-portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/invoice-list-portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,23 @@
+<master src="@portlet_layout@">
+<property name="portlet_title">#invoices.iv_invoice_2#</property>
+
+<table width="100%">
+<tr>
+  <td colspan="2" class="fill-list-bottom">
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td>
+	<include src="/packages/invoices/lib/invoice-list"
+		organization_id="@organization_id@" 
+		row_list="@row_list@"
+		orderby="@orderby@" 
+		format="@format@" 
+		page_size="@page_size@" />
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+
Index: openacs-4/packages/invoices/lib/invoice-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/invoice-list-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/invoice-list-portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1 @@
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/invoices/lib/offer-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/offer-list-portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/offer-list-portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,23 @@
+<master src="@portlet_layout@">
+<property name="portlet_title">#invoices.iv_offer_2#</property>
+
+<table width="100%">
+<tr>
+  <td colspan="2" class="fill-list-bottom">
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td>
+	<include src="/packages/invoices/lib/offer-list"
+		organization_id="@organization_id@" 
+		row_list="@row_list@"
+ 		orderby="@orderby@" 
+		format="@format@" 
+		page_size="@page_size@" />
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+
Index: openacs-4/packages/invoices/lib/offer-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/offer-list-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/offer-list-portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1 @@
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/invoices/lib/portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,19 @@
+<link href="/resources/invoices/invoices.css" rel="stylesheet" type="text/css">
+
+<!-- Wrapper Portlet Starts -->
+<!-- 9999cc -->
+<table class="list" cellpadding="0" cellspacing="0" width="100%" border="0">
+  <tr>
+    <th class="project" align="left">@portlet_title;noquote@</th>
+  </tr>
+  <tr>
+   <td width="100%">
+  <slave>
+   </td>
+ </tr>
+</table>
+<!-- Wrapper portlet stops -->
+
+
+        
+
Index: openacs-4/packages/invoices/lib/portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,19 @@
+# packages/invoices/lib/portlet.tcl
+#
+# Portlet wrapper
+#
+# @author Malte Sussdorff (sussdorff@sussdorff.de)
+# @creation-date 2005-05-01
+# @arch-tag: c3461fd0-cb54-49bf-947a-8f710b3bd016
+# @cvs-id $Id: portlet.tcl,v 1.1 2005/10/13 17:13:34 miguelm Exp $
+
+foreach required_param {portlet_title} {
+    if {![info exists $required_param]} {
+	return -code error "$required_param is a required parameter."
+    }
+}
+foreach optional_param {} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
Index: openacs-4/packages/invoices/lib/price-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/price-list-portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/price-list-portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,19 @@
+<master src="@portlet_layout@">
+<property name="portlet_title">@page_title;noquote@</property>
+
+<table width="100%">
+<tr>
+  <td colspan="2" class="fill-list-bottom">
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td>
+	    <include src="/packages/invoices/lib/price-list" 
+		list_id="@list_id@" />
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+
Index: openacs-4/packages/invoices/lib/price-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/price-list-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/price-list-portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1 @@
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/invoices/lib/projects-billable-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable-portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/projects-billable-portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,25 @@
+<master src="@portlet_layout@">
+<property name="portlet_title">#invoices.Billable_Projects#</property>
+
+<table width="100%">
+<tr>
+  <td colspan="2" class="fill-list-bottom">
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td>
+            <include src="/packages/invoices/lib/projects-billable"
+                organization_id="@organization_id@"
+                elements="@elements@"
+                package_id="@package_id@"
+                base_url="@base_url@"
+                format="@format@"
+                orderby="@orderby@"
+                page_size="@page_size@" />
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+
Index: openacs-4/packages/invoices/lib/projects-billable-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/projects-billable-portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1 @@
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/invoices/lib/projects-billable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/projects-billable.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/lib/projects-billable.tcl	16 Aug 2005 20:04:31 -0000	1.1
+++ openacs-4/packages/invoices/lib/projects-billable.tcl	13 Oct 2005 17:11:54 -0000	1.2
@@ -26,13 +26,13 @@
     append row_list "$element {}\n"
 }
 
-if {![info exists format]} {
+if {![exists_and_not_null format]} {
     set format "normal"
 }
-if {![info exists orderby]} {
+if {![exists_and_not_null orderby]} {
     set orderby ""
 }
-if {![info exists page_size]} {
+if {![exists_and_not_null page_size]} {
     set page_size "25"
 }
 
Index: openacs-4/packages/invoices/lib/reports-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/reports-portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/reports-portlet.adp	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,27 @@
+<master src="@portlet_layout@">
+<property name="portlet_title">#invoices.iv_reports#</property>
+
+<table width="100%">
+<tr>
+  <td colspan="2" class="fill-list-bottom">
+    <table border="0" cellpadding="1" cellspacing="1" width="100%">
+      <tr>
+        <td>
+	<include src="@include_src@"
+    		organization_id="@organization_id@"
+    		format="@format@"
+		last_years="@last_years@"
+		year="@year@"
+		month="@month@"
+    		day="@day@"
+    		new_clients_p="@new_clients_p@"
+    		account_manager_p="@account_manager_p@"
+    		orderby="@orderby@" />
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+
+
Index: openacs-4/packages/invoices/lib/reports-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/reports-portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/reports-portlet.tcl	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1 @@
+set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/invoices/sql/postgresql/upgrade/upgrade-0.01d10-0.01d11.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/sql/postgresql/upgrade/upgrade-0.01d10-0.01d11.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/invoices/sql/postgresql/upgrade/upgrade-0.01d10-0.01d11.sql	12 Oct 2005 23:11:26 -0000	1.2
+++ openacs-4/packages/invoices/sql/postgresql/upgrade/upgrade-0.01d10-0.01d11.sql	13 Oct 2005 17:11:54 -0000	1.3
@@ -1,8 +1,15 @@
-alter table iv_price_lists add column credit_percent numeric(12,5) default 0;
-alter table iv_offers add column credit_percent numeric(12,5) default 0;
-alter table iv_offers add column status varchar(10) default 'new';
-alter table iv_invoices add column status varchar(10) default 'new';
+alter table iv_price_lists add column credit_percent numeric(12,5);
+alter table iv_price_lists alter column credit_percent set default 0;
 
+alter table iv_offers add column credit_percent numeric(12,5);
+alter table iv_offers alter column credit_percent set default 0;
+
+alter table iv_offers add column status varchar(10);
+alter table iv_offers alter column status set default 'new';
+
+alter table iv_invoices add column status varchar(10);
+alter table iv_invoices alter column status set default 'new';
+
 update iv_price_lists set credit_percent = 0;
 update iv_offers set status = 'new', credit_percent = 0;
 update iv_invoices set status = 'new';
Index: openacs-4/packages/invoices/www/invoice-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/invoice-add.adp	16 Aug 2005 20:04:34 -0000	1.1
+++ openacs-4/packages/invoices/www/invoice-add.adp	13 Oct 2005 17:11:55 -0000	1.2
@@ -2,6 +2,11 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/invoices/lib/projects-billable"
- organization_id="@organization_id@" row_list="@row_list@"
- orderby="@orderby@" format="@format@" page_size="@page_size@">
+<include src="/packages/invoices/lib/projects-billable-portlet"
+	organization_id="@organization_id@" 
+	elements="checkbox project_id title description amount_open count_total count_billed creation_date" 
+	package_id=""
+	base_url=""
+	format="@format@" 
+ 	orderby="@orderby@" 
+	page_size="@page_size@" />
Index: openacs-4/packages/invoices/www/invoice-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/invoice-add.tcl	16 Aug 2005 20:04:34 -0000	1.1
+++ openacs-4/packages/invoices/www/invoice-add.tcl	13 Oct 2005 17:11:55 -0000	1.2
@@ -18,6 +18,5 @@
 set page_title "[_ invoices.iv_invoice_Add]"
 set context [list [list "invoice-list" "[_ invoices.iv_invoice_2]"] $page_title]
 
-set row_list {checkbox {} project_id {} title {} description {} amount_open {} count_total {} count_billed {} creation_date {}}
 
 ad_return_template
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.1 -r1.2
--- openacs-4/packages/invoices/www/invoice-list.adp	16 Aug 2005 20:04:34 -0000	1.1
+++ openacs-4/packages/invoices/www/invoice-list.adp	13 Oct 2005 17:11:55 -0000	1.2
@@ -2,6 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/invoices/lib/invoice-list"
+<include src="/packages/invoices/lib/invoice-list-portlet"
  organization_id="@organization_id@" row_list="@row_list@"
  orderby="@orderby@" format="@format@" page_size="@page_size@">
Index: openacs-4/packages/invoices/www/invoice-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/invoice-reports.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/invoice-reports.adp	16 Sep 2005 14:27:32 -0000	1.3
+++ openacs-4/packages/invoices/www/invoice-reports.adp	13 Oct 2005 17:11:55 -0000	1.4
@@ -45,7 +45,8 @@
 </table>
 </center>
 
-<include src="@include_src@"
+<include src="/packages/invoices/lib/reports-portlet"
+    include_src="@include_src@"
     organization_id="@organization_id@" 
     format="@format@" 
     last_years="@last_years@"
Index: openacs-4/packages/invoices/www/offer-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/offer-list.adp	16 Aug 2005 20:04:34 -0000	1.1
+++ openacs-4/packages/invoices/www/offer-list.adp	13 Oct 2005 17:11:55 -0000	1.2
@@ -2,6 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/invoices/lib/offer-list"
+<include src="/packages/invoices/lib/offer-list-portlet"
  organization_id="@organization_id@" row_list="@row_list@"
  orderby="@orderby@" format="@format@" page_size="@page_size@">
Index: openacs-4/packages/invoices/www/price-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/price-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/price-list.adp	12 Oct 2005 13:25:34 -0000	1.3
+++ openacs-4/packages/invoices/www/price-list.adp	13 Oct 2005 17:11:55 -0000	1.4
@@ -8,4 +8,12 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<include src="/packages/invoices/lib/price-list" list_id="@list_id@">
+<table width="40%">
+<tr>
+   <td>
+	<include src="/packages/invoices/lib/price-list-portlet" 
+		list_id="@list_id@" 
+		page_title="@list_title;noquote@" />
+   </td>
+</tr>
+</table>
Index: openacs-4/packages/invoices/www/projects-billable.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/projects-billable.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/invoices/www/projects-billable.adp	15 Sep 2005 11:07:15 -0000	1.1
+++ openacs-4/packages/invoices/www/projects-billable.adp	13 Oct 2005 17:11:55 -0000	1.2
@@ -1,2 +1,15 @@
 <master>
-	<include src="/packages/invoices/lib/projects-billable" organization_id="@organization_id@" elements="checkbox project_id title amount_open" package_id="@iv_package_id@" base_url="@iv_base_url@" />
+<table width="50%">
+<tr>
+   <td>
+	<include src="/packages/invoices/lib/projects-billable-portlet" 
+		organization_id="@organization_id@" 
+		elements="checkbox project_id title amount_open" 
+		package_id="@iv_package_id@" 
+		base_url="@iv_base_url@"
+		format=""
+		orderby="" 
+	        page_size=""/>
+    </td>
+</tr>
+</table>
Index: openacs-4/packages/invoices/www/resources/invoices.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/resources/invoices.css,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/www/resources/invoices.css	13 Oct 2005 17:13:34 -0000	1.1
@@ -0,0 +1,115 @@
+/*------- For Portlets ----------*/
+
+td.highlighted {
+  background-color:#ddddff;
+}
+
+td.highlight {
+  background-color:#ffffdd;
+  border-bottom: 1px dotted #A0BDEB;
+}
+
+td.subheader {
+  background-color:#ffffdd;
+  border-top: 1px dotted #e6e6fa;
+  border-bottom: 1px dotted #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+}
+
+td.list-bg {
+  border-left: 1px solid #e6e6fa;
+}
+
+td.list-bottom-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-left: 1px solid #e6e6fa;
+}
+
+td.list-right-bg {
+  border-bottom: 1px solid #e6e6fa;
+  border-right: 1px solid #e6e6fa;
+}
+
+th.project {
+        background-color:#9999cc;
+}
+
+td.project-filter-pane {
+        background-color: #bbbbee;
+        vertical-align: top;
+}
+
+.shaded {
+        background-color: #dddddd;
+}
+
+.selected {
+        background-color: #eeccdd;
+}
+
+th { 
+     font-size: 9pt;
+     text-align: left;
+     background-color:dfdfff;
+}
+
+
+/* From logger */
+
+table.logger_navbar {
+  background-color: #41329c;
+  clear: both;
+}
+a.logger_navbar { 
+    color: white; 
+    text-decoration: none;
+}
+a.logger_navbar:visited { 
+  color: white; 
+}
+a.logger_navbar:hover { 
+    color: white; 
+    text-decoration: underline;
+}
+td.logger_navbar {
+  font-family: tahoma,verdana,arial,helvetica; 
+  font-size: 70%; 
+  font-weight: bold; 
+  color: #ccccff; 
+  text-decoration: none; 
+}
+
+td.fill-list-right {
+  border-bottom: 3px solid #A0BDEB;
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+}
+
+td.fill-list-right2 {
+  border-right: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+}
+
+td.fill-list-bottom {
+  border-bottom: 3px solid #A0BDEB;
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+}
+
+td.fill-list-middle {
+  border-left: 1px solid #A0BDEB;
+  background-color: #eaf2ff;
+}
+
+td.fill-list-bg {
+  background-color: #eaf2ff;
+}
+
+#search-block { 
+  border:1px solid #000; 
+  background-color: #EAF2FF;
+  padding:5px; 
+  width:70%;
+}
+
+/* ----------- End of Portlets -------*/