[Koha-cvs] koha C4/Bull.pm bull/subscription-add.pl bull/s... [rel_2_2]

[Henri-Damien LAURENT]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Henri-Damien LAURENT <hdl>      07/01/15 17:46:23

Modified files:
        C4             : Bull.pm 
        bull           : subscription-add.pl subscription-detail.pl 

Log message:
        Some Bug FIXING:
        Values displayed and saved.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bull.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.40&r2=1.6.2.41
http://cvs.savannah.gnu.org/viewcvs/koha/bull/subscription-add.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.9&r2=1.5.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/bull/subscription-detail.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.8&r2=1.5.2.9

Patches:
Index: C4/Bull.pm
===================================================================
RCS file: /sources/koha/koha/C4/Attic/Bull.pm,v
retrieving revision 1.6.2.40
retrieving revision 1.6.2.41
diff -u -b -r1.6.2.40 -r1.6.2.41

Index: bull/subscription-add.pl
===================================================================
RCS file: /sources/koha/koha/bull/Attic/subscription-add.pl,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -u -b -r1.5.2.9 -r1.5.2.10
--- bull/subscription-add.pl    19 Dec 2006 03:34:14 -0000      1.5.2.9
+++ bull/subscription-add.pl    15 Jan 2007 17:46:23 -0000      1.5.2.10
@@ -40,7 +40,7 @@
 my $count = 0;
 my ($year, $month, $day) = Date::Calc::Today;
 my $firstday = Day_of_Year($year,$month,$day);
-my $wkno = Week_of_Year($year,$month,$day); # week starting monday
+my ($year2,$wkno) = Week_of_Year($year,$month,$day); # week starting monday
 my $weekno = $wkno;
 for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
         $count = $i;
@@ -61,23 +61,6 @@
 if ($op eq 'mod') {
        my $subscriptionid = $query->param('subscriptionid');
        my $subs = &getsubscription($subscriptionid);
-       $auser = $subs->{'user'};
-       $librarian => $subs->{'librarian'},
-       $cost = $subs->{'cost'};
-       $aqbooksellerid = $subs->{'aqbooksellerid'};
-       $aqbooksellername = $subs->{'aqbooksellername'};
-       $bookfundid = $subs->{'bookfundid'};
-       $aqbudgetid = $subs->{'aqbudgetid'};
-       $startdate = $subs->{'startdate'};
-       $firstacquidate = $subs->{'firstacquidate'};    
-       $periodicity = $subs->{'periodicity'};
-       $dow = $subs->{'dow'};
-        $irregularity = $subs->{'irregularity'};
-        $numberpattern = $subs->{'numberpattern'};
-       $numberlength = $subs->{'numberlength'};
-       $weeklength = $subs->{'weeklength'};
-       $monthlength = $subs->{'monthlength'};
-
         if($monthlength > 0){
            $sublength = $monthlength;
            $sub_on = $subscription_types[2];
@@ -100,77 +83,17 @@
            }
            push( @sub_type_data, \%row );
         }
+               $subs->{startdate}=format_date($subs->{startdate});
+               $subs->{firstacquidate}=format_date($subs->{firstacquidate});
     
-       $add1 = $subs->{'add1'};
-       $every1 = $subs->{'every1'};
-       $whenmorethan1 = $subs->{'whenmorethan1'};
-       $setto1 = $subs->{'setto1'};
-       $lastvalue1 = $subs->{'lastvalue1'};
-       $innerloop1 = $subs->{'innerloop1'};
-       $add2 = $subs->{'add2'};
-       $every2 = $subs->{'every2'};
-       $whenmorethan2 = $subs->{'whenmorethan2'};
-       $setto2 = $subs->{'setto2'};
-       $lastvalue2 = $subs->{'lastvalue2'};
-       $innerloop2 = $subs->{'innerloop2'};
-       $add3 = $subs->{'add3'};
-       $every3 = $subs->{'every3'};
-       $whenmorethan3 = $subs->{'whenmorethan3'};
-       $setto3 = $subs->{'setto3'};
-       $lastvalue3 = $subs->{'lastvalue3'};
-       $innerloop3 = $subs->{'innerloop3'};
-       $numberingmethod = $subs->{'numberingmethod'};
-       $status = $subs->{status};
-       $biblionumber = $subs->{'biblionumber'};
-       $bibliotitle = $subs->{'bibliotitle'};
-        $callnumber = $subs->{'callnumber'};
-       $notes = $subs->{'notes'};
-        $hemisphere = $subs->{'hemisphere'};
        $template->param(
                $op => 1,
-               user => $auser,
-               librarian => $librarian,
-               aqbooksellerid => $aqbooksellerid,
-               aqbooksellername => $aqbooksellername,
-               cost => $cost,
-               aqbudgetid => $aqbudgetid,
-               bookfundid => $bookfundid,
-               startdate => format_date($startdate),
-               firstacquidate => format_date($firstacquidate),     
-               periodicity => $periodicity,
-               dow => $dow,
-               irregularity => $irregularity,
-               numberpattern => $numberpattern,
+        %{$subs},
                sublength => $sublength,
                subtype => address@hidden,
-               add1 => $add1,
-               every1 => $every1,
-               whenmorethan1 => $whenmorethan1,
-               setto1 => $setto1,
-               lastvalue1 => $lastvalue1,
-               innerloop1 => $innerloop1,
-               add2 => $add2,
-               every2 => $every2,
-               whenmorethan2 => $whenmorethan2,
-               setto2 => $setto2,
-               lastvalue2 => $lastvalue2,
-               innerloop2 => $innerloop2,
-               add3 => $add3,
-               every3 => $every3,
-               whenmorethan3 => $whenmorethan3,
-               setto3 => $setto3,
-               lastvalue3 => $lastvalue3,
-               innerloop3 => $innerloop3,
-               numberingmethod => $numberingmethod,
-               status => $status,
-               biblionumber => $biblionumber,
-               bibliotitle => $bibliotitle,
-               callnumber => $callnumber,
-               notes => $notes,
                subscriptionid => $subscriptionid,
                weekarrayjs => $weekarrayjs,
                weekno => $weekno,
-               hemisphere => $hemisphere,
                );
 
        $template->param(
@@ -251,15 +174,15 @@
                                        
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
                                        
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
                                        
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                                       $numberingmethod, $status, $callnumber, 
$notes, $hemisphere
+                                       "$numberingmethod", "$status", 
$callnumber, $notes, $hemisphere
                                );
     } else {
        $subscriptionid = 
newsubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
                                        
$startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-                                       
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-                                       
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-                                       
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                                       $numberingmethod, $status, $notes
+                                       
$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
+                                       
$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
+                                       
$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
+                                       "$numberingmethod", "$status", $notes
                                );      
        
        }

