View | Details | Raw Unified | Return to bug 7294
Collapse All | Expand All

(-)a/C4/Acquisition.pm (-63 / +106 lines)
Lines 24-29 use Carp; Link Here
24
use C4::Context;
24
use C4::Context;
25
use C4::Debug;
25
use C4::Debug;
26
use C4::Dates qw(format_date format_date_in_iso);
26
use C4::Dates qw(format_date format_date_in_iso);
27
use MARC::Field;
27
use MARC::Record;
28
use MARC::Record;
28
use C4::Suggestions;
29
use C4::Suggestions;
29
use C4::Biblio;
30
use C4::Biblio;
Lines 1130-1135 sub NewOrder { Link Here
1130
1131
1131
    my $ordernumber=InsertInTable("aqorders",$orderinfo);
1132
    my $ordernumber=InsertInTable("aqorders",$orderinfo);
1132
    if (not $orderinfo->{parent_ordernumber}) {
1133
    if (not $orderinfo->{parent_ordernumber}) {
1134
        $orderinfo->{parent_ordernumber} = $ordernumber;
1133
        my $sth = $dbh->prepare("
1135
        my $sth = $dbh->prepare("
1134
            UPDATE aqorders
1136
            UPDATE aqorders
1135
            SET parent_ordernumber = ordernumber
1137
            SET parent_ordernumber = ordernumber
Lines 1137-1143 sub NewOrder { Link Here
1137
        ");
1139
        ");
1138
        $sth->execute($ordernumber);
1140
        $sth->execute($ordernumber);
1139
    }
1141
    }
1140
    return ( $orderinfo->{'basketno'}, $ordernumber );
1142
1143
    $orderinfo->{ordernumber} = $ordernumber;
1144
    return $orderinfo;
1141
}
1145
}
1142
1146
1143
1147
Lines 1388-1405 sub ModReceiveOrder { Link Here
1388
1392
1389
        $sth->execute($order->{quantity} - $quantrec, $ordernumber);
1393
        $sth->execute($order->{quantity} - $quantrec, $ordernumber);
1390
1394
1391
        $sth->finish;
1395
        $order->{quantity} -= $quantrec;
1396
1397
        UpdateMarcOrder( {
1398
                biblionumber => $biblionumber,
1399
                order => $order,
1400
        } );
1392
1401
1393
        delete $order->{'ordernumber'};
1402
        delete $order->{'ordernumber'};
1394
        $order->{'quantity'} = $quantrec;
1403
        $order->{'quantity'} = $quantrec;
1404
        $order->{'orderstatus'} = 3;    # totally received
1395
        $order->{'quantityreceived'} = $quantrec;
1405
        $order->{'quantityreceived'} = $quantrec;
1396
        $order->{'datereceived'} = $datereceived;
1406
        $order->{'datereceived'} = $datereceived;
1397
        $order->{'invoiceid'} = $invoiceid;
1407
        $order->{'invoiceid'} = $invoiceid;
1398
        $order->{'unitprice'} = $cost;
1408
        $order->{'unitprice'} = $cost;
1399
        $order->{'rrp'} = $rrp;
1409
        $order->{'rrp'} = $rrp;
1400
        $order->{ecost} = $ecost;
1410
        $order->{ecost} = $ecost;
1401
        $order->{'orderstatus'} = 3;    # totally received
1411
1402
        $new_ordernumber = NewOrder($order);
1412
        my $neworder = NewOrder( $order );
1413
        my $newordernumber = $neworder->{ordernumber};
1414
1415
        UpdateMarcOrder( {
1416
                biblionumber => $biblionumber,
1417
                order => $order,
1418
        } );
1403
1419
1404
        if ($received_items) {
1420
        if ($received_items) {
1405
            foreach my $itemnumber (@$received_items) {
1421
            foreach my $itemnumber (@$received_items) {
Lines 1407-1474 sub ModReceiveOrder { Link Here
1407
            }
1423
            }
1408
        }
1424
        }
1409
1425
1410
        # create a new order for the remaining items, and set its bookfund.
1411
        foreach my $orderkey ( "linenumber", "allocation" ) {
1412
            delete($order->{'$orderkey'});
1413
        }
1414
        $order->{'quantity'} -= $quantrec;
1415
        $order->{'quantityreceived'} = 0;
1416
1417
        my ($newOrder, $newordernumber) = NewOrder($order);
1418
        # Change ordernumber in aqorders_items for items not received
1419
        my @orderitems = GetItemnumbersFromOrder( $order->{'ordernumber'} );
1420
        my $count = scalar @orderitems;
1421
1422
        for (my $i=0; $i<$count; $i++){
1423
            foreach (@$received_items){
1424
                splice (@orderitems, $i, 1) if ($orderitems[$i] == $_);
1425
            }
1426
        }
1427
        foreach (@orderitems) {
1428
            ModItemOrder($_, $newOrder);
1429
        }
1430
1431
        # Do we have to update order informations from the marc record?
1432
        my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
1433
1434
        # Updating MARC order field if exists
1435
        if ($ordertag and $ordersubtag) {
1436
            $debug and warn "updating MARC";
1437
            # Getting record
1438
            my $record = GetMarcBiblio($biblionumber);
1439
            if ($record) {
1440
                $debug and warn "updating Record";
1441
                foreach ($record->field($ordertag)) {
1442
                    if ($_->subfield($ordersubtag) eq $ordernumber) {
1443
                        # Updating ordernumber
1444
                        $debug and warn "updating ordernumber $ordernumber => $newordernumber";
1445
                        $_->update($ordersubtag => $newordernumber);
1446
1447
                        # Updating quantity
1448
                        my ($quantitytag, $quantitysubtag) = GetMarcFromKohaField('aqorders.quantity', 'ACQ');
1449
                        if ($quantitysubtag) {
1450
                            $debug and warn "updating quantity " . $order->{quantity};
1451
                            $_->update($quantitysubtag => $order->{quantity});
1452
                        }
1453
                    }
1454
                }
1455
1456
                # Applying changes
1457
                ModBiblio($record, $biblionumber, 'ACQ');
1458
            }
1459
        }
1460
1461
1462
    } else {
1426
    } else {
1463
        $sth=$dbh->prepare("update aqorders
1427
        $sth=$dbh->prepare("update aqorders
1464
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1428
                            set quantityreceived=?,datereceived=?,invoiceid=?,
1465
                                unitprice=?,rrp=?,ecost=?
1429
                                unitprice=?,rrp=?,ecost=?
1466
                            where biblionumber=? and ordernumber=?");
1430
                            where biblionumber=? and ordernumber=?");
1467
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber);
1431
        $sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber);
1468
        $sth->finish;
1469
1432
1470
        # Removing MARC order field if exists
1433
        # Removing MARC order field if exists
1471
        DelMarcOrder($biblionumber, $ordernumber);
1434
        DelMarcOrder({
1435
            biblionumber => $biblionumber,
1436
            ordernumber => $ordernumber
1437
        } );
1472
    }
1438
    }
1473
    return ($datereceived, $new_ordernumber);
1439
    return ($datereceived, $new_ordernumber);
1474
}
1440
}
Lines 1520-1525 sub CancelReceipt { Link Here
1520
        };
