Index: openacs-4/packages/invoices/invoices.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/invoices.info,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/invoices/invoices.info	10 Aug 2006 07:34:59 -0000	1.30
+++ openacs-4/packages/invoices/invoices.info	24 Aug 2006 09:18:13 -0000	1.31
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.0a5" url="http://openacs.org/repository/download/apm/invoices-1.0a5.apm">
+    <version name="1.0a6" url="http://openacs.org/repository/download/apm/invoices-1.0a6.apm">
         <owner url="mailto:timo@timohentschel.de">Timo Hentschel</owner>
         <summary>Invoices package that will collect costs to invoice items in invoices and store data about received payment.</summary>
         <release-date>2005-11-15</release-date>
         <vendor url="http://www.cognovis.de">Cognovis</vendor>
         <description format="text/plain">Collect costs to invoice items and invoices, store payment information.</description>
         <maturity>0</maturity>
 
-        <provides url="invoices" version="1.0a5"/>
+        <provides url="invoices" version="1.0a6"/>
         <requires url="acs-content-repository" version="5.1.4d3"/>
         <requires url="acs-kernel" version="5.0d13"/>
         <requires url="acs-templating" version="5.1.5d1"/>
Index: openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml,v
diff -u -r1.42 -r1.43
--- openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	10 Aug 2006 07:34:59 -0000	1.42
+++ openacs-4/packages/invoices/catalog/invoices.de_DE.ISO-8859-1.xml	24 Aug 2006 09:18:14 -0000	1.43
@@ -144,7 +144,6 @@
   <msg key="iv_invoice_cancel_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Stornorechnung&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;anbei finden Sie die Stornorechnung %data.invoice_nr%.&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_cancel_email_subject">Stornorechnung # %invoice_nr%</msg>
   <msg key="iv_invoice_cancellation">Storno durch</msg>
-  <msg key="iv_invoice_cancelled_help">Storniert</msg>
   <msg key="iv_invoice_cancelled_invoice">Storno f�r</msg>
   <msg key="iv_invoice_closed_date">beendet am</msg>
   <msg key="iv_invoice_contact">Kundenkontakt</msg>
@@ -155,15 +154,13 @@
   <msg key="iv_invoice_creation_date">erstellt am</msg>
   <msg key="iv_invoice_creation_date_help">Datum an dem die Rechnung angelegt wurde</msg>
   <msg key="iv_invoice_creation_user">erstellt von</msg>
-  <msg key="iv_invoice_creation_user_help">Ersteller der Rechnung</msg>
   <msg key="iv_invoice_credit_1">Gutschrift</msg>
   <msg key="iv_invoice_credit_Add">Gutschrift erstellen</msg>
   <msg key="iv_invoice_credit_email">&lt;html&gt;&lt;body&gt;&lt;h3&gt;Gutschrift&lt;/h3&gt;%data.contact_salutation%,&lt;p&gt;anbei finden Sie die Rechnungsgutschrift %data.invoice_nr%.&lt;p&gt;Mit freundlichen Gr&amp;uuml;&amp;szlig;en&lt;br&gt;WIENERS + WIENERS GmbH&lt;br&gt;&lt;/html&gt;&lt;/body&gt;</msg>
   <msg key="iv_invoice_credit_email_subject">Gutschrift # %invoice_nr%</msg>
   <msg key="iv_invoice_credit_New">Neue Gutschrift</msg>
   <msg key="iv_invoice_credit_New2">Neue Gutschrift erstellen</msg>
   <msg key="iv_invoice_currency">W�hrung</msg>
-  <msg key="iv_invoice_currency_help">W�hrung der Rechnung</msg>
   <msg key="iv_invoice_Delete">Rechnung l�schen</msg>
   <msg key="iv_invoice_Description">Beschreibung</msg>
   <msg key="iv_invoice_Description_help">Beschreibung auf der Rechnung</msg>
@@ -297,7 +294,6 @@
   <msg key="iv_offer_file_delete_help">Zum L�schen von Dateien die entsprechende Checkbox markieren.</msg>
   <msg key="iv_offer_file_help">Dateien zur internen Verwendung - diese werden nicht mit dem Angebot verschickt!</msg>
   <msg key="iv_offer_file_view">Dateien</msg>
-  <msg key="iv_offer_file_view_help">Angebotsdatei ansehen</msg>
   <msg key="iv_offer_finish_date">Lieferdatum</msg>
   <msg key="iv_offer_finish_date_help">Abgabetermin, zu dem das Projekt an den Kunden ausgeliefert werden muss</msg>
   <msg key="iv_offer_finish_time">Timing Uhrzeit</msg>
