[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members pay.tmpl,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	pay.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pay.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- pay.tmpl	1 Mar 2005 13:41:03 -0000	1.3
***************
*** 18,27 ****
  <!-- TMPL_LOOP name="loop_pay" -->
  <tr>
! 	<td><fieldset><label for="payfine<!-- TMPL_VAR name="i" -->">Unpaid</label><input id="payfine<!-- TMPL_VAR name="i" -->" type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked" /><br>
! 	<label for="payfine<!-- TMPL_VAR name="i" -->">Pay</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="yes" /><br>
! 	<label for="payfine<!-- TMPL_VAR name="i" -->">Writeoff</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="wo" /></fieldset>
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->" />
  	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
! 	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->" />
  	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
  	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
--- 18,29 ----
  <!-- TMPL_LOOP name="loop_pay" -->
  <tr>
! 	<td><select name="payfine<!-- TMPL_VAR name="i" -->">
! 	<option value="no">Unpaid</option>
! 	<option value="yes">Paid</option>
! 	<option value="wo">Writeoff</option>
! 	</select>
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->" />
  	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
! 	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount" -->" />
  	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
  	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
***************
*** 30,43 ****
  	<td><!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" --></td>
  	<td><!-- TMPL_VAR name="accounttype" --></td>
! 	<td><!-- TMPL_VAR name="amount" --></td>
! 	<td><!-- TMPL_VAR name="amountoutstanding" --></td>
  </tr>
  <!-- /TMPL_LOOP -->
  <tr>
  	<td colspan="4">Total Due</td>
! 	<td><!-- TMPL_VAR name="total" --></td>
  	</tr>
  </table></div>
! <input type="submit" name="submit"  value="Make Payment" class="submit" /></form> <form class="inline" action="moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Member Record" /></form>
  </div>
  
--- 32,48 ----
  	<td><!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" --></td>
  	<td><!-- TMPL_VAR name="accounttype" --></td>
! 	<td class="debit"><!-- TMPL_VAR name="amount" --></td>
! 	<td class="debit"><!-- TMPL_VAR name="amountoutstanding" --></td>
  </tr>
  <!-- /TMPL_LOOP -->
+ <tfoot>
  <tr>
  	<td colspan="4">Total Due</td>
! 	<td class="debit"><!-- TMPL_VAR name="total" --></td>
  	</tr>
+ 	</tfoot>
  </table></div>
! <input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
! <div class="tabitem"><form action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Patron Record" /></form> <form action="/cgi-bin/koha/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /><input type="submit" value="View Patron Account" class="submit" /></form></div>
  </div>