Index: bull/subscription-detail.pl
===================================================================
RCS file: /sources/koha/koha/bull/Attic/subscription-detail.pl,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -b -r1.5.2.8 -r1.5.2.9
--- bull/subscription-detail.pl 19 Dec 2006 03:28:22 -0000      1.5.2.8
+++ bull/subscription-detail.pl 15 Jan 2007 17:46:23 -0000      1.5.2.9
@@ -128,7 +128,7 @@
 my $count = 0;
 my ($year, $month, $day) = Date::Calc::Today;
 my $firstday = Day_of_Year($year,$month,$day);
-my $wkno = Week_of_Year($year,$month,$day); # week starting monday
+my ($year2,$wkno) = Week_of_Year($year,$month,$day); # week starting monday
 my $weekno = $wkno;
 for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
                 $count = $i;
@@ -142,51 +142,14 @@
         }
 chop($weekarrayjs);
 
+$subs->{startdate}=format_date($subs->{startdate});
+$subs->{firstacquidate}=format_date($subs->{firstacquidate});
 $template->param(
-       user => $subs->{auser},
-       librarian => $subs->{librarian},
-       aqbooksellerid => $subs->{aqbooksellerid},
-       aqbooksellername => $subs->{aqbooksellername},
-       cost => $subs->{cost},
-       aqbudgetid => $subs->{aqbudgetid},
-       bookfundid => $subs->{bookfundid},
-       startdate => format_date($subs->{startdate}),
-       periodicity => $subs->{periodicity},
-        firstacquidate => format_date($subs->{firstacquidate}),    
-       dow => $subs->{dow},
-        irregularity => $subs->{irregularity},
-        numberlength => $subs->{numberlength},
-        weeklength => $subs->{weeklength},
-        monthlength => $subs->{monthlength},
-        numberpattern => $subs->{numberpattern},
-       add1 => $subs->{add1},
-       every1 => $subs->{every1},
-       whenmorethan1 => $subs->{whenmorethan1},
-       innerloop1 => $subs->{innerloop1},
-       setto1 => $subs->{setto1},
-       lastvalue1 => $subs->{lastvalue1},
-       add2 => $subs->{add2},
-       every2 => $subs->{every2},
-       whenmorethan2 => $subs->{whenmorethan2},
-       setto2 => $subs->{setto2},
-       lastvalue2 => $subs->{lastvalue2},
-       innerloop2 => $subs->{innerloop2},
-       add3 => $subs->{add3},
-       every3 => $subs->{every3},
-       whenmorethan3 => $subs->{whenmorethan3},
-       setto3 => $subs->{setto3},
-       lastvalue3 => $subs->{lastvalue3},
-       innerloop3 => $subs->{innerloop3},
-       numberingmethod => $subs->{numberingmethod},
-       status => $subs->{status},
-       biblionumber => $subs->{biblionumber},
-       bibliotitle => $subs->{bibliotitle},
-       notes => $subs->{notes},
+  %{$subs},
        subscriptionid => $subscriptionid,
        serialslist => address@hidden,
        totalissues => $totalissues,
         weekarrayjs => $weekarrayjs,
-        callnumber => $subs->{callnumber},
         hemisphere => $hemisphere,
        );
 $template->param(