Attachment #29214 for bug #9805

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




    $renews = $biblio->{'renewals'} + 1;

    # If item was lost, it has now been found, reverse any list item charges if neccessary.
    if ( $item->{'itemlost'} && C4::Context->preference('RemoveLostStatusOnRenewal') ) {

        _FixAccountForLostAndReturned( $item->{'itemnumber'}, undef, $item->{'barcode'} )
          if C4::Context->preference('RefundLostItemFeeOnReturn');

        ModItem( { itemlost => 0, }, $biblio->{'biblionumber'}, $itemnumber );
    }

    ModItem(
        {
            renewals => $renews,
            onloan   => $datedue->strftime('%Y-%m-%d %H:%M'),
            itemlost => 0,
        },
        $biblio->{'biblionumber'},
        $itemnumber

Lines 329-334 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
329	('RandomizeHoldsQueueWeight','0',NULL,'if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight','YesNo'),	329	('RandomizeHoldsQueueWeight','0',NULL,'if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight','YesNo'),
330	('RecordLocalUseOnReturn','0',NULL,'If ON, statistically record returns of unissued items as local use, instead of return','YesNo'),	330	('RecordLocalUseOnReturn','0',NULL,'If ON, statistically record returns of unissued items as local use, instead of return','YesNo'),
331	('RefundLostItemFeeOnReturn','1',NULL,'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.','YesNo'),	331	('RefundLostItemFeeOnReturn','1',NULL,'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.','YesNo'),
		332	('RemoveLostStatusOnRenewal','0', NULL,'If enabled, renewals mark lost items as found in the same manner as returns','YesNo'),
332	('RenewalPeriodBase','date_due','date_due\|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'),	333	('RenewalPeriodBase','date_due','date_due\|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'),
333	('RenewalSendNotice','0','',NULL,'YesNo'),	334	('RenewalSendNotice','0','',NULL,'YesNo'),
334	('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),	335	('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'),




    SetVersion($DBversion);
}

$DBversion = "3.17.00.XXX";
if ( CheckVersion($DBversion) ) {
    $dbh->do(q{
        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
        VALUES ('RemoveLostStatusOnRenewal','0', NULL,'If enabled, renewals mark lost items as found in the same manner as returns','YesNo')
    });
    print "Upgrade to $DBversion done (Bug 11169 - Add OPACAcquisitionDetails syspref)\n";
    SetVersion($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 344-349 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +7 lines)
344	nothing : "do nothing"	344	nothing : "do nothing"
345	- .	345	- .
346	-	346	-
		347	- "When renewing an item that has been marked as lost, "
		348	- pref: RemoveLostStatusOnRenewal
		349	choices:
		350	yes: "do"
		351	no: "do not"
		352	- mark the as found in the same manner as a return would.
		353	-
347	- pref: AllowMultipleIssuesOnABiblio	354	- pref: AllowMultipleIssuesOnABiblio
348	choices:	355	choices:
349	yes: Allow	356	yes: Allow
350	-

Return to bug 9805

Lines 2725-2741 sub AddRenewal { Link Here

(-)a/C4/Circulation.pm (-6 / +7 lines)
2725	$renews = $biblio->{'renewals'} + 1;	2725	$renews = $biblio->{'renewals'} + 1;
2726		2726
2727	# If item was lost, it has now been found, reverse any list item charges if neccessary.	2727	# If item was lost, it has now been found, reverse any list item charges if neccessary.
2728	if ( $item->{'itemlost'} ) {	2728	if ( $item->{'itemlost'} && C4::Context->preference('RemoveLostStatusOnRenewal') ) {
2729	if ( C4::Context->preference('RefundLostItemFeeOnReturn') ) {	2729
2730	_FixAccountForLostAndReturned( $item->{'itemnumber'}, undef, $item->{'barcode'} );	2730	_FixAccountForLostAndReturned( $item->{'itemnumber'}, undef, $item->{'barcode'} )
2731	}	2731	if C4::Context->preference('RefundLostItemFeeOnReturn');
		2732
		2733	ModItem( { itemlost => 0, }, $biblio->{'biblionumber'}, $itemnumber );
2732	}	2734	}
2733		2735
2734	ModItem(	2736	ModItem(
2735	{	2737	{
2736	renewals => $renews,	2738	renewals => $renews,
2737	onloan => $datedue->strftime('%Y-%m-%d %H:%M'),	2739	onloan => $datedue->strftime('%Y-%m-%d %H:%M'),
2738	itemlost => 0,
2739	},	2740	},
2740	$biblio->{'biblionumber'},	2741	$biblio->{'biblionumber'},
2741	$itemnumber	2742	$itemnumber

Lines 8560-8565 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
8560	SetVersion($DBversion);	8560	SetVersion($DBversion);
8561	}	8561	}
8562		8562
		8563	$DBversion = "3.17.00.XXX";
		8564	if ( CheckVersion($DBversion) ) {
		8565	$dbh->do(q{
		8566	INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
		8567	VALUES ('RemoveLostStatusOnRenewal','0', NULL,'If enabled, renewals mark lost items as found in the same manner as returns','YesNo')
		8568	});
		8569	print "Upgrade to $DBversion done (Bug 11169 - Add OPACAcquisitionDetails syspref)\n";
		8570	SetVersion($DBversion);
		8571	}
		8572
8563	=head1 FUNCTIONS	8573	=head1 FUNCTIONS
8564		8574
8565	=head2 TableExists($table)	8575	=head2 TableExists($table)