[open-ils-commits] r7695 - in branches/rel_1_2/Open-ILS: src/perlmods/OpenILS/Application/Storage/Publisher xul/staff_client/chrome/content/cat

[svn at svn.open-ils.org]

Author: miker
Date: 2007-08-16 17:04:34 -0400 (Thu, 16 Aug 2007)
New Revision: 7695

Modified:
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
   branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
Log:
fixing weird edge case of pushing out the due date after fines start to acrue

Modified: branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2007-08-16 20:58:30 UTC (rev 7694)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2007-08-16 21:04:34 UTC (rev 7695)
@@ -528,7 +528,9 @@
 				"\tItem was due on or before: ".localtime($due)."\n");
 	
 			my @fines = money::billing->search_where(
-				{ xact => $c->id, billing_type => 'Overdue materials' },
+				{ xact => $c->id,
+				  billing_type => 'Overdue materials',
+				  billing_ts => { '>' => $c->due_date } },
 				{ order_by => 'billing_ts DESC'}
 			);
 

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul	2007-08-16 20:58:30 UTC (rev 7694)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul	2007-08-16 21:04:34 UTC (rev 7695)
@@ -60,6 +60,9 @@
 
 				set_opac();
 
+				g.data.actions_for_record_popup = $('actions_for_record_popup');
+				g.data.stash('actions_for_record_popup');
+
 			} catch(E) {
 				var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
 					"system administrator or software developer the following:\ncat/opac.xul\n" + E + '\n';
@@ -320,7 +323,7 @@
 			<spacer flex="1"/>
 			<menubar>
 				<menu label="Actions for this Record" accesskey="A">
-				<menupopup>
+				<menupopup id="actions_for_record_popup">
 				<menuitem label="OPAC View" accesskey="O" id="opac_view" oncommand="set_opac();"/>
 				<menuitem label="MARC View" accesskey="V" id="marc_view" oncommand="set_marc_view();"/>
 				<menuitem label="MARC Edit" accesskey="E" id="marc_edit" oncommand="set_marc_edit();"/>