Attachment #165906 for bug #22740

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




            }
            $debit->discard_changes; # Refresh values from DB to clear floating point remainders

            # Same logic exists in Koha::Account::pay
            if (
                $debit->debit_type_code
                m|onpayment|
                && $debit->debit_type_code
                && $debit->debit_type_code eq 'LOST'
                && $debit->amountoutstanding == 0
                && $debit->itemnumber

                )
              )
            {
                if (
                    C4::Context->preference('UpdateItemLostStatusWhenPaid')
                    && !($self->credit_type_code eq 'WRITEOFF' || $self->credit_type_code eq 'VOID')
                )
                {
                    $debit->item->itemlost(C4::Context->preference('UpdateItemLostStatusWhenPaid'))->store(); 
                } 
                if (
                    C4::Context->preference('UpdateItemLostStatusWhenWriteOff')
                    && ($self->credit_type_code eq 'WRITEOFF' || $self->credit_type_code eq 'VOID')
                )
                {
                    $debit->item->itemlost(C4::Context->preference('UpdateItemLostStatusWhenWriteOff'))->store(); 
                }

                if (
                    C4::Context->preference('MarkLostItemsAsReturned') =~
                    m|onpayment|
                )
                {
                    C4::Circulation::ReturnLostItem( $self->borrowernumber,
                        $debit->itemnumber );
                }
            }

            last if $available_credit == 0;




use Modern::Perl;

return {
    bug_number  => "22740",
    description => "Preferences to enable automated setting of lost status when the associated fine is paid or written off",
    up          => sub {
        my ($args) = @_;
        my ( $dbh, $out ) = @$args{qw(dbh out)};

        # Do you stuffs here
        # sysprefs
        $dbh->do(
            q{ 
                INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLostStatusWhenPaid', '0', NULL, 'Allows the status of lost items to be automatically changed when item paid for', 'Integer')
            });
        say $out "Added new system preference 'UpdateItemLostStatusWhenPaid'";

        $dbh->do(
            q{
                INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLostStatusWhenWriteoff', '0', NULL, 'Allows the status of lost items to be automatically changed when item written off', 'Integer')
            });
        say $out "Added new system preference 'UpdateItemLostStatusWhenWriteoff'"
    },
};

Lines 796-801 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (+2 lines)
796	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),	796	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),
797	('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),	797	('UpdateItemLocationOnCheckin', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check in.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check in.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),
798	('UpdateItemLocationOnCheckout', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check out.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check out.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check out.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check out.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check out.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),	798	('UpdateItemLocationOnCheckout', '', 'NULL', 'This is a list of value pairs.\n Examples:\n\nPROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check out.\nFIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check out.\n_BLANK_:FIC - causes an item that has no location to be updated into the Fiction location on check out.\nFIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check out.\n_ALL_:FIC - causes all items to be updated into the Fiction location on check out.\nPROC: _PERM_ - causes an item that is in the Processing Center to be updated to it''s permanent location.\n\nGeneral rule: if the location value on the left matches the item''s current location, it will be updated to match the location value on the right.\nNote: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.\n\nThe special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.\nThe special term _ALL_ is used on the left side of the colon (:) to affect all items.\nThe special term _PERM_ is used on the right side of the colon (:) to return items to their permanent location.', 'Free'),
		799	('UpdateItemLostStatusWhenPaid', '0', NULL, 'Allows the status of lost items to be automatically changed to lost and paid for when paid for', 'Integer'),
		800	('UpdateItemLostStatusWhenWriteoff', '0', NULL, 'Allows the status of lost items to be automatically changed to lost and paid for when written off', 'Integer'),
799	('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'),	801	('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'),
800	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of item types and value pairs.\nExamples:\n_ALL_:\n -1: 0\n\nCR:\n 1: 0\n\nWhen an item is checked in, if its item type matches CR then when the value on the left (1) matches the items not for loan value it will be updated to the value on the right.\n\nThe special term _ALL_ is used on the left side of the colon (:) to affect all item types. This does not override all other rules\n\nEach item type needs to be defined on a separate line on the left side of the colon (:).\nEach pair of not for loan values, for that item type, should be listed on separate lines below the item type, each indented by a leading space.', 'Free'),	802	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of item types and value pairs.\nExamples:\n_ALL_:\n -1: 0\n\nCR:\n 1: 0\n\nWhen an item is checked in, if its item type matches CR then when the value on the left (1) matches the items not for loan value it will be updated to the value on the right.\n\nThe special term _ALL_ is used on the left side of the colon (:) to affect all item types. This does not override all other rules\n\nEach item type needs to be defined on a separate line on the left side of the colon (:).\nEach pair of not for loan values, for that item type, should be listed on separate lines below the item type, each indented by a leading space.', 'Free'),
801	('UpdateNotForLoanStatusOnCheckout', '', 'NULL', 'This is a list of value pairs. When an item is checked out, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'),	803	('UpdateNotForLoanStatusOnCheckout', '', 'NULL', 'This is a list of value pairs. When an item is checked out, if the not for loan value on the left matches the items not for loan value it will be updated to the right-hand value. E.g. ''-1: 0'' will cause an item that was set to ''Ordered'' to now be available for loan. Each pair of values should be on a separate line.', 'Free'),




                onpayment: "when receiving payment for the item"
                claim_returned: "when marking an item as a return claim"
            - .
        -
            - "Update item status to"
            - pref: UpdateItemLostStatusWhenPaid
              choices: authval
              source: LOST
            - "when the outstanding balance is paid."
        -
            - "Update item status to"
            - pref: UpdateItemLostStatusWhenWriteoff
              choices: authval
              source: LOST
            - "when the outstanding balance is written off."
        -
            - pref: AllowMultipleIssuesOnABiblio
              choices:
