Bug 4263: Fix subfield ordering broken by earlier patch
[koha.git] / acqui / finishreceive.pl
index 1d5b169..71b13d6 100755 (executable)
@@ -3,7 +3,6 @@
 #script to add a new item and to mark orders as received
 #written 1/3/00 by chris@katipo.co.nz
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
 # 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;
 use CGI;
 use C4::Auth;
 use C4::Output;
@@ -30,58 +30,88 @@ use C4::Acquisition;
 use C4::Biblio;
 use C4::Items;
 use C4::Search;
+use List::MoreUtils qw/any/;
 
 my $input=new CGI;
-my $flagsrequired = { acquisitions => 1};
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
+my $flagsrequired = {acquisition => 'order_receive'};
+my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired, 'intranet');
 my $user=$input->remote_user;
 my $biblionumber = $input->param('biblionumber');
 my $biblioitemnumber=$input->param('biblioitemnumber');
-my $ordnum=$input->param('ordnum');
+my $ordernumber=$input->param('ordernumber');
 my $origquantityrec=$input->param('origquantityrec');
 my $quantityrec=$input->param('quantityrec');
 my $quantity=$input->param('quantity');
-my $cost=$input->param('cost');
+my $unitprice=$input->param('cost');
 my $invoiceno=$input->param('invoice');
 my $datereceived=$input->param('datereceived');
 my $replacement=$input->param('rrp');
 my $gst=$input->param('gst');
 my $freight=$input->param('freight');
 my $supplierid = $input->param('supplierid');
-my @branch=$input->param('homebranch');
-my @barcode=$input->param('barcode');
-my @ccode=$input->param('ccode');
-my @itemtype=$input->param('itemtype');
-my @location=$input->param('location');
-my $cnt = 0;
-# if ($quantityrec != 0){
-#      $cost /= $quantityrec;
-# }
+my $cnt=0;
+my $error_url_str;
+my $ecost = $input->param('ecost');
+my $note = $input->param("note");
+
+my %tplorder = ( 'quantity'                  =>     $input->param('quantity') || '',
+                             'quantityreceived'   =>     $input->param('quantityrec') || '',
+                             'notes'                      =>      $input->param("note") || '',
+                             'rrp'                          =>      $input->param('rrp') || '',
+                             'ecost'                      =>      $input->param('ecost') || '',
+                             'unitprice'                =>      $input->param('cost') || '',
+                     );
+my $order = GetOrder($ordernumber);
+if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rrp ecost unitprice) ) {
+    $order->{quantity} = $tplorder{quantity} if $tplorder{quantity};
+    $order->{quantityreceived} = $tplorder{quantityreceived} if $tplorder{quantityreceived};
+    $order->{notes} = $tplorder{notes} if $tplorder{notes};
+    $order->{rrp} = $tplorder{rrp} if $tplorder{rrp};
+    $order->{ecost} = $tplorder{ecost} if $tplorder{ecost};
+    $order->{unitprice} = $tplorder{unitprice} if $tplorder{unitprice};
+    ModOrder($order);
+}
 
+#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
 if ($quantityrec > $origquantityrec ) {
-    # save the quantity recieved.
-    $datereceived = ModReceiveOrder($biblionumber,$ordnum,$quantityrec,$user,$cost,$invoiceno,$freight,$replacement,undef,$datereceived);
-    # create items if the user has entered barcodes
-   # my @barcodes=split(/\,| |\|/,$barcode);
-    # foreach barcode provided, build the item MARC::Record and create the item
-    foreach my $bc (@barcode) {
-        my $itemRecord = TransformKohaToMarc({
-                    "items.replacementprice" => $replacement,
-                    "items.price"            => $cost,
-                    "items.booksellerid"     => $supplierid,
-                    "items.homebranch"       => $branch[$cnt],
-                    "items.holdingbranch"    => $branch[$cnt],
-                    "items.barcode"          => $barcode[$cnt],
-                    "items.ccode"          => $ccode[$cnt],
-                    "items.itype"          => $itemtype[$cnt],
-                    "items.location"          => $location[$cnt],
-                    "items.loan"             => 0, });
-        AddItemFromMarc($itemRecord,$biblionumber);
+    # now, add items if applicable
+    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+        my @tags         = $input->param('tag');
+        my @subfields    = $input->param('subfield');
+        my @field_values = $input->param('field_value');
+        my @serials      = $input->param('serial');
+        my @itemid       = $input->param('itemid');
+        my @ind_tag      = $input->param('ind_tag');
+        my @indicator    = $input->param('indicator');
+        #Rebuilding ALL the data for items into a hash
+        # parting them on $itemid.
+        my %itemhash;
+        my $countdistinct;
+        my $range=scalar(@itemid);
+        for (my $i=0; $i<$range; $i++){
+            unless ($itemhash{$itemid[$i]}){
+            $countdistinct++;
+            }
+            push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
+            push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
+            push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
+            push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
+            push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
+        }
+        foreach my $item (keys %itemhash){
+            my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
+                                    $itemhash{$item}->{'subfields'},
+                                    $itemhash{$item}->{'field_values'},
+                                    $itemhash{$item}->{'ind_tag'},
+                                    $itemhash{$item}->{'indicator'},'ITEM');
+            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
+        }
     }
+    
+    # save the quantity received.
+       if( $quantityrec > 0 ) {
+       $datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
+       }
 }
-    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived");
-#} else {
-#    print $input->header;
-#    #delorder($biblionumber,$ordnum);
-#    print $input->redirect("/acquisitions/");
-#}
+    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");