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

(-)a/catalogue/detail.pl (-7 / +8 lines)
Lines 186-193 my $collections = GetKohaAuthorisedValues('items.ccode' , $fw); Link Here
186
my $copynumbers    = GetKohaAuthorisedValues('items.copynumber', $fw);
186
my $copynumbers    = GetKohaAuthorisedValues('items.copynumber', $fw);
187
my (@itemloop, @otheritemloop, %itemfields);
187
my (@itemloop, @otheritemloop, %itemfields);
188
my $norequests = 1;
188
my $norequests = 1;
189
my $authvalcode_items_itemlost = GetAuthValCode('items.itemlost',$fw);
189
190
my $authvalcode_items_damaged  = GetAuthValCode('items.damaged', $fw);
190
if ( my $lost_av = GetAuthValCode('items.itemlost', $fw) ) {
191
    $template->param( itemlostloop => GetAuthorisedValues( $lost_av ) );
192
}
193
if ( my $damaged_av = GetAuthValCode('items.damaged', $fw) ) {
194
    $template->param( itemdamagedloop => GetAuthorisedValues( $damaged_av ) );
195
}
191
196
192
my $materials_authvalcode = GetAuthValCode('items.materials', $fw);
197
my $materials_authvalcode = GetAuthValCode('items.materials', $fw);
193
my %materials_map;
198
my %materials_map;
Lines 217-227 foreach my $item (@items) { Link Here
217
                                               : '';
222
                                               : '';
218
223
219
    $item->{datedue} = format_sqldatetime($item->{datedue});
224
    $item->{datedue} = format_sqldatetime($item->{datedue});
220
    # item damaged, lost, withdrawn loops
225
221
    $item->{itemlostloop} = GetAuthorisedValues($authvalcode_items_itemlost) if $authvalcode_items_itemlost;
222
    if ($item->{damaged}) {
223
        $item->{itemdamagedloop} = GetAuthorisedValues($authvalcode_items_damaged) if $authvalcode_items_damaged;
224
    }
225
    #get shelf location and collection code description if they are authorised value.
226
    #get shelf location and collection code description if they are authorised value.
226
    # same thing for copy number
227
    # same thing for copy number
227
    my $shelfcode = $item->{'location'};
228
    my $shelfcode = $item->{'location'};
(-)a/catalogue/moredetail.pl (-3 / +11 lines)
Lines 137-145 foreach ( keys %{$data} ) { Link Here
137
($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
137
($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
138
foreach my $item (@items){
138
foreach my $item (@items){
139
    $item->{object} = Koha::Items->find( $item->{itemnumber} );
139
    $item->{object} = Koha::Items->find( $item->{itemnumber} );
140
    $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw)) if GetAuthValCode('items.itemlost',$fw);
141
    $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw)) if GetAuthValCode('items.damaged',$fw);
142
    $item->{itemwithdrawnloop}= GetAuthorisedValues(GetAuthValCode('items.withdrawn',$fw)) if GetAuthValCode('items.withdrawn',$fw);
143
    $item->{'collection'}              = $ccodes->{ $item->{ccode} } if ($ccodes);
140
    $item->{'collection'}              = $ccodes->{ $item->{ccode} } if ($ccodes);
144
    $item->{'itype'}                   = $itemtypes->{ $item->{'itype'} }->{'translated_description'};
141
    $item->{'itype'}                   = $itemtypes->{ $item->{'itype'} }->{'translated_description'};
145
    $item->{'replacementprice'}        = sprintf( "%.2f", $item->{'replacementprice'} );
142
    $item->{'replacementprice'}        = sprintf( "%.2f", $item->{'replacementprice'} );
Lines 203-208 foreach my $item (@items){ Link Here
203
    }
200
    }
204
201
205
}
202
}
203
204
if ( my $lost_av = GetAuthValCode('items.itemlost', $fw) ) {
205
    $template->param( itemlostloop => GetAuthorisedValues( $lost_av ) );
206
}
207
if ( my $damaged_av = GetAuthValCode('items.damaged', $fw) ) {
208
    $template->param( itemdamagedloop => GetAuthorisedValues( $damaged_av ) );
209
}
210
if ( my $withdrawn_av = GetAuthValCode('items.withdrawn', $fw) ) {
211
    $template->param( itemwithdrawnloop => GetAuthorisedValues( $withdrawn_av ) );
212
}
213
206
$template->param(count => $data->{'count'},
214
$template->param(count => $data->{'count'},
207
	subscriptionsnumber => $subscriptionsnumber,
215
	subscriptionsnumber => $subscriptionsnumber,
208
    subscriptiontitle   => $data->{title},
216
    subscriptiontitle   => $data->{title},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-4 / +4 lines)
Lines 648-655 function verify_images() { Link Here
648
                        [% END %]
648
                        [% END %]
649
649
650
                        [% IF ( item.itemlost ) %]
650
                        [% IF ( item.itemlost ) %]
651
                            [% IF ( item.itemlostloop ) %]
651
                            [% IF itemlostloop %]
652
                                [% FOREACH itemlostloo IN item.itemlostloop %]
652
                                [% FOREACH itemlostloo IN itemlostloop %]
653
                                    [% IF itemlostloo.authorised_value == item.itemlost %]
653
                                    [% IF itemlostloo.authorised_value == item.itemlost %]
654
                                        <span class="lost">[% itemlostloo.lib %]</span>
654
                                        <span class="lost">[% itemlostloo.lib %]</span>
655
                                    [% END %]
655
                                    [% END %]
Lines 664-671 function verify_images() { Link Here
664
                        [% END %]
664
                        [% END %]
665
665
666
                        [% IF ( item.damaged ) %]
666
                        [% IF ( item.damaged ) %]
667
                            [% IF ( item.itemdamagedloop ) %]
667
                            [% IF itemdamagedloop %]
668
                                [% FOREACH itemdamagedloo IN item.itemdamagedloop %]
668
                                [% FOREACH itemdamagedloo IN itemdamagedloop %]
669
                                    [% IF itemdamagedloo.authorised_value == item.damaged %]
669
                                    [% IF itemdamagedloo.authorised_value == item.damaged %]
670
                                        <span class="dmg">[% itemdamagedloo.lib %]</span>
670
                                        <span class="dmg">[% itemdamagedloo.lib %]</span>
671
                                    [% END %]
671
                                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt (-10 / +9 lines)
Lines 99-105 Link Here
99
            [% END %]
99
            [% END %]
100
            &nbsp;</li>
100
            &nbsp;</li>
101
            <li><span class="label">Current renewals:</span> [% ITEM_DAT.renewals %]&nbsp;</li>
101
            <li><span class="label">Current renewals:</span> [% ITEM_DAT.renewals %]&nbsp;</li>
102
            [% IF ( ITEM_DAT.itemlostloop ) %]
102
            [% IF itemlostloop %]
103
                <li><span class="label">Lost status:</span>
103
                <li><span class="label">Lost status:</span>
104
                    [% IF ( CAN_user_circulate ) %]
104
                    [% IF ( CAN_user_circulate ) %]
105
                        <form action="updateitem.pl" method="post">
105
                        <form action="updateitem.pl" method="post">
Lines 108-114 Link Here
108
                        <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
108
                        <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
109
                        <select name="itemlost" >
109
                        <select name="itemlost" >
110
                                    <option value="">Choose</option>
110
                                    <option value="">Choose</option>
111
                        [% FOREACH itemlostloo IN ITEM_DAT.itemlostloop %]
111
                        [% FOREACH itemlostloo IN itemlostloop %]
112
                            [% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %]
112
                            [% IF itemlostloo.authorised_value == ITEM_DAT.itemlost %]
113
                                    <option value="[% itemlostloo.authorised_value %]" selected="selected">[% itemlostloo.lib %]</option>
113
                                    <option value="[% itemlostloo.authorised_value %]" selected="selected">[% itemlostloo.lib %]</option>
114
                            [% ELSE %]
114
                            [% ELSE %]
Lines 120-126 Link Here
120
                        <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged %]" />
120
                        <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged %]" />
121
                        <input type="submit" name="submit" class="submit" value="Set status" /></form>
121
                        <input type="submit" name="submit" class="submit" value="Set status" /></form>
122
                    [% ELSE %]
122
                    [% ELSE %]
123
                        [% FOREACH itemlostloo IN ITEM_DAT.itemlostloop %]
123
                        [% FOREACH itemlostloo IN itemlostloop %]
124
                            [% IF ( itemlostloo.selected ) %]
124
                            [% IF ( itemlostloo.selected ) %]
125
                                [% itemlostloo.lib %]
125
                                [% itemlostloo.lib %]
126
                            [% END %]
126
                            [% END %]
Lines 132-138 Link Here
132
                    <li><span class="label">Lost on:</span>[% ITEM_DAT.itemlost_on | $KohaDates %] &nbsp;</li>
132
                    <li><span class="label">Lost on:</span>[% ITEM_DAT.itemlost_on | $KohaDates %] &nbsp;</li>
133
                [% END %]
133
                [% END %]
134
            [% END %]
134
            [% END %]
135
            [% IF ( ITEM_DAT.itemdamagedloop ) %]
135
            [% IF itemdamagedloop %]
136
            <li><span class="label">Damaged status:</span>
136
            <li><span class="label">Damaged status:</span>
137
                [% IF ( CAN_user_circulate ) %]
137
                [% IF ( CAN_user_circulate ) %]
138
                    <form action="updateitem.pl" method="post">
138
                    <form action="updateitem.pl" method="post">
Lines 141-147 Link Here
141
                    <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
141
                    <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
142
                    <select name="damaged" >
142
                    <select name="damaged" >
143
                    <option value="">Choose</option>
143
                    <option value="">Choose</option>
144
            [% FOREACH itemdamagedloo IN ITEM_DAT.itemdamagedloop %]
144
            [% FOREACH itemdamagedloo IN itemdamagedloop %]
145
                [% IF itemdamagedloo.authorised_value == ITEM_DAT.damaged %]
145
                [% IF itemdamagedloo.authorised_value == ITEM_DAT.damaged %]
146
                    <option value="[% itemdamagedloo.authorised_value %]" selected="selected">[% itemdamagedloo.lib %]</option>
146
                    <option value="[% itemdamagedloo.authorised_value %]" selected="selected">[% itemdamagedloo.lib %]</option>
147
                [% ELSE %]
147
                [% ELSE %]
Lines 153-159 Link Here
153
                    <input type="hidden" name="itemlost" value="[% ITEM_DAT.itemlost %]" />
153
                    <input type="hidden" name="itemlost" value="[% ITEM_DAT.itemlost %]" />
154
                    <input type="submit" name="submit" class="submit" value="Set status" /></form>
154
                    <input type="submit" name="submit" class="submit" value="Set status" /></form>
155
                [% ELSE %]
155
                [% ELSE %]
156
                    [% FOREACH itemdamagedloo IN ITEM_DAT.itemdamagedloop %]
156
                    [% FOREACH itemdamagedloo IN itemdamagedloop %]
157
                        [% IF ( itemdamagedloo.selected ) %]
157
                        [% IF ( itemdamagedloo.selected ) %]
158
                            [% itemdamagedloo.lib %]
158
                            [% itemdamagedloo.lib %]
159
                        [% END %]
159
                        [% END %]
Lines 163-169 Link Here
163
            </li>
163
            </li>
164
            [% END %]
164
            [% END %]
165
165
166
            [% IF ( ITEM_DAT.itemwithdrawnloop ) %]
166
            [% IF itemwithdrawnloop %]
167
                <li><span class="label">Withdrawn status:</span>
167
                <li><span class="label">Withdrawn status:</span>
168
                    [% IF ( CAN_user_circulate ) %]
168
                    [% IF ( CAN_user_circulate ) %]
169
                        <form action="updateitem.pl" method="post">
169
                        <form action="updateitem.pl" method="post">
Lines 172-178 Link Here
172
                            <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
172
                            <input type="hidden" name="itemnumber" value="[% ITEM_DAT.itemnumber %]" />
173
                            <select name="withdrawn" >
173
                            <select name="withdrawn" >
174
                                <option value="">Choose</option>
174
                                <option value="">Choose</option>
175
                                [% FOREACH itemwithdrawn IN ITEM_DAT.itemwithdrawnloop %]
175
                                [% FOREACH itemwithdrawn IN itemwithdrawnloop %]
176
                                    [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
176
                                    [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
177
                                        <option value="[% itemwithdrawn.authorised_value %]" selected="selected">[% itemwithdrawn.lib %]</option>
177
                                        <option value="[% itemwithdrawn.authorised_value %]" selected="selected">[% itemwithdrawn.lib %]</option>
178
                                    [% ELSE %]
178
                                    [% ELSE %]
Lines 184-190 Link Here
184
                            <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged %]" />
184
                            <input type="hidden" name="damaged" value="[% ITEM_DAT.damaged %]" />
185
                            <input type="submit" name="submit" class="submit" value="Set status" /></form>
185
                            <input type="submit" name="submit" class="submit" value="Set status" /></form>
186
                    [% ELSE %]
186
                    [% ELSE %]
187
                        [% FOREACH itemwithdrawn IN ITEM_DAT.itemwithdrawnloop %]
187
                        [% FOREACH itemwithdrawn IN itemwithdrawnloop %]
188
                            [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
188
                            [% IF itemwithdrawn.authorised_value == ITEM_DAT.withdrawn %]
189
                                [% itemwithdrawn.lib %]
189
                                [% itemwithdrawn.lib %]
190
                            [% END %]
190
                            [% END %]
191
- 

Return to bug 16158