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

(-)a/installer/onboarding.pl (+4 lines)
Lines 237-242 if ( $step == 5 ) { Link Here
237
        my $branchcode      = $input->param('branch');
237
        my $branchcode      = $input->param('branch');
238
        my $categorycode    = $input->param('categorycode');
238
        my $categorycode    = $input->param('categorycode');
239
        my $itemtype        = $input->param('itemtype');
239
        my $itemtype        = $input->param('itemtype');
240
        my $checkout_type   = $input->param('checkout_type');
240
        my $maxissueqty     = $input->param('maxissueqty');
241
        my $maxissueqty     = $input->param('maxissueqty');
241
        my $issuelength     = $input->param('issuelength');
242
        my $issuelength     = $input->param('issuelength');
242
        my $lengthunit      = $input->param('lengthunit');
243
        my $lengthunit      = $input->param('lengthunit');
Lines 254-259 if ( $step == 5 ) { Link Here
254
            branchcode      => $branchcode,
255
            branchcode      => $branchcode,
255
            categorycode    => $categorycode,
256
            categorycode    => $categorycode,
256
            itemtype        => $itemtype,
257
            itemtype        => $itemtype,
258
            checkout_type   => $checkout_type,
257
            rules => {
259
            rules => {
258
                renewalsallowed                  => $renewalsallowed,
260
                renewalsallowed                  => $renewalsallowed,
259
                renewalperiod                    => $renewalperiod,
261
                renewalperiod                    => $renewalperiod,
Lines 288-293 if ( $step == 5 ) { Link Here
288
        my $params_2 = {
290
        my $params_2 = {
289
            branchcode   => $branchcode,
291
            branchcode   => $branchcode,
290
            categorycode => $categorycode,
292
            categorycode => $categorycode,
293
            checkout_type => $checkout_type,
291
            rules        => {
294
            rules        => {
292
                patron_maxissueqty       => "",
295
                patron_maxissueqty       => "",
293
                max_holds                => "",
296
                max_holds                => "",
Lines 321-326 if ( $step == 5 ) { Link Here
321
                        categorycode => $categorycode,
324
                        categorycode => $categorycode,
322
                        itemtype     => $itemtype,
325
                        itemtype     => $itemtype,
323
                        branchcode   => $branchcode,
326
                        branchcode   => $branchcode,
327
                        checkout_type => $checkout_type,
324
                        rules        => {
328
                        rules        => {
325
                            maxissueqty => $maxissueqty,
329
                            maxissueqty => $maxissueqty,
326
                        }
330
                        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (+10 lines)
Lines 67-72 Link Here
67
                                    </select>
67
                                    </select>
68
                                    <span class="required"> Required</span>
68
                                    <span class="required"> Required</span>
69
                                </li>
69
                                </li>
70
                                <li>
71
                                    <label for="itemtype"> Checkout type: </label>
72
                                    <select id="checkout_type" name="checkout_type" required="required">
73
                                        <option value=""> Choose </option>
74
                                        <option value="*" selected="selected">All</option>
75
                                        <option value="CHECKOUT">Normal checkout</option>
76
                                        <option value="ONSITE">On-site checkout</option>
77
                                    </select>
78
                                    <span class="required"> Required</span>
79
                                </li>
70
                                <li>
80
                                <li>
71
                                    <label for="maxissueqty" class="required">Current checkouts allowed: </label>
81
                                    <label for="maxissueqty" class="required">Current checkouts allowed: </label>
72
                                    <input type="number" min="0" name="maxissueqty" id="maxissueqty" size="10" value="50" class="required" required="required" />
82
                                    <input type="number" min="0" name="maxissueqty" id="maxissueqty" size="10" value="50" class="required" required="required" />
(-)a/t/db_dependent/Circulation.t (+28 lines)
Lines 255-260 Koha::CirculationRules->set_rules( Link Here
255
        categorycode => undef,
255
        categorycode => undef,
256
        branchcode   => undef,
256
        branchcode   => undef,
257
        itemtype     => undef,
257
        itemtype     => undef,
258
        checkout_type => undef,
258
        rules        => {
259
        rules        => {
259
            reservesallowed => 25,
260
            reservesallowed => 25,
260
            issuelength     => 14,
261
            issuelength     => 14,
Lines 762-767 subtest "CanBookBeRenewed tests" => sub { Link Here
762
                categorycode => undef,
763
                categorycode => undef,
763
                branchcode   => undef,
764
                branchcode   => undef,
764
                itemtype     => undef,
765
                itemtype     => undef,
766
                checkout_type => undef,
765
                rules        => {
767
                rules        => {
766
                    norenewalbefore       => '7',
768
                    norenewalbefore       => '7',
767
                    no_auto_renewal_after => '9',
769
                    no_auto_renewal_after => '9',
Lines 778-783 subtest "CanBookBeRenewed tests" => sub { Link Here
778
                categorycode => undef,
780
                categorycode => undef,
779
                branchcode   => undef,
781
                branchcode   => undef,
780
                itemtype     => undef,
782
                itemtype     => undef,
783
                checkout_type => undef,
781
                rules        => {
784
                rules        => {
782
                    norenewalbefore       => '7',
785
                    norenewalbefore       => '7',
783
                    no_auto_renewal_after => '10',
786
                    no_auto_renewal_after => '10',
Lines 794-799 subtest "CanBookBeRenewed tests" => sub { Link Here
794
                categorycode => undef,
797
                categorycode => undef,
795
                branchcode   => undef,
798
                branchcode   => undef,
796
                itemtype     => undef,
799
                itemtype     => undef,
800
                checkout_type => undef,
797
                rules        => {
801
                rules        => {
798
                    norenewalbefore       => '7',
802
                    norenewalbefore       => '7',
799
                    no_auto_renewal_after => '11',
803
                    no_auto_renewal_after => '11',
Lines 810-815 subtest "CanBookBeRenewed tests" => sub { Link Here
810
                categorycode => undef,
814
                categorycode => undef,
811
                branchcode   => undef,
815
                branchcode   => undef,
812
                itemtype     => undef,
816
                itemtype     => undef,
817
                checkout_type => undef,
813
                rules        => {
818
                rules        => {
814
                    norenewalbefore       => '10',
819
                    norenewalbefore       => '10',
815
                    no_auto_renewal_after => '11',
820
                    no_auto_renewal_after => '11',
Lines 826-831 subtest "CanBookBeRenewed tests" => sub { Link Here
826
                categorycode => undef,
831
                categorycode => undef,
827
                branchcode   => undef,
832
                branchcode   => undef,
828
                itemtype     => undef,
833
                itemtype     => undef,
834
                checkout_type => undef,
829
                rules        => {
835
                rules        => {
830
                    norenewalbefore       => '10',
836
                    norenewalbefore       => '10',
831
                    no_auto_renewal_after => undef,
837
                    no_auto_renewal_after => undef,
Lines 843-848 subtest "CanBookBeRenewed tests" => sub { Link Here
843
                categorycode => undef,
849
                categorycode => undef,
844
                branchcode   => undef,
850
                branchcode   => undef,
845
                itemtype     => undef,
851
                itemtype     => undef,
852
                checkout_type => undef,
846
                rules        => {
853
                rules        => {
847
                    norenewalbefore       => '7',
854
                    norenewalbefore       => '7',
848
                    no_auto_renewal_after => '15',
855
                    no_auto_renewal_after => '15',
Lines 860-865 subtest "CanBookBeRenewed tests" => sub { Link Here
860
                categorycode => undef,
867
                categorycode => undef,
861
                branchcode   => undef,
868
                branchcode   => undef,
862
                itemtype     => undef,
869
                itemtype     => undef,
870
                checkout_type => undef,
863
                rules        => {
871
                rules        => {
864
                    norenewalbefore       => '10',
872
                    norenewalbefore       => '10',
865
                    no_auto_renewal_after => undef,
873
                    no_auto_renewal_after => undef,
Lines 893-898 subtest "CanBookBeRenewed tests" => sub { Link Here
893
                categorycode => undef,
901
                categorycode => undef,
894
                branchcode   => undef,
902
                branchcode   => undef,
895
                itemtype     => undef,
903
                itemtype     => undef,
904
                checkout_type => undef,
896
                rules        => {
905
                rules        => {
897
                    norenewalbefore       => '10',
906
                    norenewalbefore       => '10',
898
                    no_auto_renewal_after => '11',
907
                    no_auto_renewal_after => '11',
Lines 985-990 subtest "CanBookBeRenewed tests" => sub { Link Here
985
                categorycode => undef,
994
                categorycode => undef,
986
                branchcode   => undef,
995
                branchcode   => undef,
987
                itemtype     => undef,
996
                itemtype     => undef,
997
                checkout_type => undef,
988
                rules        => {
998
                rules        => {
989
                    norenewalbefore       => 10,
999
                    norenewalbefore       => 10,
990
                    no_auto_renewal_after => 11,
1000
                    no_auto_renewal_after => 11,
Lines 1051-1056 subtest "CanBookBeRenewed tests" => sub { Link Here
1051
                categorycode => undef,
1061
                categorycode => undef,
1052
                branchcode   => undef,
1062
                branchcode   => undef,
1053
                itemtype     => undef,
1063
                itemtype     => undef,
1064
                checkout_type => undef,
1054
                rules        => {
1065
                rules        => {
1055
                    norenewalbefore       => '7',
1066
                    norenewalbefore       => '7',
1056
                    no_auto_renewal_after => '',
1067
                    no_auto_renewal_after => '',
Lines 1066-1071 subtest "CanBookBeRenewed tests" => sub { Link Here
1066
                categorycode => undef,
1077
                categorycode => undef,
1067
                branchcode   => undef,
1078
                branchcode   => undef,
1068
                itemtype     => undef,
1079
                itemtype     => undef,
1080
                checkout_type => undef,
1069
                rules        => {
1081
                rules        => {
1070
                    norenewalbefore       => '10',
1082
                    norenewalbefore       => '10',
1071
                    no_auto_renewal_after => '5',
1083
                    no_auto_renewal_after => '5',
Lines 1087-1092 subtest "CanBookBeRenewed tests" => sub { Link Here
1087
                categorycode => undef,
1099
                categorycode => undef,
1088
                branchcode   => undef,
1100
                branchcode   => undef,
1089
                itemtype     => undef,
1101
                itemtype     => undef,
1102
                checkout_type => undef,
1090
                rules        => {
1103
                rules        => {
1091
                    norenewalbefore       => '10',
1104
                    norenewalbefore       => '10',
1092
                    no_auto_renewal_after => '15',
1105
                    no_auto_renewal_after => '15',
Lines 1105-1110 subtest "CanBookBeRenewed tests" => sub { Link Here
1105
                categorycode => undef,
1118
                categorycode => undef,
1106
                branchcode   => undef,
1119
                branchcode   => undef,
1107
                itemtype     => undef,
1120
                itemtype     => undef,
1121
                checkout_type => undef,
1108
                rules        => {
1122
                rules        => {
1109
                    norenewalbefore       => '10',
1123
                    norenewalbefore       => '10',
1110
                    no_auto_renewal_after => '',
1124
                    no_auto_renewal_after => '',
Lines 1122-1127 subtest "CanBookBeRenewed tests" => sub { Link Here
1122
                categorycode => undef,
1136
                categorycode => undef,
1123
                branchcode   => undef,
1137
                branchcode   => undef,
1124
                itemtype     => undef,
1138
                itemtype     => undef,
1139
                checkout_type => undef,
1125
                rules        => {
1140
                rules        => {
1126
                    norenewalbefore       => '10',
1141
                    norenewalbefore       => '10',
1127
                    no_auto_renewal_after => '15',
1142
                    no_auto_renewal_after => '15',
Lines 1144-1149 subtest "CanBookBeRenewed tests" => sub { Link Here
1144
            categorycode => undef,
1159
            categorycode => undef,
1145
            branchcode   => undef,
1160
            branchcode   => undef,
1146
            itemtype     => undef,
1161
            itemtype     => undef,
1162
            checkout_type => undef,
1147
            rules        => {
1163
            rules        => {
1148
                norenewalbefore => undef,
1164
                norenewalbefore => undef,
1149
                renewalsallowed => 0,
1165
                renewalsallowed => 0,
Lines 1390-1395 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1390
            categorycode => undef,
1406
            categorycode => undef,
1391
            itemtype     => undef,
1407
            itemtype     => undef,
1392
            branchcode   => undef,
1408
            branchcode   => undef,
1409
            checkout_type => undef,
1393
            rules        => {
1410
            rules        => {
1394
                reservesallowed => 25,
1411
                reservesallowed => 25,
1395
                issuelength     => 14,
1412
                issuelength     => 14,
Lines 1457-1462 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1457
            categorycode => undef,
1474
            categorycode => undef,
1458
            itemtype     => undef,
1475
            itemtype     => undef,
1459
            branchcode   => undef,
1476
            branchcode   => undef,
1477
            checkout_type => undef,
1460
            rules        => {
1478
            rules        => {
1461
                onshelfholds => 0,
1479
                onshelfholds => 0,
1462
            }
1480
            }
Lines 1471-1476 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1471
            categorycode => undef,
1489
            categorycode => undef,
1472
            itemtype     => undef,
1490
            itemtype     => undef,
1473
            branchcode   => undef,
1491
            branchcode   => undef,
1492
            checkout_type => undef,
1474
            rules        => {
1493
            rules        => {
1475
                onshelfholds => 0,
1494
                onshelfholds => 0,
1476
            }
1495
            }
Lines 1485-1490 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1485
            categorycode => undef,
1504
            categorycode => undef,
1486
            itemtype     => undef,
1505
            itemtype     => undef,
1487
            branchcode   => undef,
1506
            branchcode   => undef,
1507
            checkout_type => undef,
1488
            rules        => {
1508
            rules        => {
1489
                onshelfholds => 1,
1509
                onshelfholds => 1,
1490
            }
1510
            }
Lines 1499-1504 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1499
            categorycode => undef,
1519
            categorycode => undef,
1500
            itemtype     => undef,
1520
            itemtype     => undef,
1501
            branchcode   => undef,
1521
            branchcode   => undef,
1522
            checkout_type => undef,
1502
            rules        => {
1523
            rules        => {
1503
                onshelfholds => 1,
1524
                onshelfholds => 1,
1504
            }
1525
            }
Lines 2019-2024 subtest 'AddReturn + CumulativeRestrictionPeriods' => sub { Link Here
2019
            categorycode => undef,
2040
            categorycode => undef,
2020
            itemtype     => undef,
2041
            itemtype     => undef,
2021
            branchcode   => undef,
2042
            branchcode   => undef,
2043
            checkout_type => undef,
2022
            rules        => {
2044
            rules        => {
2023
                issuelength => 1,
2045
                issuelength => 1,
2024
                firstremind => 1,        # 1 day of grace
2046
                firstremind => 1,        # 1 day of grace
Lines 2125-2130 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2125
            categorycode => '*',
2147
            categorycode => '*',
2126
            itemtype     => '*',
2148
            itemtype     => '*',
2127
            branchcode   => '*',
2149
            branchcode   => '*',
2150
            checkout_type => '*',
2128
            rules        => {
2151
            rules        => {
2129
                issuelength => 1,
2152
                issuelength => 1,
2130
                firstremind => 0,    # 0 day of grace
2153
                firstremind => 0,    # 0 day of grace
Lines 2181-2186 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2181
            categorycode => undef,
2204
            categorycode => undef,
2182
            branchcode   => undef,
2205
            branchcode   => undef,
2183
            itemtype     => undef,
2206
            itemtype     => undef,
2207
            checkout_type => undef,
2184
            rules        => {
2208
            rules        => {
2185
                suspension_chargeperiod => 3,
2209
                suspension_chargeperiod => 3,
2186
                firstremind             => 1,
2210
                firstremind             => 1,
Lines 2205-2210 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2205
            categorycode => undef,
2229
            categorycode => undef,
2206
            branchcode   => undef,
2230
            branchcode   => undef,
2207
            itemtype     => undef,
2231
            itemtype     => undef,
2232
            checkout_type => undef,
2208
            rules        => {
2233
            rules        => {
2209
                finedays                => 2,
2234
                finedays                => 2,
2210
                suspension_chargeperiod => 1,
2235
                suspension_chargeperiod => 1,
Lines 2362-2367 subtest 'AddReturn | is_overdue' => sub { Link Here
2362
            categorycode => undef,
2387
            categorycode => undef,
2363
            itemtype     => undef,
2388
            itemtype     => undef,
2364
            branchcode   => undef,
2389
            branchcode   => undef,
2390
            checkout_type => undef,
2365
            rules        => {
2391
            rules        => {
2366
                issuelength  => 6,
2392
                issuelength  => 6,
2367
                lengthunit   => 'days',
2393
                lengthunit   => 'days',
Lines 3048-3053 subtest 'CanBookBeIssued | is_overdue' => sub { Link Here
3048
            categorycode => undef,
3074
            categorycode => undef,
3049
            branchcode   => undef,
3075
            branchcode   => undef,
3050
            itemtype     => undef,
3076
            itemtype     => undef,
3077
            checkout_type => undef,
3051
            rules        => {
3078
            rules        => {
3052
                maxissueqty     => 1,
3079
                maxissueqty     => 1,
3053
                reservesallowed => 25,
3080
                reservesallowed => 25,
Lines 3094-3099 subtest 'ItemsDeniedRenewal preference' => sub { Link Here
3094
            categorycode => '*',
3121
            categorycode => '*',
3095
            itemtype     => '*',
3122
            itemtype     => '*',
3096
            branchcode   => $idr_lib->branchcode,
3123
            branchcode   => $idr_lib->branchcode,
3124
            checkout_type => '*',
3097
            rules        => {
3125
            rules        => {
3098
                reservesallowed => 25,
3126
                reservesallowed => 25,
3099
                issuelength     => 14,
3127
                issuelength     => 14,
(-)a/t/db_dependent/Circulation/CalcDateDue.t (+4 lines)
Lines 10-15 use t::lib::Mocks; Link Here
10
use t::lib::TestBuilder;
10
use t::lib::TestBuilder;
11
use C4::Calendar;
11
use C4::Calendar;
12
12
13
use Koha::Checkouts;
13
use Koha::CirculationRules;
14
use Koha::CirculationRules;
14
15
15
use_ok('C4::Circulation');
16
use_ok('C4::Circulation');
Lines 21-26 my $builder = t::lib::TestBuilder->new; Link Here
21
my $categorycode = 'B';
22
my $categorycode = 'B';
22
my $itemtype = 'MX';
23
my $itemtype = 'MX';
23
my $branchcode = 'FPL';
24
my $branchcode = 'FPL';
25
my $checkout_type = $Koha::Checkouts::type->{checkout};
24
my $issuelength = 10;
26
my $issuelength = 10;
25
my $renewalperiod = 5;
27
my $renewalperiod = 5;
26
my $lengthunit = 'days';
28
my $lengthunit = 'days';
Lines 31-36 Koha::CirculationRules->set_rules( Link Here
31
        categorycode => $categorycode,
33
        categorycode => $categorycode,
32
        itemtype     => $itemtype,
34
        itemtype     => $itemtype,
33
        branchcode   => $branchcode,
35
        branchcode   => $branchcode,
36
        checkout_type => $checkout_type,
34
        rules        => {
37
        rules        => {
35
            issuelength   => $issuelength,
38
            issuelength   => $issuelength,
36
            renewalperiod => $renewalperiod,
39
            renewalperiod => $renewalperiod,
Lines 169-174 Koha::CirculationRules->set_rules( Link Here
169
        categorycode => $dayweek_categorycode,
172
        categorycode => $dayweek_categorycode,
170
        itemtype     => $dayweek_itemtype,
173
        itemtype     => $dayweek_itemtype,
171
        branchcode   => $dayweek_branchcode,
174
        branchcode   => $dayweek_branchcode,
175
        checkout_type => $checkout_type,
172
        rules        => {
176
        rules        => {
173
            issuelength   => $dayweek_issuelength,
177
            issuelength   => $dayweek_issuelength,
174
            renewalperiod => $dayweek_renewalperiod,
178
            renewalperiod => $dayweek_renewalperiod,
(-)a/t/db_dependent/Circulation/GetHardDueDate.t (+4 lines)
Lines 5-10 use C4::Context; Link Here
5
use DateTime;
5
use DateTime;
6
use Koha::Database;
6
use Koha::Database;
7
use Koha::DateUtils;
7
use Koha::DateUtils;
8
use Koha::Checkouts;
8
use Koha::CirculationRules;
9
use Koha::CirculationRules;
9
use Koha::Library;
10
use Koha::Library;
10
11
Lines 120-125 my $sampleissuingrule1 = { Link Here
120
    branchcode   => $samplebranch1->{branchcode},
121
    branchcode   => $samplebranch1->{branchcode},
121
    categorycode => $samplecat->{categorycode},
122
    categorycode => $samplecat->{categorycode},
122
    itemtype     => $sampleitemtype1,
123
    itemtype     => $sampleitemtype1,
124
    checkout_type => $Koha::Checkouts::type->{checkout},
123
    rules        => {
125
    rules        => {
124
        finedays                         => 0,
126
        finedays                         => 0,
125
        lengthunit                       => 'days',
127
        lengthunit                       => 'days',
Lines 153-158 my $sampleissuingrule2 = { Link Here
153
    branchcode   => $samplebranch2->{branchcode},
155
    branchcode   => $samplebranch2->{branchcode},
154
    categorycode => $samplecat->{categorycode},
156
    categorycode => $samplecat->{categorycode},
155
    itemtype     => $sampleitemtype1,
157
    itemtype     => $sampleitemtype1,
158
    checkout_type => $Koha::Checkouts::type->{checkout},
156
    rules        => {
159
    rules        => {
157
        renewalsallowed               => 0,
160
        renewalsallowed               => 0,
158
        renewalperiod                 => 2,
161
        renewalperiod                 => 2,
Lines 182-187 my $sampleissuingrule3 = { Link Here
182
    branchcode   => $samplebranch1->{branchcode},
185
    branchcode   => $samplebranch1->{branchcode},
183
    categorycode => $samplecat->{categorycode},
186
    categorycode => $samplecat->{categorycode},
184
    itemtype     => $sampleitemtype2,
187
    itemtype     => $sampleitemtype2,
188
    checkout_type => $Koha::Checkouts::type->{checkout},
185
    rules        => {
189
    rules        => {
186
        renewalsallowed               => 0,
190
        renewalsallowed               => 0,
187
        renewalperiod                 => 3,
191
        renewalperiod                 => 3,
(-)a/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t (+2 lines)
Lines 115-120 subtest "suspension_chargeperiod" => sub { Link Here
115
            categorycode => undef,
115
            categorycode => undef,
116
            itemtype     => undef,
116
            itemtype     => undef,
117
            branchcode   => undef,
117
            branchcode   => undef,
118
            checkout_type => undef,
118
            rules        => {
119
            rules        => {
119
                firstremind  => 0,
120
                firstremind  => 0,
120
                finedays     => 7,
121
                finedays     => 7,
Lines 141-146 subtest "maxsuspensiondays" => sub { Link Here
141
            categorycode => undef,
142
            categorycode => undef,
142
            itemtype     => undef,
143
            itemtype     => undef,
143
            branchcode   => undef,
144
            branchcode   => undef,
145
            checkout_type => undef,
144
            rules        => {
146
            rules        => {
145
                firstremind  => 0,
147
                firstremind  => 0,
146
                finedays     => 15,
148
                finedays     => 15,
(-)a/t/db_dependent/Circulation/Returns.t (+1 lines)
Lines 254-259 subtest 'Handle ids duplication' => sub { Link Here
254
            categorycode => undef,
254
            categorycode => undef,
255
            itemtype     => undef,
255
            itemtype     => undef,
256
            branchcode   => undef,
256
            branchcode   => undef,
257
            checkout_type => undef,
257
            rules        => {
258
            rules        => {
258
                chargeperiod => 1,
259
                chargeperiod => 1,
259
                fine         => 1,
260
                fine         => 1,
(-)a/t/db_dependent/Circulation/issue.t (+2 lines)
Lines 93-98 Koha::CirculationRules->set_rules( Link Here
93
        itemtype     => '*',
93
        itemtype     => '*',
94
        categorycode => '*',
94
        categorycode => '*',
95
        branchcode   => '*',
95
        branchcode   => '*',
96
        checkout_type => '*',
96
        rules        => {
97
        rules        => {
97
            lengthunit      => 'days',
98
            lengthunit      => 'days',
98
            issuelength     => 0,
99
            issuelength     => 0,
Lines 355-360 Koha::CirculationRules->set_rules( Link Here
355
        categorycode => undef,
356
        categorycode => undef,
356
        itemtype     => undef,
357
        itemtype     => undef,
357
        branchcode   => undef,
358
        branchcode   => undef,
359
        checkout_type => undef,
358
        rules        => {
360
        rules        => {
359
            renewalsallowed => 3,
361
            renewalsallowed => 3,
360
        }
362
        }
(-)a/t/db_dependent/DecreaseLoanHighHolds.t (+1 lines)
Lines 101-106 Koha::CirculationRules->set_rules( Link Here
101
        branchcode   => undef,
101
        branchcode   => undef,
102
        categorycode => undef,
102
        categorycode => undef,
103
        itemtype     => $item->itype,
103
        itemtype     => $item->itype,
104
        checkout_type => undef,
104
        rules        => {
105
        rules        => {
105
            issuelength     => '14',
106
            issuelength     => '14',
106
            lengthunit      => 'days',
107
            lengthunit      => 'days',
(-)a/t/db_dependent/Fines.t (+2 lines)
Lines 20-25 my $issuingrule = Koha::CirculationRules->set_rules( Link Here
20
        categorycode => undef,
20
        categorycode => undef,
21
        itemtype     => undef,
21
        itemtype     => undef,
22
        branchcode   => undef,
22
        branchcode   => undef,
23
        checkout_type => undef,
23
        rules        => {
24
        rules        => {
24
            fine                   => 1,
25
            fine                   => 1,
25
            finedays               => 0,
26
            finedays               => 0,
Lines 49-54 $issuingrule = Koha::CirculationRules->set_rules( Link Here
49
        categorycode => undef,
50
        categorycode => undef,
50
        itemtype     => undef,
51
        itemtype     => undef,
51
        branchcode   => undef,
52
        branchcode   => undef,
53
        checkout_type => undef,
52
        rules        => {
54
        rules        => {
53
            chargeperiod_charge_at => 1,
55
            chargeperiod_charge_at => 1,
54
        }
56
        }
(-)a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t (+2 lines)
Lines 87-92 Koha::CirculationRules->set_rules( Link Here
87
        categorycode => undef,
87
        categorycode => undef,
88
        itemtype     => $itemtype,
88
        itemtype     => $itemtype,
89
        branchcode   => undef,
89
        branchcode   => undef,
90
        checkout_type => undef,
90
        rules        => {
91
        rules        => {
91
            issuelength     => 7,
92
            issuelength     => 7,
92
            lengthunit      => 8,
93
            lengthunit      => 8,
Lines 272-277 Koha::CirculationRules->set_rules( Link Here
272
        categorycode => undef,
273
        categorycode => undef,
273
        itemtype     => $itemtype2,
274
        itemtype     => $itemtype2,
274
        branchcode   => undef,
275
        branchcode   => undef,
276
        checkout_type => undef,
275
        rules        => {
277
        rules        => {
276
            maxissueqty     => 99,
278
            maxissueqty     => 99,
277
            onshelfholds    => 0,
279
            onshelfholds    => 0,
(-)a/t/db_dependent/Koha/Item.t (+1 lines)
Lines 174-179 subtest 'pickup_locations' => sub { Link Here
174
            categorycode => undef,
174
            categorycode => undef,
175
            itemtype     => undef,
175
            itemtype     => undef,
176
            branchcode   => undef,
176
            branchcode   => undef,
177
            checkout_type => undef,
177
            rules        => {
178
            rules        => {
178
                reservesallowed => 25,
179
                reservesallowed => 25,
179
            }
180
            }
(-)a/t/db_dependent/SIP/ILS.t (+1 lines)
Lines 92-97 subtest cancel_hold => sub { Link Here
92
            categorycode => $patron->categorycode,
92
            categorycode => $patron->categorycode,
93
            branchcode   => $library->branchcode,
93
            branchcode   => $library->branchcode,
94
            itemtype     => $item->effective_itemtype,
94
            itemtype     => $item->effective_itemtype,
95
            checkout_type => undef,
95
            rules        => {
96
            rules        => {
96
                onshelfholds     => 1,
97
                onshelfholds     => 1,
97
                reservesallowed  => 3,
98
                reservesallowed  => 3,
(-)a/t/db_dependent/SIP/Transaction.t (+2 lines)
Lines 71-76 subtest fill_holds_at_checkout => sub { Link Here
71
            categorycode => $borrower->{categorycode},
71
            categorycode => $borrower->{categorycode},
72
            branchcode   => $branch->{branchcode},
72
            branchcode   => $branch->{branchcode},
73
            itemtype     => $itype->{itemtype},
73
            itemtype     => $itype->{itemtype},
74
            checkout_type => undef,
74
            rules        => {
75
            rules        => {
75
                onshelfholds     => 1,
76
                onshelfholds     => 1,
76
                reservesallowed  => 3,
77
                reservesallowed  => 3,
Lines 177-182 subtest cancel_hold => sub { Link Here
177
            categorycode => $patron->categorycode,
178
            categorycode => $patron->categorycode,
178
            branchcode   => $library->branchcode,
179
            branchcode   => $library->branchcode,
179
            itemtype     => $item->effective_itemtype,
180
            itemtype     => $item->effective_itemtype,
181
            checkout_type => undef,
180
            rules        => {
182
            rules        => {
181
                onshelfholds     => 1,
183
                onshelfholds     => 1,
182
                reservesallowed  => 3,
184
                reservesallowed  => 3,
(-)a/t/db_dependent/api/v1/checkouts.t (+1 lines)
Lines 76-81 Koha::CirculationRules->set_rules( Link Here
76
        categorycode => undef,
76
        categorycode => undef,
77
        itemtype     => undef,
77
        itemtype     => undef,
78
        branchcode   => undef,
78
        branchcode   => undef,
79
        checkout_type => undef,
79
        rules        => {
80
        rules        => {
80
            renewalperiod => 7,
81
            renewalperiod => 7,
81
            renewalsallowed => 1,
82
            renewalsallowed => 1,
(-)a/t/db_dependent/selenium/basic_workflow.t (-1 / +6 lines)
Lines 70-75 our $sample_data = { Link Here
70
        rentalcharge => 0,
70
        rentalcharge => 0,
71
        notforloan   => 0,
71
        notforloan   => 0,
72
    },
72
    },
73
    checkout_type => {
74
        itemtype     => 'CHECKOUT',
75
        description  => 'Just a checkout_type for tests',
76
        maxissueqty  => 80100,
77
    },
73
    issuingrule => {
78
    issuingrule => {
74
        categorycode  => 'test_cat',
79
        categorycode  => 'test_cat',
75
        itemtype      => 'IT4test',
80
        itemtype      => 'IT4test',
Lines 159-164 SKIP: { Link Here
159
            categorycode => $issuing_rules->{categorycode},
164
            categorycode => $issuing_rules->{categorycode},
160
            itemtype     => $issuing_rules->{itemtype},
165
            itemtype     => $issuing_rules->{itemtype},
161
            branchcode   => $issuing_rules->{branchcode},
166
            branchcode   => $issuing_rules->{branchcode},
167
            checkout_type => $issuing_rules->{checkout_type},
162
            rules => {
168
            rules => {
163
                maxissueqty     => $issuing_rules->{maxissueqty},
169
                maxissueqty     => $issuing_rules->{maxissueqty},
164
                issuelength     => $issuing_rules->{issuelength},
170
                issuelength     => $issuing_rules->{issuelength},
165
- 

Return to bug 25114