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 492-498 sub import_biblios_list { Link Here
492
        );
492
        );
493
        my $marcrecord = $import_record->get_marc_record || die "couldn't translate marc information";
493
        my $marcrecord = $import_record->get_marc_record || die "couldn't translate marc information";
494
494
495
        my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']);
495
        my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] );
496
        my $price = $infos->{price};
496
        my $price = $infos->{price};
497
        my $replacementprice = $infos->{replacementprice};
497
        my $replacementprice = $infos->{replacementprice};
498
        my $quantity = $infos->{quantity};
498
        my $quantity = $infos->{quantity};
Lines 511-517 sub import_biblios_list { Link Here
511
        # Items
511
        # Items
512
        my @itemlist = ();
512
        my @itemlist = ();
513
        my $all_items_quantity = 0;
513
        my $all_items_quantity = 0;
514
        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']);
514
        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' ] );
515
        if ($alliteminfos != -1) {
515
        if ($alliteminfos != -1) {
516
            foreach my $iteminfos (@$alliteminfos) {
516
            foreach my $iteminfos (@$alliteminfos) {
517
                my $item_homebranch = $iteminfos->{homebranch};
517
                my $item_homebranch = $iteminfos->{homebranch};
(-)a/acqui/neworderempty.pl (-2 / +2 lines)
Lines 629-635 sub staged_items_field { Link Here
629
    my ($marcrecord, $encoding) = MARCfindbreeding($breedingid);
629
    my ($marcrecord, $encoding) = MARCfindbreeding($breedingid);
630
    die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
630
    die("Could not find the selected record in the reservoir, bailing") unless $marcrecord;
631
631
632
    my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice']);
632
    my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] );
633
    my $price = $infos->{price};
633
    my $price = $infos->{price};
634
    my $replacementprice = $infos->{replacementprice};
634
    my $replacementprice = $infos->{replacementprice};
635
    my $quantity = $infos->{quantity};
635
    my $quantity = $infos->{quantity};
Lines 647-653 sub staged_items_field { Link Here
647
    # Items
647
    # Items
648
    my @itemlist = ();
648
    my @itemlist = ();
649
    my $all_items_quantity = 0;
649
    my $all_items_quantity = 0;
650
    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']);
650
    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' ] );
651
    if ($alliteminfos != -1) {
651
    if ($alliteminfos != -1) {
652
        foreach my $iteminfos (@$alliteminfos) {
652
        foreach my $iteminfos (@$alliteminfos) {
653
            my %itemrecord=(
653
            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