[Koha-cvs] koha/bull statecollection.pl [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/11 14:14:42

Modified files:
        bull           : statecollection.pl 

Log message:
        sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bull/statecollection.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.16&r2=1.3.2.16.2.1

Patches:
Index: statecollection.pl
===================================================================
RCS file: /sources/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3.2.16
retrieving revision 1.3.2.16.2.1
diff -u -b -r1.3.2.16 -r1.3.2.16.2.1
--- statecollection.pl  4 Apr 2006 13:55:50 -0000       1.3.2.16
+++ statecollection.pl  11 Jul 2006 14:14:42 -0000      1.3.2.16.2.1
@@ -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;