Bug 15177: TO_PROCESS notice for fr-FR

[koha-ffzg.git] / acqui / addorder.pl

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index f5508a2..f58e58d 100755 (executable)
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -7,18 +7,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 =head1 NAME
@@ -121,7 +121,7 @@ if it is an order from an existing suggestion : the id of this suggestion.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;           # get_template_and_user
 use C4::Acquisition;    # ModOrder
 use C4::Suggestions;    # ModStatus
@@ -235,7 +235,7 @@ my $user = $input->remote_user;
 if ( $orderinfo->{quantity} ne '0' ) {
     #TODO:check to see if biblio exists
     unless ( $$orderinfo{biblionumber} ) {
-        #if it doesnt create it
+        #if it doesn't create it
         my $record = TransformKohaToMarc(
             {
                 "biblio.title"                => "$$orderinfo{title}",
@@ -250,6 +250,8 @@ if ( $orderinfo->{quantity} ne '0' ) {
                 "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
             });
 
+        C4::Acquisition::FillWithDefaultValues( $record );
+
         # create the record in catalogue, with framework ''
         my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
         # change suggestion status if applicable
@@ -263,8 +265,12 @@ if ( $orderinfo->{quantity} ne '0' ) {
 
     # if we already have $ordernumber, then it's an ordermodif
     my $order = Koha::Acquisition::Order->new($orderinfo);
-    if ($$orderinfo{ordernumber}) {
-        ModOrder( $orderinfo);
+    if ( $orderinfo->{ordernumber} ) {
+        ModOrder($orderinfo);
+        my $order_users_ids = $input->param('users_ids');
+        my @order_users = split( /:/, $order_users_ids );
+
+        ModOrderUsers( $orderinfo->{ordernumber}, @order_users );
     }
     else { # else, it's a new line
         $order->insert;
@@ -301,8 +307,8 @@ if ( $orderinfo->{quantity} ne '0' ) {
             my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
                                     $itemhash{$item}->{'subfields'},
                                     $itemhash{$item}->{'field_values'},
-                                    $itemhash{$item}->{'ind_tag'},
                                     $itemhash{$item}->{'indicator'},
+                                    $itemhash{$item}->{'ind_tag'},
                                     'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
             my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber});