# 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 Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Context;
use C4::Acquisition;
use C4::Biblio;
-use C4::Bookseller;
use C4::Items;
use C4::Search;
-use Koha::Acquisition::Bookseller;
+use Koha::Number::Price;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
use List::MoreUtils qw/any/;
my $quantityrec = $input->param('quantityrec');
my $quantity = $input->param('quantity');
my $unitprice = $input->param('unitprice');
+my $replacementprice = $input->param('replacementprice');
my $datereceived = $input->param('datereceived'),
my $invoiceid = $input->param('invoiceid');
my $invoice = GetInvoice($invoiceid);
my $order = GetOrder($ordernumber);
my $new_ordernumber = $ordernumber;
+#bug18723 regression fix
+if (C4::Context->preference("CurrencyFormat") eq 'FR') {
+ if (rindex($unitprice, '.') ge 0) {
+ substr($unitprice, rindex($unitprice, '.'), 1, ',');
+ }
+ if (rindex($replacementprice,'.') ge 0) {
+ substr($replacementprice, rindex($replacementprice, '.'), 1, ',');
+ }
+}
+
+$unitprice = Koha::Number::Price->new( $unitprice )->unformat();
+$replacementprice = Koha::Number::Price->new( $replacementprice )->unformat();
+my $order_obj = Koha::Acquisition::Orders->find( $ordernumber );
+my $basket = $order_obj->basket;
+
#need old receivedate if we update the order, parcel.pl only shows the right parcel this way FIXME
if ($quantityrec > $origquantityrec ) {
my @received_items = ();
- if(C4::Context->preference('AcqCreateItem') eq 'ordering') {
- @received_items = $input->multi_param('items_to_receive');
+ if ($basket->effective_create_items eq 'ordering') {
+ @received_items = $input->param('items_to_receive');
my @affects = split q{\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceived");
if ( @affects ) {
my $frameworkcode = GetFrameworkCode($biblionumber);
$order->{order_internalnote} = $input->param("order_internalnote");
$order->{tax_rate_on_receiving} = $input->param("tax_rate");
+ $order->{replacementprice} = $replacementprice;
$order->{unitprice} = $unitprice;
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
-
$order = C4::Acquisition::populate_order_with_prices(
{
order => $order,
# save the quantity received.
if ( $quantityrec > 0 ) {
+ if ( $order_obj->subscriptionid ) {
+ # Quantity can only be modified if linked to a subscription
+ $order->{quantity} = $quantity; # quantityrec will be deduced from this value in ModReceiveOrder
+ }
( $datereceived, $new_ordernumber ) = ModReceiveOrder(
{
biblionumber => $biblionumber,
}
# now, add items if applicable
- if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
+ if ($basket->effective_create_items eq 'receiving') {
my @tags = $input->multi_param('tag');
my @subfields = $input->multi_param('subfield');
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 });
+ my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber );
foreach my $item (keys %itemhash){
my $xml = TransformHtmlToXml( $itemhash{$item}->{'tags'},
$itemhash{$item}->{'subfields'},
'ITEM' );
my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
my (undef,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
- $order->add_item( $itemnumber );
+ $new_order->add_item( $itemnumber );
}
}
}
-ModItem(
- {
- booksellerid => $booksellerid,
- dateaccessioned => $datereceived,
- price => $unitprice,
- replacementprice => $order->{rrp},
- replacementpricedate => $datereceived,
- },
- $biblionumber,
- $_
-) foreach GetItemnumbersFromOrder($new_ordernumber);
+my $new_order_object = Koha::Acquisition::Orders->find( $new_ordernumber ); # FIXME we should not need to refetch it
+my $items = $new_order_object->items;
+while ( my $item = $items->next ) {
+ ModItem(
+ {
+ booksellerid => $booksellerid,
+ dateaccessioned => $datereceived,
+ datelastseen => $datereceived,
+ price => $unitprice,
+ replacementprice => $replacementprice,
+ replacementpricedate => $datereceived,
+ },
+ $biblionumber,
+ $item->itemnumber,
+ );
+}
+
+
+# XXX KRT-4338 -- create barcode and stocknumber now!
+use Data::Dump qw(dump);
+
+my @received_items = $input->param('items_to_receive');
+foreach my $itemnumber ( @received_items ) {
+
+ my $dbh = C4::Context->dbh;
+
+ $dbh->begin_work;
+
+ my $sth = $dbh->prepare("select biblionumber,barcode,stocknumber,itype from items where itemnumber = ?");
+ $sth->execute( $itemnumber );
+
+ if ( $sth->rows != 1 ) {
+ die "ERROR: itemnumber $itemnumber have ", $sth->rows, " rows";
+ }
+
+ my ( $biblionumber, $barcode, $stocknumber, $itype ) = $sth->fetchrow_array;
+ warn "YYY got ", dump( $biblionumber, $barcode, $stocknumber, $itype );
+
+ next if $itype =~ /(BAZA|PER|CLA|PRE|RZB)/;
+
+ if (! $barcode ) {
+ $sth = $dbh->prepare("select max(abs(barcode)) from items");
+ $sth->execute;
+ $barcode = $sth->fetchrow;
+ $barcode++;
+ warn "# itemnumber: $itemnumber new barcode: $barcode";
+ }
+
+ my $year = DateTime->now->year;
+
+ if (! $stocknumber) {
+
+ $sth = $dbh->prepare("select max(num) from ffzg_inventarna_knjiga where year = ?");
+ $sth->execute($year);
+
+ $stocknumber = $sth->fetchrow; # return null without any data
+ $stocknumber += 1;
+
+ $sth = $dbh->prepare("insert into ffzg_inventarna_knjiga (year,num, biblionumber, itemnumber) values (?,?,?,?)");
+ $sth->execute( $year, $stocknumber, $biblionumber, $itemnumber );
+
+ $stocknumber = "$year-$stocknumber";
+ }
+
+ warn "## itemnumber: $itemnumber barcode: $barcode stocknumber: $stocknumber\n";
+
+ $sth = $dbh->prepare("update items set barcode=?, stocknumber=? where itemnumber = ?");
+ $sth->execute( $barcode, $stocknumber, $itemnumber );
+
+ $dbh->commit;
+
+}
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");
projects / koha.git / blobdiff