Index: openacs-4/packages/invoices/tcl/offer-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/offer-procs.tcl,v diff -u -N -r1.26 -r1.27 --- openacs-4/packages/invoices/tcl/offer-procs.tcl 11 Aug 2006 18:06:28 -0000 1.26 +++ openacs-4/packages/invoices/tcl/offer-procs.tcl 11 Aug 2006 19:37:52 -0000 1.27 @@ -37,8 +37,8 @@ set folder_id [content::folder::get_folder_from_package -package_id $package_id] # Always set the sequence outside the transaction - set item_id [db_nextval t_acs_object_id_seq] - set revision_id [db_nextval t_acs_object_id_seq] + set item_id [db_string acs "select nextval('t_acs_object_id_seq') from dual"] + set revision_id [db_string acs "select nextval('t_acs_object_id_seq') from dual"] db_transaction { if {[empty_string_p $name]} { set name "iv_offer_$item_id" @@ -113,7 +113,7 @@ set status new } set old_rev_id [content::item::get_best_revision -item_id $offer_id] - set new_rev_id [db_nextval t_acs_object_id_seq] + set new_rev_id [db_string acs "select nextval('t_acs_object_id_seq') from dual"] if {[catch {content::revision::new \ -item_id $offer_id \ -revision_id $new_rev_id \ @@ -137,7 +137,7 @@ [list vat $vat] \ [list credit_percent $credit_percent] ]} ] } { - set new_rev_id [db_nextval t_acs_object_id_seq] + set new_rev_id [db_string acs "select nextval('t_acs_object_id_seq') from dual"] set new_rev_id [content::revision::new \ -item_id $offer_id \ -revision_id $new_rev_id \ @@ -271,6 +271,13 @@ set data(credit_percent) 0 } + # Deutsche AGB f�r Deutschsprachige Kontakte + if {[string range $locale 0 1] eq "de"} { + set agb_link "http://www.wienersundwieners.de/pdf/WIENERS+WIENERS_AGB.pdf" + } else { + set agb_link "http://www.wienersundwieners.de/pdf/WIENERS+WIENERS_General_Terms_and_Conditions.pdf" + } + # offer contact data contact::employee::get -employee_id $data(contact_id) -array contact_data foreach attribute {name company_name_ext address town_line country country_code salutation salutation_letter} {