1486
        };
1521
        $sth = $dbh->prepare($query);
1487
        $sth = $dbh->prepare($query);
1522
        $sth->execute(0, undef, undef, $ordernumber);
1488
        $sth->execute(0, undef, undef, $ordernumber);
1489
1490
        UpdateMarcOrder( { ordernumber => $ordernumber } );
1523
    } else {
1491
    } else {
1524
        # The order line has a parent, increase parent quantity and delete
1492
        # The order line has a parent, increase parent quantity and delete
1525
        # the order line.
1493
        # the order line.
Lines 1582-1587 sub CancelReceipt { Link Here
1582
        $sth = $dbh->prepare($query);
1550
        $sth = $dbh->prepare($query);
1583
        $sth->execute($ordernumber);
1551
        $sth->execute($ordernumber);
1584
1552
1553
        DelMarcOrder( { ordernumber => $ordernumber } );
1554
        UpdateMarcOrder( { ordernumber => $parent_ordernumber } );
1585
    }
1555
    }
1586
1556
1587
    return $parent_ordernumber;
1557
    return $parent_ordernumber;
Lines 1690-1696 sub DelOrder { Link Here
1690
    $sth->finish;
1660
    $sth->finish;
1691
1661
1692
    # Removing MARC order field if exists
1662
    # Removing MARC order field if exists
1693
    DelMarcOrder($bibnum, $ordernumber);
1663
    DelMarcOrder( {
1664
        biblionumber => $bibnum,
1665
        ordernumber => $ordernumber,
1666
    } );
1694
1667
1695
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1668
    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1696
    foreach my $itemnumber (@itemnumbers){
1669
    foreach my $itemnumber (@itemnumbers){
Lines 1711-1717 in parameter Link Here
1711
=cut
1684
=cut
1712
1685
1713
sub DelMarcOrder {
1686
sub DelMarcOrder {
1714
    my ($biblionumber, $ordernumber) = @_;
1687
    my ( $params ) = @_;
1688
    my $biblionumber = $params->{biblionumber};
1689
    my $ordernumber = $params->{ordernumber};
1690
1691
    unless ( $biblionumber ) {
1692
        $biblionumber = GetBiblionumberFromOrdernumber( $ordernumber );
1693
    }
1715
1694
1716
    # Do we have to remove order informations from the marc record?
1695
    # Do we have to remove order informations from the marc record?
1717
    my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
1696
    my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
Lines 1722-1730 sub DelMarcOrder { Link Here
1722
        my $record = GetMarcBiblio($biblionumber);
1701
        my $record = GetMarcBiblio($biblionumber);
1723
        if ($record) {
1702
        if ($record) {
1724
            # Looking for the right field
1703
            # Looking for the right field
1725
            foreach ($record->field($ordertag)) {
1704
            foreach my $field ( $record->field($ordertag) ) {
1726
                if ($_->subfield($ordersubtag) eq $ordernumber) {
1705
                if ($field->subfield($ordersubtag) eq $ordernumber) {
1727
                    $record->delete_field($_);
1706
                    $record->delete_field($field);
1728
                }
1707
                }
1729
            }
1708
            }
1730
            # Applying changes
1709
            # Applying changes
Lines 1733-1738 sub DelMarcOrder { Link Here
1733
    }
1712
    }
1734
}
1713
}
1735
1714
1715
sub GetBiblionumberFromOrdernumber {
1716
    my $ordernumber = shift;
1717
    my $dbh = C4::Context->dbh;
1718
    my $biblionumber = $dbh->selectrow_array(q|
1719
        SELECT biblionumber
1720
        FROM aqorders
1721
        WHERE ordernumber = ?
1722
    |, {}, $ordernumber );
1723
1724
    return $biblionumber;
1725
}
1726
1727
sub UpdateMarcOrder {
1728
    my ( $params ) = @_;
1729
    my $biblionumber = $params->{biblionumber};
1730
    my $order = $params->{order};
1731
    my $ordernumber = $params->{ordernumber};
1732
    my $old_ordernumber = $params->{old_ordernumber};
1733
1734
    if ( $ordernumber and not $order ) {
1735
        $order = GetOrder( $ordernumber );
1736
    }
1737
    unless ( $order ) {
1738
        carp "A parameter is missing, ordernumber or order is required";
1739
        return;
1740
    }
1741
    unless ( $biblionumber ) {
1742
        $biblionumber = GetBiblionumberFromOrdernumber( $ordernumber );
1743
    }
1744
    $old_ordernumber ||= $order->{ordernumber};
1745
1746
    # Do we have to update order informations from the marc record?
1747
    my ($ordertag, $ordersubtag) = GetMarcFromKohaField('aqorders.ordernumber', 'ACQ');
1748
1749
    return 0 unless $ordertag or $ordersubtag;
1750
1751
    # Updating MARC order field if exists
1752
    my $record = GetMarcBiblio($biblionumber);
1753
    return unless $record;
1754
    my $matching_field;
1755
    foreach my $field ($record->field($ordertag)) {
1756
        if ( $field->subfield($ordersubtag) eq $old_ordernumber ) {
1757
            $matching_field = $field;
1758
            last;
1759
        }
1760
    }
1761
1762
    unless ( $matching_field ) {
1763
        $matching_field = MARC::Field->new( $ordertag, '', '', $ordersubtag => $order->{ordernumber} );
1764
        $record->insert_fields_ordered( $matching_field );
1765
    }
1766
    # Updating ordernumber
1767
    $matching_field->update($ordersubtag => $order->{ordernumber});
1768
1769
    # Updating quantity
1770
    my ($quantitytag, $quantitysubtag) = GetMarcFromKohaField('aqorders.quantity', 'ACQ');
1771
    if ($quantitysubtag) {
1772
        $matching_field->update($quantitysubtag => $order->{quantity});
1773
    }
1774
1775
    # Applying changes
1776
    ModBiblio($record, $biblionumber, 'ACQ');
1777
}
1778
1736
=head2 FUNCTIONS ABOUT PARCELS
1779
=head2 FUNCTIONS ABOUT PARCELS
1737
1780
1738
=cut
1781
=cut
(-)a/acqui/addorder.pl (-22 / +19 lines)
Lines 194-199 if ( $orderinfo->{quantity} ne '0' ) { Link Here
194
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement}? $$orderinfo{editionstatement}: "",
194
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement}? $$orderinfo{editionstatement}: "",
195
                "aqorders.branchcode"         => $$orderinfo{branchcode}      ? $$orderinfo{branchcode}      : "",
195
                "aqorders.branchcode"         => $$orderinfo{branchcode}      ? $$orderinfo{branchcode}      : "",
196
                "aqorders.quantity"           => $$orderinfo{quantity}        ? $$orderinfo{quantity}        : "",
196
                "aqorders.quantity"           => $$orderinfo{quantity}        ? $$orderinfo{quantity}        : "",
197
                "aqorders.quantityreceived"   => $$orderinfo{quantityreceived}? $$orderinfo{quantityreceived}: "",
197
                "aqorders.listprice"          => $$orderinfo{listprice}       ? $$orderinfo{listprice}       : "",
198
                "aqorders.listprice"          => $$orderinfo{listprice}       ? $$orderinfo{listprice}       : "",
198
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice}  ? $$orderinfo{uncertainprice}  : "",
199
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice}  ? $$orderinfo{uncertainprice}  : "",
199
                "aqorders.rrp"                => $$orderinfo{rrp}             ? $$orderinfo{rrp}             : "",
200
                "aqorders.rrp"                => $$orderinfo{rrp}             ? $$orderinfo{rrp}             : "",
Lines 224-289 if ( $orderinfo->{quantity} ne '0' ) { Link Here
224
    # Getting record
225
    # Getting record
225
    $record = GetMarcBiblio($orderinfo->{biblionumber});
226
    $record = GetMarcBiblio($orderinfo->{biblionumber});
226
227
227
228
    # if we already have $ordernumber, then it's an ordermodif
228
229
     # if we already have $ordernumber, then it's an ordermodif
230
    if ( $orderinfo->{ordernumber} ) {
229
    if ( $orderinfo->{ordernumber} ) {
231
        ModOrder($orderinfo);
230
        ModOrder($orderinfo);
232
        $ordermodif = 1;
231
        $ordermodif = 1;
233
232
234
    } else {    # else, it's a new line
233
    } else {    # else, it's a new line
235
        @$orderinfo{qw(basketno ordernumber )} = NewOrder($orderinfo);
234
        my $neworder = NewOrder($orderinfo);
235
        $orderinfo->{basketno} = $neworder->{basketno};
236
        $orderinfo->{ordernumber} = $neworder->{ordernumber};
236
237
237
        # We have to add the ordernumber in the designated subfield
238
        # We have to add the ordernumber in the designated subfield
238
        if ($ordertag && $record && !$ordermodif) {
239
        if ( $ordertag and $record ) {
239
240
240
            # If it's a new line, but we don't have any $ordertag field yet,
241
            # If it's a new line, but we don't have any $ordertag field yet,
241
            if (!$record->field($ordertag)) {
242
            if ( not $record->field($ordertag) ) {
242
                # We add a new $ordertag field, with the ordernumber as subfield (other fields will be populated later)
243
                # We add a new $ordertag field, with the ordernumber as subfield (other fields will be populated later)
243
                $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $orderinfo->{ordernumber})) if (!$record->field($ordertag));
244
                $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $orderinfo->{ordernumber})) if (!$record->field($ordertag));
244
            } else {
245
            } else {
245
                # Else, it's a new line, and we already have a $ordertag field
246
                # Else, it's a new line, and we already have a $ordertag field
246
                foreach ($record->field($ordertag)) {
247
                foreach my $field ( $record->field($ordertag) ) {
247
                    # If there's a $ordertag field without ordernumber, we create it
248
                    # If there's a $ordertag field without ordernumber, we create it
248
                    if (!$_->subfield($ordersubtag)) {
249
                    if ( not $field->subfield($ordersubtag) ) {
249
                        $_->update($ordersubtag, $orderinfo->{ordernumber});
250
                        $field->update($ordersubtag, $orderinfo->{ordernumber});
250
                    }
251
                    }
251
                }
252
                }
252
            }
253
            }
253
            ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
254
            ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
254
        }
255
        }
255
256
257
    }
