Index: openacs-4/packages/invoices/www/offer-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/invoices/www/offer-ae.tcl	26 Oct 2005 12:00:38 -0000	1.5
+++ openacs-4/packages/invoices/www/offer-ae.tcl	26 Oct 2005 12:53:45 -0000	1.6
@@ -54,7 +54,13 @@
 if {![info exists offer_id] || $__new_p} {
     set page_title "[_ invoices.iv_offer_Add2]"
     set _offer_id 0
-    set currency [iv::price_list::get_currency -organization_id $organization_id]
+    set list_id [iv::price_list::get_list_id -organization_id $organization_id]
+    if {[empty_string_p $list_id]} {
+	set currency [parameter::get -parameter "DefaultCurrency" -default "EUR" -package_id $package_id]
+	set _credit_percent 0
+    } else {
+	db_1row get_currency_and_credit_percent {}
+    }
 } else {
     db_1row get_organization_and_currencies {}
     set cur_vat_percent [format "%.1f" $cur_vat_percent]
@@ -190,7 +196,7 @@
     # we are adding/editing data
     ad_form -extend -name iv_offer_form -form {
 	{vat_percent:float {label "[_ invoices.iv_offer_vat_percent]"} {html {size 5 maxlength 10}} {help_text "[_ invoices.iv_offer_vat_percent_help]"} {after_html {%}}}
-	{hidden_sum:text(hidden) {value 0}
+	{hidden_sum:text(hidden) {value 0}}
     }
 
     if {![empty_string_p $_credit_percent] && $_credit_percent > 0} {
@@ -200,8 +206,8 @@
 	}
     } else {
 	ad_form -extend -name iv_offer_form -form {
-	    {credit_percent:text(hidden) {value 0}
-	    {credit_sum:text(hidden) {value 0}
+	    {credit_percent:text(hidden) {value 0}}
+	    {credit_sum:text(hidden) {value 0}}
 	}
     }
 
Index: openacs-4/packages/invoices/www/offer-ae.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/www/offer-ae.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/invoices/www/offer-ae.xql	26 Oct 2005 12:00:38 -0000	1.3
+++ openacs-4/packages/invoices/www/offer-ae.xql	26 Oct 2005 12:53:45 -0000	1.4
@@ -1,6 +1,17 @@
 <?xml version="1.0"?>
 <queryset>
 
+<fullquery name="get_currency_and_credit_percent">
+      <querytext>
+      
+	select l.currency, l.credit_percent as _credit_percent
+	from iv_price_lists l, cr_items li
+	where l.list_id = li.latest_revision
+	and li.item_id = :list_id
+	
+      </querytext>
+</fullquery>
+
 <fullquery name="get_organization_and_currencies">
       <querytext>