Bug Fixing : 217 (Suivi.paulpoulain.com : use ecost for actual cost rather than repla...

+ another bug fixing.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Bookfund.pm b/C4/Bookfund.pm
index 4368ef5..375e62f 100644 (file)
--- 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 db9eba9..1b0a8b7 100644 (file)
--- 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 @@
         <!-- TMPL_IF name="unitprice"-->
          <input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->" />
         <!-- TMPL_ELSE -->
-            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="rrp" -->" />
+            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost" -->" />
         <!-- /TMPL_IF --></p>
         <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
     <!-- TMPL_IF name="catview" -->