Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
index 1cb3dce..75152ce 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm
@@ -197,8 +197,10 @@ sub calc_proximity {
                                actor.org_unit r;
        SQL
 
+       $self->method_lookup('open-ils.storage.transaction.begin')->run;
        actor::org_unit_proximity->db_Main->do($delete_sql);
        actor::org_unit_proximity->db_Main->do($insert_sql);
+       $self->method_lookup('open-ils.storage.transaction.commit')->run;
 
        return 1;
 }

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index a411b21..5c48282 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -1040,7 +1040,7 @@ sub import_record_asset_list_impl {
             $copy->barcode($item->barcode);
             $copy->location($item->location);
             $copy->circ_lib($item->circ_lib || $item->owning_lib);
-            $copy->status($item->status || OILS_COPY_STATUS_IN_PROCESS);
+            $copy->status( defined($item->status) ? $item->status : OILS_COPY_STATUS_IN_PROCESS );
             $copy->circulate($item->circulate);
             $copy->deposit($item->deposit);
             $copy->deposit_amount($item->deposit_amount);