[Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.5,1.24.2.6 newbiblio.pl,1.21.2.1,1.21.2.2

[Henri-Damien LAURENT]

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

Modified Files:
      Tag: rel_2_2
	basket.pl newbiblio.pl 
Log Message:
Commiting all that allows Branch Independancy management :
* in acquisition module, an order can be modified/recieved/closed only by a librarian from the same branch than the librarian that created the basket.
* in catalogue module, an item can be modified/deleted/created only by a librarian from the same branch as item owner branch
* in members module, a member can be created/modified only by a librarian from the branch of the member.
Modifying Context.pm :
Adding userenv context variable.
Is set during checkauth or get_template_and_user
Modifying Auth.pm function checkauth : setting userenv context variable
Modifying Acquisition.pm:
    * histsearch
    * branches
    * bookfunds
    * getsupplierlistwithlateorders
    * getlateorders
    * getallorders
    * getorders
Add a branch criterium if IndependantBranches is set.
Modifiying Suggestion.pm:
    * searchsuggestions Will look first for th Librarian Branch and restrict search to suggestion made by users from this branch
    * countsuggestions Will look first for th Librarian Branch and restrict search to suggestion made by users from this branch
File Modifiying :
    * admin/aqbudget.pl adding a branch selection for budget.
    * parameters/aqbudget.tmpl
    * admin/aqbookfund.pl adding a branch selection for bookfund
    * parameters/aqookfund.tmpl
And adding branch selection to members and items changes.
WARNING: bibid are still used in additem, unlike in HEAD... Shall be soon fixed.

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -C2 -r1.24.2.5 -r1.24.2.6
*** basket.pl	2 Aug 2005 08:59:28 -0000	1.24.2.5
--- basket.pl	26 Aug 2005 12:21:49 -0000	1.24.2.6
***************
*** 57,60 ****
--- 57,74 ----
  
  # get librarian branch...
+ if (C4::Context->preference("IndependantBranches")) {
+ 	my $userenv = C4::Context->userenv;
+ 	unless ($userenv->{flags} == 1){
+ 		my $validtest = ($basket->{creationdate} eq '') 
+ 					|| ($basket->{branch} eq '')
+ 					|| ($userenv->{branch} eq $basket->{branch})
+ 					|| ($userenv->{branch} eq '')
+ 					|| ($basket->{branch} eq '');
+ 		unless ($validtest) {
+ 			print $query->redirect("../mainpage.pl");
+ 			exit 1;
+ 		}
+ 	}
+ }
  
  # if new basket, pre-fill infos

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** newbiblio.pl	28 Jun 2005 11:51:59 -0000	1.21.2.1
--- newbiblio.pl	26 Aug 2005 12:21:49 -0000	1.21.2.2
***************
*** 170,173 ****
--- 170,176 ----
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
+ 						invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
+ 						invoicedisc => $booksellers[0]->{'invoicedisc'},                               
+ 						nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},