X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Faddorderiso2709.pl;h=1921a5af6ec7080a845bc6463e263ce338179d5f;hb=refs%2Fheads%2Fkoha_ffzg;hp=c97b891e84ee755544e17adacb8372737ba37ea4;hpb=9ada51e6b4ea581104f7b55586ec4ed4a056d76c;p=koha.git

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index c97b891e84..1921a5af6e 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -2,7 +2,7 @@
 
 #A script that lets the user populate a basket from an iso2709 file
 #the script first displays a list of import batches, then when a batch is selected displays all the biblios in it.
-#The user can then pick which biblios he wants to order
+#The user can then pick which biblios they want to order
 
 # Copyright 2008 - 2011 BibLibre SARL
 #
@@ -43,9 +43,12 @@ use C4::Suggestions;    # GetSuggestion
 use C4::Members;
 
 use Koha::Number::Price;
+use Koha::Libraries;
+use Koha::Acquisition::Baskets;
 use Koha::Acquisition::Currencies;
-use Koha::Acquisition::Order;
+use Koha::Acquisition::Orders;
 use Koha::Acquisition::Booksellers;
+use Koha::Patrons;
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({
@@ -76,6 +79,7 @@ if ($cgiparams->{'import_batch_id'} && $op eq ""){
 if (! $cgiparams->{'basketno'}){
     die "Basketnumber required to order from iso2709 file import";
 }
+my $basket = Koha::Acquisition::Baskets->find( $cgiparams->{basketno} );
 
 #
 # 1st step = choose the file to import into acquisition
@@ -99,8 +103,7 @@ if ($op eq ""){
                      "allmatch" => $allmatch,
                      );
     import_biblios_list($template, $cgiparams->{'import_batch_id'});
-    my $basket = GetBasket($cgiparams->{basketno});
-    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
+    if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) {
         # prepare empty item form
         my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' );
 
@@ -143,7 +146,10 @@ if ($op eq ""){
     my @sort2 = $input->multi_param('sort2');
     my $matcher_id = $input->param('matcher_id');
     my $active_currency = Koha::Acquisition::Currencies->get_active;
+    my $biblio_count = 0;
     for my $biblio (@$biblios){
+        $biblio_count++;
+        my $duplifound = 0;
         # Check if this import_record_id was selected
         next if not grep { $_ eq $$biblio{import_record_id} } @import_record_id_selected;
         my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
@@ -157,19 +163,19 @@ if ($op eq ""){
         my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
         my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';
 
-        # 1st insert the biblio, or find it through matcher
+        # Insert the biblio, or find it through matcher
         unless ( $biblionumber ) {
             if ($matcher_id) {
                 if ( $matcher_id eq '_TITLE_AUTHOR_' ) {
-                    $duplinbatch = $import_batch_id if FindDuplicate($marcrecord);
+                    $duplifound = 1 if FindDuplicate($marcrecord);
                 }
                 else {
                     my $matcher = C4::Matcher->fetch($matcher_id);
                     my @matches = $matcher->get_matches( $marcrecord, my $max_matches = 1 );
-                    $duplinbatch = $import_batch_id if @matches;
+                    $duplifound = 1 if @matches;
                 }
 
-                next if $duplinbatch;
+                $duplinbatch = $import_batch_id and next if $duplifound;
             }
 
             # add the biblio
@@ -188,29 +194,29 @@ if ($op eq ""){
             }
             ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' );
             SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
-            # 2nd add authorities if applicable
-            if (C4::Context->preference("BiblioAddsAuthorities")){
-                my $headings_linked =BiblioAutoLink($marcrecord, $cgiparams->{'frameworkcode'});
-            }
         } else {
             SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
         }
 
         # Add items from MarcItemFieldsToOrder
-        my @homebranches = $input->multi_param('homebranch');
+        my @homebranches = $input->multi_param('homebranch_' . $biblio_count);
         my $count = scalar @homebranches;
-        my @holdingbranches = $input->multi_param('holdingbranch');
-        my @itypes = $input->multi_param('itype');
-        my @nonpublic_notes = $input->multi_param('nonpublic_note');
-        my @public_notes = $input->multi_param('public_note');
-        my @locs = $input->multi_param('loc');
-        my @ccodes = $input->multi_param('ccodes');
-        my @notforloans = $input->multi_param('notforloans');
-        my @uris = $input->multi_param('uri');
-        my @copynos = $input->multi_param('copyno');
-        my @budget_codes = $input->multi_param('budget_code');
-        my @itemprices = $input->multi_param('itemprice');
+        my @holdingbranches = $input->multi_param('holdingbranch_' . $biblio_count);
+        my @itypes = $input->multi_param('itype_' . $biblio_count);
+        my @nonpublic_notes = $input->multi_param('nonpublic_note_' . $biblio_count);
+        my @public_notes = $input->multi_param('public_note_' . $biblio_count);
+        my @locs = $input->multi_param('loc_' . $biblio_count);
+        my @ccodes = $input->multi_param('ccode_' . $biblio_count);
+        my @notforloans = $input->multi_param('notforloan_' . $biblio_count);
+        my @uris = $input->multi_param('uri_' . $biblio_count);
+        my @copynos = $input->multi_param('copyno_' . $biblio_count);
+        my @budget_codes = $input->multi_param('budget_code_' . $biblio_count);
+        my @itemprices = $input->multi_param('itemprice_' . $biblio_count);
+        my @replacementprices = $input->multi_param('replacementprice_' . $biblio_count);
+        my @itemcallnumbers = $input->multi_param('itemcallnumber_' . $biblio_count);
         my $itemcreation = 0;
+
+        my @itemnumbers;
         for (my $i = 0; $i < $count; $i++) {
             $itemcreation = 1;
             my ($item_bibnum, $item_bibitemnum, $itemnumber) = AddItem({
@@ -220,11 +226,15 @@ if ($op eq ""){
                 itemnotes => $public_notes[$i],
                 location => $locs[$i],
                 ccode => $ccodes[$i],
+                itype => $itypes[$i],
                 notforloan => $notforloans[$i],
                 uri => $uris[$i],
                 copynumber => $copynos[$i],
                 price => $itemprices[$i],
+                replacementprice => $replacementprices[$i],
+                itemcallnumber => $itemcallnumbers[$i],
             }, $biblionumber);
+            push( @itemnumbers, $itemnumber );
         }
         if ($itemcreation == 1) {
             # Group orderlines from MarcItemFieldsToOrder
@@ -232,10 +242,12 @@ if ($op eq ""){
             for (my $i = 0; $i < $count; $i++) {
                 $budget_hash->{$budget_codes[$i]}->{quantity} += 1;
                 $budget_hash->{$budget_codes[$i]}->{price} = $itemprices[$i];
+                $budget_hash->{$budget_codes[$i]}->{itemnumbers} //= [];
+                push @{ $budget_hash->{$budget_codes[$i]}->{itemnumbers} }, $itemnumbers[$i];
             }
 
             # Create orderlines from MarcItemFieldsToOrder
-            while(my ($budget_id, $infos) = each $budget_hash) {
+            while(my ($budget_id, $infos) = each %$budget_hash) {
                 if ($budget_id) {
                     my %orderinfo = (
                         biblionumber       => $biblionumber,
@@ -246,29 +258,21 @@ if ($op eq ""){
                     );
 
                     my $price = $infos->{price};
+                    my $replacementprice = $infos->{replacementprice};
                     if ($price){
                         # in France, the cents separator is the , but sometimes, ppl use a .
                         # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
                         $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
                         $price = Koha::Number::Price->new($price)->unformat;
-                        $orderinfo{gstrate} = $bookseller->{gstrate};
-                        my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100;
-                        if ( $bookseller->{listincgst} ) {
-                            if ( $c_discount ) {
-                                $orderinfo{ecost} = $price;
-                                $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                            } else {
-                                $orderinfo{ecost} = $price * ( 1 - $c );
-                                $orderinfo{rrp}   = $price;
-                            }
+                        $orderinfo{tax_rate} = $bookseller->tax_rate;
+                        my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
+                        $orderinfo{discount} = $c;
+                        if ( $c_discount ) {
+                            $orderinfo{ecost} = $price;
+                            $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                         } else {
-                            if ( $c_discount ) {
-                                $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
-                                $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                            } else {
-                                $orderinfo{rrp}   = $price / ( 1 + $orderinfo{gstrate} );
-                                $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
-                            }
+                            $orderinfo{ecost} = $price * ( 1 - $c );
+                            $orderinfo{rrp}   = $price;
                         }
                         $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
                         $orderinfo{unitprice} = $orderinfo{ecost};
@@ -276,22 +280,36 @@ if ($op eq ""){
                     } else {
                         $orderinfo{listprice} = 0;
                     }
+                    $orderinfo{replacementprice} = $replacementprice || 0;
 
                     # remove uncertainprice flag if we have found a price in the MARC record
                     $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
-                    my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;
+
+                    %orderinfo = %{
+                        C4::Acquisition::populate_order_with_prices(
+                            {
+                                order        => \%orderinfo,
+                                booksellerid => $booksellerid,
+                                ordering     => 1,
+                                receiving    => 1,
+                            }
+                        )
+                    };
+
+                    my $order = Koha::Acquisition::Order->new( \%orderinfo )->store;
+                    $order->add_item( $_ ) for @{ $budget_hash->{$budget_id}->{itemnumbers} };
                 }
             }
         } else {
             # 3rd add order
-            my $patron = C4::Members::GetMember( borrowernumber => $loggedinuser );
+            my $patron = Koha::Patrons->find( $loggedinuser );
             # get quantity in the MARC record (1 if none)
             my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1;
             my %orderinfo = (
                 biblionumber       => $biblionumber,
                 basketno           => $cgiparams->{'basketno'},
                 quantity           => $c_quantity,
-                branchcode         => $patron->{branchcode},
+                branchcode         => $patron->branchcode,
                 budget_id          => $c_budget_id,
                 uncertainprice     => 1,
                 sort1              => $c_sort1,
@@ -307,24 +325,15 @@ if ($op eq ""){
                 # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation
                 $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR";
                 $price = Koha::Number::Price->new($price)->unformat;
-                $orderinfo{gstrate} = $bookseller->{gstrate};
-                my $c = $c_discount ? $c_discount : $bookseller->{discount} / 100;
-                if ( $bookseller->{listincgst} ) {
-                    if ( $c_discount ) {
-                        $orderinfo{ecost} = $price;
-                        $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                    } else {
-                        $orderinfo{ecost} = $price * ( 1 - $c );
-                        $orderinfo{rrp}   = $price;
-                    }
+                $orderinfo{tax_rate} = $bookseller->tax_rate;
+                my $c = $c_discount ? $c_discount : $bookseller->discount / 100;
+                $orderinfo{discount} = $c;
+                if ( $c_discount ) {
+                    $orderinfo{ecost} = $price;
+                    $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
                 } else {
-                    if ( $c_discount ) {
-                        $orderinfo{ecost} = $price / ( 1 + $orderinfo{gstrate} );
-                        $orderinfo{rrp}   = $orderinfo{ecost} / ( 1 - $c );
-                    } else {
-                        $orderinfo{rrp}   = $price / ( 1 + $orderinfo{gstrate} );
-                        $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c );
-                    }
+                    $orderinfo{ecost} = $price * ( 1 - $c );
+                    $orderinfo{rrp}   = $price;
                 }
                 $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate;
                 $orderinfo{unitprice} = $orderinfo{ecost};
@@ -347,13 +356,12 @@ if ($op eq ""){
             )
         };
 
-        my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;
+        my $order = Koha::Acquisition::Order->new( \%orderinfo )->store;
 
         # 4th, add items if applicable
         # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
         # this is not optimised, but it's working !
-        my $basket = GetBasket($cgiparams->{basketno});
-        if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$basket->{is_standing} ) {
+        if ( $basket->effective_create_items eq 'ordering' && !$basket->is_standing ) {
             my @tags         = $input->multi_param('tag');
             my @subfields    = $input->multi_param('subfield');
             my @field_values = $input->multi_param('field_value');
@@ -371,7 +379,7 @@ if ($op eq ""){
             for (my $qtyloop=1;$qtyloop <= $c_quantity;$qtyloop++) {
                 my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber );
                 $order->add_item( $itemnumber );
-	    }
+                }
             } else {
                 SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' );
             }
@@ -390,15 +398,14 @@ if ($op eq ""){
 my $budgets = GetBudgets();
 my $budget_id = @$budgets[0]->{'budget_id'};
 # build bookfund list
-my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
-my ( $flags, $homebranch ) = ( $borrower->{'flags'}, $borrower->{'branchcode'} );
+my $patron = Koha::Patrons->find( $loggedinuser )->unblessed;
 my $budget = GetBudget($budget_id);
 
 # build budget list
 my $budget_loop = [];
 my $budgets_hierarchy = GetBudgetHierarchy;
 foreach my $r ( @{$budgets_hierarchy} ) {
-    next unless (CanUserUseBudget($borrower, $r, $userflags));
+    next unless (CanUserUseBudget($patron, $r, $userflags));
     if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) {
         next;
     }
@@ -457,11 +464,11 @@ sub import_biblios_list {
     return () unless $batch and $batch->{import_status} =~ /^staged$|^reverted$/;
     my $biblios = GetImportRecordsRange($import_batch_id,'','',$batch->{import_status});
     my @list = ();
-    my $item_id = 1;
     my $item_error = 0;
 
-    my $ccodes    = GetKohaAuthorisedValues("items.ccode");
-    my $locations = GetKohaAuthorisedValues("items.location");
+    my $ccodes = { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' } ) };
+    my $locations = { map { $_->{authorised_value} => $_->{opac_description} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' } ) };
+    my $notforloans = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.notforloan' } ) };
     # location list
     my @locations;
     foreach (sort keys %$locations) {
@@ -471,10 +478,15 @@ sub import_biblios_list {
     foreach (sort {$ccodes->{$a} cmp $ccodes->{$b}} keys %$ccodes) {
         push @ccodes, { code => $_, description => $ccodes->{$_} };
     }
+    my @notforloans;
+    foreach (sort {$notforloans->{$a} cmp $notforloans->{$b}} keys %$notforloans) {
+        push @notforloans, { code => $_, description => $notforloans->{$_} };
+    }
 
-
-
+    my $biblio_count = 0;
     foreach my $biblio (@$biblios) {
+        my $item_id = 1;
+        $biblio_count++;
         my $citation = $biblio->{'title'};
         $citation .= " $biblio->{'author'}" if $biblio->{'author'};
         $citation .= " (" if $biblio->{'issn'} or $biblio->{'isbn'};
@@ -497,8 +509,9 @@ sub import_biblios_list {
         my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} );
         my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information";
 
-        my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2']);
+        my $infos = get_infos_syspref('MarcFieldsToOrder', $marcrecord, ['price', 'quantity', 'budget_code', 'discount', 'sort1', 'sort2','replacementprice']);
         my $price = $infos->{price};
+        my $replacementprice = $infos->{replacementprice};
         my $quantity = $infos->{quantity};
         my $budget_code = $infos->{budget_code};
         my $discount = $infos->{discount};
@@ -515,7 +528,7 @@ sub import_biblios_list {
         # Items
         my @itemlist = ();
         my $all_items_quantity = 0;
-        my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $marcrecord, ['homebranch', 'holdingbranch', 'itype', 'nonpublic_note', 'public_note', 'loc', 'ccode', 'notforloan', 'uri', 'copyno', 'price', 'quantity', 'budget_code']);
+        my $alliteminfos = get_infos_syspref_on_item('MarcItemFieldsToOrder', $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};
@@ -530,12 +543,22 @@ sub import_biblios_list {
                 my $item_copyno = $iteminfos->{copyno};
                 my $item_quantity = $iteminfos->{quantity} || 1;
                 my $item_budget_code = $iteminfos->{budget_code};
+                my $item_budget_id;
+                if ( $iteminfos->{budget_code} ) {
+                    my $item_budget = GetBudgetByCode( $iteminfos->{budget_code} );
+                    if ( $item_budget ) {
+                        $item_budget_id = $item_budget->{budget_id};
+                    }
+                }
                 my $item_price = $iteminfos->{price};
+                my $item_replacement_price = $iteminfos->{replacementprice};
+                my $item_callnumber = $iteminfos->{itemcallnumber};
 
                 for (my $i = 0; $i < $item_quantity; $i++) {
 
                     my %itemrecord = (
                         'item_id' => $item_id++,
+                        'biblio_count' => $biblio_count,
                         'homebranch' => $item_homebranch,
                         'holdingbranch' => $item_holdingbranch,
                         'itype' => $item_itype,
@@ -547,8 +570,10 @@ sub import_biblios_list {
                         'uri' => $item_uri,
                         'copyno' => $item_copyno,
                         'quantity' => $item_quantity,
-                        'budget_code' => $item_budget_code || $budget_code,
+                        'budget_id' => $item_budget_id || $budget_id,
                         'itemprice' => $item_price || $price,
+                        'replacementprice' => $item_replacement_price || $replacementprice,
+                        'itemcallnumber' => $item_callnumber,
                     );
                     $all_items_quantity++;
                     push @itemlist, \%itemrecord;
@@ -558,12 +583,13 @@ sub import_biblios_list {
 
             $cellrecord{'iteminfos'} = \@itemlist;
         } else {
-            $item_error = 1;
+            $cellrecord{'item_error'} = 1;
         }
         push @list, \%cellrecord;
 
         if ($alliteminfos == -1 || scalar(@$alliteminfos) == 0) {
             $cellrecord{price} = $price || '';
+            $cellrecord{replacementprice} = $replacementprice || '';
             $cellrecord{quantity} = $quantity || '';
             $cellrecord{budget_id} = $budget_id || '';
             $cellrecord{discount} = $discount || '';
@@ -589,10 +615,11 @@ sub import_biblios_list {
                         "item_action_${item_action}" => 1,
                         item_action => $item_action,
                         item_error => $item_error,
-                        branchloop => GetBranchesLoop(),
+                        libraries => scalar Koha::Libraries->search(),
                         locationloop => \@locations,
                         itypeloop => \@itypes,
                         ccodeloop => \@ccodes,
+                        notforloanloop => \@notforloans,
                     );
     batch_info($template, $batch);
 }
@@ -667,18 +694,21 @@ sub get_infos_syspref {
 
 sub equal_number_of_fields {
     my ($tags_list, $record) = @_;
-    my $refcount = 0;
-    my $count = 0;
+    my $tag_fields_count;
     for my $tag (@$tags_list) {
-        return -1 if $count != $refcount;
-        $count = 0;
-        for my $field ($record->field($tag)) {
-            $count++;
+        my @fields = $record->field($tag);
+        $tag_fields_count->{$tag} = scalar @fields;
+    }
+
+    my $tags_count;
+    foreach my $key ( keys %$tag_fields_count ) {
+        if ( $tag_fields_count->{$key} > 0 ) { # Having 0 of a field is ok
+            $tags_count //= $tag_fields_count->{$key}; # Start with the count from the first occurrence
+            return -1 if $tag_fields_count->{$key} != $tags_count; # All counts of various fields should be equal if they exist
         }
-        $refcount = $count if ($refcount == 0);
     }
-    return -1 if $count != $refcount;
-    return $count;
+
+    return $tags_count;
 }
 
 sub get_infos_syspref_on_item {
@@ -708,7 +738,7 @@ sub get_infos_syspref_on_item {
     @tags_list = List::MoreUtils::uniq(@tags_list);
 
     my $tags_count = equal_number_of_fields(\@tags_list, $record);
-    # Return if the number of theses fields in the record is not the same.
+    # Return if the number of these fields in the record is not the same.
     return -1 if $tags_count == -1;
 
     # Gather the fields
@@ -729,7 +759,7 @@ sub get_infos_syspref_on_item {
             for my $field ( @fields ) {
                 my ( $f, $sf ) = split /\$/, $field;
                 next unless $f and $sf;
-                my $v = $fields_hash->{$f}[$i]->subfield( $sf );
+                my $v = $fields_hash->{$f}[$i] ? $fields_hash->{$f}[$i]->subfield( $sf ) : undef;
                 $r->{$field_name} = $v if (defined $v);
                 last if $yaml->{$field};
             }