Attachment #113078 for bug #24083

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

Lines 2969-2975 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (-1 / +1 lines)
2969	$soonestrenewal->truncate( to => 'day' );	2969	$soonestrenewal->truncate( to => 'day' );
2970	}	2970	}
2971		2971
2972	if ( $soonestrenewal > DateTime->now( time_zone => C4::Context->tz() ) )	2972	if ( $soonestrenewal > dt_from_string() )
2973	{	2973	{
2974	return ( 0, "auto_too_soon" ) if $issue->auto_renew;	2974	return ( 0, "auto_too_soon" ) if $issue->auto_renew;
2975	return ( 0, "too_soon" );	2975	return ( 0, "too_soon" );




  `returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues
  `lastreneweddate` datetime default NULL, -- date the item was last renewed
  `renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
  `issuedate` datetime default NULL, -- date the item was checked out or issued

  `returndate` datetime default NULL, -- date the item was returned
  `lastreneweddate` datetime default NULL, -- date the item was last renewed
  `renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
  `auto_renew` tinyint(1) default FALSE, -- automatic renewal
  `auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
  `issuedate` datetime default NULL, -- date the item was checked out or issued

Lines 672-678 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
672	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),	672	('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),
673	('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'),	673	('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'),
674	('UniqueItemFields','barcode','','Pipe-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'),	674	('UniqueItemFields','barcode','','Pipe-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'),
675	('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit','YesNo'),	675	('UnseenRenewals','0','','Allow renewals to be recorded as "unseen" by the library, and count against the patrons unseen renewals limit.','YesNo'),
676	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),	676	('UnsubscribeReflectionDelay','',NULL,'Delay for locking unsubscribers', 'Integer'),
677	('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'),	677	('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'),
678	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, 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'),	678	('UpdateNotForLoanStatusOnCheckin', '', 'NULL', 'This is a list of value pairs. When an item is checked in, 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'),

Lines 324-330 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
324	choices:	324	choices:
325	yes: Allow	325	yes: Allow
326	no: "Don't allow"	326	no: "Don't allow"
327	- renewals to be recorded as "unseen" by the library, and count against the borrowers unseen renewals limit	327	- renewals to be recorded as "unseen" by the library, and count against the patrons unseen renewals limit.
328	-	328	-
329	- Prevent patrons from making holds on the OPAC if they owe more than	329	- Prevent patrons from making holds on the OPAC if they owe more than
330	- pref: maxoutstanding	330	- pref: maxoutstanding

Lines 32-38 use Koha::Checkouts; Link Here

(-)a/t/db_dependent/Circulation/issue.t (-2 lines)
32	use Koha::Database;	32	use Koha::Database;
33	use Koha::DateUtils;	33	use Koha::DateUtils;
34	use Koha::Holds;	34	use Koha::Holds;
35	use Koha::IssuingRules;
36	use Koha::Items;	35	use Koha::Items;
37	use Koha::Library;	36	use Koha::Library;
38	use Koha::Patrons;	37	use Koha::Patrons;
39	-

Return to bug 24083

Lines 1624-1631 CREATE TABLE `issues` ( -- information related to check outs or issues Link Here

(-)a/installer/data/mysql/kohastructure.sql (-2 / +2 lines)
1624	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues	1624	`returndate` datetime default NULL, -- date the item was returned, will be NULL until moved to old_issues
1625	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1625	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1626	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1626	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
1627	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1628	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen	1627	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
		1628	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1629	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1629	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1630	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1630	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1631	`issuedate` datetime default NULL, -- date the item was checked out or issued	1631	`issuedate` datetime default NULL, -- date the item was checked out or issued
Lines 1657-1664 CREATE TABLE `old_issues` ( -- lists items that were checked out and have been r Link Here
1657	`returndate` datetime default NULL, -- date the item was returned	1657	`returndate` datetime default NULL, -- date the item was returned
1658	`lastreneweddate` datetime default NULL, -- date the item was last renewed	1658	`lastreneweddate` datetime default NULL, -- date the item was last renewed
1659	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed	1659	`renewals` tinyint(4) NOT NULL default 0, -- lists the number of times the item was renewed
1660	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1661	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen	1660	`unseen_renewals` tinyint(4) NOT NULL default 0, -- lists the number of consecutive times the item was renewed without being seen
		1661	`auto_renew` tinyint(1) default FALSE, -- automatic renewal
1662	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error	1662	`auto_renew_error` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL, -- automatic renewal error
1663	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched	1663	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this record was last touched
1664	`issuedate` datetime default NULL, -- date the item was checked out or issued	1664	`issuedate` datetime default NULL, -- date the item was checked out or issued