[Koha-cvs] koha bullstatecollection.pl C4/Bull.pm koha-tmp... [rel_2_2]

[Henri-Damien LAURENT]

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

Modified files:
        bull           : statecollection.pl 
        C4             : Bull.pm 
        koha-tmpl/intranet-tmpl/default/en/bull: statecollection.tmpl 
        updater        : updatedatabase 

Log message:
        Adding publication date to issues arrival. So that two dates can be 
used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bull/statecollection.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.16&r2=1.3.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.24&r2=1.6.2.25
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.8&r2=1.4.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=rel_2_2&r1=1.100.2.44&r2=1.100.2.45

Patches:
Index: bull/statecollection.pl
===================================================================
RCS file: /sources/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3.2.16
retrieving revision 1.3.2.17
diff -u -b -r1.3.2.16 -r1.3.2.17
--- bull/statecollection.pl     4 Apr 2006 13:55:50 -0000       1.3.2.16
+++ bull/statecollection.pl     13 Jun 2006 12:34:15 -0000      1.3.2.17
@@ -26,6 +26,7 @@
 my @serialids = $query->param('serialid');
 my @serialseqs = $query->param('serialseq');
 my @planneddates = $query->param('planneddate');
+my @publisheddates = $query->param('publisheddate');
 my @status = $query->param('status');
 my @notes = $query->param('notes');
 my @barcodes = $query->param('barcode');
@@ -48,7 +49,7 @@
                
                my ($oldstatus) = $sth->fetchrow;
                if ($serialids[$i]) {
-                       
serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i],$notes[$i])
 unless ($hassubscriptionexpired && $oldstatus == 1);
+                       
serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($publisheddates[$i]),($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso(localtime(time()))),$status[$i],$notes[$i])
 unless ($hassubscriptionexpired && $oldstatus == 1);
                        if (($status[$i]==2) && 
C4::Context->preference("serialsadditems")){
                                my %info;
                                $info{branch}=$homebranches[$i];
@@ -62,7 +63,7 @@
                } else {
                        # add a special issue
                        if ($serialseqs[$i]) {
-                               
newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i],
 format_date_in_iso($planneddates[$i]));
