[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.27,1.27.2.1 aqbudget.tmpl,1.25,1.25.2.1

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24682/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	aqbookfund.tmpl aqbudget.tmpl 
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: aqbookfund.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -r1.27 -r1.27.2.1
*** aqbookfund.tmpl	13 Sep 2004 15:31:13 -0000	1.27
--- aqbookfund.tmpl	26 Aug 2005 12:21:50 -0000	1.27.2.1
***************
*** 12,15 ****
--- 12,16 ----
  		<th>Book fund</th>
  		<th>Name</th>
+ 		<th>Branch</th>
  		<th>Edit</th>
  		<th>Delete</th>
***************
*** 19,22 ****
--- 20,26 ----
  			<td><!-- TMPL_VAR NAME="bookfundid" --></td>
  			<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+ 			<td align="center">
+ 			<!--TMPL_VAR Name="branchname"-->
+ 			</td>
  			<td><a href="<!-- TMPL_VAR NAME="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" --> ">
  				<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edit" title="Edit" width="32" hspace="0" vspace="0" border="0"></a>
***************
*** 27,30 ****
--- 31,35 ----
  			<td>&nbsp;</td>
  			<th>Budget</th>
+ 			<th>Branch</th>
  			<td>
  				<a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->" class="button">
***************
*** 39,42 ****
--- 44,54 ----
  					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b>
  				</td>
+ 				<td align="center">
+ 				<!--TMPL_IF Name="branchcode"-->
+ 				 	<!--TMPL_VAR Name="branchcode"-->
+ 				<!--TMPL_ELSE -->
+ 					&nbsp;
+ 				<!--/TMPL_IF-->
+ 				</td>
  				<td>
  					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
***************
*** 139,142 ****
--- 151,158 ----
  	</p>
  	<p>
+ 		<label>Branch</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
+ 		<br/> Select one if budget is branch specific, otherwise, leave it blank.
+ 	</p>
+ 	<p>
  		<label>&nbsp;</label><input type="button" value="OK" onclick="Check(this.form)" class="button">
  	</p>

Index: aqbudget.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** aqbudget.tmpl	13 Sep 2004 15:31:13 -0000	1.25
--- aqbudget.tmpl	26 Aug 2005 12:21:50 -0000	1.25.2.1
***************
*** 126,129 ****
--- 126,133 ----
  			<label class="label100">Budget amount</label><input type="text" name="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->">
  		</p>
+ 		<p>
+ 			<label class="label100">Branch</label><!--TMPL_VAR Name="CGIbranch" -->
+ 			<br/> If budget is specifically allowed to a branch, select it here, otherwise leave it empty .
+ 		</p>
  		<p><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->"><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
  		</form>