From 7fe042a008c72b836e2f1dffd2d1b31702d4190c Mon Sep 17 00:00:00 2001 From: Ryan Higgins Date: Tue, 25 Mar 2008 14:43:32 -0500 Subject: [PATCH] Change LateOrders to inclusive <=, s/supplier/vendor , s/parcel/shipment. Signed-off-by: Joshua Ferraro --- C4/Acquisition.pm | 4 ++-- .../prog/en/includes/acquisitions-history-search.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/acquisitions-search.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl | 2 +- .../intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 35735c0b5f..5ceb8fbf5c 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -991,7 +991,7 @@ sub GetLateOrders { (aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber) LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id WHERE aqorders.basketno = aqbasket.basketno - AND (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)) + AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL $delay DAY)) AND ((datereceived = '' OR datereceived is null) OR (aqorders.quantityreceived < aqorders.quantity) ) "; @@ -1032,7 +1032,7 @@ sub GetLateOrders { LEFT JOIN aqbookfund ON aqorderbreakdown.bookfundid = aqbookfund.bookfundid), (aqbasket LEFT JOIN borrowers on aqbasket.authorisedby = borrowers.borrowernumber) LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id WHERE aqorders.basketno = aqbasket.basketno - AND (closedate < (CURDATE -(INTERVAL $delay DAY)) + AND (closedate <= (CURDATE -(INTERVAL $delay DAY)) AND ((datereceived = '' OR datereceived is null) OR (aqorders.quantityreceived < aqorders.quantity) ) "; $strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc index f87be61ecc..fcb9f03026 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc @@ -3,7 +3,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index aede5d46bd..b91199976f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -2,7 +2,7 @@

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 63c7c52023..c4abb1ca82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -21,12 +21,12 @@ //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl index 7f1cdc6a02..3a40109ac6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl @@ -37,7 +37,7 @@ Inactive - ">Receive order + ">Receive shipment "> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl index 009415ab34..eeae811e1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl @@ -28,7 +28,7 @@
- " /> days + " /> days ago -- 2.39.5