Attachment #15301 for bug #8365

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




sub GetLoanLength {
    my ( $borrowertype, $itemtype, $branchcode ) = @_;
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare(qq{
        SELECT issuelength, lengthunit, renewalperiod
        FROM issuingrules
        WHERE   categorycode=?
            AND itemtype=?
            AND branchcode=?
            AND issuelength IS NOT NULL
    });

    # try to find issuelength & return the 1st available.
    # check with borrowertype, itemtype and branchcode, then without one of those parameters

    $sth->execute( $borrowertype, $itemtype, $branchcode );
    my $loanlength = $sth->fetchrow_hashref;
    return $loanlength

    # if no rule is set => 21 days (hardcoded)
    return {
        issuelength => 21,
        renewalperiod => 21,
        lengthunit => 'days',
    };



FIXME - This is a copy-paste of GetLoanLength
as a stop-gap.  Do not wish to change API for GetLoanLength 
this close to release.

Get the issuing rule for an itemtype, a borrower type and a branch
Returns a hashref from the issuingrules table.

    my $dbh       = C4::Context->dbh;
    my $renews    = 1;
    my $renewokay = 0;
    my $error;

    my $borrower    = C4::Members::GetMemberDetails( $borrowernumber, 0 )   or return;
    my $item        = GetItem($itemnumber)                                  or return;
    my $itemissue   = GetItemIssue($itemnumber)                             or return;

    my $branchcode  = _GetCircControlBranch($item, $borrower);
    # and not yet returned.
    my %branch = (
            'ItemHomeLibrary' => 'items.homebranch',
            'PickupLibrary'   => 'items.holdingbranch',
            'PatronLibrary'   => 'borrowers.branchcode'
            );
    my $controlbranch = $branch{C4::Context->preference('CircControl')};
    my $itype         = C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype';
    
    my $sthcount = $dbh->prepare("
                   SELECT 
                    borrowers.categorycode, biblioitems.itemtype, issues.renewals, renewalsallowed, $controlbranch
                   FROM  issuingrules, 
                   issues
                   LEFT JOIN items USING (itemnumber) 
                   LEFT JOIN borrowers USING (borrowernumber) 
                   LEFT JOIN biblioitems USING (biblioitemnumber)
                   
                   WHERE
                    (issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
                   AND
                    (issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
                   AND
                    (issuingrules.branchcode = $controlbranch OR issuingrules.branchcode = '*') 
                   AND 
                    borrowernumber = ? 
                   AND
                    itemnumber = ?
                   ORDER BY
                    issuingrules.categorycode desc,
                    issuingrules.itemtype desc,
                    issuingrules.branchcode desc
                   LIMIT 1;
                  ");

    $sthcount->execute( $borrowernumber, $itemnumber );
    if ( my $data1 = $sthcount->fetchrow_hashref ) {
        
        if ( ( $data1->{renewalsallowed} && $data1->{renewalsallowed} > $data1->{renewals} ) || $override_limit ) {
            $renewokay = 1;
        }
        else {
			$error="too_many";
		}
		
        my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
        if ($resfound) {
            $renewokay = 0;
			$error="on_reserve"
        }

    my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);

    if ( ( $issuingrule->{renewalsallowed} > $itemissue->{renewals} ) || $override_limit ) {
        $renewokay = 1;
    } else {
        $error = "too_many";
    }

    my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
    if ( $resfound ) {
        $renewokay = 0;
        $error     = "on_reserve";
    }

    return ( $renewokay, $error );
}

=head2 AddRenewal

        $datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
                                        $issuedata->{date_due} :
                                        DateTime->now( time_zone => C4::Context->tz());
        $datedue =  CalcDateDue($datedue, $itemtype, $issuedata->{'branchcode'}, $borrower, 'is a renewal');
    }

    # Update the issues record to have the new due date, and a new count

=cut

sub CalcDateDue {
    my ( $startdate, $itemtype, $branch, $borrower, $isrenewal ) = @_;

    $isrenewal ||= 0;

    # loanlength now a href
    my $loanlength =
            GetLoanLength( $borrower->{'categorycode'}, $itemtype, $branch );

    my $length_key = ( $isrenewal and defined $loanlength->{renewalperiod} )
            ? qq{renewalperiod}
            : qq{issuelength};

    my $datedue;

    # calculate the datedue as normal
    if ( C4::Context->preference('useDaysMode') eq 'Days' )
    {    # ignoring calendar
        my $dt =
          DateTime->now( time_zone => C4::Context->tz() )
          ->truncate( to => 'minute' );
        if ( $loanlength->{lengthunit} eq 'hours' ) {
            $dt->add( hours => $loanlength->{$length_key} );
        } else {    # days
            $dt->add( days => $loanlength->{$length_key} );
            $dt->set_hour(23);
            $dt->set_minute(59);
        }
        # break
        return $dt;
    } else {
        my $dur;
        if ($loanlength->{lengthunit} eq 'hours') {
            $dur = DateTime::Duration->new( hours => $loanlength->{$length_key});
        }
        else { # days
            $dur = DateTime::Duration->new( days => $loanlength->{$length_key});
        }
        if (ref $startdate ne 'DateTime' ) {
            $startdate = dt_from_string($startdate);
        }
        my $calendar = Koha::Calendar->new( branchcode => $branch );
        $datedue = $calendar->addDate( $startdate, $dur, $loanlength->{lengthunit} );
        if ($loanlength->{lengthunit} eq 'days') {
            $datedue->set_hour(23);
            $datedue->set_minute(59);
            return $dt;

        } else {
            my $dur;
            if ($loanlength->{lengthunit} eq 'hours') {
                $dur = DateTime::Duration->new( hours => $loanlength->{issuelength});
            }
            else { # days
                $dur = DateTime::Duration->new( days => $loanlength->{issuelength});
            }
            if (ref $startdate ne 'DateTime' ) {
                $startdate = dt_from_string($startdate);
            }
            my $calendar = Koha::Calendar->new( branchcode => $branch );
            $datedue = $calendar->addDate( $startdate, $dur, $loanlength->{lengthunit} );
            if ($loanlength->{lengthunit} eq 'days') {
                $datedue->set_hour(23);
                $datedue->set_minute(59);
            }
        }
    }





	push @EXPORT, qw(
        &GetIssuesIteminfo
	);
    #
	# &GetIssuingRules - delete.
	# use C4::Circulation::GetIssuingRule instead.
	
	# subs to move to Members.pm
	push @EXPORT, qw(
        &CheckBorrowerDebarred

    return 0;
}


=head2 GetIssuingRules

FIXME - This sub should be deprecated and removed.
It ignores branch and defaults.

    $data = &GetIssuingRules($itemtype,$categorycode);

Looks up for all issuingrules an item info 

C<$itemnumber> is a reference-to-hash whose keys are all of the fields
from the borrowers and categories tables of the Koha database. Thus,

C<$categorycode> contains  information about borrowers category 

C<$data> contains all information about both the borrower and
category he or she belongs to.
=cut 

sub GetIssuingRules {
	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
   my ($itemtype,$categorycode)=@_;
   my $dbh   = C4::Context->dbh();    
   my $query=qq|SELECT *
        FROM issuingrules
        WHERE issuingrules.itemtype=?
            AND issuingrules.categorycode=?
        |;
    my $sth = $dbh->prepare($query);
    #  print $query;
    $sth->execute($itemtype,$categorycode);
    return $sth->fetchrow_hashref;
}


sub ReplacementCost2 {
    my ( $itemnum, $borrowernumber ) = @_;
    my $dbh   = C4::Context->dbh();




# save the values entered
elsif ($op eq 'add') {
    my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
    my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, renewalperiod, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
    my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, renewalperiod=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=?  WHERE branchcode=? AND categorycode=? AND itemtype=?");
    
    my $br = $branch; # branch
    my $bor  = $input->param('categorycode'); # borrower category

    my $chargeperiod = $input->param('chargeperiod');
    my $maxissueqty  = $input->param('maxissueqty');
    my $renewalsallowed  = $input->param('renewalsallowed');
    my $renewalperiod    = $input->param('renewalperiod');
    my $reservesallowed  = $input->param('reservesallowed');
    $maxissueqty =~ s/\s//g;
    $maxissueqty = undef if $maxissueqty !~ /^\d+/;

    $sth_search->execute($br,$bor,$cat);
    my $res = $sth_search->fetchrow_hashref();
    if ($res->{total}) {
        $sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed, $renewalperiod, $reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
    } else {
        $sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed, $renewalperiod, $reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
    }
} 
elsif ($op eq "set-branch-defaults") {

Lines 1016-1021 CREATE TABLE `issuingrules` ( -- circulation and fine rules Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
1016	`hardduedate` date default NULL, -- hard due date	1016	`hardduedate` date default NULL, -- hard due date
1017	`hardduedatecompare` tinyint NOT NULL default "0", -- type of hard due date (1 = after, 0 = on, -1 = before)	1017	`hardduedatecompare` tinyint NOT NULL default "0", -- type of hard due date (1 = after, 0 = on, -1 = before)
1018	`renewalsallowed` smallint(6) NOT NULL default "0", -- how many renewals are allowed	1018	`renewalsallowed` smallint(6) NOT NULL default "0", -- how many renewals are allowed
		1019	`renewalperiod` int(4) default NULL -- renewal period in the unit set in issuingrules.lengthunit
1019	`reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed	1020	`reservesallowed` smallint(6) NOT NULL default "0", -- how many holds are allowed
1020	`branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)	1021	`branchcode` varchar(10) NOT NULL default '', -- the branch this rule is for (branches.branchcode)
1021	overduefinescap decimal default NULL, -- the maximum amount of an overdue fine	1022	overduefinescap decimal default NULL, -- the maximum amount of an overdue fine




}


$DBversion = '3.11.00.XXX';
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    $dbh->do(qq{
        ALTER TABLE issuingrules ADD COLUMN renewalperiod int(4) DEFAULT NULL AFTER renewalsallowed
    });
    $dbh->do(qq{
        UPDATE issuingrules SET renewalperiod = issuelength
    });
    print "Upgrade to $DBversion done (Add colum issuingrules.renewalperiod)\n";
    SetVersion ($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)




                <th>Overdue Fines Cap ($)</th>
                <th>Suspension in days (day)</th>
                <th>Renewals allowed (count)</th>
                <th>Renewals period</th>
                <th>Holds allowed (count)</th>
		<th>Rental discount (%)</th>
				<th>&nbsp;</th>

                            <td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
							<td>[% rule.finedays %]</td>
							<td>[% rule.renewalsallowed %]</td>
                            <td>[% rule.renewalperiod %]</td>
							<td>[% rule.reservesallowed %]</td>
							<td>[% rule.rentaldiscount %]</td>
							<td>

                    <td><input name="overduefinescap" size="6" /> </td>
                    <td><input name="finedays" size="3" /> </td>
                    <td><input name="renewalsallowed" size="2" /></td>
                    <td><input name="renewalperiod" size="3" /></td>
                    <td><input name="reservesallowed" size="2" /></td>
		    <td><input name="rentaldiscount" size="2" /></td>
                    <td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>

Lines 23-29 sub methods : Test( 1 ) { Link Here

(-)a/t/db_dependent/lib/KohaTest/Overdues.pm (-2 lines)
23	BorType	23	BorType
24	ReplacementCost	24	ReplacementCost
25	GetFine	25	GetFine
26	GetIssuingRules
27	ReplacementCost2	26	ReplacementCost2
28	GetNextIdNotify	27	GetNextIdNotify
29	NumberNotifyId	28	NumberNotifyId
30	-

Return to bug 8365

Lines 1324-1336 Get loan length for an itemtype, a borrower type and a branch Link Here

(-)a/C4/Circulation.pm (-109 / +72 lines)
1324	sub GetLoanLength {	1324	sub GetLoanLength {
1325	my ( $borrowertype, $itemtype, $branchcode ) = @_;	1325	my ( $borrowertype, $itemtype, $branchcode ) = @_;
1326	my $dbh = C4::Context->dbh;	1326	my $dbh = C4::Context->dbh;
1327	my $sth =	1327	my $sth = $dbh->prepare(qq{
1328	$dbh->prepare(	1328	SELECT issuelength, lengthunit, renewalperiod
1329	'select issuelength, lengthunit from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null'	1329	FROM issuingrules
1330	);	1330	WHERE categorycode=?
1331	# warn "in get loan lenght $borrowertype $itemtype $branchcode ";	1331	AND itemtype=?
1332	# try to find issuelength & return the 1st available.	1332	AND branchcode=?
1333	# check with borrowertype, itemtype and branchcode, then without one of those parameters	1333	AND issuelength IS NOT NULL
		1334	});
		1335
		1336	# try to find issuelength & return the 1st available.
		1337	# check with borrowertype, itemtype and branchcode, then without one of those parameters
		1338
1334	$sth->execute( $borrowertype, $itemtype, $branchcode );	1339	$sth->execute( $borrowertype, $itemtype, $branchcode );
1335	my $loanlength = $sth->fetchrow_hashref;	1340	my $loanlength = $sth->fetchrow_hashref;
1336	return $loanlength	1341	return $loanlength
Lines 1374-1379 sub GetLoanLength { Link Here
1374	# if no rule is set => 21 days (hardcoded)	1379	# if no rule is set => 21 days (hardcoded)
1375	return {	1380	return {
1376	issuelength => 21,	1381	issuelength => 21,
		1382	renewalperiod => 21,
1377	lengthunit => 'days',	1383	lengthunit => 'days',
1378	};	1384	};
1379		1385
Lines 1408-1414 sub GetHardDueDate { Link Here
1408		1414
1409	FIXME - This is a copy-paste of GetLoanLength	1415	FIXME - This is a copy-paste of GetLoanLength
1410	as a stop-gap. Do not wish to change API for GetLoanLength	1416	as a stop-gap. Do not wish to change API for GetLoanLength
1411	this close to release, however, Overdues::GetIssuingRules is broken.	1417	this close to release.
1412		1418
1413	Get the issuing rule for an itemtype, a borrower type and a branch	1419	Get the issuing rule for an itemtype, a borrower type and a branch
1414	Returns a hashref from the issuingrules table.	1420	Returns a hashref from the issuingrules table.
Lines 2430-2494 sub CanBookBeRenewed { Link Here
2430	my $dbh = C4::Context->dbh;	2436	my $dbh = C4::Context->dbh;
2431	my $renews = 1;	2437	my $renews = 1;
2432	my $renewokay = 0;	2438	my $renewokay = 0;
2433	my $error;	2439	my $error;
2434		2440
2435	# Look in the issues table for this item, lent to this borrower,	2441	my $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 ) or return;
2436	# and not yet returned.	2442	my $item = GetItem($itemnumber) or return;
		2443	my $itemissue = GetItemIssue($itemnumber) or return;
2437		2444
2438	# Look in the issues table for this item, lent to this borrower,	2445	my $branchcode = _GetCircControlBranch($item, $borrower);
2439	# and not yet returned.
2440	my %branch = (
2441	'ItemHomeLibrary' => 'items.homebranch',
2442	'PickupLibrary' => 'items.holdingbranch',
2443	'PatronLibrary' => 'borrowers.branchcode'
2444	);
2445	my $controlbranch = $branch{C4::Context->preference('CircControl')};
2446	my $itype = C4::Context->preference('item-level_itypes') ? 'items.itype' : 'biblioitems.itemtype';
2447
2448	my $sthcount = $dbh->prepare("
2449	SELECT
2450	borrowers.categorycode, biblioitems.itemtype, issues.renewals, renewalsallowed, $controlbranch
2451	FROM issuingrules,
2452	issues
2453	LEFT JOIN items USING (itemnumber)
2454	LEFT JOIN borrowers USING (borrowernumber)
2455	LEFT JOIN biblioitems USING (biblioitemnumber)
2456
2457	WHERE
2458	(issuingrules.categorycode = borrowers.categorycode OR issuingrules.categorycode = '*')
2459	AND
2460	(issuingrules.itemtype = $itype OR issuingrules.itemtype = '*')
2461	AND
2462	(issuingrules.branchcode = $controlbranch OR issuingrules.branchcode = '*')
2463	AND
2464	borrowernumber = ?
2465	AND
2466	itemnumber = ?
2467	ORDER BY
2468	issuingrules.categorycode desc,
2469	issuingrules.itemtype desc,
2470	issuingrules.branchcode desc
2471	LIMIT 1;
2472	");
2473
2474	$sthcount->execute( $borrowernumber, $itemnumber );
2475	if ( my $data1 = $sthcount->fetchrow_hashref ) {
2476
2477	if ( ( $data1->{renewalsallowed} && $data1->{renewalsallowed} > $data1->{renewals} ) \|\| $override_limit ) {
2478	$renewokay = 1;
2479	}
2480	else {
2481	$error="too_many";
2482	}
2483
2484	my ( $resfound, $resrec, undef ) = C4::Reserves::CheckReserves($itemnumber);
2485	if ($resfound) {
2486	$renewokay = 0;
2487	$error="on_reserve"
2488	}
2489		2446
		2447	my $issuingrule = GetIssuingRule($borrower->{categorycode}, $item->{itype}, $branchcode);
		2448
		2449	if ( ( $issuingrule->{renewalsallowed} > $itemissue->{renewals} ) \|\| $override_limit ) {
		2450	$renewokay = 1;
		2451	} else {
		2452	$error = "too_many";
2490	}	2453	}
2491	return ($renewokay,$error);	2454
		2455	my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
		2456	if ( $resfound ) {
		2457	$renewokay = 0;
		2458	$error = "on_reserve";
		2459	}
		2460
		2461	return ( $renewokay, $error );
2492	}	2462	}
2493		2463
2494	=head2 AddRenewal	2464	=head2 AddRenewal
Lines 2549-2555 sub AddRenewal { Link Here
2549	$datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?	2519	$datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2550	$issuedata->{date_due} :	2520	$issuedata->{date_due} :
2551	DateTime->now( time_zone => C4::Context->tz());	2521	DateTime->now( time_zone => C4::Context->tz());
2552	$datedue = CalcDateDue($datedue,$itemtype,$issuedata->{'branchcode'},$borrower);	2522	$datedue = CalcDateDue($datedue, $itemtype, $issuedata->{'branchcode'}, $borrower, 'is a renewal');
2553	}	2523	}
2554		2524
2555	# Update the issues record to have the new due date, and a new count	2525	# Update the issues record to have the new due date, and a new count
Lines 3018-3075 C<$borrower> = Borrower object Link Here
3018	=cut	2988	=cut
3019		2989
3020	sub CalcDateDue {	2990	sub CalcDateDue {
3021	my ( $startdate, $itemtype, $branch, $borrower ) = @_;	2991	my ( $startdate, $itemtype, $branch, $borrower, $isrenewal ) = @_;
		2992
		2993	$isrenewal \|\|= 0;
3022		2994
3023	# loanlength now a href	2995	# loanlength now a href
3024	my $loanlength =	2996	my $loanlength =
3025	GetLoanLength( $borrower->{'categorycode'}, $itemtype, $branch );	2997	GetLoanLength( $borrower->{'categorycode'}, $itemtype, $branch );
		2998
		2999	my $length_key = ( $isrenewal and defined $loanlength->{renewalperiod} )
		3000	? qq{renewalperiod}
		3001	: qq{issuelength};
3026		3002
3027	my $datedue;	3003	my $datedue;
3028		3004
3029	# if globalDueDate ON the datedue is set to that date	3005	# calculate the datedue as normal
3030	if (C4::Context->preference('globalDueDate')	3006	if ( C4::Context->preference('useDaysMode') eq 'Days' )
3031	&& ( C4::Context->preference('globalDueDate') =~	3007	{ # ignoring calendar
3032	C4::Dates->regexp('syspref') )	3008	my $dt =
3033	) {	3009	DateTime->now( time_zone => C4::Context->tz() )
3034	$datedue = dt_from_string(	3010	->truncate( to => 'minute' );
3035	C4::Context->preference('globalDueDate'),	3011	if ( $loanlength->{lengthunit} eq 'hours' ) {
3036	C4::Context->preference('dateformat')	3012	$dt->add( hours => $loanlength->{$length_key} );
3037	);	3013	} else { # days
		3014	$dt->add( days => $loanlength->{$length_key} );
		3015	$dt->set_hour(23);
		3016	$dt->set_minute(59);
		3017	}
		3018	# break
		3019	return $dt;
3038	} else {	3020	} else {
3039		3021	my $dur;
3040	# otherwise, calculate the datedue as normal	3022	if ($loanlength->{lengthunit} eq 'hours') {
3041	if ( C4::Context->preference('useDaysMode') eq 'Days' )	3023	$dur = DateTime::Duration->new( hours => $loanlength->{$length_key});
3042	{ # ignoring calendar	3024	}
3043	my $dt =	3025	else { # days
3044	DateTime->now( time_zone => C4::Context->tz() )	3026	$dur = DateTime::Duration->new( days => $loanlength->{$length_key});
3045	->truncate( to => 'minute' );	3027	}
3046	if ( $loanlength->{lengthunit} eq 'hours' ) {	3028	if (ref $startdate ne 'DateTime' ) {
3047	$dt->add( hours => $loanlength->{issuelength} );	3029	$startdate = dt_from_string($startdate);
3048	} else { # days	3030	}
3049	$dt->add( days => $loanlength->{issuelength} );	3031	my $calendar = Koha::Calendar->new( branchcode => $branch );
3050	$dt->set_hour(23);	3032	$datedue = $calendar->addDate( $startdate, $dur, $loanlength->{lengthunit} );
3051	$dt->set_minute(59);	3033	if ($loanlength->{lengthunit} eq 'days') {
3052	}	3034	$datedue->set_hour(23);
3053	# break	3035	$datedue->set_minute(59);
3054	return $dt;
3055
3056	} else {
3057	my $dur;
3058	if ($loanlength->{lengthunit} eq 'hours') {
3059	$dur = DateTime::Duration->new( hours => $loanlength->{issuelength});
3060	}
3061	else { # days
3062	$dur = DateTime::Duration->new( days => $loanlength->{issuelength});
3063	}
3064	if (ref $startdate ne 'DateTime' ) {
3065	$startdate = dt_from_string($startdate);
3066	}
3067	my $calendar = Koha::Calendar->new( branchcode => $branch );
3068	$datedue = $calendar->addDate( $startdate, $dur, $loanlength->{lengthunit} );
3069	if ($loanlength->{lengthunit} eq 'days') {
3070	$datedue->set_hour(23);
3071	$datedue->set_minute(59);
3072	}
3073	}	3036	}
3074	}	3037	}
3075		3038

Lines 72-81 BEGIN { Link Here

(-)a/C4/Overdues.pm (-39 lines)
72	push @EXPORT, qw(	72	push @EXPORT, qw(
73	&GetIssuesIteminfo	73	&GetIssuesIteminfo
74	);	74	);
75	#
76	# &GetIssuingRules - delete.
77	# use C4::Circulation::GetIssuingRule instead.
78
79	# subs to move to Members.pm	75	# subs to move to Members.pm
80	push @EXPORT, qw(	76	push @EXPORT, qw(
81	&CheckBorrowerDebarred	77	&CheckBorrowerDebarred
Lines 692-732 sub GetFine { Link Here
692	return 0;	688	return 0;
693	}	689	}
694		690
695
696	=head2 GetIssuingRules
697
698	FIXME - This sub should be deprecated and removed.
699	It ignores branch and defaults.
700
701	$data = &GetIssuingRules($itemtype,$categorycode);
702
703	Looks up for all issuingrules an item info
704
705	C<$itemnumber> is a reference-to-hash whose keys are all of the fields
706	from the borrowers and categories tables of the Koha database. Thus,
707
708	C<$categorycode> contains information about borrowers category
709
710	C<$data> contains all information about both the borrower and
711	category he or she belongs to.
712	=cut
713
714	sub GetIssuingRules {
715	warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
716	my ($itemtype,$categorycode)=@_;
717	my $dbh = C4::Context->dbh();
718	my $query=qq\|SELECT *
719	FROM issuingrules
720	WHERE issuingrules.itemtype=?
721	AND issuingrules.categorycode=?
722	\|;
723	my $sth = $dbh->prepare($query);
724	# print $query;
725	$sth->execute($itemtype,$categorycode);
726	return $sth->fetchrow_hashref;
727	}
728
729
730	sub ReplacementCost2 {	691	sub ReplacementCost2 {
731	my ( $itemnum, $borrowernumber ) = @_;	692	my ( $itemnum, $borrowernumber ) = @_;
732	my $dbh = C4::Context->dbh();	693	my $dbh = C4::Context->dbh();

Lines 101-108 elsif ($op eq 'delete-branch-item') { Link Here

(-)a/admin/smart-rules.pl (-4 / +5 lines)
101	# save the values entered	101	# save the values entered
102	elsif ($op eq 'add') {	102	elsif ($op eq 'add') {
103	my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');	103	my $sth_search = $dbh->prepare('SELECT COUNT(*) AS total FROM issuingrules WHERE branchcode=? AND categorycode=? AND itemtype=?');
104	my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');	104	my $sth_insert = $dbh->prepare('INSERT INTO issuingrules (branchcode, categorycode, itemtype, maxissueqty, renewalsallowed, renewalperiod, reservesallowed, issuelength, lengthunit, hardduedate, hardduedatecompare, fine, finedays, firstremind, chargeperiod,rentaldiscount, overduefinescap) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)');
105	my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=? WHERE branchcode=? AND categorycode=? AND itemtype=?");	105	my $sth_update=$dbh->prepare("UPDATE issuingrules SET fine=?, finedays=?, firstremind=?, chargeperiod=?, maxissueqty=?, renewalsallowed=?, renewalperiod=?, reservesallowed=?, issuelength=?, lengthunit = ?, hardduedate=?, hardduedatecompare=?, rentaldiscount=?, overduefinescap=? WHERE branchcode=? AND categorycode=? AND itemtype=?");
106		106
107	my $br = $branch; # branch	107	my $br = $branch; # branch
108	my $bor = $input->param('categorycode'); # borrower category	108	my $bor = $input->param('categorycode'); # borrower category
Lines 113-118 elsif ($op eq 'add') { Link Here
113	my $chargeperiod = $input->param('chargeperiod');	113	my $chargeperiod = $input->param('chargeperiod');
114	my $maxissueqty = $input->param('maxissueqty');	114	my $maxissueqty = $input->param('maxissueqty');
115	my $renewalsallowed = $input->param('renewalsallowed');	115	my $renewalsallowed = $input->param('renewalsallowed');
		116	my $renewalperiod = $input->param('renewalperiod');
116	my $reservesallowed = $input->param('reservesallowed');	117	my $reservesallowed = $input->param('reservesallowed');
117	$maxissueqty =~ s/\s//g;	118	$maxissueqty =~ s/\s//g;
118	$maxissueqty = undef if $maxissueqty !~ /^\d+/;	119	$maxissueqty = undef if $maxissueqty !~ /^\d+/;
Lines 128-136 elsif ($op eq 'add') { Link Here
128	$sth_search->execute($br,$bor,$cat);	129	$sth_search->execute($br,$bor,$cat);
129	my $res = $sth_search->fetchrow_hashref();	130	my $res = $sth_search->fetchrow_hashref();
130	if ($res->{total}) {	131	if ($res->{total}) {
131	$sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed,$reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);	132	$sth_update->execute($fine, $finedays,$firstremind, $chargeperiod, $maxissueqty, $renewalsallowed, $renewalperiod, $reservesallowed, $issuelength,$lengthunit, $hardduedate,$hardduedatecompare,$rentaldiscount,$overduefinescap, $br,$bor,$cat);
132	} else {	133	} else {
133	$sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed,$reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);	134	$sth_insert->execute($br,$bor,$cat,$maxissueqty,$renewalsallowed, $renewalperiod, $reservesallowed,$issuelength,$lengthunit,$hardduedate,$hardduedatecompare,$fine,$finedays,$firstremind,$chargeperiod,$rentaldiscount,$overduefinescap);
134	}	135	}
135	}	136	}
136	elsif ($op eq "set-branch-defaults") {	137	elsif ($op eq "set-branch-defaults") {

Lines 6400-6405 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
6400	}	6400	}
6401		6401
6402		6402
		6403	$DBversion = '3.11.00.XXX';
		6404	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		6405	$dbh->do(qq{
		6406	ALTER TABLE issuingrules ADD COLUMN renewalperiod int(4) DEFAULT NULL AFTER renewalsallowed
		6407	});
		6408	$dbh->do(qq{
		6409	UPDATE issuingrules SET renewalperiod = issuelength
		6410	});
		6411	print "Upgrade to $DBversion done (Add colum issuingrules.renewalperiod)\n";
		6412	SetVersion ($DBversion);
		6413	}
		6414
6403	=head1 FUNCTIONS	6415	=head1 FUNCTIONS
6404		6416
6405	=head2 TableExists($table)	6417	=head2 TableExists($table)

Lines 75-80 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (+3 lines)
75	<th>Overdue Fines Cap ($)</th>	75	<th>Overdue Fines Cap ($)</th>
76	<th>Suspension in days (day)</th>	76	<th>Suspension in days (day)</th>
77	<th>Renewals allowed (count)</th>	77	<th>Renewals allowed (count)</th>
		78	<th>Renewals period</th>
78	<th>Holds allowed (count)</th>	79	<th>Holds allowed (count)</th>
79	<th>Rental discount (%)</th>	80	<th>Rental discount (%)</th>
80	<th> </th>	81	<th> </th>
Lines 120-125 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here
120	<td>[% rule.overduefinescap FILTER format("%.2f") %]</td>	121	<td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
121	<td>[% rule.finedays %]</td>	122	<td>[% rule.finedays %]</td>
122	<td>[% rule.renewalsallowed %]</td>	123	<td>[% rule.renewalsallowed %]</td>
		124	<td>[% rule.renewalperiod %]</td>
123	<td>[% rule.reservesallowed %]</td>	125	<td>[% rule.reservesallowed %]</td>
124	<td>[% rule.rentaldiscount %]</td>	126	<td>[% rule.rentaldiscount %]</td>
125	<td>	127	<td>
Lines 166-171 for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde Link Here
166	<td><input name="overduefinescap" size="6" /> </td>	168	<td><input name="overduefinescap" size="6" /> </td>
167	<td><input name="finedays" size="3" /> </td>	169	<td><input name="finedays" size="3" /> </td>
168	<td><input name="renewalsallowed" size="2" /></td>	170	<td><input name="renewalsallowed" size="2" /></td>
		171	<td><input name="renewalperiod" size="3" /></td>
169	<td><input name="reservesallowed" size="2" /></td>	172	<td><input name="reservesallowed" size="2" /></td>
170	<td><input name="rentaldiscount" size="2" /></td>	173	<td><input name="rentaldiscount" size="2" /></td>
171	<td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>	174	<td><input type="hidden" name="branch" value="[% current_branch %]"/><input type="submit" value="Add" class="submit" /></td>