last commits before 1.9.1

diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index 28fbf5b..2106cc7 100644 (file)
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -28,6 +28,7 @@ use C4::Print;
 use C4::Interface::CGI::Output;
 use HTML::Template;
 use DBI;
+use C4::Koha;
 
 
 # this is a reorganisation of circulationold.pl

diff --git a/detail.pl b/detail.pl
index 3513842..917444d 100755 (executable)
--- a/detail.pl
+++ b/detail.pl
@@ -33,8 +33,6 @@ my $type=$query->param('type');
 ($type) || ($type='intra');
 
 my $biblionumber=$query->param('bib');
-#my $type='intra';     # FIXME - There's already a $type in this scope
-
 
 # change back when ive fixed request.pl
 my @items = ItemInfo(undef, $biblionumber, $type);

diff --git a/insertdata.pl b/insertdata.pl
index 81bce7b..ed55d71 100755 (executable)
--- a/insertdata.pl
+++ b/insertdata.pl
@@ -51,8 +51,8 @@ my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"
 my $sth=$dbh->prepare($query);
 $sth->execute;
 if (my $data=$sth->fetchrow_hashref){
-  $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-  $data{'joining'}=format_date_in_iso($data{'joining'});
+  $data{'dateofbirth'}=format_date($data{'dateofbirth'});
+  $data{'joining'}=format_date($data{'joining'});
   $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
   cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
   streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
@@ -67,8 +67,8 @@ if (my $data=$sth->fetchrow_hashref){
 #  print $query;
 
 }else{
-  $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-  $data{'joining'}=format_date_in_iso($data{'joining'});
+  $data{'dateofbirth'}=format_date($data{'dateofbirth'});
+  $data{'joining'}=format_date($data{'joining'});
   $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
   firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
   altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,

diff --git a/updater/updatedatabase b/updater/updatedatabase
index 3bca095..7186b13 100755 (executable)
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -279,7 +279,8 @@ my %tabledata=(
        { uniquefieldrequired => 'variable', variable => 'marc', value => 'ON', explanation => 'MARC support (ON or OFF)' },
        { uniquefieldrequired => 'variable', variable => 'marcflavour', value => 'MARC21', explanation => 'your MARC flavor (MARC21 or UNIMARC) used for character encoding' },
        { uniquefieldrequired => 'variable', variable => 'checkdigit', value => 'katipo', explanation => 'none= no check on member cardnumber. katipo= katipo check' },
-    ],
+       { uniquefieldrequired => 'variable', variable => 'dateformat', value => 'ISO', explanation => 'date format (US mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd) ' },
+   ],
 
 );
 
@@ -544,6 +545,9 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.39  2003/04/04 08:45:00  tipaul
+# last commits before 1.9.1
+#
 # Revision 1.38  2003/03/18 10:58:19  tipaul
 # adding checkdigit parameter that choose how to check the members cardnumber.
 # At the moment :