From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 2 Mar 2011 17:00:19 +0000 (-0500)
Subject: merge conflicts
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ec66c27e4d0b7ec9f2724ca80057e9df978a238f;p=evergreen%2Fequinox.git

merge conflicts
---

ec66c27e4d0b7ec9f2724ca80057e9df978a238f
diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
index fcc8a5b66a,45d3a07ee3..4e1218a64b
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
@@@ -1704,8 -1704,8 +1704,8 @@@ sub retrieve_copy 
  	    	    $cpid,
      		    { flesh		=> 2,
          		  flesh_fields	=> {
 -	        	  			acn	=> [qw/owning_lib record/],
 +	        	  			acn	=> [qw/owning_lib record prefix suffix/],
- 		        			acp	=> [qw/call_number location status circ_lib stat_cat_entries notes/],
+ 		        			acp	=> [qw/call_number location status circ_lib stat_cat_entries notes parts/],
      				}
  	    	    })
              ->gather(1))
@@@ -1747,9 -1747,9 +1747,9 @@@ sub retrieve_callnumber 
  	    	    $cnid,
      		    { flesh		=> 5,
          		  flesh_fields	=> {
 -	        	  			acn	=> [qw/owning_lib record copies uri_maps/],
 +	        	  			acn	=> [qw/owning_lib record copies uri_maps prefix suffix/],
  	        	  			auricnm	=> [qw/uri/],
- 		        			acp	=> [qw/location status circ_lib stat_cat_entries notes/],
+ 		        			acp	=> [qw/location status circ_lib stat_cat_entries notes parts/],
      				}
  	    	    })
              ->gather(1))
@@@ -1796,8 -1796,8 +1796,8 @@@ sub basic_record_holdings 
  		{ flesh		=> 5,
  		  flesh_fields	=> {
  					bre	=> [qw/call_numbers/],
 -		  			acn	=> [qw/copies owning_lib/],
 +		  			acn	=> [qw/copies owning_lib prefix suffix/],
- 					acp	=> [qw/location status circ_lib/],
+ 					acp	=> [qw/location status circ_lib parts/],
  				}
  		}
  	)->gather(1);
@@@ -1948,9 -1948,9 +1948,9 @@@ sub new_record_holdings 
          },
  		{ flesh		=> 5,
  		  flesh_fields	=> {
 -		  			acn	=> [qw/copies owning_lib uri_maps/],
 +		  			acn	=> [qw/copies owning_lib uri_maps prefix suffix/],
  		  			auricnm	=> [qw/uri/],
- 					acp	=> [qw/circ_lib location status stat_cat_entries notes/],
+ 					acp	=> [qw/circ_lib location status stat_cat_entries notes parts/],
  					asce	=> [qw/stat_cat/],
  				},
            ( $limit > -1 ? ( limit  => $limit  ) : () ),