From e363ddc14ba5c851269a9e7adc5986feb836fbe9 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 13 Jun 2003 13:46:01 +0000 Subject: [PATCH] fixes for bookfunds & budget. Should work now. I fix #223, #424 --- admin/aqbudget.pl | 7 ++- .../default/en/parameters/aqbookfund.tmpl | 8 +++- .../default/en/parameters/aqbudget.tmpl | 2 +- .../default/fr/parameters/aqbookfund.tmpl | 43 +++++++++++++------ .../default/fr/parameters/aqbudget.tmpl | 33 +++++++------- 5 files changed, 58 insertions(+), 35 deletions(-) diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl index 4b6ee7374d..7c612a5308 100755 --- a/admin/aqbudget.pl +++ b/admin/aqbudget.pl @@ -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') { diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl index de9567d805..b572df7bff 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl @@ -20,10 +20,16 @@ ?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0> + +   + Budget + ">//images/filenew.png" ALT="Add budget" border=0> + +   - + - : ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl index 28c77e26bb..b7e1612583 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl @@ -91,7 +91,7 @@ - Book fund + Bookfund"> Start date ()  diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl index 59efb994ba..a9a85ed5f1 100644 --- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl @@ -10,22 +10,37 @@ Votre recherche :


- +
- - - - + + + + + -"> - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
/images/background-mem.gif">Fonds documentaire/images/background-mem.gif">Nom/images/background-mem.gif">Groupe/images/background-mem.gif">Budget/images/background-mem.gif"> /images/background-mem.gif">  /images/background-mem.gif"> 
Fonds documentaireNomModifSuppr
  ">Budget?op=add_form&bookfundid= ">//images/fileopen.png" border="0">?op=delete_confirm&bookfundid=">//images/edittrash.png" border="0"> 
?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
 Budget">//images/filenew.png" ALT="Add budget" border=0>
  + - : + ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>

      
//images/filenew.png" ALT="Add budget" BORDER=0 >

diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl index 407ec963d9..e26d64faac 100644 --- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl +++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl @@ -20,12 +20,12 @@ "> - () + () - ">//images/fileopen.png" border="0"> - ">//images/edittrash.png" border="0"> + ">//images/fileopen.png" border="0"> + ">//images/edittrash.png" border="0"> @@ -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 @@ Fonds documentaire - > + > + Fonds documentaire - - Fonds documentaire - + fonds"> - Date de début -   + Date de début () +   - Date de fin - + Date de fin () + Montant du budget - + ">   @@ -127,11 +126,11 @@ - - + + - + -- 2.39.5
/images/background-mem.gif">Fonds documentaire/images/background-mem.gif">
/images/background-mem.gif">Budget/images/background-mem.gif">
Date de début