Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

fixes for bookfunds & budget. Should work now. I fix #223, #424

Browse source
This commit is contained in:
tipaul 2003-06-13 13:46:01 +00:00
parent 0dd1c92971
commit e363ddc14b
5 changed files with 58 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
admin/aqbudget.pl
View file

@ -122,7 +122,8 @@ if ($op eq 'add_form') {
$template->param(bookfundid => $dataaqbudget->{bookfundid});
$template->param(bookfundname => $dataaqbudget->{bookfundname});
} else {
$template->param(adding => 1);
$template->param(bookfundid => $bookfundid,
adding => 1);
}
$template->param(dateformat => display_date_format(),
aqbudgetid => $dataaqbudget->{'aqbudgetid'},
@ -143,7 +144,9 @@ if ($op eq 'add_form') {
$input->param('budgetamount')
);
$sth->finish;
# END $OP eq ADD_VALIDATE
print $input->redirect("aqbookfund.pl");
exit;
# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {

8
koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
View file

@ -20,10 +20,16 @@
<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0></a></td>
<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
</tr>
<tr valign=top bgcolor=#99cc33>
<td bgcolor="#FFFFFF">&nbsp;</td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" border=0></a></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"></td>
</tr>
<TMPL_LOOP name="budget">
<tr valign=top>
<td>&nbsp;</td>
<td align="right">
<td>
<TMPL_VAR name="startdate"> - <TMPL_VAR name="enddate"> : <b><TMPL_VAR name="budgetamount"></b>
</td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0></a></td>

2
koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl
View file

@ -91,7 +91,7 @@
</TMPL_IF>
<TMPL_IF name="adding">
<tr><td>Book fund</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
<tr><td>Bookfund</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<TMPL_VAR name="bookfundid">"><TMPL_VAR name="bookfundid"></td></tr>
</TMPL_IF>
<tr><td>Start date (<TMPL_VAR NAME=dateformat>)</td><td><input type=text name=startdate size=11 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>

43
koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
View file

@ -10,22 +10,37 @@
Votre recherche :<b><TMPL_VAR name=searchfield><b>
<p><br>
</TMPL_IF>
<table border=0 cellspacing=0 cellpadding=5>
<table border=0 cellspacing=0 cellpadding=2 width="80%">
<tr valign=top bgcolor=#99cc33>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Nom</b></td>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Groupe</b></td>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Budget</b></td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp; </td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp; </td></tr>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Fonds documentaire</b></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Nom</b></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Modif</b></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Suppr</b></td>
</tr>
<TMPL_LOOP name="bookfund">
<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
<td><TMPL_VAR name="bookfundid"></td>
<td><TMPL_VAR name="bookfundname"></td>
<td><TMPL_VAR name="bookfundgroup"> &nbsp;</td>
<td><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> ">Budget</a></td>
<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
<td>&nbsp; </td>
</tr>
<tr valign=top bgcolor="ffffcc">
<td><TMPL_VAR name="bookfundid"></td>
<td><TMPL_VAR name="bookfundname"></td>
<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0></a></td>
<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
</tr>
<tr valign=top bgcolor=#99cc33>
<td bgcolor="#FFFFFF">&nbsp;</td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"></td>
<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" border=0></a></td>
</tr>
<TMPL_LOOP name="budget">
<tr valign=top>
<td>&nbsp;</td>
<td>
<TMPL_VAR name="startdate"> - <TMPL_VAR name="enddate"> : <b><TMPL_VAR name="budgetamount"></b>
</td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0></a></td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
</tr>
</TMPL_LOOP>
</TMPL_LOOP>
</table>
<form action='<TMPL_VAR name=scriptname>' method=post><input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<br><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" BORDER=0 ><br></form><br clear=all>

33
koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
View file

@ -20,12 +20,12 @@
</tr>
<TMPL_LOOP name="budget">
<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
<td><TMPL_VAR name="bookfundid"> (<TMPL_VAR name="bookfundname">)</td>
<td><TMPL_VAR name="aqbudgetid"> (<TMPL_VAR name="bookfundname">)</td>
<td><TMPL_VAR name="startdate"></td>
<td><TMPL_VAR name="enddate"></td>
<td><TMPL_VAR name="budgetamount"></td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetdid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
</tr>
</TMPL_LOOP>
</table>
@ -70,8 +70,8 @@
var ok=1;
var _alertString="";
var alertString2;
if (f.bookfundid.value.length==0) {
_alertString += "- bookfundid missing\n";
if (f.aqbudgetid.value.length==0) {
_alertString += "- aqbudgetid missing\n";
}
if (!(isNotNull(window.document.Aform.budgetamount,1))) {
_alertString += "- Budget missing\n";
@ -94,25 +94,24 @@
<TMPL_IF name="modify">
<tr>
<td>Fonds documentaire</td>
<td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="bookfundid"></td></tr>
<td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="aqbudgetid"></td>
</tr>
<tr>
<td>Fonds documentaire</td>
<td><TMPL_VAR name="bookfundname"></td></tr>
</TMPL_IF>
<TMPL_IF name="adding">
<tr>
<td>Fonds documentaire</td>
<td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
<tr><td>fonds</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<TMPL_VAR name="bookfundid">"><TMPL_VAR name="bookfundid"></td></tr>
</TMPL_IF>
<tr>
<td>Date de d&eacute;but</td>
<td><input type=text name=startdate size=40 maxlength=80 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
<td>Date de d&eacute;but (<TMPL_VAR NAME=dateformat>)</td>
<td><input type=text name=startdate size=20 maxlength=14 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
<tr>
<td>Date de fin</td>
<td><input type=text name=enddate value='<TMPL_VAR name="enddate">'></td></tr>
<td>Date de fin (<TMPL_VAR NAME=dateformat>)</td>
<td><input type=text name=enddate size=20 maxlength=14 value='<TMPL_VAR name="enddate">'></td></tr>
<tr>
<td>Montant du budget</td>
<td><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
<td><input type="hidden" name="aqbudgetid" value="<TMPL_VAR name="aqbudgetid">"><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
</table>
</form>
@ -127,11 +126,11 @@
<TMPL_IF name="delete_confirm">
<table border=0 cellspacing=0 cellpadding=5>
<tr valign=top bgcolor=#99cc33>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Budget</b></td>
<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="aqbudgetid"></b></td></tr>
<form action='<TMPL_VAR name="action">' method=post>
<input type="hidden" name="op" value="delete_confirmed">
<input type="hidden" name="bookfundid" value='<TMPL_VAR name="bookfundid">'>
<input type="hidden" name="aqbudgetid" value='<TMPL_VAR name="aqbudgetid">'>
<tr>
<td>Date de d&eacute;but</td>
<td><TMPL_VAR name="startdate"></td></tr>