[koha-commits] main Koha release repository branch master updated. v19.05.00-1296-g150361c
Git repo owner
gitmaster at git.koha-community.org
Tue Nov 12 15:15:38 CET 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 150361c0e58e9a049b03693ce4859b9035d5c558 (commit)
via a70320077c7bb9878762e42d39211ab4de8e19dd (commit)
via b16c7c0615f41dde587370ba32ca5711ae8127dd (commit)
via 3d3336ed6607d80b72502075ebf9567cf48e1709 (commit)
via 5e5c47ea300b7eb34cbcd3e71ff4a1ac9a3eaa38 (commit)
via 508a5addf15170d32dea0f21e3acf569596db228 (commit)
via 7e602c275b3687460c55f3f103781f2a44bdbee8 (commit)
from 5ef116c58debd516903607aed5852601f1283ece (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 150361c0e58e9a049b03693ce4859b9035d5c558
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 15:44:49 2019 +0100
Bug 24002: One more occurrence of datecancellationprinted
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a70320077c7bb9878762e42d39211ab4de8e19dd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 14:49:48 2019 +0100
Bug 24002: Incorrect DATE value: '' in C4/Acquisition.pm
DBD::mysql::st execute failed: Incorrect DATE value: '' [for Statement "
SELECT aqbasket.basketno,
aqorders.ordernumber,
DATE(aqbasket.closedate) AS orderdate,
aqbasket.basketname AS basketname,
aqbasket.basketgroupid AS basketgroupid,
aqbasketgroups.name AS basketgroupname,
aqorders.rrp AS unitpricesupplier,
aqorders.ecost AS unitpricelib,
aqorders.claims_count AS claims_count,
aqorders.claimed_date AS claimed_date,
aqbudgets.budget_name AS budget,
borrowers.branchcode AS branch,
aqbooksellers.name AS supplier,
aqbooksellers.id AS supplierid,
biblio.author, biblio.title,
biblioitems.publishercode AS publisher,
biblioitems.publicationyear,
ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate,
aqorders.quantity - COALESCE(aqorders.quantityreceived,0) AS quantity,
(aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
DATEDIFF(CAST(now() AS date),closedate) AS latesince
FROM
aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber
LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber
LEFT JOIN aqbudgets ON aqorders.budget_id = aqbudgets.budget_id,
aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber
LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid = aqbasketgroups.id
WHERE aqorders.basketno = aqbasket.basketno
AND ( datereceived = ''
OR datereceived IS NULL
OR aqorders.quantityreceived < aqorders.quantity
)
AND aqbasket.closedate IS NOT NULL
AND aqorders.datecancellationprinted IS NULL
AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0 AND orderstatus <> 'cancelled'
ORDER BY latesince, basketno, borrowers.branchcode, supplier" with ParamValues: 0=0] at /kohadevbox/koha/C4/Acquisition.pm line 2248.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b16c7c0615f41dde587370ba32ca5711ae8127dd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 14:46:38 2019 +0100
Bug 24002: Incorrect DATE value: '0000-00-00' in C4/Acquisition.pm
t/db_dependent/Acquisition/close_reopen_basket.t .. DBD::mysql::st execute failed: Incorrect DATE value: '0000-00-00' [for Statement "
SELECT COUNT( DISTINCT( biblionumber ) )
FROM aqorders
WHERE basketno = ?
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
" with ParamValues: 0='2'] at /kohadevbox/koha/C4/Acquisition.pm line 3012.
DBD::mysql::st execute failed: Incorrect DATE value: '0000-00-00' [for Statement "
SELECT COUNT( DISTINCT( biblionumber ) )
FROM aqorders
WHERE basketno = ?
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
" with ParamValues: 0='2'] at /kohadevbox/koha/C4/Acquisition.pm line 3012.
And anticipating other failures
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3d3336ed6607d80b72502075ebf9567cf48e1709
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 14:44:28 2019 +0100
Bug 24002: Incorrect DATE value: '00-00-0000' in C4/Serials.pm
t/db_dependent/Biblio.t .. 2/12 DBD::mysql::st execute failed: Incorrect DATE value: '00-00-0000' [for Statement "
SELECT serial.serialid,
serial.serialseq,
serial.planneddate,
serial.publisheddate,
serial.publisheddatetext,
serial.status,
serial.notes as notes,
year(IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate)) as year,
biblio.title as bibliotitle,
subscription.branchcode AS branchcode,
subscription.subscriptionid AS subscriptionid
FROM serial
LEFT JOIN subscription ON
(serial.subscriptionid=subscription.subscriptionid)
LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id
LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber
WHERE subscription.biblionumber = ?
ORDER BY year DESC,
IF(serial.publisheddate="00-00-0000",serial.planneddate,serial.publisheddate) DESC,
serial.subscriptionid
" with ParamValues: 0='446'] at /kohadevbox/koha/C4/Serials.pm line 482.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5e5c47ea300b7eb34cbcd3e71ff4a1ac9a3eaa38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 14:03:37 2019 +0100
Bug 24002: Incorrect DATE value: '0000-00-00' in C4/Serials.pm
DBD::mysql::st execute failed: Incorrect DATE value: '0000-00-00' [for Statement "SELECT serialid,serialseq, status, planneddate, publisheddate,
publisheddatetext, notes, routingnotes
FROM serial
WHERE subscriptionid = ?
AND status IN ( 2,4,41,42,43,44,5 )
ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC
" with ParamValues: 0=8] at /kohadevbox/koha/C4/Serials.pm line 688.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 508a5addf15170d32dea0f21e3acf569596db228
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 14:00:43 2019 +0100
Bug 24002: Incorrect DATE value: '' in C4/Bookseller.pm
t/db_dependent/Bookseller.t .. 3/86 DBD::mysql::st execute failed: Incorrect DATE value: '' [for Statement "
SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
WHERE
( datereceived = ''
OR datereceived IS NULL
OR aqorders.quantityreceived < aqorders.quantity
)
AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0
AND aqbasket.closedate IS NOT NULL
"] at /kohadevbox/koha/C4/Bookseller.pm line 100.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7e602c275b3687460c55f3f103781f2a44bdbee8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 8 13:58:32 2019 +0100
Bug 24002: Incorrect DATE value: '00-00-0000' in NewsChannels.pm
% prove xt/author/valid-templates.t
DBD::mysql::st execute failed: Incorrect DATE value: '00-00-0000' [for Statement "
SELECT opac_news.*,timestamp AS newdate,
borrowers.title AS author_title,
borrowers.firstname AS author_firstname,
borrowers.surname AS author_surname
FROM opac_news
LEFT JOIN borrowers on borrowers.borrowernumber = opac_news.borrowernumber
WHERE (
expirationdate >= CURRENT_DATE()
OR expirationdate IS NULL
OR expirationdate = '00-00-0000'
)
AND DATE(timestamp) < DATE_ADD(CURDATE(), INTERVAL 1 DAY)
AND (opac_news.lang = '' OR opac_news.lang = ?)
AND (opac_news.branchcode IS NULL OR opac_news.branchcode = ?)
ORDER BY number
" with ParamValues: 0='OpacNavRight_', 1=''] at /kohadevbox/koha/C4/NewsChannels.pm line 216.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 18 ++++++++----------
C4/Biblio.pm | 2 +-
C4/Bookseller.pm | 3 +--
C4/NewsChannels.pm | 1 -
C4/Serials.pm | 12 ++++++------
5 files changed, 16 insertions(+), 20 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list