From: phasefx Date: Fri, 9 Oct 2009 23:09:22 +0000 (+0000) Subject: When editing billing or payment notes, default with the existing notes. If batch... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f1c7722384f4c8e835caa45469bb1f0e5852004c;p=contrib%2FConifer.git When editing billing or payment notes, default with the existing notes. If batch editing, concatenate the existing notes. git-svn-id: svn://svn.open-ils.org/ILS/trunk@14343 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index 6c16da658b..2dc4f2d40c 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -13,11 +13,9 @@ staff.patron.barcode_entry.user_perm_display_error=spawning user perm editor staff.patron.bill_details.my_init.error=bill_details.xul, my_init: staff.patron.bill_details.handle_edit_bill_note.note_dialog.title=Replacement Note staff.patron.bill_details.handle_edit_bill_note.note_dialog.prompt=Enter new note: -staff.patron.bill_details.handle_edit_bill_note.note_dialog.default_value= staff.patron.bill_details.handle_edit_bill_note.failure=Note for selected bills not likely updated. staff.patron.bill_details.handle_edit_payment_note.note_dialog.title=Replacement Note staff.patron.bill_details.handle_edit_payment_note.note_dialog.prompt=Enter new note: -staff.patron.bill_details.handle_edit_payment_note.note_dialog.default_value= staff.patron.bill_details.handle_edit_payment_note.failure=Note for selected payments not likely updated. staff.patron.bill_details.handle_void.voided_billings.alert=All selected billings have already voided. staff.patron.bill_details.handle_void.confirm_void_billing=Are you sure you would like to void $%1$s worth of line-item billings? diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.js b/Open-ILS/xul/staff_client/server/patron/bill_details.js index 91e76f2930..92ed9ca5f8 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_details.js +++ b/Open-ILS/xul/staff_client/server/patron/bill_details.js @@ -249,7 +249,7 @@ function handle_edit_bill_note() { if (mb_list.length == 0) return; var new_note = window.prompt( $("patronStrings").getString('staff.patron.bill_details.handle_edit_bill_note.note_dialog.prompt'), - $("patronStrings").getString('staff.patron.bill_details.handle_edit_bill_note.note_dialog.default_value'), + util.functional.map_list(g.bill_list_selection, function(o){return g.mb_list[o].note();}).join(", "), $("patronStrings").getString('staff.patron.bill_details.handle_edit_bill_note.note_dialog.title') ); if (new_note) { @@ -274,7 +274,7 @@ function handle_edit_payment_note() { if (mp_list.length == 0) return; var new_note = window.prompt( $("patronStrings").getString('staff.patron.bill_details.handle_edit_payment_note.note_dialog.prompt'), - $("patronStrings").getString('staff.patron.bill_details.handle_edit_payment_note.note_dialog.default_value'), + util.functional.map_list(g.payment_list_selection, function(o){return g.mp_list[o].note();}).join(", "), $("patronStrings").getString('staff.patron.bill_details.handle_edit_payment_note.note_dialog.title') ); if (new_note) {