Attachment #98066 for bug #21979

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

Lines 82-91 sub new { Link Here

(-)a/C4/SIP/ILS/Item.pm (-4 / +8 lines)
82	return;	82	return;
83	}	83	}
84	my $self = $item->unblessed;	84	my $self = $item->unblessed;
85	$self->{ 'id' } = $item->barcode; # to SIP, the barcode IS the id.	85	$self->{'id'} = $item->barcode; # to SIP, the barcode IS the id.
86	$self->{permanent_location}= $item->homebranch;	86	$self->{permanent_location} = $item->homebranch;
87	$self->{'collection_code'} = $item->ccode;	87	$self->{'collection_code'} = $item->ccode;
88	$self->{ 'call_number' } = $item->itemcallnumber;	88	$self->{'call_number'} = $item->itemcallnumber;
		89	$self->{'shelving_location'} = $item->location;
		90	$self->{'permanent_shelving_location'} = $item->permanent_location;
89		91
90	my $it = $item->effective_itemtype;	92	my $it = $item->effective_itemtype;
91	my $itemtype = Koha::Database->new()->schema()->resultset('Itemtype')->find( $it );	93	my $itemtype = Koha::Database->new()->schema()->resultset('Itemtype')->find( $it );
Lines 130-135 my %fields = ( Link Here
130	barcode => 0,	132	barcode => 0,
131	onloan => 0,	133	onloan => 0,
132	collection_code => 0,	134	collection_code => 0,
		135	shelving_location => 0,
		136	permanent_shelving_location => 0,
133	call_number => 0,	137	call_number => 0,
134	enumchron => 0,	138	enumchron => 0,
135	location => 0,	139	location => 0,

Lines 682-694 sub handle_checkin { Link Here

(-)a/C4/SIP/Sip/MsgType.pm (-7 / +18 lines)
682	$resp .= add_field( FID_PATRON_ID, $patron->id, $server );	682	$resp .= add_field( FID_PATRON_ID, $patron->id, $server );
683	}	683	}
684	if ($item) {	684	if ($item) {
685	$resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server );	685	$resp .= maybe_add( FID_MEDIA_TYPE, $item->sip_media_type, $server );
686	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );	686	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
687	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );	687	$resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server );
688	$resp .= maybe_add( FID_CALL_NUMBER, $item->call_number, $server );	688	$resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server );
689	$resp .= maybe_add( FID_HOLD_PATRON_ID, $item->hold_patron_bcode, $server );	689	$resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc \|\| $server->{account}->{ct_always_send} );
690	$resp .= add_field( FID_DESTINATION_LOCATION, $item->destination_loc, $server ) if ( $item->destination_loc \|\| $server->{account}->{ct_always_send} );	690	$resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server );
691	$resp .= maybe_add( FID_HOLD_PATRON_NAME, $item->hold_patron_name( $server->{account}->{da_field_template} ), $server );	691
		692	if ( my $CR = $server->{account}->{cr_item_field} ) {
		693	$resp .= maybe_add( FID_COLLECTION_CODE, $item->{$CR}, $server );
		694	} else {
		695	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );
		696	}
692		697
693	if ( $status->hold and $status->hold->{branchcode} ne $item->destination_loc ) {	698	if ( $status->hold and $status->hold->{branchcode} ne $item->destination_loc ) {
694	warn 'SIP hold mismatch: $status->hold->{branchcode}=' . $status->hold->{branchcode} . '; $item->destination_loc=' . $item->destination_loc;	699	warn 'SIP hold mismatch: $status->hold->{branchcode}=' . $status->hold->{branchcode} . '; $item->destination_loc=' . $item->destination_loc;
Lines 1160-1165 sub handle_item_information { Link Here
1160	$resp .= maybe_add( FID_CURRENT_LOCN, $item->current_location, $server );	1165	$resp .= maybe_add( FID_CURRENT_LOCN, $item->current_location, $server );
1161	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );	1166	$resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server );
1162		1167
		1168	if ( my $CR = $server->{account}->{cr_item_field} ) {
		1169	$resp .= maybe_add( FID_COLLECTION_CODE, $item->$CR, $server );
		1170	} else {
		1171	$resp .= maybe_add( FID_COLLECTION_CODE, $item->collection_code, $server );
		1172	}
		1173
1163	if ( ( $i = $item->fee ) != 0 ) {	1174	if ( ( $i = $item->fee ) != 0 ) {
1164	$resp .= add_field( FID_CURRENCY, $item->fee_currency, $server );	1175	$resp .= add_field( FID_CURRENCY, $item->fee_currency, $server );
1165	$resp .= add_field( FID_FEE_AMT, $i, $server );	1176	$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