[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/...
|
From: |
Bruno Toumi |
|
Subject: |
[Koha-cvs] koha C4Members.pm koha-tmpl/intranet-tmpl/prog/... |
|
Date: |
Thu, 22 Jun 2006 10:07:49 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Bruno Toumi <btoumi> 06/06/22 10:07:49
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl
memberentryC.tmpl
memberentryP.tmpl
members : memberentry.pl
Log message:
Members.pm ,memberentry(A)(P)(C).tmpl,memberentry.pl:bug fix with wrong
field name
memberentry.pl:translate title in english ;=) (i hope is ok)
buf fix with bad condition
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.34&r2=1.35
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- C4/Members.pm 15 Jun 2006 14:05:23 -0000 1.27
+++ C4/Members.pm 22 Jun 2006 10:07:49 -0000 1.28
@@ -19,7 +19,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.27 2006/06/15 14:05:23 btoumi Exp $
+# $Id: Members.pm,v 1.28 2006/06/22 10:07:49 btoumi Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.27 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.28 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -466,15 +466,15 @@
. ",contactnote="
. $dbh->quote( $data{'contactnote'} )
. ",B_address="
- . $dbh->quote( $data{'b_address'} )
+ . $dbh->quote( $data{'B_address'} )
. ",B_zipcode="
- . $dbh->quote( $data{'b_zipcode'} )
+ . $dbh->quote( $data{'B_zipcode'} )
. ",B_city="
- . $dbh->quote( $data{'b_city'} )
+ . $dbh->quote( $data{'B_city'} )
. ",B_phone="
- . $dbh->quote( $data{'b_phone'} )
+ . $dbh->quote( $data{'B_phone'} )
. ",B_email="
- . $dbh->quote( $data{'b_email'}, )
+ . $dbh->quote( $data{'B_email'}, )
. ",password="
. $dbh->quote( $data{'password'} )
. ",userid="
@@ -498,9 +498,9 @@
. ",relationship="
. $dbh->quote( $data{'relationship'} )
. ",B_streetnumber="
- . $dbh->quote( $data{'b_streetnumber'})
+ . $dbh->quote( $data{'B_streetnumber'})
. ",B_streettype="
- . $dbh->quote( $data{'b_streettype'})
+ . $dbh->quote( $data{'B_streettype'})
. ",gonenoaddress="
. $dbh->quote( $data{'gonenoaddress'})
. ",lost="
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 9 Jun 2006
11:34:39 -0000 1.10
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl 22 Jun 2006
10:07:49 -0000 1.11
@@ -73,9 +73,9 @@
<input type="hidden" name="zipcode" value="<!-- TMPL_VAR
NAME="zipcode" -->">
<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city"
-->">
<input type="hidden" name="branchcode" value="<!-- TMPL_VAR
NAME="branchcode" -->">
- <input type="hidden" name="b_address" value="<!-- TMPL_VAR
NAME="b_address" -->">
- <input type="hidden" name="b_zipcode" value="<!-- TMPL_VAR
NAME="b_zipcode" -->">
- <input type="hidden" name="b_city" value="<!-- TMPL_VAR NAME="b_city"
-->">
+ <input type="hidden" name="B_address" value="<!-- TMPL_VAR
NAME="B_address" -->">
+ <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR
NAME="B_zipcode" -->">
+ <input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city"
-->">
<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone"
-->" >
<input type="hidden" name="phonepro" value="<!-- TMPL_VAR
NAME="phonepro" -->" >
<input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile"
-->" >
@@ -349,31 +349,31 @@
<fieldset>
<legend>Alt Address</legend>
<p>
- <!-- TMPL_IF NAME="mandatoryb_address" -->
+ <!-- TMPL_IF NAME="mandatoryB_address" -->
<label style="font-weight:bold">
<!--TMPL_ELSE-->
<label>
<!-- /TMPL_IF-->
Address</label>
- <input type="text" name="b_address" size="40"
value="<!-- TMPL_VAR NAME="b_address" -->">
+ <input type="text" name="B_address" size="40"
value="<!-- TMPL_VAR NAME="B_address" -->">
</p>
<p>
- <!-- TMPL_IF NAME="mandatoryb_zipcode" -->
+ <!-- TMPL_IF NAME="mandatoryB_zipcode" -->
<label style="font-weight:bold">
<!--TMPL_ELSE-->
<label>
<!-- /TMPL_IF-->
Zipcode</label>
- <input type="text" name="b_zipcode"
maxlength="5" size="5" value="<!-- TMPL_VAR NAME="b_zipcode" -->">
+ <input type="text" name="B_zipcode"
maxlength="5" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
</p>
<p>
- <!-- TMPL_IF NAME="mandatoryb_city" -->
+ <!-- TMPL_IF NAME="mandatoryB_city" -->
<label style="font-weight:bold" >
<!--TMPL_ELSE-->
<label>
<!-- /TMPL_IF-->
City</label>
- <input type="text"
style="text-transform:uppercase;" name="b_city" size="20" value="<!-- TMPL_VAR
NAME="b_city" -->">
+ <input type="text"
style="text-transform:uppercase;" name="B_city" size="20" value="<!-- TMPL_VAR
NAME="B_city" -->">
</p>
</fieldset>
</fieldset>
@@ -496,9 +496,9 @@
<input type="hidden" name="zipcode" value="<!-- TMPL_VAR
NAME="zipcode" -->">
<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city"
-->">
<input type="hidden" name="branchcode" value="<!-- TMPL_VAR
NAME="branchcode" -->">
- <input type="hidden" name="b_address" value="<!-- TMPL_VAR
NAME="b_address" -->">
- <input type="hidden" name="b_zipcode" value="<!-- TMPL_VAR
NAME="b_zipcode" -->">
- <input type="hidden" name="b_city" value="<!-- TMPL_VAR NAME="b_city"
-->">
+ <input type="hidden" name="B_address" value="<!-- TMPL_VAR
NAME="B_address" -->">
+ <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR
NAME="B_zipcode" -->">
+ <input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city"
-->">
<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone"
-->" >
<input type="hidden" name="phonepro" value="<!-- TMPL_VAR
NAME="phonepro" -->" >
<input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile"
-->" >
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 14 Jun 2006
15:59:37 -0000 1.8
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl 22 Jun 2006
10:07:49 -0000 1.9
@@ -79,8 +79,8 @@
<input type="hidden" name="mobile" size="10"
value="<!-- TMPL_VAR NAME="mobile" -->" >
<input type="hidden" name="email" value="<!-- TMPL_VAR
NAME="email" -->" >
<input type="hidden" name="emailpro" value="<!--
TMPL_VAR NAME="emailpro" -->" >
- <input type="hidden" name="b_email" value="<!--
TMPL_VAR NAME="b_email" -->" >
- <input type="hidden" name="b_phone" value="<!--
TMPL_VAR NAME="b_phone" -->" >
+ <input type="hidden" name="B_email" value="<!--
TMPL_VAR NAME="B_email" -->" >
+ <input type="hidden" name="B_phone" value="<!--
TMPL_VAR NAME="B_phone" -->" >
<input type="hidden" name="fax" value="<!-- TMPL_VAR
NAME="fax" -->" >
<!-- input from form3 -->
@@ -244,7 +244,7 @@
<form name="form" action="/cgi-bin/koha/members/memberentry.pl"
method="post">
<!-- field always hidden in different form (1,2,3) -->
<input type="hidden" name="BorrowerMandatoryfield"
value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
- <input type="hidden" name="FormFieldList"
value="streetnumber|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|branchcode|phone|phonepro|mobile|email|emailpro|b_email|b_phone">
+ <input type="hidden" name="FormFieldList"
value="streetnumber|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|branchcode|phone|phonepro|mobile|email|emailpro|B_email|B_phone">
<input type="hidden" name="category_type" value="<!-- TMPL_VAR
name="category_type" -->">
<input type="hidden" name="type" value="borrowers">
<input type="hidden" name="step" value="<!-- TMPL_VAR
NAME="step" -->">
@@ -469,20 +469,20 @@
</p>
<h2>Member</h2>
<p>
- <!-- TMPL_IF NAME="mandatoryb_email" -->
+ <!-- TMPL_IF NAME="mandatoryB_email" -->
<label class="borrowers_mandafield">
<!--TMPL_ELSE-->
<label>
<!-- /TMPL_IF-->
E-mail (home)</label>
- <input type="text" name="b_email" value="<!-- TMPL_VAR
NAME="b_email" -->" >
- <!-- TMPL_IF NAME="mandatoryb_phone" -->
+ <input type="text" name="B_email" value="<!-- TMPL_VAR
NAME="B_email" -->" >
+ <!-- TMPL_IF NAME="mandatoryB_phone" -->
<label class="borrowers_mandafield">
<!--TMPL_ELSE-->
<label>
<!-- /TMPL_IF-->
Phone (cell)</label>
- <input type="text" name="b_phone" value="<!-- TMPL_VAR
NAME="b_phone" -->" >
+ <input type="text" name="B_phone" value="<!-- TMPL_VAR
NAME="B_phone" -->" >
</p>
</fieldset>
<div>
@@ -538,8 +538,8 @@
<input type="hidden" name="mobile" size="10" value="<!--
TMPL_VAR NAME="mobile" -->" >
<input type="hidden" name="email" value="<!-- TMPL_VAR
NAME="email" -->" >
<input type="hidden" name="emailpro" value="<!-- TMPL_VAR
NAME="emailpro" -->" >
- <input type="hidden" name="b_email" value="<!-- TMPL_VAR
NAME="b_email" -->" >
- <input type="hidden" name="b_phone" value="<!-- TMPL_VAR
NAME="b_phone" -->" >
+ <input type="hidden" name="B_email" value="<!-- TMPL_VAR
NAME="B_email" -->" >
+ <input type="hidden" name="B_phone" value="<!-- TMPL_VAR
NAME="B_phone" -->" >
<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax"
-->" >
<!-- TMPL_IF NAME="opadd" -->
Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 12 Jun 2006
13:00:40 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl 22 Jun 2006
10:07:49 -0000 1.7
@@ -76,10 +76,10 @@
<input type="hidden" name="emailpro" value="<!-- TMPL_VAR
NAME="emailpro" -->" >
<input type="hidden" name="contactname" value="<!-- TMPL_VAR
NAME="contactname" -->">
<input type="hidden" name="relationship" value="<!-- TMPL_VAR
NAME="relationship" -->">
- <input type="hidden" name="b_address" value="<!-- TMPL_VAR
NAME="b_address" -->">
- <input type="hidden" name="b_zipcode" value="<!-- TMPL_VAR
NAME="b_zipcode" -->">
- <input type="hidden" name="b_city" value="<!-- TMPL_VAR
NAME="b_city" -->">
- <input type="hidden" name="b_phone" value="<!-- TMPL_VAR
NAME="b_phone" -->">
+ <input type="hidden" name="B_address" value="<!-- TMPL_VAR
NAME="B_address" -->">
+ <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR
NAME="B_zipcode" -->">
+ <input type="hidden" name="B_city" value="<!-- TMPL_VAR
NAME="B_city" -->">
+ <input type="hidden" name="B_phone" value="<!-- TMPL_VAR
NAME="B_phone" -->">
<input type="hidden" name="fax" value="<!-- TMPL_VAR
NAME="fax" -->">
<textarea style="display:none;" name="contactnotes" cols="70"
rows="3" ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
@@ -442,39 +442,39 @@
</select>
</p>
<p>
- <!-- TMPL_IF NAME="mandatoryb_address" -->
+ <!-- TMPL_IF NAME="mandatoryB_address" -->
<label class="borrowers_mandafield">
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
Adress </label>
- <input type="text" name="b_address" size="40"
value="<!-- TMPL_VAR NAME="b_address" -->">
+ <input type="text" name="B_address" size="40"
value="<!-- TMPL_VAR NAME="B_address" -->">
</p>
<p>
- <!-- TMPL_IF NAME="mandatoryb_zipcode" -->
+ <!-- TMPL_IF NAME="mandatoryB_zipcode" -->
<label class="borrowers_mandafield">
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
Zipcode</label>
- <input type="text" maxlength="5" name="b_zipcode"
size="5" value="<!-- TMPL_VAR NAME="b_zipcode" -->">
+ <input type="text" maxlength="5" name="B_zipcode"
size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
</p>
- <!-- TMPL_IF NAME="mandatoryb_city" -->
+ <!-- TMPL_IF NAME="mandatoryB_city" -->
<label class="borrowers_mandafield">
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
City</label>
- <input style="text-transform:uppercase;" type="text"
name="b_city" size="20" value="<!-- TMPL_VAR NAME="b_city" -->">
+ <input style="text-transform:uppercase;" type="text"
name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
</p>
<p>
- <!-- TMPL_IF NAME="mandatoryb_phone" -->
+ <!-- TMPL_IF NAME="mandatoryB_phone" -->
<label class="borrowers_mandafield">
<!-- TMPL_ELSE -->
<label>
<!-- /TMPL_IF-->
Phone (home)</label>
- <input type="text" name="b_phone" size="20" value="<!--
TMPL_VAR NAME="b_phone" -->">
+ <input type="text" name="B_phone" size="20" value="<!--
TMPL_VAR NAME="B_phone" -->">
</p>
<p>
<!-- TMPL_IF NAME="mandatorycontactnotes" -->
@@ -540,10 +540,10 @@
<input type="hidden" name="emailpro" value="<!-- TMPL_VAR
NAME="emailpro" -->" >
<input type="hidden" name="contactname" value="<!-- TMPL_VAR
NAME="contactname" -->">
<input type="hidden" name="relationship" value="<!-- TMPL_VAR
NAME="relationship" -->">
- <input type="hidden" name="b_address" value="<!-- TMPL_VAR
NAME="b_address" -->">
- <input type="hidden" name="b_zipcode" value="<!-- TMPL_VAR
NAME="b_zipcode" -->">
- <input type="hidden" name="b_city" value="<!-- TMPL_VAR
NAME="b_city" -->">
- <input type="hidden" name="b_phone" value="<!-- TMPL_VAR
NAME="b_phone" -->">
+ <input type="hidden" name="B_address" value="<!-- TMPL_VAR
NAME="B_address" -->">
+ <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR
NAME="B_zipcode" -->">
+ <input type="hidden" name="B_city" value="<!-- TMPL_VAR
NAME="B_city" -->">
+ <input type="hidden" name="B_phone" value="<!-- TMPL_VAR
NAME="B_phone" -->">
<input type="hidden" name="fax" value="<!-- TMPL_VAR
NAME="fax" -->">
<textarea style="display:none;" name="contactnotes" cols="70"
rows="3" ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- members/memberentry.pl 15 Jun 2006 14:05:23 -0000 1.34
+++ members/memberentry.pl 22 Jun 2006 10:07:49 -0000 1.35
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: memberentry.pl,v 1.34 2006/06/15 14:05:23 btoumi Exp $
+# $Id: memberentry.pl,v 1.35 2006/06/22 10:07:49 btoumi Exp $
# Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
#
@@ -145,7 +145,7 @@
$data{'city'}= $borrower_city;
$data{'zipcode'}=$borrower_zipcode;
}
- if ($categorycode ne 'I') {
+ if ($category_type ne 'I') {
my $age = get_age(format_date_in_iso($data{dateofbirth}));
my
(undef,$agelimitmin,$agelimitmax,undef)=getborrowercategory($data{'categorycode'});
if ($age > $agelimitmax
@@ -324,9 +324,9 @@
}
push(@relshipdata, \%row);
}
- my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Adresse érronée'],
- 'lost' => ['lost', 'Carte Perdue'],
- 'debarred' => ['debarred', 'Lecteur exclu']);
+ my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
+ 'lost' => ['lost', 'Lost'],
+ 'debarred' => ['debarred', 'Debarred']);
my @flagdata;
foreach (keys(%flags)) {
@@ -476,11 +476,11 @@
fax => $data{'fax'},
phonepro => $data{'phonepro'},
emailpro => $data{'emailpro'},
- b_address => $data{'b_address'},
- b_city => $data{'b_city'},
- b_zipcode => $data{'b_zipcode'},
- b_email => $data{'b_email'},
- b_phone => $data{'b_phone'},
+ B_address => $data{'B_address'},
+ B_city => $data{'B_city'},
+ B_zipcode => $data{'B_zipcode'},
+ B_email => $data{'B_email'},
+ B_phone => $data{'B_phone'},
dateofbirth => $data{'dateofbirth'},
branchcode => $data{'branchcode'},
catcodepopup => $catcodepopup,