[Koha-cvs] koha acqui/basket.pl C4/Acquisition.pm koha-tmp... [rel_2_2]

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	06/07/31 13:55:32

Modified files:
	acqui          : basket.pl 
	C4             : Acquisition.pm 
	koha-tmpl/intranet-tmpl/default/en/acqui: basket.tmpl 

Log message:
	fix for #1110 : Created by isn't ever filled for baskets

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.24.2.9&r2=1.24.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.18&r2=1.9.2.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.11&r2=1.15.2.12

Patches:
Index: acqui/basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.9
retrieving revision 1.24.2.10
diff -u -b -r1.24.2.9 -r1.24.2.10
--- acqui/basket.pl	5 Feb 2006 21:59:21 -0000	1.24.2.9
+++ acqui/basket.pl	31 Jul 2006 13:55:32 -0000	1.24.2.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: basket.pl,v 1.24.2.9 2006/02/05 21:59:21 kados Exp $
+# $Id: basket.pl,v 1.24.2.10 2006/07/31 13:55:32 tipaul Exp $
 
 #script to show display basket of orders
 #written by chris at katipo.co.nz 24/2/2000
@@ -73,7 +73,7 @@
 
 # if new basket, pre-fill infos
 $basket->{creationdate} = "" unless ($basket->{creationdate});
-$basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby});
+$basket->{authorisedbyname} = $loggedinuser unless ($basket->{authorisedbyname});
 ($count, at results)=getbasketcontent($basketno,'',$order);
 
 my $line_total; # total of each line
@@ -123,8 +123,7 @@
 $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
 $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
 $template->param(basketno => $basketno,
-				creationdate => $basket->{creationdate},
-				authorisedby => $basket->{authorisedby},
+				creationdate => format_date($basket->{creationdate}),
 				authorisedbyname => $basket->{authorisedbyname},
 				closedate => format_date($basket->{closedate}),
 				active => $booksellers[0]->{'active'},

Index: C4/Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.18
retrieving revision 1.9.2.19
diff -u -b -r1.9.2.18 -r1.9.2.19
--- C4/Acquisition.pm	25 Jul 2006 12:27:55 -0000	1.9.2.18
+++ C4/Acquisition.pm	31 Jul 2006 13:55:32 -0000	1.9.2.19
@@ -87,7 +87,7 @@
 sub getbasket {
 	my ($basketno)=@_;
 	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("select aqbasket.*,borrowers.firstname+' '+borrowers.surname as authorisedbyname from aqbasket left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber where basketno=?");
+	my $sth=$dbh->prepare("select aqbasket.*,concat(borrowers.firstname,' ',borrowers.surname) as authorisedbyname from aqbasket left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber where basketno=?");
 	$sth->execute($basketno);
 	return($sth->fetchrow_hashref);
 }

Index: koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -u -b -r1.15.2.11 -r1.15.2.12
--- koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl	14 Dec 2005 10:59:24 -0000	1.15.2.11
+++ koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl	31 Jul 2006 13:55:32 -0000	1.15.2.12
@@ -8,7 +8,7 @@
 			<p><label class="label100">Basket number<label> <!-- TMPL_VAR NAME="basketno" --></p>
 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
-			<p><label class="label100">for<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
+			<p><label class="label100">for<label> <!-- TMPL_VAR NAME="name" --></p>
 			<p><label class="label100">Invoice number </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
 			<!-- TMPL_IF name="closedate" -->
 				Closed on <!-- TMPL_VAR name="closedate" -->