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.15 -r1.16 --- openacs-4/packages/invoices/tcl/invoice-procs.tcl 4 Jan 2006 08:06:47 -0000 1.15 +++ openacs-4/packages/invoices/tcl/invoice-procs.tcl 25 Jan 2006 16:58:32 -0000 1.16 @@ -187,14 +187,15 @@ @returns list of invoice texts } { set package_id [ad_conn package_id] + set user_id [ad_conn user_id] # Get the invoice data db_1row get_data {} -column_array data set locale [lang::user::site_wide_locale -user_id $data(recipient_id)] set contact_locale [lang::user::site_wide_locale -user_id $data(contact_id)] set rec_locale $locale set data(creator_name) "$data(first_names) $data(last_name)" - set data(amount_diff) [format "%.2f" [expr $data(total_amount) - $data(amount_sum)]] + set data(amount_diff) [format "%.2f" [expr abs($data(total_amount) - $data(amount_sum))]] set amount_diff $data(amount_diff) set data(amount_diff) [lc_numeric $data(amount_diff) "" $locale] set data(final_amount) [lc_numeric [format "%.2f" [expr $data(total_amount)+$data(vat)]] "" $locale] @@ -208,9 +209,7 @@ set data(due_date) [lc_time_fmt $data(due_date) $time_format] set name [contact::name -party_id $data(recipient_id)] - set data(rep_first_names) [lindex $name 1] - set data(rep_last_name) [string trim [lindex $name 0] ,] - set data(recipient_name) "$data(rep_first_names) $data(rep_last_name)" + set data(recipient_name) $name set orga_revision_id [content::item::get_best_revision -item_id $data(organization_id)] set contact_client_id [ams::value -attribute_name "client_id" -object_id $orga_revision_id -locale $contact_locale] set rec_revision_id [content::item::get_best_revision -item_id $data(recipient_id)] @@ -287,11 +286,31 @@ set data(vat_percent) [lc_numeric [format "%.1f" $data(vat_percent)] "" $locale] # Get the account manager information for the organization. - set account_manager_id [contacts::util::get_account_manager -organization_id $data(organization_id)] - if {$account_manager_id ne ""} { - set am_name "[contact::name -party_id [lindex $account_manager_id 0]]" + set account_manager_ids [contacts::util::get_account_manager -organization_id $data(organization_id)] + if {$account_manager_ids ne ""} { + + # We do have one or more account manager. Now check if the current user is one of them + if {[lsearch $account_manager_ids $user_id] > -1} { + contact::employee::get -employee_id $user_id -array account_manager + set am_name "$account_manager(first_names) $account_manager(last_name)" + set data(am_name) $am_name + set data(am_directphoneno) [ad_html_to_text -no_format $account_manager(directphoneno)] + set am_directphoneno $data(am_directphoneno) + } else { + # Someone else is sending the offer. We need to mark this in the name + contact::employee::get -employee_id [lindex $account_manager_ids 0] -array account_manager + set account_manager_name "$account_manager(first_names) $account_manager(last_name)" + set data(am_name) $account_manager_name + set data(am_directphoneno) [ad_html_to_text -no_format $account_manager(directphoneno)] + set am_directphoneno $data(am_directphoneno) + set am_name "[_ contacts.pp] [contact::name -party_id $user_id]

$account_manager_name" + } } else { - set am_name "[contact::name -party_id [parameter::get_from_package_key -package_key contacts -parameter DefaultOrganizationID]]" + set default_orga_id [parameter::get_from_package_key -package_key contacts -parameter DefaultOrganizationID] + set am_name "[contact::name -party_id $default_orga_id]" + set am_directphoneno [ams::value -object_id [content::item::get_best_revision -item_id $default_orga_id] -attribute_name directphoneno] + set data(am_name) "[contact::name -party_id $user_id]" + set data(am_directphoneno) [ad_html_to_text -no_format $am_directphoneno] } # parse invoice email text 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 -r1.17 -r1.18 --- openacs-4/packages/invoices/tcl/offer-procs.tcl 8 Jan 2006 10:03:44 -0000 1.17 +++ openacs-4/packages/invoices/tcl/offer-procs.tcl 25 Jan 2006 16:58:32 -0000 1.18 @@ -222,11 +222,10 @@ } set document_type $type - set time_format "[lc_get -locale $locale d_fmt] [lc_get -locale $locale t_fmt]" - set data(finish_date) [lc_time_fmt $data(finish_date) $time_format] - set data(current_date) [lc_time_fmt $data(current_date) $time_format] - set data(creation_date) [lc_time_fmt $data(creation_date) $time_format] - set data(accepted_date) [lc_time_fmt $data(accepted_date) $time_format] + set data(finish_date) [lc_time_fmt $data(finish_date) "%x, %X"] + set data(current_date) [lc_time_fmt $data(current_date) "%x, %X"] + set data(creation_date) [lc_time_fmt $data(creation_date) "%x, %X"] + set data(accepted_date) [lc_time_fmt $data(accepted_date) "%x, %X"] if {$type == "offer"} { set data(accepted_date) $data(current_date) @@ -255,17 +254,26 @@ # We do have one or more account manager. Now check if the current user is one of them if {[lsearch $account_manager_ids $user_id] > -1} { - set am_name "[contact::name -party_id $user_id]" + contact::employee::get -employee_id $user_id -array account_manager + set am_name "$account_manager(first_names) $account_manager(last_name)" set data(am_name) $am_name + set data(am_directphoneno) [ad_html_to_text -no_format $account_manager(directphoneno)] + set am_directphoneno $data(am_directphoneno) } else { # Someone else is sending the offer. We need to mark this in the name - set account_manager_name [contact::name -party_id [lindex $account_manager_ids 0]] + contact::employee::get -employee_id [lindex $account_manager_ids 0] -array account_manager + set account_manager_name "$account_manager(first_names) $account_manager(last_name)" set data(am_name) $account_manager_name + set data(am_directphoneno) [ad_html_to_text -no_format $account_manager(directphoneno)] + set am_directphoneno $data(am_directphoneno) set am_name "[_ contacts.pp] [contact::name -party_id $user_id]

$account_manager_name" } } else { - set am_name "[contact::name -party_id [parameter::get_from_package_key -package_key contacts -parameter DefaultOrganizationID]]" + set default_orga_id [parameter::get_from_package_key -package_key contacts -parameter DefaultOrganizationID] + set am_name "[contact::name -party_id $default_orga_id]" + set am_directphoneno [ams::value -object_id [content::item::get_best_revision -item_id $default_orga_id] -attribute_name directphoneno] set data(am_name) "[contact::name -party_id $user_id]" + set data(am_directphoneno) [ad_html_to_text -no_format $am_directphoneno] } # parse offer email text Index: openacs-4/packages/invoices/tcl/offer-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/invoices/tcl/offer-procs.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/invoices/tcl/offer-procs.xql 27 Dec 2005 16:39:35 -0000 1.8 +++ openacs-4/packages/invoices/tcl/offer-procs.xql 25 Jan 2006 16:58:32 -0000 1.9 @@ -68,6 +68,7 @@ to_char(t.finish_date, 'YYYY-MM-DD HH24:MI:SS') as finish_date, o.creation_user, p.first_names, p.last_name, t.credit_percent, to_char(o.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date, + to_char(now(), 'YYYY-MM-DD HH24:MI:SS') as current_date, to_char(t.accepted_date, 'YYYY-MM-DD HH24:MI:SS') as accepted_date, t.amount_sum, t.payment_days, t.date_comment, t.currency, t.organization_id, pr.title as project_title, ci.item_id as offer_id, @@ -101,7 +102,7 @@ and r.revision_id = ofi.offer_item_id and oi.item_id = :offer_id and m.object_id = ofi.offer_item_id - order by ofi.sort_order + order by ofi.item_nr @@ -120,7 +121,7 @@ and r.revision_id = ofi.offer_item_id and oi.item_id = :offer_id and m.object_id = ofi.offer_item_id - order by ofi.sort_order + order by ofi.item_nr