[Koha-cvs] CVS: koha insertdata.pl,1.10,1.11 memberentry.pl,1.26,1.27

[Mike Hansen]

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1:/tmp/cvs-serv32487/koha

Modified Files:
	insertdata.pl memberentry.pl 
Log Message:
Fixed bug #218


Index: insertdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertdata.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** insertdata.pl	25 Mar 2003 05:13:26 -0000	1.10
--- insertdata.pl	25 Mar 2003 06:05:13 -0000	1.11
***************
*** 59,63 ****
    categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
    borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!   initials='$data{'initials'}',physstreet='$data{'address'}',ethnicity='$data{'ethnicity'}',
    gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',textmessaging='$data{'textmessaging'}'
    where borrowernumber=$data{'borrowernumber'}";
--- 59,63 ----
    categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
    borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!   initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
    gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',textmessaging='$data{'textmessaging'}'
    where borrowernumber=$data{'borrowernumber'}";
***************
*** 72,76 ****
    firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
    altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
!   initials,ethnicity,borrowernumber) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
    '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
    '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
--- 72,76 ----
    firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
    altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
!   initials,ethnicity,borrowernumber,physstreet) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
    '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
    '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
***************
*** 78,82 ****
    '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
    '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
!   '$data{'ethnicity'}','$data{'borrowernumber'}')";
  }
  # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
--- 78,82 ----
    '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
    '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
!   '$data{'ethnicity'}','$data{'borrowernumber'}','$data{'streetaddress'}')";
  }
  # ok if its an adult (type) it may have borrowers that depend on it as a guarantor

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/memberentry.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** memberentry.pl	25 Mar 2003 05:13:26 -0000	1.26
--- memberentry.pl	25 Mar 2003 06:05:13 -0000	1.27
***************
*** 183,186 ****
--- 183,187 ----
    $template->param( 
    			member          => $member,
+ 			address         => $data->{'streetaddress'},
    			firstname       => $data->{'firstname'},
    			surname         => $data->{'surname'},
***************
*** 189,193 ****
    			ethcatpopup	=> $ethcatpopup,
    			catcodepopup	=> $catcodepopup,
!   			streetaddress   => $data->{'streetaddress'},
    			streetcity      => $data->{'streetcity'},
  			city		=> $data->{'city'},
--- 190,194 ----
    			ethcatpopup	=> $ethcatpopup,
    			catcodepopup	=> $catcodepopup,
!   			streetaddress   => $data->{'physstreet'},
    			streetcity      => $data->{'streetcity'},
  			city		=> $data->{'city'},