From 3ffed06025219fdf41c954ba364e346111e21d5b Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Tue, 9 Oct 2007 16:46:50 -0500 Subject: [PATCH] Bug Fixing : 217 (Suivi.paulpoulain.com : use ecost for actual cost rather than replacement price) + another bug fixing. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- C4/Bookfund.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Bookfund.pm b/C4/Bookfund.pm index 4368ef5cf7..375e62f814 100644 --- a/C4/Bookfund.pm +++ b/C4/Bookfund.pm @@ -228,7 +228,7 @@ sub GetBookFundBreakdown { FROM aqorders LEFT JOIN aqorderbreakdown ON aqorders.ordernumber=aqorderbreakdown.ordernumber LEFT JOIN aqbookfund ON (aqorderbreakdown.bookfundid=aqbookfund.bookfundid and aqorderbreakdown.branchcode=aqbookfund.branchcode) - LEFT JOIN aqbudget ON (aqbudget.bookfundid=aqbookfund.bookfundid and aqbudget.branchcode=aqbudget.branchcode) + LEFT JOIN aqbudget ON (aqbudget.bookfundid=aqbookfund.bookfundid and aqbudget.branchcode=aqbookfund.branchcode) WHERE aqorderbreakdown.bookfundid=? AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00') AND ((budgetdate >= ? and budgetdate < ?) OR (startdate>=? and enddate<=?)) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl index db9eba99bc..1b0a8b7208 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl @@ -54,7 +54,7 @@ " /> - " /> + " />

" /> -- 2.20.1