[Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/members... [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <hdl>      06/09/12 13:25:52

Modified files:
        koha-tmpl/intranet-tmpl/default/en/members: jmemberentry.tmpl 
        members        : insertjdata.pl jmemberentry.pl 

Log message:
        BugFixing adding informations branch to child creation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13&r2=1.13.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/insertjdata.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/members/jmemberentry.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl        19 Jul 
2004 20:33:52 -0000      1.13
+++ koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl        12 Sep 
2006 13:25:51 -0000      1.13.2.1
@@ -2,9 +2,9 @@
 <div id="mainbloc">
        <h1>Add New Junior Member </h1><br>
        <form action="/cgi-bin/koha/members/newjmember.pl" method="post">
-               <!--<input type="hidden" name="joining" value="">
-               <input type="hidden" name="expiry" value="">
-               <input type="hidden" name="type" value="borrowers">-->
+               <input type="hidden" name="branchcode" value="<!-- TMPL_VAR 
NAME="branchcode" -->">
+               <input type="hidden" name="expiry" value="<!-- TMPL_VAR 
NAME="expiry" -->">
+               <input type="hidden" name="expiry" value="<!-- TMPL_VAR 
NAME="zipcode" -->">
                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="member" -->">
                <input type="hidden" name="updtype" value="I">
                <input type="hidden" name="area" value="<!-- TMPL_VAR 
NAME="area" -->">

Index: members/insertjdata.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/insertjdata.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- members/insertjdata.pl      6 Jul 2004 08:24:18 -0000       1.4
+++ members/insertjdata.pl      12 Sep 2006 13:25:51 -0000      1.4.2.1
@@ -48,7 +48,7 @@
        my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
        $sth->execute($data{'bornumber_child_$i'});
        if (my $data=$sth->fetchrow_hashref){
-               $query="update borrowers set 
title='$data{'title'}',expiry='$data{'expiry'}',
+               $query="update borrowers set 
title='$data{'title'}',branchcode='$data{'branchcode'}',expiry='$data{'expiry'}',
                
cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
                
streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
                
altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
@@ -79,7 +79,7 @@
                $query="insert into borrowers 
(title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
                
firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
                
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-               
initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2)
+               
initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2, 
branchcode)
                values ('','$data{'expiry'}',
                '$cardnumber',
                
'$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
@@ -87,7 +87,7 @@
                
'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
                
'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
                '$notes','$data{'altphone'}','$surname','$data{'initials'}',
-               
'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}','$data{'sort1'}','$data{'sort2'}')";
+               
'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}','$data{'sort1'}','$data{'sort2'}','$data{'branchcode'}')";
 
        }
        #print $query;

Index: members/jmemberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/jmemberentry.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- members/jmemberentry.pl     5 Feb 2006 21:59:21 -0000       1.1.2.3
+++ members/jmemberentry.pl     12 Sep 2006 13:25:51 -0000      1.1.2.4
@@ -93,6 +93,9 @@
                        emailaddress    => $data->{'emailaddress'},
                        contactname     => $data->{'contactname'},
                        altphone        => $data->{'altphone'},
+                       branchcode     => $data->{'branchcode'},
+                       expiry        => $data->{'expiry'},
+                       zipcode        => $data->{'zipcode'},
                        dateformat      => display_date_format(),
                        titleloop       => address@hidden,
                        cmemloop        => address@hidden,