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 -N -r1.9 -r1.10 --- openacs-4/packages/invoices/lib/projects-billable.tcl 17 Nov 2005 16:22:24 -0000 1.9 +++ openacs-4/packages/invoices/lib/projects-billable.tcl 2 Dec 2005 14:27:37 -0000 1.10 @@ -131,7 +131,7 @@ default_direction asc } description { - label {[_ invoices.iv_invoice_project_descr}] + label {[_ invoices.iv_invoice_project_descr]} orderby_desc {lower(r.description) desc, r.item_id} orderby_asc {lower(r.description) asc, r.item_id} default_direction asc Index: openacs-4/packages/invoices/sql/postgresql/invoices-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/sql/postgresql/invoices-create.sql,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/invoices/sql/postgresql/invoices-create.sql 26 Oct 2005 12:00:37 -0000 1.5 +++ openacs-4/packages/invoices/sql/postgresql/invoices-create.sql 2 Dec 2005 14:27:38 -0000 1.6 @@ -321,8 +321,8 @@ end; -insert into contact_message_types (message_type,pretty_name) values ('offer','#invoices.template_offer#'); -insert into contact_message_types (message_type,pretty_name) values ('offer_accepted','#invoices.template_offer_accepted#'); -insert into contact_message_types (message_type,pretty_name) values ('invoice','#invoices.template_invoice#'); -insert into contact_message_types (message_type,pretty_name) values ('invoice_cancel','#invoices.template_invoice_cancel#'); -insert into contact_message_types (message_type,pretty_name) values ('invoice_credit','#invoices.template_invoice_credit#'); +-- insert into contact_message_types (message_type,pretty_name) values ('offer','#invoices.template_offer#'); +-- insert into contact_message_types (message_type,pretty_name) values ('offer_accepted','#invoices.template_offer_accepted#'); +-- insert into contact_message_types (message_type,pretty_name) values ('invoice','#invoices.template_invoice#'); +-- insert into contact_message_types (message_type,pretty_name) values ('invoice_cancel','#invoices.template_invoice_cancel#'); +-- insert into contact_message_types (message_type,pretty_name) values ('invoice_credit','#invoices.template_invoice_credit#'); Index: openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl 26 Oct 2005 12:00:37 -0000 1.7 +++ openacs-4/packages/invoices/tcl/invoices-callback-procs.tcl 2 Dec 2005 14:27:38 -0000 1.8 @@ -325,7 +325,7 @@ and p.customer_id = :organization_id }] - if {[lsearch $group_ids $group_id] >-1 && $!already_offer_p} { + if {[lsearch $group_ids $group_id] >-1 && !$already_offer_p} { # Create the new project and credit offer foreach package_id [apm_package_id_from_key invoices] { iv::offer::new_credit -organization_id $organization_id -package_id $package_id