From 711c90b4605d8a8ea0c309b48a8197bbc1dbfe19 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 23 Jun 2003 11:26:21 +0000
Subject: [PATCH] *** empty log message ***

---
 .../default/fr/members/jmemberentry.tmpl            |  2 +-
 .../default/fr/members/member-password.tmpl         |  3 +++
 updater/updatedatabase                              | 13 +++++++++++++
 value_builder/unimarc_field_100.pl                  | 10 ++++++++++
 value_builder/unimarc_field_225a.pl                 | 10 ++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
index 031fed97a6..d02074baad 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl
@@ -55,7 +55,7 @@
 			<STRONG>Lecteur N° <TMPL_VAR NAME=cmember></STRONG>, <b>N° de carte*</b></STRONG>
 		</TD>
 		<TD>
-			<input type=text name=cardnumber_child_<TMPL_VAR NAME=i> size=20 value=""><br>
+			<input type=text name=cardnumber_child_<TMPL_VAR NAME=i> size=20 value="<TMPL_VAR NAME=jcardnumber>"><br>
 			<input type=hidden name=bornumber_child_<TMPL_VAR NAME=i> value="<TMPL_VAR NAME=cmember>">
 		</td>
 	</TR>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
index 9ed0c7bfb6..6d3ad1c700 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl
@@ -9,6 +9,9 @@ Cliquer <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=member>">Ici<
 	<h2><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname">, <TMPL_VAR NAME="firstname"></h2>
 	<form method=post>
 	<input type=hidden name=member value=<TMPL_VAR NAME=member>>
+	<TMPL_IF NAME="warn">
+		Cet identifiant existe d&eacute;ja. Entrez en un autre.<br>
+	</TMPL_IF>
 	Identifiant utilisateur : <input name=newuserid size=20 value=<TMPL_VAR NAME=userid>> <br>
 	Nouveau mot de passe : <input name=newpassword size=20 value=<TMPL_VAR NAME=defaultnewpassword>>
 	<p>
diff --git a/updater/updatedatabase b/updater/updatedatabase
index ade885227b..cbd77b126e 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -237,6 +237,7 @@ my %requirefields = (
 			'homezipcode' => 'varchar(25)',
     },
     aqorders => { 'budgetdate' => 'date' },
+    aqbudget => {'aqbudgetid' => 'tinyint(4) auto_increment'},
 
     #added so that reference items are not available for reserves...
     itemtypes         => { 'notforloan'  => 'smallint(6)' },
@@ -543,6 +544,15 @@ my %fielddefinitions = (
             default => ''
         },
     ],
+    aqbudget => [
+        {
+            field   => 'aqbudgetid',
+            type    => 'tinyint(4)',
+            null    => '',
+            key     => 'PRI',
+            default => 'auto_increment'
+        },
+    ],
     z3950servers => [
         {
             field   => 'id',
@@ -847,6 +857,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.51  2003/06/23 11:27:29  tipaul
+# *** empty log message ***
+#
 # Revision 1.50  2003/06/11 21:28:22  tonnesen
 # Added modifications required to the systempreferences table by the new
 # systempreferences.pl script.  The systempreferences.pl script will not work
diff --git a/value_builder/unimarc_field_100.pl b/value_builder/unimarc_field_100.pl
index 6ca4317481..3c2d012183 100755
--- a/value_builder/unimarc_field_100.pl
+++ b/value_builder/unimarc_field_100.pl
@@ -27,6 +27,16 @@ use HTML::Template;
 use C4::Search;
 use C4::Output;
 
+=head1
+
+plugin_parameters : other parameters added when the plugin is called by the dopop function
+
+=cut
+sub plugin_parameters {
+my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+return "";
+}
+
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= "100".(int(rand(100000))+1);
diff --git a/value_builder/unimarc_field_225a.pl b/value_builder/unimarc_field_225a.pl
index f04d1bd29e..63ea08f70d 100644
--- a/value_builder/unimarc_field_225a.pl
+++ b/value_builder/unimarc_field_225a.pl
@@ -49,6 +49,16 @@ use HTML::Template;
 use C4::Search;
 use C4::Output;
 
+=head1
+
+plugin_parameters : other parameters added when the plugin is called by the dopop function
+
+=cut
+sub plugin_parameters {
+my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+return "";
+}
+
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= "100".(int(rand(100000))+1);
-- 
2.39.5