Merge remote branch 'kc/new/bug_3319' into kcmaster

[koha.git] / acqui / addorder.pl

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 38ece55..35d3507 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
@@ -30,19 +30,23 @@ addorder.pl
 this script allows to add an order.
 It is called by :
 
+=over
+
 =item neworderbiblio.pl to add an order from nothing.
 
 =item neworderempty.pl to add an order from an existing biblio.
 
 =item newordersuggestion.pl to add an order from an existing suggestion.
 
+=back
+
 =head1 CGI PARAMETERS
 
 All of the cgi parameters below are related to the new order.
 
-=over 4
+=over
 
-=item C<ordnum>
+=item C<ordernumber>
 the number of this new order.
 
 =item C<basketno>
@@ -148,7 +152,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)
@@ -189,17 +193,18 @@ my $bibitemnum;
 if ( $orderinfo->{quantity} ne '0' ) {
     #TODO:check to see if biblio exists
     unless ( $$orderinfo{biblionumber} ) {
-
         #if it doesnt create it
         my $record = TransformKohaToMarc(
             {
                 "biblio.title"                => "$$orderinfo{title}",
-                "biblio.author"               => "$$orderinfo{author}",
-                "biblio.series"               => $$orderinfo{series}          ? $$orderinfo{series}        : "",
+                "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 ''
         my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
         # change suggestion status if applicable
@@ -210,12 +215,12 @@ if ( $orderinfo->{quantity} ne '0' ) {
                $orderinfo->{biblionumber}=$biblionumber;
     }
 
-    # if we already have $ordnum, then it's an ordermodif
-    if ($$orderinfo{ordnum}) {
+    # if we already have $ordernumber, then it's an ordermodif
+    if ($$orderinfo{ordernumber}) {
         ModOrder( $orderinfo);
     }
     else { # else, it's a new line
-        @$orderinfo{qw(basketno ordnum )} = NewOrder($orderinfo);
+        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
     }
 
     # now, add items if applicable
@@ -254,7 +259,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
                                     'ITEM');
             my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
             my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$$orderinfo{biblionumber});
-            NewOrderItem($itemnumber, $$orderinfo{ordnum});
+            NewOrderItem($itemnumber, $$orderinfo{ordernumber});
 
         }
     }
@@ -263,7 +268,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
 
 else { # qty=0, delete the line
     my $biblionumber = $input->param('biblionumber');
-    DelOrder( $biblionumber, $$orderinfo{ordnum} );
+    DelOrder( $biblionumber, $$orderinfo{ordernumber} );
 }
 my $basketno=$$orderinfo{basketno};
 my $booksellerid=$$orderinfo{booksellerid};