backport changeset 13280 and 13289 for hold list Available On columns

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

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 3eb8e69..0932087 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1330,7 +1330,7 @@ circ.util.hold_columns = function(modify,params) {
                                if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
                                        return my.ahr.transit().dest_recv_time().toString();
                                }
-                               if (my.ahr.capture_time()) {
+                               if (!my.ahr.transit() && my.ahr.capture_time()) {
                                        return my.ahr.capture_time().toString();
                                }
                                return "";
@@ -1347,7 +1347,7 @@ circ.util.hold_columns = function(modify,params) {
                                if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
                                        return my.ahr.transit().dest_recv_time().toString().substr(0,10);
                                }
-                               if (my.ahr.capture_time()) {
+                               if (!my.ahr.transit() && my.ahr.capture_time()) {
                                        return my.ahr.capture_time().toString().substr(0,10);
                                }
                                return "";