Attachment #110746 for bug #21979

View | Details | Raw Unified | Return to bug 21979
Collapse All | Expand All

Lines 89-94 sub new { Link Here

(-)a/C4/SIP/ILS/Item.pm (+4 lines)
89	$self->{permanent_location} = $item->homebranch;	89	$self->{permanent_location} = $item->homebranch;
90	$self->{collection_code} = $item->ccode;	90	$self->{collection_code} = $item->ccode;
91	$self->{call_number} = $item->itemcallnumber;	91	$self->{call_number} = $item->itemcallnumber;
		92	$self->{'shelving_location'} = $item->location;
		93	$self->{'permanent_shelving_location'} = $item->permanent_location;
92		94
93	$self->{object} = $item;	95	$self->{object} = $item;
94		96
Lines 135-140 my %fields = ( Link Here
135	barcode => 0,	137	barcode => 0,
136	onloan => 0,	138	onloan => 0,
137	collection_code => 0,	139	collection_code => 0,
		140	shelving_location => 0,
		141	permanent_shelving_location => 0,
138	call_number => 0,	142	call_number => 0,
139	enumchron => 0,	143	enumchron => 0,
140	location => 0,	144	location => 0,

Lines 691-703 sub handle_checkin { Link Here

(-)a/C4/SIP/Sip/MsgType.pm (-7 / +18 lines)
691	$resp .= add_field( FID_PATRON_ID, $patron->id, $server );	691	$resp .= add_field( FID_PATRON_ID, $patron->id, $server );
692	}	692	}
693	if ($item) {	693	if ($item) {
694	$resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server );	694	$resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server );
695	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );	695	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
696	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );	696	$resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server );
697	$resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server );	697	$resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server );
698	$resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server );	698	$resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc \|\| $server->{account}->{ct_always_send} );
699	$resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc \|\| $server->{account}->{ct_always_send} );	699	$resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server );
700	$resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server );	700
		701	if ( my $CR = $server->{account}->{cr_item_field} ) {
		702	$resp .= maybe_add( FID_COLLECTION_CODE, $item->{$CR}, $server );
		703	} else {
		704	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );
		705	}
701		706
702	if ( $status->hold and $status->hold->{branchcode} ne $item->destination_loc ) {	707	if ( $status->hold and $status->hold->{branchcode} ne $item->destination_loc ) {
703	warn 'SIP hold mismatch: $status->hold->{branchcode}=' . $status->hold->{branchcode} . '; $item->destination_loc=' . $item->destination_loc;	708	warn 'SIP hold mismatch: $status->hold->{branchcode}=' . $status->hold->{branchcode} . '; $item->destination_loc=' . $item->destination_loc;
Lines 1214-1219 sub handle_item_information { Link Here
1214	$resp .= maybe_add( FID_CURRENT_LOCN, $item->current_location, $server );	1219	$resp .= maybe_add( FID_CURRENT_LOCN, $item->current_location, $server );
1215	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );	1220	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1216		1221
		1222	if ( my $CR = $server->{account}->{cr_item_field} ) {
		1223	$resp .= maybe_add( FID_COLLECTION_CODE, $item->$CR, $server );
		1224	} else {
		1225	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );
		1226	}
		1227
1217	if ( ( $i = $item->fee ) != 0 ) {	1228	if ( ( $i = $item->fee ) != 0 ) {
1218	$resp .= add_field( FID_CURRENCY, $item->fee_currency, $server );	1229	$resp .= add_field( FID_CURRENCY, $item->fee_currency, $server );
1219	$resp .= add_field( FID_FEE_AMT, $i, $server );	1230	$resp .= add_field( FID_FEE_AMT, $i, $server );

Lines 55-60 Link Here

(-)a/etc/SIPconfig.xml (-1 / +1 lines)
55	ct_always_send="1"	55	ct_always_send="1"
56	cv_triggers_alert="1"	56	cv_triggers_alert="1"
57	allow_empty_passwords="1"	57	allow_empty_passwords="1"
		58	cr_item_field="shelving_location"
58	ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"	59	ae_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
59	da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"	60	da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
60	av_field_template="[% accountline.description %] [% accountline.amountoutstanding \| format('%.2f') %]"	61	av_field_template="[% accountline.description %] [% accountline.amountoutstanding \| format('%.2f') %]"
61	-

Return to bug 21979