Attachment #32650 for bug #13141

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

Lines 962-968 sub GetReservedAuthorisedValues { Link Here

(-)a/C4/Reports/Guided.pm (-1 / +2 lines)
962	'branches',	962	'branches',
963	'itemtypes',	963	'itemtypes',
964	'cn_source',	964	'cn_source',
965	'categorycode' );	965	'categorycode',
		966	'biblio_framework' );
966		967
967	return \%reserved_authorised_values;	968	return \%reserved_authorised_values;
968	}	969	}




use C4::Dates qw/format_date/;
use C4::Debug;
use C4::Branch; # XXX subfield_is_koha_internal_p
use C4::Koha qw/IsAuthorisedValueCategory GetFrameworksLoop/;

=head1 NAME


                            $authorised_lib{$itemtype} = $description;
                        }
                    }
                    elsif ( $authorised_value eq "biblio_framework" ) {
                        my $frameworks = GetFrameworksLoop();
                        my $default_source = '';
                        push @authorised_values,$default_source;
                        $authorised_lib{$default_source} = 'Default';
                        foreach my $framework (@$frameworks) {
                            push @authorised_values, $framework->{value};
                            $authorised_lib{$framework->{value}} = $framework->{description};
                        }
                    }
                    elsif ( $authorised_value eq "cn_source" ) {
                        my $class_sources = GetClassSources();
                        my $default_source = C4::Context->preference("DefaultClassificationSource");

Lines 44-50 $koha->mock( Link Here

(-)a/t/db_dependent/ReportsGuided.t (-2 / +2 lines)
44	'branches' => 1,	44	'branches' => 1,
45	'itemtypes' => 1,	45	'itemtypes' => 1,
46	'cn_source' => 1,	46	'cn_source' => 1,
47	'categorycode' => 1	47	'categorycode' => 1,
		48	'biblio_framework' => 1,
48	);	49	);
49		50
50	my $reserved_authorised_values = GetReservedAuthorisedValues();	51	my $reserved_authorised_values = GetReservedAuthorisedValues();
51	-

Return to bug 13141

Lines 29-35 use C4::Output; Link Here

(-)a/reports/guided_reports.pl (-1 / +11 lines)
29	use C4::Dates qw/format_date/;	29	use C4::Dates qw/format_date/;
30	use C4::Debug;	30	use C4::Debug;
31	use C4::Branch; # XXX subfield_is_koha_internal_p	31	use C4::Branch; # XXX subfield_is_koha_internal_p
32	use C4::Koha qw/IsAuthorisedValueCategory/;	32	use C4::Koha qw/IsAuthorisedValueCategory GetFrameworksLoop/;
33		33
34	=head1 NAME	34	=head1 NAME
35		35
Lines 644-649 elsif ($phase eq 'Run this report'){ Link Here
644	$authorised_lib{$itemtype} = $description;	644	$authorised_lib{$itemtype} = $description;
645	}	645	}
646	}	646	}
		647	elsif ( $authorised_value eq "biblio_framework" ) {
		648	my $frameworks = GetFrameworksLoop();
		649	my $default_source = '';
		650	push @authorised_values,$default_source;
		651	$authorised_lib{$default_source} = 'Default';
		652	foreach my $framework (@$frameworks) {
		653	push @authorised_values, $framework->{value};
		654	$authorised_lib{$framework->{value}} = $framework->{description};
		655	}
		656	}
647	elsif ( $authorised_value eq "cn_source" ) {	657	elsif ( $authorised_value eq "cn_source" ) {
648	my $class_sources = GetClassSources();	658	my $class_sources = GetClassSources();
649	my $default_source = C4::Context->preference("DefaultClassificationSource");	659	my $default_source = C4::Context->preference("DefaultClassificationSource");