@@ -, +, @@ --- Koha/Acquisition/Utils.pm | 8 ++++---- acqui/addorderiso2709.pl | 4 ++-- acqui/neworderempty.pl | 4 ++-- t/Acquisition/Utils.t | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-) --- a/Koha/Acquisition/Utils.pm +++ a/Koha/Acquisition/Utils.pm @@ -39,8 +39,8 @@ given system preference. =cut sub GetMarcFieldsToOrderValues { - my ($syspref_name, $record, $field_list) = @_; - my $syspref = C4::Context->preference($syspref_name); + my ($record, $field_list) = @_; + my $syspref = C4::Context->preference('MarcFieldsToOrder'); $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt my $yaml = eval { YAML::Load($syspref); @@ -83,8 +83,8 @@ find a matching number of all fields to be looked up. =cut sub GetMarcItemFieldsToOrderValues { - my ($syspref_name, $record, $field_list) = @_; - my $syspref = C4::Context->preference($syspref_name); + my ($record, $field_list) = @_; + my $syspref = C4::Context->preference('MarcItemFieldsToOrder'); $syspref = "$syspref\n\n"; # YAML is anal on ending \n. Surplus does not hurt my $yaml = eval { YAML::Load($syspref); --- a/acqui/addorderiso2709.pl +++ a/acqui/addorderiso2709.pl @@ -492,7 +492,7 @@ sub import_biblios_list { ); my $marcrecord = $import_record->get_marc_record || die "couldn't translate marc information"; - my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']); + my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] ); my $price = $infos->{price}; my $replacementprice = $infos->{replacementprice}; my $quantity = $infos->{quantity}; @@ -511,7 +511,7 @@ sub import_biblios_list { # Items my @itemlist = (); my $all_items_quantity = 0; - 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']); + 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' ] ); if ($alliteminfos != -1) { foreach my $iteminfos (@$alliteminfos) { my $item_homebranch = $iteminfos->{homebranch}; --- a/acqui/neworderempty.pl +++ a/acqui/neworderempty.pl @@ -629,7 +629,7 @@ sub staged_items_field { my ($marcrecord, $encoding) = MARCfindbreeding($breedingid); die("Could not find the selected record in the reservoir, bailing") unless $marcrecord; - my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice']); + my $infos = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( $marcrecord, [ 'price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2', 'replacementprice' ] ); my $price = $infos->{price}; my $replacementprice = $infos->{replacementprice}; my $quantity = $infos->{quantity}; @@ -647,7 +647,7 @@ sub staged_items_field { # Items my @itemlist = (); my $all_items_quantity = 0; - 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']); + 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' ] ); if ($alliteminfos != -1) { foreach my $iteminfos (@$alliteminfos) { my %itemrecord=( --- a/t/Acquisition/Utils.t +++ a/t/Acquisition/Utils.t @@ -52,7 +52,6 @@ test4: 541$a }; t::lib::Mocks::mock_preference('MarcFieldsToOrder', $MarcFieldsToOrder); my $data = Koha::Acquisition::Utils::GetMarcFieldsToOrderValues( - 'MarcFieldsToOrder', $record, [ 'test1', 'test2', 'test3', 'test4' ] ); @@ -86,7 +85,6 @@ testD: 976$b }; t::lib::Mocks::mock_preference('MarcItemFieldsToOrder', $MarcItemFieldsToOrder); my $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues( - 'MarcItemFieldsToOrder', $record, [ 'testA', 'testB', 'testC', 'testD' ] ); @@ -117,7 +115,6 @@ testD: 976$b ); $data = Koha::Acquisition::Utils::GetMarcItemFieldsToOrderValues( - 'MarcItemFieldsToOrder', $record, [ 'testA', 'testB', 'testC', 'testD' ] ); --