+                               
newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i],format_date_in_iso($publisheddates[$i]),($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso(localtime(time()))));
                        }
                        if (($status[$i]==2) && 
C4::Context->preference("serialsadditems") && 
!hassubscriptionexpired($subscriptionid)){
                                my %info;

Index: C4/Bull.pm
===================================================================
RCS file: /sources/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.24
retrieving revision 1.6.2.25
diff -u -b -r1.6.2.24 -r1.6.2.25
--- C4/Bull.pm  12 May 2006 09:35:09 -0000      1.6.2.24
+++ C4/Bull.pm  13 Jun 2006 12:34:15 -0000      1.6.2.25
@@ -136,7 +136,7 @@
        $sth = $dbh->prepare("insert into subscriptionhistory (biblionumber, 
subscriptionid, histstartdate, enddate, missinglist, recievedlist, opacnote, 
librariannote) values (?,?,?,?,?,?,?,?)");
        $sth->execute($biblionumber, $subscriptionid, 
format_date_in_iso($startdate), 0, "", "", "", $notes);
        # reread subscription to get a hash (for calculation of the 1st issue 
number)
-       $sth = $dbh->prepare("select * from subscription where subscriptionid = 
? ");
+       $sth = $dbh->prepare("SELECT * from subscription where subscriptionid = 
? ");
        $sth->execute($subscriptionid);
        my $val = $sth->fetchrow_hashref;
 
@@ -150,7 +150,7 @@
 sub getsubscription {
        my ($subscriptionid) = @_;
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare('select 
subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as 
aqbooksellername,biblio.title as bibliotitle 
+       my $sth = $dbh->prepare('SELECT 
subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as 
aqbooksellername,biblio.title as bibliotitle 
                                                        from subscription 
                                                        left join 
subscriptionhistory on 
subscription.subscriptionid=subscriptionhistory.subscriptionid
                                                        left join aqbudget on 
subscription.aqbudgetid=aqbudget.aqbudgetid 
@@ -165,7 +165,7 @@
 sub getsubscriptionfrombiblionumber {
        my ($biblionumber) = @_;
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare('select count(*) from subscription where 
biblionumber=?');
+       my $sth = $dbh->prepare('SELECT count(*) from subscription where 
biblionumber=?');
        $sth->execute($biblionumber);
        my $subscriptionsnumber = $sth->fetchrow;
        return $subscriptionsnumber;
@@ -174,7 +174,7 @@
 sub get_subscription_list_from_biblionumber {
        my ($biblionumber) = @_;
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  
aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as 
bibliotitle 
+       my $sth = $dbh->prepare('SELECT subscription.*,subscriptionhistory.*,  
aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as 
bibliotitle 
                                                        from subscription 
                                                        left join 
subscriptionhistory on 
subscription.subscriptionid=subscriptionhistory.subscriptionid
                                                        left join aqbudget on 
subscription.aqbudgetid=aqbudget.aqbudgetid 
@@ -204,12 +204,18 @@
 sub get_full_subscription_list_from_biblionumber {
        my ($biblionumber) = @_;
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, 
serial.status, serial.notes, year(serial.planneddate) as year, 
aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as 
bibliotitle 
-                                                       from serial left join 
subscription on (serial.subscriptionid=subscription.subscriptionid and 
subscription.biblionumber=serial.biblionumber)
-                                                       left join aqbudget on 
subscription.aqbudgetid=aqbudget.aqbudgetid 
-                                                       left join aqbooksellers 
on subscription.aqbooksellerid=aqbooksellers.id 
-                                                       left join biblio on 
biblio.biblionumber=subscription.biblionumber 
-                                                       where 
subscription.biblionumber = ? order by 
year,serial.subscriptionid,serial.planneddate');
+  my $sth = $dbh->prepare('
+  SELECT serial.serialseq,serial.planneddate, serial.publisheddate, 
serial.status, serial.notes,
+    year(serial.publisheddate) as year,
+    aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as 
bibliotitle
+  FROM serial 
+        LEFT JOIN subscription ON 
+          (serial.subscriptionid=subscription.subscriptionid AND 
subscription.biblionumber=serial.biblionumber)
+        LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid 
+        LEFT JOIN aqbooksellers on 
subscription.aqbooksellerid=aqbooksellers.id 
+        LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber 
+  WHERE subscription.biblionumber = ? 
+  ORDER BY 
year,serial.publisheddate,serial.subscriptionid,serial.planneddate');
        $sth->execute($biblionumber);
        my @res;
        my $year;
@@ -230,7 +236,8 @@
                        if ($first eq 1){$first=0;}
                        my $temp=$res[scalar(@res)-1]->{'serials'};
                        push @$temp,
-                               {'planneddate' => 
format_date($subs->{'planneddate'}), 
+                {'publisheddate' =>format_date($subs->{'publisheddate'}),
+                'planneddate' => format_date($subs->{'planneddate'}), 
                                'serialseq' => $subs->{'serialseq'},
                                "status".$subs->{'status'} => 1,
                                'notes' => $subs->{'notes'} eq 
$previousnote?"":$subs->{notes},
@@ -243,7 +250,8 @@
                        $bibliotitle= $subs->{'bibliotitle'};
                        my @temp;
                        push @temp,
-                               {'planneddate' => 
format_date($subs->{'planneddate'}), 
+                               {'publisheddate' 
=>format_date($subs->{'publisheddate'}),
+                'planneddate' => format_date($subs->{'planneddate'}), 
                                'serialseq' => $subs->{'serialseq'},
                                "status".$subs->{'status'} => 1,
                                'notes' => $subs->{'notes'} eq 
$previousnote?"":$subs->{notes},
@@ -301,24 +309,24 @@
        my $dbh = C4::Context->dbh;
        my $sth;
        if ($biblionumber) {
-               $sth = $dbh->prepare("select 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
biblio.biblionumber=? order by title");
+               $sth = $dbh->prepare("SELECT 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
biblio.biblionumber=? order by title");
                $sth->execute($biblionumber);
        } else {
                if ($ISSN and $title)
                {
-                       $sth = $dbh->prepare("select 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
(biblio.title like ? or biblioitems.issn = ? order by title )");
+                       $sth = $dbh->prepare("SELECT 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
(biblio.title like ? or biblioitems.issn = ? order by title )");
                        $sth->execute("%$title%",$ISSN);
                }
                else
                {
                        if ($ISSN)
                        {
-                               $sth = $dbh->prepare("select 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
biblioitems.issn = ? order by title");
+                               $sth = $dbh->prepare("SELECT 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and 
biblioitems.issn = ? order by title");
                                $sth->execute($ISSN);
                        }
                        else
                        {
-                               $sth = $dbh->prepare("select 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and
+                               $sth = $dbh->prepare("SELECT 
subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber
 from subscription,biblio,biblioitems where  biblio.biblionumber = 
biblioitems.biblionumber and
  biblio.biblionumber=subscription.biblionumber and biblio.title like ?  order 
by title");
                                $sth->execute("%$title%");
                        }
@@ -345,7 +353,10 @@
 sub modsubscriptionhistory {
        my 
($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote)address@hidden;
        my $dbh=C4::Context->dbh;
-       my $sth = $dbh->prepare("update subscriptionhistory set 
histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=?
 where subscriptionid=?");
+       my $sth = $dbh->prepare("
+  UPDATE subscriptionhistory 
+  SET 
histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=?
 
+  WHERE subscriptionid=?");
        $recievedlist =~ s/^,//g;
        $missinglist =~ s/^,//g;
        $opacnote =~ s/^,//g;
@@ -358,27 +369,36 @@
        my ($subscriptionid) = @_;
        my $dbh = C4::Context->dbh;
        # OK, now add the last 5 issues arrives/missing
-       my $sth=$dbh->prepare("select serialid,serialseq, status, 
planneddate,notes from serial where subscriptionid = ? and (status in (2,4,5)) 
order by serialid DESC");
+       my $sth=$dbh->prepare("
+  SELECT serialid,serialseq, status, publisheddate,planneddate,notes 
+  FROM serial 
+  WHERE subscriptionid = ? AND (status IN (2,4,5)) 
+  ORDER BY serialid DESC");
        $sth->execute($subscriptionid);
        my $counter=0;
        my @serials;
        while((my $line = $sth->fetchrow_hashref) && $counter <5) {
                $counter++;
                $line->{"status".$line->{status}} = 1; # fills a "statusX" 
value, used for template status select list
+               $line->{"publisheddate"} = 
format_date($line->{"publisheddate"});
                $line->{"planneddate"} = format_date($line->{"planneddate"});
                push @serials,$line;
        }
        
        # status = 2 is "arrived"
-       my $sth=$dbh->prepare("select serialid,serialseq, status, 
planneddate,notes from serial where subscriptionid = ? and status <>2 and 
status <>4 and status <>5");
+       my $sth=$dbh->prepare("
+  SELECT serialid,serialseq, status, publisheddate, planneddate,notes 
+  FROM serial 
+  WHERE subscriptionid = ? AND status NOT IN (2,4,5)");
        $sth->execute($subscriptionid);
        my @serials;
        while(my $line = $sth->fetchrow_hashref) {
                $line->{"status".$line->{status}} = 1; # fills a "statusX" 
value, used for template status select list
+               $line->{"publisheddate"} = 
format_date($line->{"publisheddate"});
                $line->{"planneddate"} = format_date($line->{"planneddate"});
                push @serials,$line;
        }
-       $sth=$dbh->prepare("select count(*) from serial where 
subscriptionid=?");
+       $sth=$dbh->prepare("SELECT count(*) FROM serial WHERE 
subscriptionid=?");
        $sth->execute($subscriptionid);
        my ($totalissues) = $sth->fetchrow;
        return ($totalissues,@serials);
@@ -389,7 +409,7 @@
        my ($subscriptionid,$limit) address@hidden;
        my $dbh = C4::Context->dbh;
        # status = 2 is "arrived"
-       my $strsth="select serialid,serialseq, status, planneddate from serial 
where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC 
LIMIT 0,$limit";
+       my $strsth="SELECT serialid,serialseq, status, planneddate FROM serial 
WHERE subscriptionid = ? AND (status =2 or status=4) ORDER BY planneddate DESC 
LIMIT 0,$limit";
        my $sth=$dbh->prepare($strsth);
        $sth->execute($subscriptionid);
        my @serials;
@@ -398,27 +418,27 @@
                $line->{"planneddate"} = format_date($line->{"planneddate"});
                push @serials,$line;
        }
-       $sth=$dbh->prepare("select count(*) from serial where 
subscriptionid=?");
+       $sth=$dbh->prepare("SELECT count(*) from serial where 
subscriptionid=?");
        $sth->execute($subscriptionid);
        my ($totalissues) = $sth->fetchrow;
        return address@hidden;
 }
 
 sub serialchangestatus {
-       my ($serialid,$serialseq,$planneddate,$status,$notes)address@hidden;
+       my ($serialid,$serialseq, 
$publisheddate,$planneddate,$status,$notes)address@hidden;
 #      warn "($serialid,$serialseq,$planneddate,$status)";
        # 1st, get previous status : if we change from "waited" to something 
else, then we will have to create a new "waited" entry
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare("select subscriptionid,status from serial where 
serialid=?");
+       my $sth = $dbh->prepare("SELECT subscriptionid,status from serial where 
serialid=?");
        $sth->execute($serialid);
        my ($subscriptionid,$oldstatus) = $sth->fetchrow;
        # change status & update subscriptionhistory
        if ($status eq 6){
                delissue($serialseq, $subscriptionid) 
        }else{
-               $sth = $dbh->prepare("update serial set 
serialseq=?,planneddate=?,status=?,notes=? where serialid = ?");
-               $sth->execute($serialseq,$planneddate,$status,$notes,$serialid);
-               $sth = $dbh->prepare("select missinglist,recievedlist from 
subscriptionhistory where subscriptionid=?");
+               $sth = $dbh->prepare("update serial set 
serialseq=?,publisheddate=?,planneddate=?,status=?,notes=? where serialid = ?");
+               
$sth->execute($serialseq,$publisheddate,$planneddate,$status,$notes,$serialid);
+               $sth = $dbh->prepare("SELECT missinglist,recievedlist from 
subscriptionhistory where subscriptionid=?");
                $sth->execute($subscriptionid);
                my ($missinglist,$recievedlist) = $sth->fetchrow;
                if ($status eq 2) {
@@ -431,14 +451,14 @@
        }
        # create new waited entry if needed (ie : was a "waited" and has 
changed)
        if ($oldstatus eq 1 && $status ne 1) {
-               $sth = $dbh->prepare("select * from subscription where 
subscriptionid = ? ");
+               $sth = $dbh->prepare("SELECT * from subscription where 
subscriptionid = ? ");
                $sth->execute($subscriptionid);
                my $val = $sth->fetchrow_hashref;
                # next issue number
                my 
($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3)
 = Get_Next_Seq($val);
                # next date (calculated from actual date & frequency parameters)
-               my $nextplanneddate = Get_Next_Date($planneddate,$val);
-               newissue($newserialseq, $subscriptionid, 
$val->{'biblionumber'}, 1, $nextplanneddate);
+               my $nextpublisheddate = Get_Next_Date($publisheddate,$val);
+               newissue($newserialseq, $subscriptionid, 
$val->{'biblionumber'}, 1, $nextpublisheddate,0);
                $sth = $dbh->prepare("update subscription set lastvalue1=?, 
lastvalue2=?,lastvalue3=?,
                                                                                
                                innerloop1=?,innerloop2=?,innerloop3=?
                                                                                
                                where subscriptionid = ?");
@@ -447,11 +467,14 @@
 }
 
 sub newissue {
-       my ($serialseq,$subscriptionid,$biblionumber,$status, $planneddate) = 
@_;
+       my ($serialseq,$subscriptionid,$biblionumber,$status, $publisheddate, 
$planneddate) = @_;
        my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare("insert into serial 
(serialseq,subscriptionid,biblionumber,status, planneddate) values 
(?,?,?,?,?)");
-       $sth->execute($serialseq,$subscriptionid,$biblionumber,$status, 
$planneddate);
-       $sth = $dbh->prepare("select missinglist,recievedlist from 
subscriptionhistory where subscriptionid=?");
+       my $sth = $dbh->prepare("
+  INSERT INTO serial 
+    (serialseq,subscriptionid,biblionumber,status,publisheddate,planneddate) 
+  VALUES (?,?,?,?,?,?)");
+       
$sth->execute($serialseq,$subscriptionid,$biblionumber,$status,$publisheddate, 
$planneddate);
+       $sth = $dbh->prepare("SELECT missinglist,recievedlist from 
subscriptionhistory where subscriptionid=?");
        $sth->execute($subscriptionid);
        my ($missinglist,$recievedlist) = $sth->fetchrow;
        if ($status eq 2) {
@@ -672,7 +695,7 @@
        my $subscription = getsubscription($subscriptionid);
        # we don't do the same test if the subscription is based on X numbers 
or on X weeks/months
        if ($subscription->{numberlength}) {
-               my $sth = $dbh->prepare("select count(*) from serial where 
subscriptionid=?  and planneddate>=?");
+               my $sth = $dbh->prepare("SELECT count(*) from serial where 
subscriptionid=?  and planneddate>=?");
                $sth->execute($subscriptionid,$subscription->{startdate});
                my $res = $sth->fetchrow;
                if ($subscription->{numberlength}>=$res) {
@@ -682,7 +705,7 @@
                }
        } else {
                #a little bit more tricky if based on X weeks/months : search 
if the latest issue waited is not after subscription startdate + duration
-               my $sth = $dbh->prepare("select max(planneddate) from serial 
where subscriptionid=?");
+               my $sth = $dbh->prepare("SELECT max(planneddate) from serial 
where subscriptionid=?");
                $sth->execute($subscriptionid);
                my $res = ParseDate(format_date_in_iso($sth->fetchrow));
                my $endofsubscriptiondate;
@@ -717,7 +740,7 @@
        my 
($subscriptionid,$user,$startdate,$numberlength,$weeklength,$monthlength,$note) 
= @_;
        my $dbh = C4::Context->dbh;
        my $subscription = getsubscription($subscriptionid);
-       my $sth = $dbh->prepare("select * from biblio,biblioitems where 
biblio.biblionumber=biblioitems.biblionumber and biblio.biblionumber=?");
+       my $sth = $dbh->prepare("SELECT * from biblio,biblioitems where 
biblio.biblionumber=biblioitems.biblionumber and biblio.biblionumber=?");
        $sth->execute($subscription->{biblionumber});
        my $biblio = $sth->fetchrow_hashref;
        
newsuggestion($user,$subscription->{bibliotitle},$biblio->{author},$biblio->{publishercode},$biblio->{note},'','','','','',$subscription->{biblionumber});

Index: koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -b -r1.4.2.8 -r1.4.2.9
--- koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl        8 Feb 
2006 09:20:11 -0000       1.4.2.8
+++ koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl        13 Jun 
2006 12:34:15 -0000      1.4.2.9
@@ -20,6 +20,9 @@
                        Numbered
                </th>
                <th class="bull">
+                       Published on
+               </th>
+               <th class="bull">
                        planned for
                </th>
                <th class="bull">
@@ -35,6 +38,9 @@
                                Issue <input type="text" name="serialseq" 
value="<!-- TMPL_VAR name="serialseq" -->" size=50 maxlength=100>
                        </td>
                        <td>
+                               <input type="text" name="publisheddate" 
value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+                       </td>
+                       <td>
                                <input type="text" name="planneddate" 
value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
                        </td>
                        <td>
@@ -77,9 +83,12 @@
                <!--TMPL_IF Name="serialadditems" -->
                <tr>
                        <td>
-                               Callnumber <input type="text" 
name="itemcallnumber" value="" size=10 maxlength=15>
                                Barcode <input type="text" name="barcode" 
value="" size=20 maxlength=20>
+                               Callnumber <input type="text" 
name="itemcallnumber" value="" size=10 maxlength=15>
                        </td>
+                       </td>
+            &nbsp;
+                       <td>
                        <td>
                                <select name="branch" size="1">
                                                <option value="">Branch</option>
@@ -121,6 +130,9 @@
                                Manual issue <input type="text" 
name="serialseq" size=30 maxlength=100>
                        </td>
                        <td>
+                               <input type="text" name="publisheddate" size=10 
maxlength=15>
+                       </td>
+                       <td>
                                <input type="text" name="planneddate" size=10 
maxlength=15>
                        </td>
                        <td>
@@ -135,8 +147,11 @@
                <!--TMPL_IF Name="serialadditems" -->
                <tr>
                        <td>
-                               Callnumber <input type="text" 
name="itemcallnumber" value="" size=10 maxlength=15>
                                Barcode <input type="text" name="barcode" 
value="" size=20 maxlength=20>
+                               Callnumber <input type="text" 
name="itemcallnumber" value="" size=10 maxlength=15>
+                       </td>
+                       <td>
+                               &nbsp;
                        </td>
                        <td>
                                <select name="branch" size="1">

Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.44
retrieving revision 1.100.2.45
diff -u -b -r1.100.2.44 -r1.100.2.45
--- updater/updatedatabase      2 Jun 2006 15:21:40 -0000       1.100.2.44
+++ updater/updatedatabase      13 Jun 2006 12:34:15 -0000      1.100.2.45
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.100.2.44 2006/06/02 15:21:40 tipaul Exp $
+# $Id: updatedatabase,v 1.100.2.45 2006/06/13 12:34:15 hdl Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -319,6 +319,7 @@
                                serialseq varchar(100) NOT NULL default '',
                                status tinyint(4) NOT NULL default '0',
                                planneddate date NOT NULL default '0000-00-00',
+                               publishedddate date NOT NULL default 
'0000-00-00',
                                PRIMARY KEY  (serialid)
                                )",
     subscription => "(biblionumber int(11) NOT NULL default '0',
@@ -2133,6 +2134,9 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.100.2.45  2006/06/13 12:34:15  hdl
+# Adding publication date to issues arrival. So that two dates can be used.
+#
 # Revision 1.100.2.44  2006/06/02 15:21:40  tipaul
 # moving dewey to a varchar
 #