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

(-)a/C4/Acquisition.pm (-61 / +4 lines)
Lines 54-62 BEGIN { Link Here
54
        &GetBasketgroups &ReOpenBasketgroup
54
        &GetBasketgroups &ReOpenBasketgroup
55
55
56
        &NewOrder &DelOrder &ModOrder &GetPendingOrders &GetOrder &GetOrders
56
        &NewOrder &DelOrder &ModOrder &GetPendingOrders &GetOrder &GetOrders
57
        &GetOrderNumber &GetLateOrders &GetOrderFromItemnumber
57
        &GetLateOrders &GetOrderFromItemnumber
58
        &SearchOrder &GetHistory &GetRecentAcqui
58
        &SearchOrder &GetHistory &GetRecentAcqui
59
        &ModReceiveOrder &CancelReceipt &ModOrderBiblioitemNumber
59
        &ModReceiveOrder &CancelReceipt
60
        &GetCancelledOrders
60
        &GetCancelledOrders
61
        &GetLastOrderNotReceivedFromSubscriptionid &GetLastOrderReceivedFromSubscriptionid
61
        &GetLastOrderNotReceivedFromSubscriptionid &GetLastOrderReceivedFromSubscriptionid
62
        &NewOrderItem &ModOrderItem &ModItemOrder
62
        &NewOrderItem &ModOrderItem &ModItemOrder
Lines 945-983 sub GetOrders { Link Here
945
945
946
#------------------------------------------------------------#
946
#------------------------------------------------------------#
947
947
948
=head3 GetOrderNumber
949
950
  $ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber);
951
952
Looks up the ordernumber with the given biblionumber and biblioitemnumber.
953
954
Returns the number of this order.
955
956
=over
957
958
=item C<$ordernumber> is the order number.
959
960
=back
961
962
=cut
963
964
sub GetOrderNumber {
965
    my ( $biblionumber,$biblioitemnumber ) = @_;
966
    my $dbh = C4::Context->dbh;
967
    my $query = "
968
        SELECT ordernumber
969
        FROM   aqorders
970
        WHERE  biblionumber=?
971
        AND    biblioitemnumber=?
972
    ";
973
    my $sth = $dbh->prepare($query);
974
    $sth->execute( $biblionumber, $biblioitemnumber );
975
976
    return $sth->fetchrow;
977
}
978
979
#------------------------------------------------------------#
980
981
=head3 GetOrder
948
=head3 GetOrder
982
949
983
  $order = &GetOrder($ordernumber);
950
  $order = &GetOrder($ordernumber);
Lines 1094-1100 Else, the upcoming July 1st is used. Link Here
1094
1061
1095
=item defaults entrydate to Now
1062
=item defaults entrydate to Now
1096
1063
1097
The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "biblioitemnumber", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
1064
The following keys are used: "biblionumber", "title", "basketno", "quantity", "notes", "rrp", "ecost", "gstrate", "unitprice", "subscription", "sort1", "sort2", "booksellerinvoicenumber", "listprice", "budgetdate", "purchaseordernumber", "branchcode", "booksellerinvoicenumber", "budget_id".
1098
1065
1099
=back
1066
=back
1100
1067
Lines 1262-1290 sub ModItemOrder { Link Here
1262
1229
1263
#------------------------------------------------------------#
1230
#------------------------------------------------------------#
1264
1231
1265
1266
=head3 ModOrderBibliotemNumber
1267
1268
  &ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber);
1269
1270
Modifies the biblioitemnumber for an existing order.
1271
Updates the order with order number C<$ordernum> and biblionumber C<$biblionumber>.
1272
1273
=cut
1274
1275
#FIXME: is this used at all?
1276
sub ModOrderBiblioitemNumber {
1277
    my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
1278
    my $dbh = C4::Context->dbh;
1279
    my $query = "
1280
    UPDATE aqorders
1281
    SET    biblioitemnumber = ?
1282
    WHERE  ordernumber = ?
1283
    AND biblionumber =  ?";
1284
    my $sth = $dbh->prepare($query);
1285
    $sth->execute( $biblioitemnumber, $ordernumber, $biblionumber );
1286
}
1287
1288
=head3 GetCancelledOrders
1232
=head3 GetCancelledOrders
1289
1233
1290
  my @orders = GetCancelledOrders($basketno, $orderby);
1234
  my @orders = GetCancelledOrders($basketno, $orderby);
Lines 1326-1333 sub GetCancelledOrders { Link Here
1326
=head3 ModReceiveOrder
1270
=head3 ModReceiveOrder
1327
1271
1328
  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user,
1272
  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user,
1329
    $unitprice, $invoiceid, $biblioitemnumber,
1273
    $cost, $ecost, $invoiceid, rrp, budget_id, datereceived, \@received_itemnumbers);
1330
    $bookfund, $rrp, \@received_itemnumbers);
