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

(-)a/Koha/Acquisition/Utils.pm (-4 / +4 lines)
Lines 39-46 given system preference. Link Here
39
=cut
39
=cut
40
40
41
sub GetMarcFieldsToOrderValues {
41
sub GetMarcFieldsToOrderValues {
42
    my ($syspref_name, $record, $field_list) = @_;
42
    my ($record, $field_list) = @_;
43
    my $syspref = C4::Context->preference($syspref_name);
43
    my $syspref = C4::Context->preference('MarcFieldsToOrder');
44
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
44
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
45
    my $yaml = eval {
45
    my $yaml = eval {
46
        YAML::Load($syspref);
46
        YAML::Load($syspref);
Lines 83-90 find a matching number of all fields to be looked up. Link Here
83
=cut
83
=cut
84
84
85
sub GetMarcItemFieldsToOrderValues {
85
sub GetMarcItemFieldsToOrderValues {
86
    my ($syspref_name, $record, $field_list) = @_;
86
    my ($record, $field_list) = @_;
87
    my $syspref = C4::Context->preference($syspref_name);
87
    my $syspref = C4::Context->preference('MarcItemFieldsToOrder');
88
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
88
    $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt
89
    my $yaml = eval {
89
    my $yaml = eval {
90
        YAML::Load($syspref);
90
        YAML::Load($syspref);
(-)a/acqui/addorderiso2709.pl (-2 / +2 lines)
Lines 513-519 sub import_biblios_list { Link Here
513
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
513
        my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
514
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
514
        my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
515
515
516
        my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']);
516
        my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] );
517
        my $price = $infos->{price};
517
        my $price = $infos->{price};
518
        my $replacementprice = $infos->{replacementprice};
518
        my $replacementprice = $infos->{replacementprice};
519
        my $quantity = $infos->{quantity};
519
        my $quantity = $infos->{quantity};
Lines 532-538 sub import_biblios_list { Link Here
532
        # Items
532
        # Items
533
        my @itemlist = ();
533
        my @itemlist = ();
534
        my $all_items_quantity = 0;
534
        my $all_items_quantity = 0;
535
        my $alliteminfos = C4::Acquisition::Utils::GetMarcItemFieldsToOrderValues('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code']);
535
        my $alliteminfos = C4::Acquisition::Utils::GetMarcItemFieldsToOrderValues( $marcrecord, [ 'homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code' ] );
536
        if ($alliteminfos != -1) {
536
        if ($alliteminfos != -1) {
537
            foreach my $iteminfos (@$alliteminfos) {
537
            foreach my $iteminfos (@$alliteminfos) {
538
                my $item_homebranch = $iteminfos->{homebranch};
538
                my $item_homebranch = $iteminfos->{homebranch};
(-)a/acqui/neworderempty.pl (-2 / +2 lines)
Lines 619-625 sub staged_items_field { Link Here
619
    my ($marcrecord, $encoding) = MARCfindbreeding($breedingid);
619
    my ($marcrecord, $encoding) = MARCfindbreeding($breedingid);
620
    die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
620
    die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
621
621
622
    my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice']);
622
    my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] );
623
    my $price = $infos->{price};
623
    my $price = $infos->{price};
624
    my $replacementprice = $infos->{replacementprice};
624
    my $replacementprice = $infos->{replacementprice};
625
    my $quantity = $infos->{quantity};
625
    my $quantity = $infos->{quantity};
Lines 637-643 sub staged_items_field { Link Here
637
    # Items
637
    # Items
638
    my @itemlist = ();
638
    my @itemlist = ();
639
    my $all_items_quantity = 0;
639
    my $all_items_quantity = 0;
640
    my $alliteminfos = C4::Acquisition::Utils::GetMarcItemFieldsToOrderValues('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code']);
640
    my $alliteminfos = C4::Acquisition::Utils::GetMarcItemFieldsToOrderValues( $marcrecord, [ 'homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'replacementprice', 'itemcallnumber', 'quantity', 'budget_code' ] );
641
    if ($alliteminfos != -1) {
641
    if ($alliteminfos != -1) {
642
        foreach my $iteminfos (@$alliteminfos) {
642
        foreach my $iteminfos (@$alliteminfos) {
643
            my %itemrecord=(
643
            my %itemrecord=(
(-)a/t/Acquisition/Utils.t (-4 lines)
Lines 52-58 test4: 541$a Link Here
52
    };
52
    };
53
    t::lib::Mocks::mock_preference('MarcFieldsToOrder', $MarcFieldsToOrder);
53
    t::lib::Mocks::mock_preference('MarcFieldsToOrder', $MarcFieldsToOrder);
54
    my $data = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues(
54
    my $data = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues(
55
        'MarcFieldsToOrder',
56
        $record,
55
        $record,
57
        [ 'test1', 'test2', 'test3', 'test4' ]
56
        [ 'test1', 'test2', 'test3', 'test4' ]
58
    );
57
    );
Lines 86-92 testD: 976$b Link Here
86
    };
85
    };
87
    t::lib::Mocks::mock_preference('MarcItemFieldsToOrder', $MarcItemFieldsToOrder);
86
    t::lib::Mocks::mock_preference('MarcItemFieldsToOrder', $MarcItemFieldsToOrder);
88
    my $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues(
87
    my $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues(
89
        'MarcItemFieldsToOrder',
90
        $record,
88
        $record,
91
        [ 'testA', 'testB', 'testC', 'testD' ]
89
        [ 'testA', 'testB', 'testC', 'testD' ]
92
    );
90
    );
Lines 117-123 testD: 976$b Link Here
117
    );
115
    );
118
116
119
    $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues(
117
    $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues(
120
        'MarcItemFieldsToOrder',
121
        $record,
118
        $record,
122
        [ 'testA', 'testB', 'testC', 'testD' ]
119
        [ 'testA', 'testB', 'testC', 'testD' ]
123
    );
120
    );
124
- 

Return to bug 20817