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

(-)a/C4/Items.pm (-4 / +1 lines)
Lines 1677-1686 sub PrepareItemrecordDisplay { Link Here
1677
                    && $defaultvalues
1677
                    && $defaultvalues
1678
                    && $defaultvalues->{'ccode'} ) {
1678
                    && $defaultvalues->{'ccode'} ) {
1679
1679
1680
                    if ( $itemrecord and $defaultvalues and not $itemrecord->subfield($tag,$subfield->{subfield}) ) {
1680
                    if ( !$itemrecord and $defaultvalues ) {
1681
                        # if the item record exists, only use default value if the item has no ccode
1682
                        $defaultvalue = $defaultvalues->{ccode};
1683
                    } elsif ( !$itemrecord and $defaultvalues ) {
1684
                        # if the item record *doesn't* exists, always use the default value
1681
                        # if the item record *doesn't* exists, always use the default value
1685
                        $defaultvalue = $defaultvalues->{ccode};
1682
                        $defaultvalue = $defaultvalues->{ccode};
1686
                    }
1683
                    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-2 / +3 lines)
Lines 200-209 fieldset.rows table { clear: none; margin: 0; } Link Here
200
                                    </select>
200
                                    </select>
201
                                </li>
201
                                </li>
202
                                <li>
202
                                <li>
203
                                    <label for="ccode">Collection code:</label>
203
                                    <label for="ccode">Collection:</label>
204
                                    <select name="ccode" id="ccode">
204
                                    <select name="ccode" id="ccode">
205
                                        <option value="">None</option>
205
                                        [% FOREACH ccode_loo IN ccodes_loop %]
206
                                        [% FOREACH ccode_loo IN ccodes_loop %]
206
                                            [% IF (ccode_loo.selected) %]
207
                                            [% IF ccode_loo.authorised_value == ccode %]
207
                                                <option value="[% ccode_loo.authorised_value | html %]" selected="selected">[% ccode_loo.lib | html %]</option>
208
                                                <option value="[% ccode_loo.authorised_value | html %]" selected="selected">[% ccode_loo.lib | html %]</option>
208
                                            [% ELSE %]
209
                                            [% ELSE %]
209
                                                <option value="[% ccode_loo.authorised_value | html %]">[% ccode_loo.lib | html %]</option>
210
                                                <option value="[% ccode_loo.authorised_value | html %]">[% ccode_loo.lib | html %]</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +1 lines)
Lines 143-149 Link Here
143
                                    <ol>
143
                                    <ol>
144
                                        [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %]
144
                                        [% IF ( location ) %]<li><span class="label">Location:</span> [% location | html %]</li>[% END %]
145
                                        [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber | html %]</li>[% END %]
145
                                        [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber | html %]</li>[% END %]
146
                                        [% IF ( ccode ) %]<li><span class="label">Collection code:</span> [% ccode | html %]</li>[% END %]
146
                                        [% IF ( ccode ) %]<li><span class="label">Collection:</span> [% ccode | html %]</li>[% END %]
147
                                        [% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount | html %]</li>[% END %]
147
                                        [% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount | html %]</li>[% END %]
148
                                        [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount | html %]</li>[% END %]
148
                                        [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount | html %]</li>[% END %]
149
                                        [% IF ( letter ) %]
149
                                        [% IF ( letter ) %]
150
- 

Return to bug 23352