@@ -417,7 +413,6 @@
   <msg key="last_years">Letztes Jahr</msg>
   <msg key="Link_instances">Anwendungen verlinken</msg>
   <msg key="lt_empty_offer_id">In der URL ist leider die Angebotsnummer nicht enthalten. M�glicherweise hat Ihr E-Mail-Programm beim Anklicken des Links nicht die gesamte URL �bergeben - einige E-Mail-Programme umbrechen die URLs, dann geht beim Klick auf den Link die zweite Zeile verloren. In diesem Fall bitte den zweiten Teil der URL einfach kopieren und im Browser an den ersten Teil anh�ngen. Vielen Dank!</msg>
-  <msg key="lt_no_org_for_invoice">Leider konnten wir keine Organisation als Rechnungsempf�nger finden. Bitte stellen Sie sicher, das der Rechnungsempf�nger als Angestellter einer Firma im System hinterlegt ist (�ber eine employment_relationship)</msg>
   <msg key="lt_no_such_invoice_no">Leider k�nnen wir die von Ihnen angeforderte Rechnungsnummer nicht in unserem System finden. Bitte �berpr�fen Sie ob die Nummer richtig ist.</msg>
   <msg key="Mapped">Verbunden</msg>
   <msg key="mass_invoice_email_body">Die Stapelverarbeitung der Rechungen ist abschlossen. &lt;p&gt; %failed_projects_html%</msg>
@@ -431,7 +426,6 @@
   <msg key="New">Neu</msg>
   <msg key="New_clients">Neue Kunden</msg>
   <msg key="no">Nein</msg>
-  <msg key="no_organization_for_invoice">Keine Organisation f�r die Rechnung gefunden.</msg>
   <msg key="no_such_invoice_no">Unbekannte Rechnungsnummer</msg>
   <msg key="None">Keine</msg>
   <msg key="Number_of_units">Anzahl Stunden</msg>
@@ -470,6 +464,7 @@
   <msg key="Recipient">Empf�nger</msg>
   <msg key="report_customer_type">Kundentyp</msg>
   <msg key="report_new_customer">Neukunden</msg>
+  <msg key="Report_Projects">Report der Projekte</msg>
   <msg key="show_all_offer_projects">Alle Projekte</msg>
   <msg key="show_all_offers">Alle Angebote</msg>
   <msg key="show_all_offers2">Zeige alle Angebote</msg>
Index: openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	10 Aug 2006 07:34:59 -0000	1.44
+++ openacs-4/packages/invoices/catalog/invoices.en_US.ISO-8859-1.xml	24 Aug 2006 09:18:14 -0000	1.45
@@ -414,7 +414,6 @@
   <msg key="last_years">Last Years</msg>
   <msg key="Link_instances">Link package instances</msg>
   <msg key="lt_empty_offer_id">Sorry, the offer_id cannot be found on the URL. It is possible that when you left clicked, your email program did not transfer the whole URL - some email programs break up the URLs, which means the second part is lost when you left click. If this is the case, please just copy the second part of the URL and attach it to the first part in the browser. Thank you!</msg>
-  <msg key="lt_no_org_for_invoice">Sadly we were not able to find an organization where to send the invoice to. Please make sure that the invoice recipient is working at an organization and has an employment_relationship.</msg>
   <msg key="lt_no_such_invoice_no">We are sorry but the invoice number you are searching for does not exist in our system.</msg>
   <msg key="Mapped">Mapped</msg>
   <msg key="mass_invoice_email_body">The mass generation of invoices is finished.&lt;p&gt; %failed_projects_html%</msg>
@@ -428,7 +427,6 @@
   <msg key="New">New</msg>
   <msg key="New_clients">New Clients</msg>
   <msg key="no">No</msg>
-  <msg key="no_organization_for_invoice">No organization for invoice found</msg>
   <msg key="no_such_invoice_no">No such invoice number</msg>
   <msg key="None">None</msg>
   <msg key="Number_of_units">Number of units</msg>
@@ -467,6 +465,7 @@
   <msg key="Recipient">Recipient</msg>
   <msg key="report_customer_type">Customer type</msg>
   <msg key="report_new_customer">New customer</msg>
+  <msg key="Report_Projects">Report of projects</msg>
   <msg key="show_all_offer_projects">All projects</msg>
   <msg key="show_all_offers">All Offers</msg>
   <msg key="show_all_offers2">Show all offers</msg>