256
    }
258
257
259
    if ($record) {
258
    if ($record) {
260
261
        # If we have to add order infos to the marc record
259
        # If we have to add order infos to the marc record
262
        if ($ordertag) {
260
        if ($ordertag) {
263
264
            # If the order was made on an existing biblio and it is not a modification, we add the field
261
            # If the order was made on an existing biblio and it is not a modification, we add the field
265
            $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $$orderinfo{ordernumber})) if (!$ordermodif && $existingbiblio);
262
            if ( not $ordermodif and $existingbiblio and not $record->field($ordertag) ) {
263
                $record->insert_fields_ordered(new MARC::Field($ordertag, '', '', $ordersubtag => $$orderinfo{ordernumber}))
264
            }
266
265
267
            foreach ($record->field($ordertag)) {
266
            foreach my $field ($record->field($ordertag)) {
268
                # Looking for the matching one
267
                # Looking for the matching one
269
                if ($_->subfield($ordersubtag) eq $orderinfo->{ordernumber}) {
268
                if ($field->subfield($ordersubtag) eq $orderinfo->{ordernumber}) {
270
269
271
                    # Replacing or creating subfields
270
                    # Replacing or creating subfields
272
                    my ($t, $st);
271
                    my ($t, $st);
273
                    for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2/) {
272
                    for my $tablefield (qw/branchcode quantity quantityreceived listprice uncertainprice rrp ecost notes supplierreference sort1 sort2/) {
274
                        ($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ');
273
                        ($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ');
275
                        $_->update($st, $orderinfo->{$tablefield}) if ($orderinfo->{$tablefield} and $st);
274
                        $field->update($st, $orderinfo->{$tablefield})
275
                            if $orderinfo->{$tablefield} and $st;
276
                    }
276
                    }
277
                    ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
277
                    ModBiblio($record, $orderinfo->{biblionumber}, 'ACQ');
278
                }
278
                }
279
            }
279
            }
280
281
        }
280
        }
282
283
    }
