[Koha-cvs] CVS: koha/acqui acqui-home.pl,1.4,1.5 acquire.pl,1.18,1.19 newbiblio.pl,1.24,1.25

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20385/acqui

Modified Files:
	acqui-home.pl acquire.pl newbiblio.pl 
Log Message:
Adding branch specific display to budgets and selection.

Be warned that to be able to select a budget which is not from patron's Branch, you should have a '' Branch information.


Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.pl	20 Jun 2005 13:15:46 -0000	1.4
--- acqui-home.pl	14 Jul 2005 09:13:24 -0000	1.5
***************
*** 22,26 ****
  
  # budget
! my ($count, at results)=bookfunds;
  my $classlist='';
  my $total=0;
--- 22,31 ----
  
  # budget
! my $dbh = C4::Context->dbh;
! my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
! $sthtemp->execute($loggedinuser);
! my ($flags, $homebranch)=$sthtemp->fetchrow;
! 
! my ($count, at results)=bookfunds($homebranch);
  my $classlist='';
  my $total=0;

Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** acquire.pl	13 Sep 2004 15:17:48 -0000	1.18
--- acquire.pl	14 Jul 2005 09:13:24 -0000	1.19
***************
*** 59,64 ****
  			     debug => 1,
  			     });
- 
  $template->param($count);
  if ($count == 1){
  	my $sth;
--- 59,67 ----
  			     debug => 1,
  			     });
  $template->param($count);
+ my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
+ $sthtemp->execute($borrowernumber);
+ my ($flags, $homebranch)=$sthtemp->fetchrow;
+ 
  if ($count == 1){
  	my $sth;

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** newbiblio.pl	29 Jun 2005 01:00:49 -0000	1.24
--- newbiblio.pl	14 Jul 2005 09:13:24 -0000	1.25
***************
*** 126,133 ****
  
  # build bookfund list
  my @bookfund;
  my @select_bookfund;
  my %select_bookfunds;
! ($count2, at bookfund)=bookfunds();
  for (my $i=0;$i<$count2;$i++){
  	push @select_bookfund, $bookfund[$i]->{'bookfundid'};
--- 126,137 ----
  
  # build bookfund list
+ my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
+ $sthtemp->execute($loggedinuser);
+ my ($flags, $homebranch)=$sthtemp->fetchrow;
+ 
  my @bookfund;
  my @select_bookfund;
  my %select_bookfunds;
! ($count2, at bookfund)=bookfunds($homebranch);
  for (my $i=0;$i<$count2;$i++){
  	push @select_bookfund, $bookfund[$i]->{'bookfundid'};