[open-ils-commits] r18376 - in branches/rel_2_0/Open-ILS/xul/staff_client: chrome/content/OpenILS server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-10-18 11:37:23 -0400 (Mon, 18 Oct 2010)
New Revision: 18376

Modified:
   branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
   branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/bill2.js
Log:
merge r18374-18375 from trunk for bill receipt fixes

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2010-10-18 15:35:50 UTC (rev 18375)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2010-10-18 15:37:23 UTC (rev 18376)
@@ -363,7 +363,7 @@
                 'bills_historical' : {
                     'type' : 'bills',
                     'header' : 'Welcome to %LIBRARY%!<br/>You had the following bills:<hr/><ol>',
-                    'line_item' : '<dt><b>Bill #%id%</b></dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
+                    'line_item' : '<dt><b>Bill #%mbts_id%</b> %title% </dt> <dd> <table> <tr valign="top"><td>Date:</td><td>%xact_start%</td></tr> <tr valign="top"><td>Type:</td><td>%xact_type%</td></tr> <tr valign="top"><td>Last Billing:</td><td>%last_billing_type%<br/>%last_billing_note%</td></tr> <tr valign="top"><td>Total Billed:</td><td>$%total_owed%</td></tr> <tr valign="top"><td>Last Payment:</td><td>%last_payment_type%<br/>%last_payment_note%</td></tr> <tr valign="top"><td>Total Paid:</td><td>$%total_paid%</td></tr> <tr valign="top"><td><b>Balance:</b></td><td><b>$%balance_owed%</b></td></tr> </table><br/>',
                     'footer' : '</ol><hr />%SHORTNAME% %TODAY_TRIM%<br/>\r\n<br/>\r\n'
                 }, 
                 'bills_current' : {

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/bill2.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/bill2.js	2010-10-18 15:35:50 UTC (rev 18375)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/bill2.js	2010-10-18 15:37:23 UTC (rev 18376)
@@ -809,8 +809,8 @@
                                 'payment' : o[1],
                                 'last_billing_type' : g.bill_map[ o[0] ].transaction.last_billing_type(),
                                 'last_billing_note' : g.bill_map[ o[0] ].transaction.last_billing_note(),
-                                'title' : typeof g.bill_map[ o[0] ].title != 'undefined' ? g.bill_map[ o[0] ].title : '', 
-                                'barcode' : typeof g.bill_map[ o[0] ].barcode != 'undefined' ? g.bill_map[ o[0] ].barcode : ''
+                                'title' : typeof g.bill_map[ o[0] ].record != 'undefined' ? g.bill_map[ o[0] ].record.title() : '', 
+                                'barcode' : typeof g.bill_map[ o[0] ].copy != 'undefined' ? g.bill_map[ o[0] ].copy.barcode() : ''
                             };
                         }
                     ),