1331
1274
1332
Updates an order, to reflect the fact that it was received, at least
1275
Updates an order, to reflect the fact that it was received, at least
1333
in part. All arguments not mentioned below update the fields with the
1276
in part. All arguments not mentioned below update the fields with the
(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 318-324 sub SendAlerts { Link Here
318
            FROM aqorders
318
            FROM aqorders
319
            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
319
            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
320
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
320
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
321
            LEFT JOIN biblioitems ON aqorders.biblioitemnumber=biblioitems.biblioitemnumber
321
            LEFT JOIN biblioitems ON aqorders.biblionumber=biblioitems.biblionumber
322
            LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
322
            LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
323
            WHERE aqorders.ordernumber IN (
323
            WHERE aqorders.ordernumber IN (
324
            }
324
            }
(-)a/acqui/addorder.pl (-3 / +1 lines)
Lines 162-168 my $user = $input->remote_user; Link Here
162
# modify if $quantity>=0 and $existing='yes'
162
# modify if $quantity>=0 and $existing='yes'
163
# delete if $quantity has been set to 0 by the librarian
163
# delete if $quantity has been set to 0 by the librarian
164
# delete biblio if delbiblio has been set to 1 by the librarian
164
# delete biblio if delbiblio has been set to 1 by the librarian
165
my $bibitemnum;
166
if ( $orderinfo->{quantity} ne '0' ) {
165
if ( $orderinfo->{quantity} ne '0' ) {
167
    #TODO:check to see if biblio exists
166
    #TODO:check to see if biblio exists
168
    unless ( $$orderinfo{biblionumber} ) {
167
    unless ( $$orderinfo{biblionumber} ) {
Lines 194-201 if ( $orderinfo->{quantity} ne '0' ) { Link Here
194
        if ($$orderinfo{suggestionid}) {
193
        if ($$orderinfo{suggestionid}) {
195
            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
194
            ModSuggestion( {suggestionid=>$$orderinfo{suggestionid}, STATUS=>'ORDERED', biblionumber=>$biblionumber} );
196
        }
195
        }
197
		$orderinfo->{biblioitemnumber}=$bibitemnum;
196
        $orderinfo->{biblionumber}=$biblionumber;
198
		$orderinfo->{biblionumber}=$biblionumber;
199
    }
197
    }
200
198
201
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
199
    $orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
(-)a/acqui/finishreceive.pl (-1 lines)
Lines 40-46 checkauth($input, 0, $flagsrequired, 'intranet'); Link Here
40
40
41
my $user             = $input->remote_user;
41
my $user             = $input->remote_user;
42
my $biblionumber     = $input->param('biblionumber');
42
my $biblionumber     = $input->param('biblionumber');
43
my $biblioitemnumber = $input->param('biblioitemnumber');
44
my $ordernumber      = $input->param('ordernumber');
43
my $ordernumber      = $input->param('ordernumber');
45
my $origquantityrec  = $input->param('origquantityrec');
44
my $origquantityrec  = $input->param('origquantityrec');
46
my $quantityrec      = $input->param('quantityrec');
45
my $quantityrec      = $input->param('quantityrec');
(-)a/acqui/neworderempty.pl (-1 lines)
Lines 379-385 $template->param( Link Here
379
    biblionumber         => $biblionumber,
379
    biblionumber         => $biblionumber,
380
    uncertainprice       => $data->{'uncertainprice'},
380
    uncertainprice       => $data->{'uncertainprice'},
381
    authorisedbyname     => $borrower->{'firstname'} . " " . $borrower->{'surname'},
381
    authorisedbyname     => $borrower->{'firstname'} . " " . $borrower->{'surname'},
382
    biblioitemnumber     => $data->{'biblioitemnumber'},
383
    discount_2dp         => sprintf( "%.2f",  $bookseller->{'discount'} ) ,   # for display
382
    discount_2dp         => sprintf( "%.2f",  $bookseller->{'discount'} ) ,   # for display
384
    discount             => $bookseller->{'discount'},
383
    discount             => $bookseller->{'discount'},
385
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
384
    orderdiscount_2dp    => sprintf( "%.2f", $data->{'discount'} || 0 ),
(-)a/acqui/orderreceive.pl (-1 lines)
Lines 198-204 $template->param( Link Here
198
    count                 => 1,
198
    count                 => 1,
199
    biblionumber          => $order->{'biblionumber'},
199
    biblionumber          => $order->{'biblionumber'},
200
    ordernumber           => $order->{'ordernumber'},
200
    ordernumber           => $order->{'ordernumber'},
201
    biblioitemnumber      => $order->{'biblioitemnumber'},
202
    subscriptionid        => $order->{subscriptionid},
201
    subscriptionid        => $order->{subscriptionid},
203
    booksellerid          => $order->{'booksellerid'},
202
    booksellerid          => $order->{'booksellerid'},
204
    freight               => $freight,
203
    freight               => $freight,
(-)a/acqui/spent.pl (-3 / +4 lines)
Lines 67-81 SELECT Link Here
67
    datereceived,
67
    datereceived,
68
    aqorders.biblionumber
68
    aqorders.biblionumber
69
FROM (aqorders, aqbasket)
69
FROM (aqorders, aqbasket)
70
LEFT JOIN items ON
71
    items.biblioitemnumber=aqorders.biblioitemnumber
72
LEFT JOIN biblio ON
70
LEFT JOIN biblio ON
73
    biblio.biblionumber=aqorders.biblionumber
71
    biblio.biblionumber=aqorders.biblionumber
72
LEFT JOIN items ON
73
    biblio.biblionumber = items.biblionumber
74
LEFT JOIN aqorders_items ON
74
LEFT JOIN aqorders_items ON
75
    aqorders.ordernumber=aqorders_items.ordernumber
75
     items.itemnumber = aqorders_items.itemnumber
76
LEFT JOIN aqinvoices ON
76
LEFT JOIN aqinvoices ON
77
    aqorders.invoiceid = aqinvoices.invoiceid
77
    aqorders.invoiceid = aqinvoices.invoiceid
78
WHERE
78
WHERE
79
    aqorders.ordernumber=aqorders_items.ordernumber AND
79
    aqorders.basketno=aqbasket.basketno AND
80
    aqorders.basketno=aqbasket.basketno AND
80
    budget_id=? AND
81
    budget_id=? AND
81
    (datecancellationprinted IS NULL OR
82
    (datecancellationprinted IS NULL OR
(-)a/installer/data/mysql/kohastructure.sql (-1 lines)
Lines 2777-2783 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2777
  `supplierreference` mediumtext, -- not used? always NULL
2777
  `supplierreference` mediumtext, -- not used? always NULL
2778
  `purchaseordernumber` mediumtext, -- not used? always NULL
2778
  `purchaseordernumber` mediumtext, -- not used? always NULL
2779
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2779
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2780
  `biblioitemnumber` int(11) default NULL, -- links this order line the biblioitems table (biblioitems.biblioitemnumber)
2781
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order line was last modified
2780
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order line was last modified
2782
  `rrp` decimal(13,2) default NULL, -- the replacement cost for this line item
2781
  `rrp` decimal(13,2) default NULL, -- the replacement cost for this line item
2783
  `ecost` decimal(13,2) default NULL, -- the estimated cost for this line item
2782
  `ecost` decimal(13,2) default NULL, -- the estimated cost for this line item
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 6758-6763 if ( CheckVersion($DBversion) ) { Link Here
6758
    SetVersion($DBversion);
6758
    SetVersion($DBversion);
6759
}
6759
}
6760
6760
6761
6762
$DBversion = "3.13.00.XXX";
6763
if ( CheckVersion($DBversion) ) {
6764
    $dbh->do("ALTER TABLE aqorders DROP COLUMN biblioitemnumber");
6765
    print "Upgrade to $DBversion done (Bug 9987 - Drop column aqorders.biblioitemnumber)\n";
6766
    SetVersion($DBversion);
6767
}
6768
6761
=head1 FUNCTIONS
6769
=head1 FUNCTIONS
6762
6770
6763
=head2 TableExists($table)
6771
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 lines)
Lines 243-249 $(document).ready(function() Link Here
243
        <input type="hidden" name="basketno" value="[% basketno %]" />
243
        <input type="hidden" name="basketno" value="[% basketno %]" />
244
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
244
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
245
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
245
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
246
        <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
247
        <input type="hidden" name="listinc" id="listinc" value="[% listincgst %]" />
246
        <input type="hidden" name="listinc" id="listinc" value="[% listincgst %]" />
248
        <input type="hidden" name="applygst" id="applygst" value="[% gstreg %]" />
247
        <input type="hidden" name="applygst" id="applygst" value="[% gstreg %]" />
249
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst %]" />
248
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 lines)
Lines 283-289 function IEEventHandler_KeyDown() { Link Here
283
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
283
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
284
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
284
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
285
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
285
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
286
    <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
287
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
286
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
288
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
287
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
289
    <input type="hidden" name="gstrate" value="[% gstrate %]" />
288
    <input type="hidden" name="gstrate" value="[% gstrate %]" />
(-)a/t/db_dependent/lib/KohaTest/Acquisition.pm (-2 lines)
Lines 22-28 sub methods : Test( 1 ) { Link Here
22
                       CloseBasket 
22
                       CloseBasket 
23
                       GetPendingOrders 
23
                       GetPendingOrders 
24
                       GetOrders 
24
                       GetOrders 
25
                       GetOrderNumber 
26
                       GetOrder 
25
                       GetOrder 
27
                       NewOrder 
26
                       NewOrder 
28
                       ModOrder 
27
                       ModOrder 
29
- 

Return to bug 9987