[Koha-cvs] koha bull/statecollection.pl C4/Bull.pm koha-tm... [rel_2_2]

[paul poulain]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     paul poulain <tipaul>   06/09/26 10:04:06

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

Log message:
        minor fix for serials management (planned date & publisheddate)
        + updatedonline help

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bull/statecollection.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.19&r2=1.3.2.20
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.33&r2=1.6.2.34
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.9&r2=1.4.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1

Patches:
Index: bull/statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/Attic/statecollection.pl,v
retrieving revision 1.3.2.19
retrieving revision 1.3.2.20
diff -u -b -r1.3.2.19 -r1.3.2.20
--- bull/statecollection.pl     8 Aug 2006 19:52:23 -0000       1.3.2.19
+++ bull/statecollection.pl     26 Sep 2006 10:04:06 -0000      1.3.2.20
@@ -49,7 +49,7 @@
                
                my ($oldstatus) = $sth->fetchrow;
                if ($serialids[$i]) {
-            my $planneddate = 
($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso("today"))
 if ($status[$i]==2);
+            my $planneddate = 
($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso("today"));
                        
serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($publisheddates[$i]),$planneddate,$status[$i],$notes[$i])
 unless ($hassubscriptionexpired && $oldstatus == 1);
                        if (($status[$i]==2) && 
C4::Context->preference("serialsadditems")){
                                my %info;
@@ -63,7 +63,7 @@
                        }
                } else {
                        # add a special issue
-            my $planneddate = 
($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso("today"))
 if ($status[$i]==2);
+            my $planneddate = 
($planneddates[$i]?format_date_in_iso($planneddates[$i]):format_date_in_iso("today"));
                        if ($serialseqs[$i]) {
               
newissue($serialseqs[$i],$subscriptionid,$subscription->{bibnum},$status[$i],format_date_in_iso($publisheddates[$i]),$planneddate);
               my $rq=$dbh->prepare("SELECT LAST_INSERT_ID()");

Index: C4/Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Attic/Bull.pm,v
retrieving revision 1.6.2.33
retrieving revision 1.6.2.34
diff -u -b -r1.6.2.33 -r1.6.2.34
--- C4/Bull.pm  9 Aug 2006 16:39:46 -0000       1.6.2.33
+++ C4/Bull.pm  26 Sep 2006 10:04:06 -0000      1.6.2.34
@@ -460,7 +460,7 @@
                my 
($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3)
 = Get_Next_Seq($val);
                # next date (calculated from actual date & frequency parameters)
                my $nextpublisheddate = Get_Next_Date($publisheddate,$val);
-               newissue($newserialseq, $subscriptionid, 
$val->{'biblionumber'}, 1, $nextpublisheddate,0);
+               newissue($newserialseq, $subscriptionid, 
$val->{'biblionumber'}, 1, $nextpublisheddate,$nextpublisheddate);
                $sth = $dbh->prepare("update subscription set lastvalue1=?, 
lastvalue2=?,lastvalue3=?,
                                                                                
                                innerloop1=?,innerloop2=?,innerloop3=?
                                                                                
                                where subscriptionid = ?");

Index: koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/Attic/statecollection.tmpl,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -b -r1.4.2.9 -r1.4.2.10
--- koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl        13 Jun 
2006 12:34:15 -0000      1.4.2.9
+++ koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl        26 Sep 
2006 10:04:06 -0000      1.4.2.10
@@ -8,7 +8,7 @@
 <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" 
-->">Back to biblio</a>
 
 <div id="bloc25">
-<h2 class="bull">waited or late numbers</h2>
+<h2 class="bull">waited or late issues</h2>
        <form method="post" name="f" action="statecollection.pl">
                <input type="hidden" name="op" value="serialchangestatus">
                <input type="hidden" name="serial" value="<!-- TMPL_VAR 
name="serial" -->">
@@ -35,13 +35,13 @@
        <!-- TMPL_LOOP name="serialslist" -->
                <tr>
                        <td>
-                               Issue <input type="text" name="serialseq" 
value="<!-- TMPL_VAR name="serialseq" -->" size=50 maxlength=100>
+                               Issue <input type="text" name="serialseq" 
value="<!-- TMPL_VAR name="serialseq" -->" size="40" maxlength="100">
                        </td>
                        <td>
-                               <input type="text" name="publisheddate" 
value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+                               <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>
+                               <input type="text" name="planneddate" 
value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
                        </td>
                        <td>
                                <input type="hidden" name="serialid" 
value="<!-- TMPL_VAR name="serialid" -->">

Index: koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/bull/Attic/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl   12 Aug 
2004 14:38:12 -0000      1.1
+++ koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl   26 Sep 
2006 10:04:06 -0000      1.1.2.1
@@ -1,15 +1,19 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
        <h1>Serials issues & summary</h1>
        <p>This screen is divided in 2 parts</p>
-       <h2>The right part</h2>
-       <p>The right part deals with issues. When you create a new 
subscription, the 1st issue is automatically calculated. When you want/need, 
you can define issues that have a new status:</p>
+       <h2>The 1st part, waited or late issues</h2>
+       <p>The first part deals with issues. When you create a new 
subscription, the 1st issue is automatically calculated. When you want/need, 
you can define issues that have a new status:</p>
        <ul>
                <li>Arrived : when an book arrives, you can set it's status to 
"arrived". Then, the issue disappear from this list, and the number of the 
issue is added to the "arrived list" (on the left box)</li>
                <li>Late : means that the book is late and should be arrived. A 
books changed to "late" status stays on the issue list, and the next waited 
number is generated</li>
-               <li>Missing : means the book will never arrive. The issue 
disappear from the list, and the number of the issue is added to the "missing 
list" (on the left box)</li>
+               <li>Missing : means the book is not in the library but has been 
published (it has been lost for example). The issue disappear from the list, 
and the number of the issue is added to the "missing list" (on the 2nd box)</li>
+               <li>Not published : means the book will never arrive because it 
has not been published. The issue disappear from the list, and the number of 
the issue is added to the "missing list" (on the 2nd box)</li>
+               <li>Delete : this issue will be deleted from the database. It 
is usefull when 2 issues are merged in only 1 : change the issue number of the 
1st and delete the 2nd issue.</li>
        </ul>
-       <h2>The left part</h2>
-       <p>the left part contains 6 differents informations, that are 
automatically calculated for some of them, but that you can change<p>
+       <p>When you change a "waited" issue to something else, the next waited 
issue is automatically calculated. The issue list contains only waited/ late 
issues and the last 5 issues.</p>
+       <p>Published on and planned for : for new issues, those values are 
automatically calculated. The 1st one is the published date. It is usually 
never modified. The 2nd one is the date where you expect to recieve the issue 
or have recieved it. Late issues depends on planned dates, while the published 
date is usefull to order issues in serials summary : for a monthly issue, you 
can recieve the february issue in april, but still need to know that the 
february issue has been published before the march one.</p>
+       <h2>The second part</h2>
+       <p>the second part contains 6 differents informations, that are 
automatically calculated for some of them, but that you can change<p>
        <ul>
                <li>Subscription beginning date : the date of the beginning of 
the 1st subscription. Should not be modified and is not modified automatically 
by subscriptions renewals</li>
                <li>Subscription enddate : must be entered manually when the 
subscription is definetly closed</li>