diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 12861bc117..743a8a076c 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -823,7 +823,7 @@ sub GetParcel {
LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
WHERE
- AND aqbasket.booksellerid=?
+ aqbasket.booksellerid=?
AND aqorders.booksellerinvoicenumber LIKE \"$code\"
AND aqorders.datereceived= \'$datereceived\'";
@@ -831,13 +831,14 @@ sub GetParcel {
my $userenv = C4::Context->userenv;
if ( ($userenv) && ( $userenv->{flags} != 1 ) ) {
$strsth .=
- " and (borrowers.branchcode = '"
+ " AND (borrowers.branchcode = '"
. $userenv->{branch}
- . "' or borrowers.branchcode ='')";
+ . "' OR borrowers.branchcode ='')";
}
}
- $strsth .= " order by aqbasket.basketno";
+ $strsth .= " ORDER BY aqbasket.basketno";
### parcelinformation : $strsth
+ warn "STH : $strsth";
my $sth = $dbh->prepare($strsth);
$sth->execute($supplierid);
while ( my $data = $sth->fetchrow_hashref ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 194a67793e..22b1310c26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -69,7 +69,7 @@
|
-
+ ">
-
@@ -78,7 +78,7 @@
|
-
+ ">
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index 6c705913f2..9996a6d60b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -41,14 +41,13 @@
| QTY ordered |
Est Cost |
ACTUAL |
- P&P |
QTY received |
TOTAL |
- |
- &biblionumber=&daterecieved=&invoice=&gst=&freight=&supplierid=">
+ | "> |
+ ">
ISBN:
author :
Publisher :
@@ -56,8 +55,7 @@
| |
|
|
- |
- |
+ &biblionumber=&daterecieved=&invoice=&gst=&freight=&supplierid="> |
|
@@ -100,21 +98,27 @@
Summary |
Order qty |
Order cost |
- Recieved qty |
+ Already Recieved |
Recieved cost |
- |
+ "> |
- &biblionumber=&daterecieved=&invoice=&gst=&freight=&supplierid=">
+ ">
+
ISBN:
author :
Publisher :
|
|
|
- |
+
+ &biblionumber=&daterecieved=&invoice=&gst=&freight=&supplierid=">More
+
+ &biblionumber=&daterecieved=&invoice=&gst=&freight=&supplierid=">Recieve
+
+ |
|