Index: openacs-4/packages/invoices/lib/report-projects-offers.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/report-projects-offers.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/report-projects-offers.adp	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,2 @@
+<listfilters name="report" style="select-menu"></listfilters> 
+<listtemplate name="report"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/invoices/lib/report-projects-offers.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/report-projects-offers.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/report-projects-offers.tcl	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,94 @@
+# author Nils Lohse (nils.lohse@cognovis.de)
+# creation-date 2006-08-21
+# creation-date 2006-08-22
+
+
+# if { [exists_and_not_null orderby] }
+
+set today [clock format [clock seconds] -format "%Y-%m-%d"]
+
+if { [exists_and_not_null start_date] } {
+    if {[string equal $start_date "YYYY-MM-DD"]} {
+	set date_range_start $today
+    } else {
+	set date_range_start $start_date
+    }
+} else {
+    set date_range_start $today
+}
+
+if { [exists_and_not_null end_date] } {
+    if {[string equal $end_date "YYYY-MM-DD"]} {
+	#set date_range_end $today
+	unset -nocomplain date_range_end
+    } else {
+	set date_range_end $end_date
+    }
+} else {
+    #set date_range_end $today
+}
+
+set date_range_clause ""
+
+if { [exists_and_not_null date_range_start] } {
+    set date_range 1
+    catch { set date_range_start [lc_time_fmt $date_range_start %y-%m-%d] } errMsg
+    append date_range_clause " and to_char(p.latest_finish_date,'yy-mm-dd') >= :date_range_start"
+}
+
+if { [exists_and_not_null date_range_end] } {
+    set date_range 1
+    catch { set date_range_end [lc_time_fmt $date_range_end %y-%m-%d] } errMsg
+    append date_range_clause " and to_char(p.latest_finish_date,'yy-mm-dd') <= :date_range_end"
+}
+
+template::list::create \
+    -name report \
+    -multirow report \
+    -elements {
+	title {
+	    label {[_ invoices.iv_offer_project]}
+	    csv_col title
+	}
+        customer_name {
+            label {[_ invoices.Customer]}
+	    csv_col customer_name
+        }
+	prj_sum {
+	    label {[_ invoices.Amount_total]}
+	    csv_col prj_sum
+	}
+    } -formats {
+	normal {
+            label "[_ logger.Table]"
+            layout table
+        }
+        csv {
+            label "[_ logger.CSV]"
+            output csv
+            page_size 0
+        }
+    } -filters {
+	start_date {}
+	end_date {}
+    }
+
+db_multirow -extend {prj_sum customer_url} report main_projects {} {
+    # was copy&paste (2006/08/22) set customer_url "${contacts_url}$customer_id"
+    set allsubs [pm::project::get_all_subprojects -project_item_id $item_id]
+    set prj_sum $allsubs
+    set prj_and_subs [linsert $allsubs 0 $item_id]
+    set total_sum 0
+    foreach project_item_id $prj_and_subs { 
+	db_foreach get_project_amount_values {} {
+	    set total_sum [expr $total_sum + $amount_total]
+	}
+    }
+    set prj_sum [lc_numeric $total_sum]
+}
+
+# This spits out the CSV if we happen to be in CSV layout
+if {$format eq "csv"} {
+    template::list::write_csv -name report
+    ad_script_abort
+}
Index: openacs-4/packages/invoices/lib/report-projects-offers.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/lib/report-projects-offers.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/lib/report-projects-offers.xql	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="main_projects">
+    <querytext>
+	select 
+		p.project_id,
+		i.item_id,
+		cr.title,
+		p.latest_finish_date,
+		p.customer_id,
+		org.name as customer_name
+	from
+		pm_projects p, cr_revisions cr, cr_items i, cr_items i2, organizations org
+	where 
+		p.project_id = i.latest_revision
+		and p.project_id = cr.revision_id
+		$date_range_clause
+		and i.parent_id = i2.item_id
+		and i2.content_type = 'content_folder'
+		and p.customer_id = org.organization_id
+	order by
+		latest_finish_date
+    </querytext>
+</fullquery>
+
+<fullquery name="get_project_amount_values">
+    <querytext>
+        select  
+		amount_total
+        from
+                iv_offers o,
+          	cr_items i,
+		acs_data_links r,
+		cr_items i2
+                
+        where
+                o.offer_id = i.latest_revision
+		and r.object_id_one = i.item_id
+		and r.object_id_two = i2.item_id
+		and i2.item_id = :project_item_id
+    </querytext>
+</fullquery>         
+
+</queryset>
Index: openacs-4/packages/invoices/tcl/invoice-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/invoice-procs.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/invoices/tcl/invoice-procs.tcl	11 Aug 2006 19:37:52 -0000	1.25
+++ openacs-4/packages/invoices/tcl/invoice-procs.tcl	24 Aug 2006 09:18:14 -0000	1.26
@@ -302,7 +302,7 @@
 	if {$price_per_unit > 1} {
 	    set item_units [expr $item_units * (1. + ($credit_percent / 100.))]
 	} else {
-	    set item_units [format "%.1f" $item_units]
+	    set item_units $item_units
 	}
 	set amount_sum [format "%.2f" [expr $multiplier * $item_units * $price_per_unit]]
 	set amount_total [format "%.2f" [expr (1. - ($rebate / 100.)) * $amount_sum]]
