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

[Henri-Damien LAURENT]

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

Modified Files:
	aqbookfund.tmpl aqbudget.tmpl 
Log Message:
Add branch selection and filter for budgets and funds.
May be too much... Funds could be enough....

It works provided you update your base adding branchcode both in aqbookfund AND aqbudget.
If selection in budget is not needed, I shall remove.


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.28
diff -C2 -r1.27 -r1.28
*** aqbookfund.tmpl	13 Sep 2004 15:31:13 -0000	1.27
--- aqbookfund.tmpl	6 Jul 2005 17:47:22 -0000	1.28
***************
*** 12,15 ****
--- 12,16 ----
  		<th>Book fund</th>
  		<th>Name</th>
+ 		<th>Branch</th>
  		<th>Edit</th>
  		<th>Delete</th>
***************
*** 19,22 ****
--- 20,30 ----
  			<td><!-- TMPL_VAR NAME="bookfundid" --></td>
  			<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+ 			<td align="center">
+ 			<!--TMPL_IF Name="branchname"-->
+ 				<!--TMPL_VAR Name="branchname"-->
+ 			<!--TMPL_ELSE -->
+ 				&nbsp;
+ 			<!--/TMPL_IF-->
+ 			</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 ****
--- 35,39 ----
  			<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">
***************
*** 37,41 ****
  				<td>&nbsp;</td>
  				<td>
! 					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b>
  				</td>
  				<td>
--- 46,56 ----
  				<td>&nbsp;</td>
  				<td>
! 					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b> 
! 				<td align="center">
! 				<!--TMPL_IF Name="branchcode"-->
! 				 	<!--TMPL_VAR Name="branchcode"-->
! 				<!--TMPL_ELSE -->
! 					&nbsp;
! 				<!--/TMPL_IF-->
  				</td>
  				<td>
***************
*** 139,142 ****
--- 154,161 ----
  	</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.26
diff -C2 -r1.25 -r1.26
*** aqbudget.tmpl	13 Sep 2004 15:31:13 -0000	1.25
--- aqbudget.tmpl	6 Jul 2005 17:47:22 -0000	1.26
***************
*** 126,129 ****
--- 126,134 ----
  			<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>