- 

Return to bug 22740

Lines 678-688 sub apply { Link Here

(-)a/Koha/Account/Line.pm (-6 / +24 lines)
678	}	678	}
679	$debit->discard_changes; # Refresh values from DB to clear floating point remainders	679	$debit->discard_changes; # Refresh values from DB to clear floating point remainders
680		680
681	# Same logic exists in Koha::Account::pay
682	if (	681	if (
683	C4::Context->preference('MarkLostItemsAsReturned') =~	682	$debit->debit_type_code
684	m\|onpayment\|
685	&& $debit->debit_type_code
686	&& $debit->debit_type_code eq 'LOST'	683	&& $debit->debit_type_code eq 'LOST'
687	&& $debit->amountoutstanding == 0	684	&& $debit->amountoutstanding == 0
688	&& $debit->itemnumber	685	&& $debit->itemnumber
Lines 692-699 sub apply { Link Here
692	)	689	)
693	)	690	)
694	{	691	{
695	C4::Circulation::ReturnLostItem( $self->borrowernumber,	692	if (
696	$debit->itemnumber );	693	C4::Context->preference('UpdateItemLostStatusWhenPaid')
		694	&& !($self->credit_type_code eq 'WRITEOFF' \|\| $self->credit_type_code eq 'VOID')
		695	)
		696	{
		697	$debit->item->itemlost(C4::Context->preference('UpdateItemLostStatusWhenPaid'))->store();
		698	}
		699	if (
		700	C4::Context->preference('UpdateItemLostStatusWhenWriteOff')
		701	&& ($self->credit_type_code eq 'WRITEOFF' \|\| $self->credit_type_code eq 'VOID')
		702	)
		703	{
		704	$debit->item->itemlost(C4::Context->preference('UpdateItemLostStatusWhenWriteOff'))->store();
		705	}
		706
		707	if (
		708	C4::Context->preference('MarkLostItemsAsReturned') =~
		709	m\|onpayment\|
		710	)
		711	{
		712	C4::Circulation::ReturnLostItem( $self->borrowernumber,
		713	$debit->itemnumber );
		714	}
697	}	715	}
698		716
699	last if $available_credit == 0;	717	last if $available_credit == 0;

Lines 478-483 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +12 lines)
478	onpayment: "when receiving payment for the item"	478	onpayment: "when receiving payment for the item"
479	claim_returned: "when marking an item as a return claim"	479	claim_returned: "when marking an item as a return claim"
480	- .	480	- .
		481	-
		482	- "Update item status to"
		483	- pref: UpdateItemLostStatusWhenPaid
		484	choices: authval
		485	source: LOST
		486	- "when the outstanding balance is paid."
		487	-
		488	- "Update item status to"
		489	- pref: UpdateItemLostStatusWhenWriteoff
		490	choices: authval
		491	source: LOST
		492	- "when the outstanding balance is written off."
481	-	493	-
482	- pref: AllowMultipleIssuesOnABiblio	494	- pref: AllowMultipleIssuesOnABiblio
483	choices:	495	choices:
484	-

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_22740-add_UpdateItemLostStatusWhenPaid_syspref.pl (+24 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "22740",
	5	description => "Preferences to enable automated setting of lost status when the associated fine is paid or written off",
	6	up => sub {
	7	my ($args) = @_;
	8	my ( $dbh, $out ) = @$args{qw(dbh out)};
	9
	10	# Do you stuffs here
	11	# sysprefs
	12	$dbh->do(
	13	q{
	14	INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLostStatusWhenPaid', '0', NULL, 'Allows the status of lost items to be automatically changed when item paid for', 'Integer')
	15	});
	16	say $out "Added new system preference 'UpdateItemLostStatusWhenPaid'";
	17
	18	$dbh->do(
	19	q{
	20	INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('UpdateItemLostStatusWhenWriteoff', '0', NULL, 'Allows the status of lost items to be automatically changed when item written off', 'Integer')
	21	});
	22	say $out "Added new system preference 'UpdateItemLostStatusWhenWriteoff'"
	23	},
	24	};