281
    }
284
282
285
283
    # now, add items if applicable
286
      # now, add items if applicable
287
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
284
    if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
288
285
289
        my @tags         = $input->param('tag');
286
        my @tags         = $input->param('tag');
(-)a/acqui/addorderiso2709.pl (-2 / +3 lines)
Lines 233-240 if ($op eq ""){ Link Here
233
233
234
        # remove uncertainprice flag if we have found a price in the MARC record
234
        # remove uncertainprice flag if we have found a price in the MARC record
235
        $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
235
        $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
236
        my $basketno;
236
        my $order = NewOrder( \%orderinfo );
237
        ( $basketno, $ordernumber ) = NewOrder( \%orderinfo );
237
        my $basketno = $order->{basketno};
238
        $ordernumber = $order->{ordernumber};
238
239
239
        # 4th, add items if applicable
240
        # 4th, add items if applicable
240
        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
241
        # parse the item sent by the form, and create an item just for the import_record_id we are dealing with
(-)a/t/db_dependent/lib/KohaTest/Acquisition.pm (-1 / +2 lines)
Lines 76-82 sub create_new_basket { Link Here
76
#             $basketnote, $basketbooksellernote, $basketcontractnumber );
76
#             $basketnote, $basketbooksellernote, $basketcontractnumber );
77
#   The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gst", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "bookfundid".
77
#   The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gst", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "bookfundid".
78
    my $budget_id = AddBudget( { budget_name => "Budget $rand" } );
78
    my $budget_id = AddBudget( { budget_name => "Budget $rand" } );
79
    my ( undef, $ordernumber ) = NewOrder( {
79
    my $order = NewOrder( {
80
            basketno => $basketno,
80
            basketno => $basketno,
81
            budget_id => $budget_id,
81
            budget_id => $budget_id,
82
            biblionumber => $self->{'biblios'}[0],
82
            biblionumber => $self->{'biblios'}[0],
Lines 86-91 sub create_new_basket { Link Here
86
            ecost => 1,
86
            ecost => 1,
87
            booksellerinvoicenumber => $param{'invoice'},
87
            booksellerinvoicenumber => $param{'invoice'},
88
        } );
88
        } );
89
    my $ordernumber = $order->{ordernumber};
89
    ok( $basketno, "my basket number is $basketno" );
90
    ok( $basketno, "my basket number is $basketno" );
90
    ok( $ordernumber,   "my order number is $ordernumber" );
91
    ok( $ordernumber,   "my order number is $ordernumber" );
91
    
92
    
(-)a/t/db_dependent/lib/KohaTest/Acquisition/NewOrder.pm (-3 / +7 lines)
Lines 25-31 sub new_order_no_budget : Test( 4 ) { Link Here
25
                         localtime->year() + 1900,
25
                         localtime->year() + 1900,
26
                         localtime->mon() + 1,
26
                         localtime->mon() + 1,
27
                         localtime->mday() );
27
                         localtime->mday() );
28
    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
28
29
    my $order = NewOrder( undef, # $basketno,
29
                                          1, # $bibnum,
30
                                          1, # $bibnum,
30
                                          undef, # $title,
31
                                          undef, # $title,
31
                                          undef, # $quantity,
32
                                          undef, # $quantity,
Lines 47-52 sub new_order_no_budget : Test( 4 ) { Link Here
47
                                          undef, # $purchaseorder,
48
                                          undef, # $purchaseorder,
48
										  undef, # $branchcode
49
										  undef, # $branchcode
49
                                     );
50
                                     );
51
    my $basketno = $order->{basketno};
52
    my $ordernumber = $order->{ordernumber};
50
    ok( $basketno, "my basket number is $basketno" );
53
    ok( $basketno, "my basket number is $basketno" );
51
    ok( $ordernumber,   "my order number is $ordernumber" );
54
    ok( $ordernumber,   "my order number is $ordernumber" );
52
55
Lines 73-79 sub new_order_set_budget : Test( 4 ) { Link Here
73
                         localtime->year() + 1900,
76
                         localtime->year() + 1900,
74
                         localtime->mon() + 1,
77
                         localtime->mon() + 1,
75
                         localtime->mday() );
78
                         localtime->mday() );
76
    my ( $basketno, $ordernumber ) = NewOrder( undef, # $basketno,
79
    my $order = NewOrder( undef, # $basketno,
77
                                          1, # $bibnum,
80
                                          1, # $bibnum,
78
                                          undef, # $title,
81
                                          undef, # $title,
79
                                          undef, # $quantity,
82
                                          undef, # $quantity,
Lines 95-100 sub new_order_set_budget : Test( 4 ) { Link Here
95
                                          undef, # $purchaseorder,
98
                                          undef, # $purchaseorder,
96
										  undef, # $branchcode
99
										  undef, # $branchcode
97
                                     );
100
                                     );
101
    my $basketno = $order->{basketno};
102
    my $ordernumber = $order->{ordernumber};
98
    ok( $basketno, "my basket number is $basketno" );
103
    ok( $basketno, "my basket number is $basketno" );
99
    ok( $ordernumber,   "my order number is $ordernumber" );
104
    ok( $ordernumber,   "my order number is $ordernumber" );
100
105
101
- 

Return to bug 7294