fixing weird edge case of pushing out the due date after fines start to acrue

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@7695 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
index fc125dc..fb2afeb 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
@@ -528,7 +528,9 @@ sub generate_fines {
                                "\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'}
                        );
 

diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index ee034f3..e206c8e 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -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();"/>