Attachment #107529 for bug #25089

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

Lines 237-242 if ( $step == 5 ) { Link Here

(-)a/installer/onboarding.pl (+2 lines)
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,




                                    </select>
                                    <span class="required"> Required</span>
                                </li>
                                <li>
                                    <label for="itemtype"> Checkout type: </label>
                                    <select id="checkout_type" name="checkout_type" required="required">
                                        <option value=""> Choose </option>
                                        <option value="*" selected="selected">All</option>
                                        <option value="CHECKOUT">Normal checkout</option>
                                        <option value="ONSITE">On-site checkout</option>
                                    </select>
                                    <span class="required"> Required</span>
                                </li>
                                <li>
                                    <label for="maxissueqty" class="required">Current checkouts allowed: </label>
                                    <input type="number" min="0" name="maxissueqty" id="maxissueqty" size="10" value="50" class="required" required="required" />




        categorycode => undef,
        branchcode   => undef,
        itemtype     => undef,
        checkout_type => undef,
        rules        => {
            reservesallowed => 25,
            issuelength     => 14,

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '7',
                    no_auto_renewal_after => '9',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '7',
                    no_auto_renewal_after => '10',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '7',
                    no_auto_renewal_after => '11',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '11',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => undef,

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '7',
                    no_auto_renewal_after => '15',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => undef,

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '11',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => 10,
                    no_auto_renewal_after => 11,

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '7',
                    no_auto_renewal_after => '',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '5',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '15',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '',

                categorycode => undef,
                branchcode   => undef,
                itemtype     => undef,
                checkout_type => undef,
                rules        => {
                    norenewalbefore       => '10',
                    no_auto_renewal_after => '15',

            categorycode => undef,
            branchcode   => undef,
            itemtype     => undef,
            checkout_type => undef,
            rules        => {
                norenewalbefore => undef,
                renewalsallowed => 0,

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                reservesallowed => 25,
                issuelength     => 14,

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                onshelfholds => 0,
            }

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                onshelfholds => 0,
            }

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                onshelfholds => 1,
            }

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                onshelfholds => 1,
            }

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                issuelength => 1,
                firstremind => 1,        # 1 day of grace

            categorycode => '*',
            itemtype     => '*',
            branchcode   => '*',
            checkout_type => '*',
            rules        => {
                issuelength => 1,
                firstremind => 0,    # 0 day of grace

            categorycode => undef,
            branchcode   => undef,
            itemtype     => undef,
            checkout_type => undef,
            rules        => {
                suspension_chargeperiod => 3,
                firstremind             => 1,

            categorycode => undef,
            branchcode   => undef,
            itemtype     => undef,
            checkout_type => undef,
            rules        => {
                finedays                => 2,
                suspension_chargeperiod => 1,

            categorycode => undef,
            itemtype     => undef,
            branchcode   => undef,
            checkout_type => undef,
            rules        => {
                issuelength  => 6,
                lengthunit   => 'days',

            categorycode => undef,
            branchcode   => undef,
            itemtype     => undef,
            checkout_type => undef,
            rules        => {
                maxissueqty     => 1,
                reservesallowed => 25,

            categorycode => '*',
            itemtype     => '*',
            branchcode   => $idr_lib->branchcode,
            checkout_type => '*',
            rules        => {
                reservesallowed => 25,
                issuelength     => 14,




use t::lib::TestBuilder;
use C4::Calendar;

use Koha::Checkouts;
use Koha::CirculationRules;

use_ok('C4::Circulation');

my $categorycode = 'B';
my $itemtype = 'MX';
my $branchcode = 'FPL';
my $checkout_type = $Koha::Checkouts::type->{checkout};
my $issuelength = 10;
my $renewalperiod = 5;
my $lengthunit = 'days';

        categorycode => $categorycode,
        itemtype     => $itemtype,
        branchcode   => $branchcode,
        checkout_type => $checkout_type,
        rules        => {
            issuelength   => $issuelength,
            renewalperiod => $renewalperiod,

        categorycode => $dayweek_categorycode,
        itemtype     => $dayweek_itemtype,
        branchcode   => $dayweek_branchcode,
        checkout_type => $checkout_type,
        rules        => {
            issuelength   => $dayweek_issuelength,
            renewalperiod => $dayweek_renewalperiod,




use DateTime;
use Koha::Database;
use Koha::DateUtils;
use Koha::Checkouts;
use Koha::CirculationRules;
use Koha::Library;


    branchcode   => $samplebranch1->{branchcode},
    categorycode => $samplecat->{categorycode},
    itemtype     => $sampleitemtype1,
    checkout_type => $Koha::Checkouts::type->{checkout},
    rules        => {
        finedays                         => 0,
        lengthunit                       => 'days',

    branchcode   => $samplebranch2->{branchcode},
    categorycode => $samplecat->{categorycode},
    itemtype     => $sampleitemtype1,
    checkout_type => $Koha::Checkouts::type->{checkout},
    rules        => {
        renewalsallowed               => 0,
        renewalperiod                 => 2,

    branchcode   => $samplebranch1->{branchcode},
    categorycode => $samplecat->{categorycode},
    itemtype     => $sampleitemtype2,
    checkout_type => $Koha::Checkouts::type->{checkout},
    rules        => {
        renewalsallowed               => 0,
        renewalperiod                 => 3,

Lines 113-118 subtest "suspension_chargeperiod" => sub { Link Here

(-)a/t/db_dependent/Circulation/IssuingRules/maxsuspensiondays.t (+2 lines)
113	categorycode => undef,	113	categorycode => undef,
114	itemtype => undef,	114	itemtype => undef,
115	branchcode => undef,	115	branchcode => undef,
		116	checkout_type => undef,
116	rules => {	117	rules => {
117	firstremind => 0,	118	firstremind => 0,
118	finedays => 7,	119	finedays => 7,
Lines 139-144 subtest "maxsuspensiondays" => sub { Link Here
139	categorycode => undef,	140	categorycode => undef,
140	itemtype => undef,	141	itemtype => undef,
141	branchcode => undef,	142	branchcode => undef,
		143	checkout_type => undef,
142	rules => {	144	rules => {
143	firstremind => 0,	145	firstremind => 0,
144	finedays => 15,	146	finedays => 15,

Lines 254-259 subtest 'Handle ids duplication' => sub { Link Here

(-)a/t/db_dependent/Circulation/Returns.t (+1 lines)
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,

Lines 93-98 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/Circulation/issue.t (+2 lines)
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	}

Lines 104-109 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/DecreaseLoanHighHolds.t (+1 lines)
104	branchcode => undef,	104	branchcode => undef,
105	categorycode => undef,	105	categorycode => undef,
106	itemtype => $item->itype,	106	itemtype => $item->itype,
		107	checkout_type => undef,
107	rules => {	108	rules => {
108	issuelength => '14',	109	issuelength => '14',
109	lengthunit => 'days',	110	lengthunit => 'days',

Lines 20-25 my $issuingrule = Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/Fines.t (+2 lines)
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	}

Lines 87-92 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t (+2 lines)
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,

Lines 174-179 subtest 'pickup_locations' => sub { Link Here

(-)a/t/db_dependent/Koha/Item.t (+1 lines)
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	}

Lines 92-97 subtest cancel_hold => sub { Link Here

(-)a/t/db_dependent/SIP/ILS.t (+1 lines)
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,

Lines 70-75 subtest fill_holds_at_checkout => sub { Link Here

(-)a/t/db_dependent/SIP/Transaction.t (+2 lines)
70	categorycode => $borrower->{categorycode},	70	categorycode => $borrower->{categorycode},
71	branchcode => $branch->{branchcode},	71	branchcode => $branch->{branchcode},
72	itemtype => $itype->{itemtype},	72	itemtype => $itype->{itemtype},
		73	checkout_type => undef,
73	rules => {	74	rules => {
74	onshelfholds => 1,	75	onshelfholds => 1,
75	reservesallowed => 3,	76	reservesallowed => 3,
Lines 176-181 subtest cancel_hold => sub { Link Here
176	categorycode => $patron->categorycode,	177	categorycode => $patron->categorycode,
177	branchcode => $library->branchcode,	178	branchcode => $library->branchcode,
178	itemtype => $item->effective_itemtype,	179	itemtype => $item->effective_itemtype,
		180	checkout_type => undef,
179	rules => {	181	rules => {
180	onshelfholds => 1,	182	onshelfholds => 1,
181	reservesallowed => 3,	183	reservesallowed => 3,

Lines 76-81 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/api/v1/checkouts.t (+1 lines)
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,

Lines 70-75 our $sample_data = { Link Here

(-)a/t/db_dependent/selenium/basic_workflow.t (-1 / +6 lines)
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 25089

Lines 67-72 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (+10 lines)
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" />

Lines 261-266 Koha::CirculationRules->set_rules( Link Here

(-)a/t/db_dependent/Circulation.t (+28 lines)
261	categorycode => undef,	261	categorycode => undef,
262	branchcode => undef,	262	branchcode => undef,
263	itemtype => undef,	263	itemtype => undef,
		264	checkout_type => undef,
264	rules => {	265	rules => {
265	reservesallowed => 25,	266	reservesallowed => 25,
266	issuelength => 14,	267	issuelength => 14,
Lines 768-773 subtest "CanBookBeRenewed tests" => sub { Link Here
768	categorycode => undef,	769	categorycode => undef,
769	branchcode => undef,	770	branchcode => undef,
770	itemtype => undef,	771	itemtype => undef,
		772	checkout_type => undef,
771	rules => {	773	rules => {
772	norenewalbefore => '7',	774	norenewalbefore => '7',
773	no_auto_renewal_after => '9',	775	no_auto_renewal_after => '9',
Lines 784-789 subtest "CanBookBeRenewed tests" => sub { Link Here
784	categorycode => undef,	786	categorycode => undef,
785	branchcode => undef,	787	branchcode => undef,
786	itemtype => undef,	788	itemtype => undef,
		789	checkout_type => undef,
787	rules => {	790	rules => {
788	norenewalbefore => '7',	791	norenewalbefore => '7',
789	no_auto_renewal_after => '10',	792	no_auto_renewal_after => '10',
Lines 800-805 subtest "CanBookBeRenewed tests" => sub { Link Here
800	categorycode => undef,	803	categorycode => undef,
801	branchcode => undef,	804	branchcode => undef,
802	itemtype => undef,	805	itemtype => undef,
		806	checkout_type => undef,
803	rules => {	807	rules => {
804	norenewalbefore => '7',	808	norenewalbefore => '7',
805	no_auto_renewal_after => '11',	809	no_auto_renewal_after => '11',
Lines 816-821 subtest "CanBookBeRenewed tests" => sub { Link Here
816	categorycode => undef,	820	categorycode => undef,
817	branchcode => undef,	821	branchcode => undef,
818	itemtype => undef,	822	itemtype => undef,
		823	checkout_type => undef,
819	rules => {	824	rules => {
820	norenewalbefore => '10',	825	norenewalbefore => '10',
821	no_auto_renewal_after => '11',	826	no_auto_renewal_after => '11',
Lines 832-837 subtest "CanBookBeRenewed tests" => sub { Link Here
832	categorycode => undef,	837	categorycode => undef,
833	branchcode => undef,	838	branchcode => undef,
834	itemtype => undef,	839	itemtype => undef,
		840	checkout_type => undef,
835	rules => {	841	rules => {
836	norenewalbefore => '10',	842	norenewalbefore => '10',
837	no_auto_renewal_after => undef,	843	no_auto_renewal_after => undef,
Lines 849-854 subtest "CanBookBeRenewed tests" => sub { Link Here
849	categorycode => undef,	855	categorycode => undef,
850	branchcode => undef,	856	branchcode => undef,
851	itemtype => undef,	857	itemtype => undef,
		858	checkout_type => undef,
852	rules => {	859	rules => {
853	norenewalbefore => '7',	860	norenewalbefore => '7',
854	no_auto_renewal_after => '15',	861	no_auto_renewal_after => '15',
Lines 866-871 subtest "CanBookBeRenewed tests" => sub { Link Here
866	categorycode => undef,	873	categorycode => undef,
867	branchcode => undef,	874	branchcode => undef,
868	itemtype => undef,	875	itemtype => undef,
		876	checkout_type => undef,
869	rules => {	877	rules => {
870	norenewalbefore => '10',	878	norenewalbefore => '10',
871	no_auto_renewal_after => undef,	879	no_auto_renewal_after => undef,
Lines 899-904 subtest "CanBookBeRenewed tests" => sub { Link Here
899	categorycode => undef,	907	categorycode => undef,
900	branchcode => undef,	908	branchcode => undef,
901	itemtype => undef,	909	itemtype => undef,
		910	checkout_type => undef,
902	rules => {	911	rules => {
903	norenewalbefore => '10',	912	norenewalbefore => '10',
904	no_auto_renewal_after => '11',	913	no_auto_renewal_after => '11',
Lines 991-996 subtest "CanBookBeRenewed tests" => sub { Link Here
991	categorycode => undef,	1000	categorycode => undef,
992	branchcode => undef,	1001	branchcode => undef,
993	itemtype => undef,	1002	itemtype => undef,
		1003	checkout_type => undef,
994	rules => {	1004	rules => {
995	norenewalbefore => 10,	1005	norenewalbefore => 10,
996	no_auto_renewal_after => 11,	1006	no_auto_renewal_after => 11,
Lines 1057-1062 subtest "CanBookBeRenewed tests" => sub { Link Here
1057	categorycode => undef,	1067	categorycode => undef,
1058	branchcode => undef,	1068	branchcode => undef,
1059	itemtype => undef,	1069	itemtype => undef,
		1070	checkout_type => undef,
1060	rules => {	1071	rules => {
1061	norenewalbefore => '7',	1072	norenewalbefore => '7',
1062	no_auto_renewal_after => '',	1073	no_auto_renewal_after => '',
Lines 1072-1077 subtest "CanBookBeRenewed tests" => sub { Link Here
1072	categorycode => undef,	1083	categorycode => undef,
1073	branchcode => undef,	1084	branchcode => undef,
1074	itemtype => undef,	1085	itemtype => undef,
		1086	checkout_type => undef,
1075	rules => {	1087	rules => {
1076	norenewalbefore => '10',	1088	norenewalbefore => '10',
1077	no_auto_renewal_after => '5',	1089	no_auto_renewal_after => '5',
Lines 1093-1098 subtest "CanBookBeRenewed tests" => sub { Link Here
1093	categorycode => undef,	1105	categorycode => undef,
1094	branchcode => undef,	1106	branchcode => undef,
1095	itemtype => undef,	1107	itemtype => undef,
		1108	checkout_type => undef,
1096	rules => {	1109	rules => {
1097	norenewalbefore => '10',	1110	norenewalbefore => '10',
1098	no_auto_renewal_after => '15',	1111	no_auto_renewal_after => '15',
Lines 1111-1116 subtest "CanBookBeRenewed tests" => sub { Link Here
1111	categorycode => undef,	1124	categorycode => undef,
1112	branchcode => undef,	1125	branchcode => undef,
1113	itemtype => undef,	1126	itemtype => undef,
		1127	checkout_type => undef,
1114	rules => {	1128	rules => {
1115	norenewalbefore => '10',	1129	norenewalbefore => '10',
1116	no_auto_renewal_after => '',	1130	no_auto_renewal_after => '',
Lines 1128-1133 subtest "CanBookBeRenewed tests" => sub { Link Here
1128	categorycode => undef,	1142	categorycode => undef,
1129	branchcode => undef,	1143	branchcode => undef,
1130	itemtype => undef,	1144	itemtype => undef,
		1145	checkout_type => undef,
1131	rules => {	1146	rules => {
1132	norenewalbefore => '10',	1147	norenewalbefore => '10',
1133	no_auto_renewal_after => '15',	1148	no_auto_renewal_after => '15',
Lines 1150-1155 subtest "CanBookBeRenewed tests" => sub { Link Here
1150	categorycode => undef,	1165	categorycode => undef,
1151	branchcode => undef,	1166	branchcode => undef,
1152	itemtype => undef,	1167	itemtype => undef,
		1168	checkout_type => undef,
1153	rules => {	1169	rules => {
1154	norenewalbefore => undef,	1170	norenewalbefore => undef,
1155	renewalsallowed => 0,	1171	renewalsallowed => 0,
Lines 1396-1401 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1396	categorycode => undef,	1412	categorycode => undef,
1397	itemtype => undef,	1413	itemtype => undef,
1398	branchcode => undef,	1414	branchcode => undef,
		1415	checkout_type => undef,
1399	rules => {	1416	rules => {
1400	reservesallowed => 25,	1417	reservesallowed => 25,
1401	issuelength => 14,	1418	issuelength => 14,
Lines 1463-1468 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1463	categorycode => undef,	1480	categorycode => undef,
1464	itemtype => undef,	1481	itemtype => undef,
1465	branchcode => undef,	1482	branchcode => undef,
		1483	checkout_type => undef,
1466	rules => {	1484	rules => {
1467	onshelfholds => 0,	1485	onshelfholds => 0,
1468	}	1486	}
Lines 1477-1482 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1477	categorycode => undef,	1495	categorycode => undef,
1478	itemtype => undef,	1496	itemtype => undef,
1479	branchcode => undef,	1497	branchcode => undef,
		1498	checkout_type => undef,
1480	rules => {	1499	rules => {
1481	onshelfholds => 0,	1500	onshelfholds => 0,
1482	}	1501	}
Lines 1491-1496 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1491	categorycode => undef,	1510	categorycode => undef,
1492	itemtype => undef,	1511	itemtype => undef,
1493	branchcode => undef,	1512	branchcode => undef,
		1513	checkout_type => undef,
1494	rules => {	1514	rules => {
1495	onshelfholds => 1,	1515	onshelfholds => 1,
1496	}	1516	}
Lines 1505-1510 subtest "AllowRenewalIfOtherItemsAvailable tests" => sub { Link Here
1505	categorycode => undef,	1525	categorycode => undef,
1506	itemtype => undef,	1526	itemtype => undef,
1507	branchcode => undef,	1527	branchcode => undef,
		1528	checkout_type => undef,
1508	rules => {	1529	rules => {
1509	onshelfholds => 1,	1530	onshelfholds => 1,
1510	}	1531	}
Lines 2025-2030 subtest 'AddReturn + CumulativeRestrictionPeriods' => sub { Link Here
2025	categorycode => undef,	2046	categorycode => undef,
2026	itemtype => undef,	2047	itemtype => undef,
2027	branchcode => undef,	2048	branchcode => undef,
		2049	checkout_type => undef,
2028	rules => {	2050	rules => {
2029	issuelength => 1,	2051	issuelength => 1,
2030	firstremind => 1, # 1 day of grace	2052	firstremind => 1, # 1 day of grace
Lines 2131-2136 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2131	categorycode => '*',	2153	categorycode => '*',
2132	itemtype => '*',	2154	itemtype => '*',
2133	branchcode => '*',	2155	branchcode => '*',
		2156	checkout_type => '*',
2134	rules => {	2157	rules => {
2135	issuelength => 1,	2158	issuelength => 1,
2136	firstremind => 0, # 0 day of grace	2159	firstremind => 0, # 0 day of grace
Lines 2187-2192 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2187	categorycode => undef,	2210	categorycode => undef,
2188	branchcode => undef,	2211	branchcode => undef,
2189	itemtype => undef,	2212	itemtype => undef,
		2213	checkout_type => undef,
2190	rules => {	2214	rules => {
2191	suspension_chargeperiod => 3,	2215	suspension_chargeperiod => 3,
2192	firstremind => 1,	2216	firstremind => 1,
Lines 2211-2216 subtest 'AddReturn + suspension_chargeperiod' => sub { Link Here
2211	categorycode => undef,	2235	categorycode => undef,
2212	branchcode => undef,	2236	branchcode => undef,
2213	itemtype => undef,	2237	itemtype => undef,
		2238	checkout_type => undef,
2214	rules => {	2239	rules => {
2215	finedays => 2,	2240	finedays => 2,
2216	suspension_chargeperiod => 1,	2241	suspension_chargeperiod => 1,
Lines 2380-2385 subtest 'AddReturn \| is_overdue' => sub { Link Here
2380	categorycode => undef,	2405	categorycode => undef,
2381	itemtype => undef,	2406	itemtype => undef,
2382	branchcode => undef,	2407	branchcode => undef,
		2408	checkout_type => undef,
2383	rules => {	2409	rules => {
2384	issuelength => 6,	2410	issuelength => 6,
2385	lengthunit => 'days',	2411	lengthunit => 'days',
Lines 3301-3306 subtest 'CanBookBeIssued \| is_overdue' => sub { Link Here
3301	categorycode => undef,	3327	categorycode => undef,
3302	branchcode => undef,	3328	branchcode => undef,
3303	itemtype => undef,	3329	itemtype => undef,
		3330	checkout_type => undef,
3304	rules => {	3331	rules => {
3305	maxissueqty => 1,	3332	maxissueqty => 1,
3306	reservesallowed => 25,	3333	reservesallowed => 25,
Lines 3347-3352 subtest 'ItemsDeniedRenewal preference' => sub { Link Here
3347	categorycode => '*',	3374	categorycode => '*',
3348	itemtype => '*',	3375	itemtype => '*',
3349	branchcode => $idr_lib->branchcode,	3376	branchcode => $idr_lib->branchcode,
		3377	checkout_type => '*',
3350	rules => {	3378	rules => {
3351	reservesallowed => 25,	3379	reservesallowed => 25,
3352	issuelength => 14,	3380	issuelength => 14,

Lines 10-15 use t::lib::Mocks; Link Here

(-)a/t/db_dependent/Circulation/CalcDateDue.t (+4 lines)
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 170-175 Koha::CirculationRules->set_rules( Link Here
170	categorycode => $dayweek_categorycode,	173	categorycode => $dayweek_categorycode,
171	itemtype => $dayweek_itemtype,	174	itemtype => $dayweek_itemtype,
172	branchcode => $dayweek_branchcode,	175	branchcode => $dayweek_branchcode,
		176	checkout_type => $checkout_type,
173	rules => {	177	rules => {
174	issuelength => $dayweek_issuelength,	178	issuelength => $dayweek_issuelength,
175	renewalperiod => $dayweek_renewalperiod,	179	renewalperiod => $dayweek_renewalperiod,

Lines 5-10 use C4::Context; Link Here

(-)a/t/db_dependent/Circulation/GetHardDueDate.t (+4 lines)
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,