View | Details | Raw Unified | Return to bug 12072
Collapse All | Expand All

(-)a/C4/Dates.pm (-1 / +1 lines)
Lines 47-53 sub _prefformat { Link Here
47 

          47
          

        

        

          48
          
sub reset_prefformat {  # subroutine to clear the prefformat, called when we change it

          48
          
sub reset_prefformat {  # subroutine to clear the prefformat, called when we change it

        

        

          49
          
    if (defined $prefformat){

          49
          
    if (defined $prefformat){

        

          
            

              50
              
	$prefformat = C4::Context->preference('dateformat') || 'us';


              50
              
        $prefformat = C4::Context->preference('dateformat') || 'us';

            

        

          51
          
    }

          51
          
    }

        

        

          52
          
}

          52
          
}

        

        

          53
          

          53
          

        



(-)a/tools/exceptionHolidays.pl
      (-1 / +1 lines)




  

    
      
            Lines 41-47
          if ($description) {
      
      
        Link Here
      
    
  

        

          41
          
}   

          41
          
}   

        

        

          42
          

          42
          

        

        

          43
          

          43
          

        

          
            

              44
              
my $datecancelrange = C4::Dates->new($datecancelrange)->output('iso');


              44
              
$datecancelrange = C4::Dates->new($datecancelrange)->output('iso');

            

        

          45
          
my @dateend = split(/[\/-]/, $datecancelrange);

          45
          
my @dateend = split(/[\/-]/, $datecancelrange);

        

        

          46
          
$year1 = $dateend[0];

          46
          
$year1 = $dateend[0];

        

        

          47
          
$month1 = $dateend[1];

          47
          
$month1 = $dateend[1];

        



(-)a/tools/newHolidays.pl
      (-2 / +1 lines)




  

    
      
            Lines 34-40
          my $calendardate        = sprintf("%04d-%02d-%02d", $year, $month, $day);
      
      
        Link Here
      
    
  

        

          34
          
my $isodate             = C4::Dates->new($calendardate, 'iso');

          34
          
my $isodate             = C4::Dates->new($calendardate, 'iso');

        

        

          35
          
$calendardate           = $isodate->output('syspref');

          35
          
$calendardate           = $isodate->output('syspref');

        

        

          36
          

          36
          

        

          
            

              37
              
my $dateofrange = C4::Dates->new($dateofrange)->output('iso');


              37
              
$dateofrange = C4::Dates->new($dateofrange)->output('iso');

            

        

          38
          
my @dateend = split(/[\/-]/, $dateofrange);

          38
          
my @dateend = split(/[\/-]/, $dateofrange);

        

        

          39
          
$year1 = $dateend[0];

          39
          
$year1 = $dateend[0];

        

        

          40
          
$month1 = $dateend[1];

          40
          
$month1 = $dateend[1];

        

            

              41
              
- 

              
              
            






  

  Return to bug 12072