#
# 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>.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Bookseller;
use C4::Items;
use C4::Search;
+
+use Koha::Acquisition::Bookseller;
+
use List::MoreUtils qw/any/;
my $input=new CGI;
my $cnt = 0;
my $ecost = $input->param('ecost');
my $rrp = $input->param('rrp');
-my $note = $input->param("note");
+my $order_internalnote = $input->param("order_internalnote");
my $bookfund = $input->param("bookfund");
my $order = GetOrder($ordernumber);
+my $new_ordernumber = $ordernumber;
#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
if ($quantityrec > $origquantityrec ) {
for my $in ( @received_items ) {
my $item = C4::Items::GetMarcItem( $biblionumber, $in );
for my $affect ( @affects ) {
- my ( $sf, $v ) = split q{=}, $affect;
+ my ( $sf, $v ) = split q{=}, $affect, 2;
foreach ( $item->field($itemfield) ) {
$_->update( $sf => $v );
}
$order->{rrp} = $rrp;
$order->{ecost} = $ecost;
$order->{unitprice} = $unitprice;
- my $bookseller = C4::Bookseller::GetBookSellerFromId($booksellerid);
+ my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
if ( $bookseller->{listincgst} ) {
if ( not $bookseller->{invoiceincgst} ) {
$order->{rrp} = $order->{rrp} * ( 1 + $order->{gstrate} );
}
}
- my $new_ordernumber = $ordernumber;
# save the quantity received.
if ( $quantityrec > 0 ) {
- ($datereceived, $new_ordernumber) = ModReceiveOrder(
- $biblionumber,
- $ordernumber,
- $quantityrec,
- $user,
- $order->{unitprice},
- $order->{ecost},
- $invoiceid,
- $order->{rrp},
- $bookfund,
- $datereceived,
- \@received_items,
- );
+ ($datereceived, $new_ordernumber) = ModReceiveOrder({
+ biblionumber => $biblionumber,
+ ordernumber => $ordernumber,
+ quantityreceived => $quantityrec,
+ user => $user,
+ cost => $order->{unitprice},
+ ecost => $order->{ecost},
+ invoiceid => $invoiceid,
+ rrp => $order->{rrp},
+ budget_id => $bookfund,
+ datereceived => $datereceived,
+ received_items => \@received_items,
+ order_internalnote => $order_internalnote,
+ } );
}
# now, add items if applicable
push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
}
+ my $order = Koha::Acquisition::Order->fetch({ ordernumber => $new_ordernumber });
foreach my $item (keys %itemhash){
my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
$itemhash{$item}->{'subfields'},
$itemhash{$item}->{'indicator'},'ITEM');
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
- NewOrderItem($itemnumber, $new_ordernumber);
+ $order->add_item( $itemnumber );
}
}
}
-update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
-
-print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
-
-################################ End of script ################################
-
-sub update_item {
- my ( $itemnumber ) = @_;
-
- ModItem( {
+ModItem(
+ {
booksellerid => $booksellerid,
dateaccessioned => $datereceived,
price => $unitprice,
replacementprice => $rrp,
replacementpricedate => $datereceived,
- }, $biblionumber, $itemnumber );
-}
+ },
+ $biblionumber,
+ $_
+) foreach GetItemnumbersFromOrder($new_ordernumber);
+
+print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");
projects / srvgit / blobdiff