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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-4 / +4 lines)
Lines 297-305 $(document).ready(function() { Link Here
297
                                                            [% IF rule.onshelfholds == 1 %]
297
                                                            [% IF rule.onshelfholds == 1 %]
298
                                                                Yes
298
                                                                Yes
299
                                                            [% ELSIF rule.onshelfholds == 2 %]
299
                                                            [% ELSIF rule.onshelfholds == 2 %]
300
                                                                If all unavailable
300
                                                                Only if other items unavailable
301
                                                            [% ELSE %]
301
                                                            [% ELSE %]
302
                                                                If any unavailable
302
                                                                No
303
                                                            [% END %]</td>
303
                                                            [% END %]</td>
304
                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
304
                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
305
                                                        <td>
305
                                                        <td>
Lines 393-400 $(document).ready(function() { Link Here
393
                    <td>
393
                    <td>
394
                        <select name="onshelfholds" id="onshelfholds">
394
                        <select name="onshelfholds" id="onshelfholds">
395
                            <option value="1">Yes</option>
395
                            <option value="1">Yes</option>
396
                            <option value="0">If any unavailable</option>
396
                            <option value="0">No</option>
397
                            <option value="2">If all unavailable</option>
397
                            <option value="2">Only if other items unavailable</option>
398
                        </select>
398
                        </select>
399
                    </td>
399
                    </td>
400
                    <td>
400
                    <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt (-1 / +1 lines)
Lines 76-82 Link Here
76
    </ul>
76
    </ul>
77
    </li>
77
    </li>
78
    <li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
78
    <li>If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field</li>
79
    <li>Next you can decide if this patron/item combo are allowed to place holds on items that are on the shelf (or available in the library) or not. If you choose 'no' then items can only be placed on hold if checked out</li>
79
    <li>Next you can decide if this patron/item combo are allowed to place holds on items that are on the shelf (or available in the library). You can choose between Yes, No and "Only if other items unavailable".</li>
80
    <li>You can also decide if patrons are allowed to place item specific holds on the item type in question. The options are:
80
    <li>You can also decide if patrons are allowed to place item specific holds on the item type in question. The options are:
81
    <ul>
81
    <ul>
82
    <li>Allow: Will allow patrons the option to choose next available or item specific</li>
82
    <li>Allow: Will allow patrons the option to choose next available or item specific</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-2 / +2 lines)
Lines 117-124 Link Here
117
                                    <select name="onshelfholds" id="onshelfholds" required="required">
117
                                    <select name="onshelfholds" id="onshelfholds" required="required">
118
                                        <option value="">Choose</option>
118
                                        <option value="">Choose</option>
119
                                        <option value="1" selected="selected">Yes</option>
119
                                        <option value="1" selected="selected">Yes</option>
120
                                        <option value="0">If any unavailable</option>
120
                                        <option value="0">No</option>
121
                                        <option value="2">If all unavailable</option>
121
                                        <option value="2">Only if other items unavailable</option>
122
                                    </select>
122
                                    </select>
123
                                </li>
123
                                </li>
124
                            </ol>
124
                            </ol>
(-)a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t (-3 / +2 lines)
Lines 137-143 AddReturn( $item1->{barcode} ); Link Here
137
            Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_B, holdingbranch => $library_B })->store;
137
            Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_B, holdingbranch => $library_B })->store;
138
            $item1 = GetItem( $itemnumber1 );
138
            $item1 = GetItem( $itemnumber1 );
139
            #Scenario is:
139
            #Scenario is:
140
            #One shelf holds is 'If all unavailable'/2
140
            #One shelf holds is 'Only if other items unavailable'/2
141
            #Item 1 homebranch library B is available
141
            #Item 1 homebranch library B is available
142
            #Item 2 homebranch library A is checked out
142
            #Item 2 homebranch library A is checked out
143
            #Borrower1 is from library A
143
            #Borrower1 is from library A
Lines 177-183 AddReturn( $item1->{barcode} ); Link Here
177
            Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_A, holdingbranch => $library_A })->store;
177
            Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_A, holdingbranch => $library_A })->store;
178
            $item1 = GetItem( $itemnumber1 );
178
            $item1 = GetItem( $itemnumber1 );
179
            #Scenario is:
179
            #Scenario is:
180
            #One shelf holds is 'If all unavailable'/2
180
            #One shelf holds is 'Only if other items unavailable'/2
181
            #Item 1 homebranch library A is available
181
            #Item 1 homebranch library A is available
182
            #Item 2 homebranch library A is checked out
182
            #Item 2 homebranch library A is checked out
183
            #Borrower1 is from library A
183
            #Borrower1 is from library A
184
- 

Return to bug 19690