Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

[koha.git] / acqui / addorder.pl

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 8705c46..94560c4 100755 (executable)
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -16,9 +16,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.
 
 
 =head1 NAME
@@ -42,7 +42,7 @@ All of the cgi parameters below are related to the new order.
 
 =over 4
 
-=item C<ordnum>
+=item C<ordernumber>
 the number of this new order.
 
 =item C<basketno>
@@ -148,7 +148,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 # get CGI parameters
 my $orderinfo                                  = $input->Vars;
 $orderinfo->{'list_price'}    ||=  0;
-#my $ordnum        = $input->param('ordnum');
+#my $ordernumber        = $input->param('ordernumber');
 #my $basketno      = $input->param('basketno');
 #my $booksellerid  = $input->param('booksellerid');
 #my $existing      = $input->param('existing');    # existing biblio, (not basket or order)
@@ -186,35 +186,37 @@ my $user          = $input->remote_user;
 # modify if $quantity>=0 and $existing='yes'
 # delete if $quantity has been set to 0 by the librarian
 my $bibitemnum;
-if ( $quantity ne '0' ) {
+if ( $orderinfo->{quantity} ne '0' ) {
     #TODO:check to see if biblio exists
-    unless ( $biblionumber ) {
-
+    unless ( $$orderinfo{biblionumber} ) {
         #if it doesnt create it
         my $record = TransformKohaToMarc(
             {
-                "biblio.title"                => "$title",
-                "biblio.author"               => "$author",
-                "biblio.series"               => $series          ? $series        : "",
-                "biblioitems.isbn"            => $isbn            ? $isbn          : "",
-                "biblioitems.publishercode"   => $publishercode   ? $publishercode : "",
-                "biblioitems.publicationyear" => $publicationyear ? $publicationyear: "",
+                "biblio.title"                => "$$orderinfo{title}",
+                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
+                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
+                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
+                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
+                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
+                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
             });
+
         # create the record in catalogue, with framework ''
-        ($biblionumber,$bibitemnum) = AddBiblio($record,'');
+        my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
         # change suggestion status if applicable
-        if ($suggestionid) {
-            ModStatus( $suggestionid, 'ORDERED', '', $biblionumber );
+        if ($$orderinfo{suggestionid}) {
+            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, status=>'ORDERED', biblionumber=>$biblionumber} );
         }
                $orderinfo->{biblioitemnumber}=$bibitemnum;
+               $orderinfo->{biblionumber}=$biblionumber;
     }
 
-    # if we already have $ordnum, then it's an ordermodif
-    if ($ordnum) {
+    # if we already have $ordernumber, then it's an ordermodif
+    if ($$orderinfo{ordernumber}) {
         ModOrder( $orderinfo);
     }
     else { # else, it's a new line
-        ( $basketno, $ordnum ) = NewOrder($orderinfo);
+        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
     }
 
     # now, add items if applicable
@@ -252,8 +254,8 @@ if ( $quantity ne '0' ) {
                                     $itemhash{$item}->{'indicator'},
                                     'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
-            NewOrderItem($itemnumber, $ordnum);
+            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber});
+            NewOrderItem($itemnumber, $$orderinfo{ordernumber});
 
         }
     }
@@ -261,10 +263,12 @@ if ( $quantity ne '0' ) {
 }
 
 else { # qty=0, delete the line
-    $biblionumber = $input->param('biblionumber');
-    DelOrder( $biblionumber, $ordnum );
+    my $biblionumber = $input->param('biblionumber');
+    DelOrder( $biblionumber, $$orderinfo{ordernumber} );
 }
-if ($import_batch_id) {
+my $basketno=$$orderinfo{basketno};
+my $booksellerid=$$orderinfo{booksellerid};
+if (my $import_batch_id=$$orderinfo{import_batch_id}) {
     print $input->redirect("/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=$import_batch_id&basketno=$basketno&booksellerid=$booksellerid");
 } else {
     print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");