Index: openacs-4/packages/invoices/www/#index.adp#
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/Attic/#index.adp#,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/www/#index.adp#	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,28 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<if @admin_p@ true>
+  <a href="admin/">#invoices.admin#</a>
+  <p>
+</if>
+
+<ul>
+<if @admin_p@ true>
+  <li><a href="price-list-list">#invoices.Price_Lists#</a></li>
+  <li><a href="offer-list">#invoices.Offers#</a></li>
+  <li><a href="invoice-list">#invoices.Invoices#</a></li>
+  <li><a href="projects-billable">#invoices.Billable_Projects#</a></li>
+
+  <li><a href="invoice-items">#invoices.Invoices_items#</a></li>
+  <li><a href="offer-items">#invoices.Offers_items#</a></li>
+<!--  <li><a href="offer-items-reports">#invoices.Offer_Items_Reports#</a></li>
+  <li><a href="invoice-items-reports">#invoices.Invoice_Items_Reports#</a></li> -->
+  <li><a href="offer-first-reports">#invoices.First_Order_Reports#</a></li>
+</if>
+<li><a href="invoice-customer-reports">#invoices.Customer_Invoices_Reports#</a></li>
+<li><a href="offer-projects-reports">#invoices.Report_Projects#</a></li>
+<if @admin_p@ true>
+  <li><a href="@fs_folder_url@">#invoices.iv_journal#</a></li>
+</if>
+</ul>
Index: openacs-4/packages/invoices/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/invoices/www/index.adp	3 Jun 2006 18:26:48 -0000	1.9
+++ openacs-4/packages/invoices/www/index.adp	24 Aug 2006 09:18:14 -0000	1.10
@@ -20,6 +20,7 @@
   <li><a href="offer-first-reports">#invoices.First_Order_Reports#</a></li>
 </if>
 <li><a href="invoice-customer-reports">#invoices.Customer_Invoices_Reports#</a></li>
+<li><a href="offer-projects-reports">#invoices.Report_Projects#</a></li>
 <if @admin_p@ true>
   <li><a href="@fs_folder_url@">#invoices.iv_journal#</a></li>
 </if>
Index: openacs-4/packages/invoices/www/offer-projects-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-projects-reports.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/www/offer-projects-reports.adp	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,33 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+
+<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="/packages/invoices/lib/report-projects-offers"
+	portlet_title="@page_title@"
+	base_url="@base_url@"
+	start_date="@start_date@"
+	end_date="@end_date@"
+        orderby="@orderby@"
+	format="@format@"
+/>
Index: openacs-4/packages/invoices/www/offer-projects-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-projects-reports.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/invoices/www/offer-projects-reports.tcl	24 Aug 2006 09:18:14 -0000	1.1
@@ -0,0 +1,27 @@
+ad_page_contract {
+    Generates reports about the projects
+
+    @author Nils Lohse (nils.lohse@cognovis.de)
+    @creation-date 2006-08-21
+    @creation-date 2006-08-22
+} {
+    {start_date "YYYY-MM-DD"}
+    {end_date "YYYY-MM-DD"}
+    {orderby ""}
+    {format "normal"}
+}
+
+set page_title "[_ invoices.Report_Projects]"
+set context [list $page_title]
+
+set base_url [ad_conn url]
+set current_url [ad_conn url]
+set clear_link [export_vars -base $current_url {page orderby organization_id}]
+set export_vars [export_vars -form {page orderby organization_id}]
+
+set clear_p 1
+if {$start_date == "YYYY-MM-DD" && $end_date == "YYYY-MM-DD"} {
+    set clear_p 0
+}
+
+ad_return_template