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

(-)a/cataloguing/additem.pl (-10 / +8 lines)
Lines 31-37 use C4::Circulation; Link Here
31
use C4::Koha; # XXX subfield_is_koha_internal_p
31
use C4::Koha; # XXX subfield_is_koha_internal_p
32
use C4::Branch; # XXX subfield_is_koha_internal_p
32
use C4::Branch; # XXX subfield_is_koha_internal_p
33
use C4::ClassSource;
33
use C4::ClassSource;
34
use C4::Dates;
34
use Koha::DateUtils;
35
use List::MoreUtils qw/any/;
35
use List::MoreUtils qw/any/;
36
use C4::Search;
36
use C4::Search;
37
use Storable qw(thaw freeze);
37
use Storable qw(thaw freeze);
Lines 104-110 sub _increment_barcode { Link Here
104
104
105
105
106
sub generate_subfield_form {
106
sub generate_subfield_form {
107
        my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
107
        my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $biblionumber, $temp, $loop_data, $i, $restrictededition) = @_;
108
  
108
  
109
        my $frameworkcode = &GetFrameworkCode($biblionumber);
109
        my $frameworkcode = &GetFrameworkCode($biblionumber);
110
110
Lines 129-138 sub generate_subfield_form { Link Here
129
        if ( ! defined( $value ) || $value eq '')  {
129
        if ( ! defined( $value ) || $value eq '')  {
130
            $value = $subfieldlib->{defaultvalue};
130
            $value = $subfieldlib->{defaultvalue};
131
            # get today date & replace YYYY, MM, DD if provided in the default value
131
            # get today date & replace YYYY, MM, DD if provided in the default value
132
            my ( $year, $month, $day ) = split ',', $today_iso;     # FIXME: iso dates don't have commas!
132
            my $today = dt_from_string;
133
            $value =~ s/YYYY/$year/g;
133
            $value =~ s/YYYY/$today->year/g;
134
            $value =~ s/MM/$month/g;
134
            $value =~ s/MM/$today->month/g;
135
            $value =~ s/DD/$day/g;
135
            $value =~ s/DD/$today->day/g;
136
        }
136
        }
137
        
137
        
138
        $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} <= -4));
138
        $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} <= -4));
Lines 402-408 $restrictededition = 0 if ($restrictededition != 0 && C4::Context->IsSuperLibra Link Here
402
# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
402
# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
403
$restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'}));
403
$restrictededition = 0 if ($restrictededition != 0 && $frameworkcode eq 'FA' && haspermission($uid, {'editcatalogue' => 'fast_cataloging'}));
404
404
405
my $today_iso = C4::Dates->today('iso');
406
my $tagslib = &GetMarcStructure(1,$frameworkcode);
405
my $tagslib = &GetMarcStructure(1,$frameworkcode);
407
my $record = GetMarcBiblio($biblionumber);
406
my $record = GetMarcBiblio($biblionumber);
408
my $oldrecord = TransformMarcToKoha($dbh,$record);
407
my $oldrecord = TransformMarcToKoha($dbh,$record);
Lines 841-847 if($itemrecord){ Link Here
841
            next if subfield_is_koha_internal_p($subfieldtag);
840
            next if subfield_is_koha_internal_p($subfieldtag);
842
            next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
841
            next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
843
842
844
            my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
843
            my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
845
            push @fields, "$tag$subfieldtag";
844
            push @fields, "$tag$subfieldtag";
846
            push (@loop_data, $subfield_data);
845
            push (@loop_data, $subfield_data);
847
            $i++;
846
            $i++;
Lines 865-871 foreach my $tag ( keys %{$tagslib}){ Link Here
865
        my @values = (undef);
864
        my @values = (undef);
866
        @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
865
        @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)) && defined($itemrecord->field($tag)->subfield($subtag)));
867
        for my $value (@values){
866
        for my $value (@values){
868
            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
867
            my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $biblionumber, $temp, \@loop_data, $i, $restrictededition);
869
            push (@loop_data, $subfield_data);
868
            push (@loop_data, $subfield_data);
870
            $i++;
869
            $i++;
871
        }
870
        }
872
- 

Return to bug 14922