(bug #4084) fix offline circ

[koha_fer] / acqui / addorderiso2709.pl

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 7ca6746..903d2db 100755 (executable)
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -18,9 +18,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -38,6 +38,7 @@ use C4::Items;
 use C4::Koha qw/GetItemTypes/;
 use C4::Budgets qw/GetBudgets/;
 use C4::Acquisition qw/NewOrderItem/;
+use C4::Bookseller qw/GetBookSellerFromId/;
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
@@ -51,11 +52,13 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 my $cgiparams = $input->Vars;
 my $op = $cgiparams->{'op'};
 my $booksellerid  = $input->param('booksellerid');
+my $bookseller = GetBookSellerFromId($booksellerid);
 
 $template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl",
                 booksellerid => $booksellerid,
+                booksellername => $bookseller->{name},
                 );
-my $ordnum;
+my $ordernumber;
 
 if ($cgiparams->{'import_batch_id'} && $op eq ""){
     $op = "batch_details";
@@ -123,7 +126,7 @@ if ($op eq ""){
             if (C4::Context->preference("BiblioAddsAuthorities")){
                 my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $cgiparams->{'frameworkcode'});
             }
-            my $patron = C4::Members->GetMember($loggedinuser);
+            my $patron = C4::Members->GetMember(borrowernumber => $loggedinuser);
             my $branch = C4::Branch->GetBranchDetail($patron->{branchcode});
             my ($invoice);
             my %orderinfo = ("biblionumber", $biblionumber,
@@ -174,7 +177,7 @@ if ($op eq ""){
             # remove uncertainprice flag if we have found a price in the MARC record
             $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
             my $basketno;
-            ( $basketno, $ordnum ) = NewOrder(\%orderinfo);
+            ( $basketno, $ordernumber ) = NewOrder(\%orderinfo);
 
             # now, add items if applicable
             # parse all items sent by the form, and create an item just for the import_record_id we are dealing with
@@ -208,11 +211,11 @@ if ($op eq ""){
                                 $found = 1;
                             }
                         }
-                        push @{$item->{tags}}, @tags[$i];
-                        push @{$item->{subfields}}, @subfields[$i];
-                        push @{$item->{field_values}}, @field_values[$i];
-                        push @{$item->{ind_tag}}, @ind_tag[$i];
-                        push @{$item->{indicator}}, @indicator[$i];
+                        push @{$item->{tags}}, $tags[$i];
+                        push @{$item->{subfields}}, $subfields[$i];
+                        push @{$item->{field_values}}, $field_values[$i];
+                        push @{$item->{ind_tag}}, $ind_tag[$i];
+                        push @{$item->{indicator}}, $indicator[$i];
                         $item->{itemid} = $itemid;
                         if (! $found){
                              push @items, $item;
@@ -228,7 +231,7 @@ if ($op eq ""){
                                                 $item->{'indicator'});
                         my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
                         my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
-                        NewOrderItem( $itemnumber, $ordnum);
+                        NewOrderItem( $itemnumber, $ordernumber);
                 }
             }
         }
@@ -295,7 +298,7 @@ sub import_biblios_list {
             match_score => $#$match > -1 ? $match->[0]->{'score'} : 0,
 #             itemtypes => \@itemtypes,
         );
-#         if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordnum) {
+#         if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
 #             # prepare empty item form
 #             my $cell = PrepareItemrecordDisplay();
 #             my @itemloop;