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 &GetOrdersByBiblionumber
56
        &NewOrder &DelOrder &ModOrder &GetPendingOrders &GetOrder &GetOrders &GetOrdersByBiblionumber
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 993-1031 sub GetOrdersByBiblionumber { Link Here
993
993
994
#------------------------------------------------------------#
994
#------------------------------------------------------------#
995
995
996
=head3 GetOrderNumber
997
998
  $ordernumber = &GetOrderNumber($biblioitemnumber, $biblionumber);
999
1000
Looks up the ordernumber with the given biblionumber and biblioitemnumber.
1001
1002
Returns the number of this order.
1003
1004
=over
1005
1006
=item C<$ordernumber> is the order number.
1007
1008
=back
1009
1010
=cut
1011
1012
sub GetOrderNumber {
1013
    my ( $biblionumber,$biblioitemnumber ) = @_;
1014
    my $dbh = C4::Context->dbh;
1015
    my $query = "
1016
        SELECT ordernumber
1017
        FROM   aqorders
1018
        WHERE  biblionumber=?
1019
        AND    biblioitemnumber=?
1020
    ";
1021
    my $sth = $dbh->prepare($query);
1022
    $sth->execute( $biblionumber, $biblioitemnumber );
1023
1024
    return $sth->fetchrow;
1025
}
1026
1027
#------------------------------------------------------------#
1028
1029
=head3 GetOrder
996
=head3 GetOrder
1030
997
1031
  $order = &GetOrder($ordernumber);
998
  $order = &GetOrder($ordernumber);
Lines 1142-1148 Else, the upcoming July 1st is used. Link Here
1142
1109
1143
=item defaults entrydate to Now
1110
=item defaults entrydate to Now
1144
1111
1145
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".
1112
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".
1146
1113
1147
=back
1114
=back
1148
1115
Lines 1313-1341 sub ModItemOrder { Link Here
1313
1280
1314
#------------------------------------------------------------#
1281
#------------------------------------------------------------#
1315
1282
1316
1317
=head3 ModOrderBibliotemNumber
1318
1319
  &ModOrderBiblioitemNumber($biblioitemnumber,$ordernumber, $biblionumber);
1320
1321
Modifies the biblioitemnumber for an existing order.
1322
Updates the order with order number C<$ordernum> and biblionumber C<$biblionumber>.
1323
1324
=cut
1325
1326
#FIXME: is this used at all?
1327
sub ModOrderBiblioitemNumber {
1328
    my ($biblioitemnumber,$ordernumber, $biblionumber) = @_;
1329
    my $dbh = C4::Context->dbh;
1330
    my $query = "
1331
    UPDATE aqorders
1332
    SET    biblioitemnumber = ?
1333
    WHERE  ordernumber = ?
1334
    AND biblionumber =  ?";
1335
    my $sth = $dbh->prepare($query);
1336
    $sth->execute( $biblioitemnumber, $ordernumber, $biblionumber );
1337
}
1338
1339
=head3 GetCancelledOrders
1283
=head3 GetCancelledOrders
1340
1284
1341
  my @orders = GetCancelledOrders($basketno, $orderby);
1285
  my @orders = GetCancelledOrders($basketno, $orderby);
Lines 1377-1384 sub GetCancelledOrders { Link Here
1377
=head3 ModReceiveOrder
1321
=head3 ModReceiveOrder
1378
1322
1379
  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user,
1323
  &ModReceiveOrder($biblionumber, $ordernumber, $quantityreceived, $user,
1380
    $unitprice, $invoiceid, $biblioitemnumber,
1324
    $cost, $ecost, $invoiceid, rrp, budget_id, datereceived, \@received_itemnumbers);
1381
    $bookfund, $rrp, \@received_itemnumbers);
1382
1325
1383
Updates an order, to reflect the fact that it was received, at least
1326
Updates an order, to reflect the fact that it was received, at least
1384
in part. All arguments not mentioned below update the fields with the
1327
in part. All arguments not mentioned below update the fields with the
(-)a/C4/Letters.pm (-1 / +1 lines)
Lines 323-329 sub SendAlerts { Link Here
323
            FROM aqorders
323
            FROM aqorders
324
            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
324
            LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
325
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
325
            LEFT JOIN biblio ON aqorders.biblionumber=biblio.biblionumber
326
            LEFT JOIN biblioitems ON aqorders.biblioitemnumber=biblioitems.biblioitemnumber
326
            LEFT JOIN biblioitems ON aqorders.biblionumber=biblioitems.biblionumber
327
            LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
327
            LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
328
            WHERE aqorders.ordernumber IN (
328
            WHERE aqorders.ordernumber IN (
329
            }
329
            }
(-)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 2896-2902 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2896
  `supplierreference` mediumtext, -- not used? always NULL
2896
  `supplierreference` mediumtext, -- not used? always NULL
2897
  `purchaseordernumber` mediumtext, -- not used? always NULL
2897
  `purchaseordernumber` mediumtext, -- not used? always NULL
2898
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2898
  `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno)
2899
  `biblioitemnumber` int(11) default NULL, -- links this order line the biblioitems table (biblioitems.biblioitemnumber)
2900
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order line was last modified
2899
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order line was last modified
2901
  `rrp` decimal(13,2) default NULL, -- the replacement cost for this line item
2900
  `rrp` decimal(13,2) default NULL, -- the replacement cost for this line item
2902
  `ecost` decimal(13,2) default NULL, -- the estimated cost for this line item
2901
  `ecost` decimal(13,2) default NULL, -- the estimated cost for this line item
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 6991-6996 if ( CheckVersion($DBversion) ) { Link Here
6991
}
6991
}
6992
6992
6993
6993
6994
6995
$DBversion = "3.13.00.XXX";
6996
if ( CheckVersion($DBversion) ) {
6997
    $dbh->do("ALTER TABLE aqorders DROP COLUMN biblioitemnumber");
6998
    print "Upgrade to $DBversion done (Bug 9987 - Drop column aqorders.biblioitemnumber)\n";
6999
    SetVersion($DBversion);
7000
}
7001
6994
=head1 FUNCTIONS
7002
=head1 FUNCTIONS
6995
7003
6996
=head2 TableExists($table)
7004
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 lines)
Lines 228-234 $(document).ready(function() Link Here
228
        <input type="hidden" name="basketno" value="[% basketno %]" />
228
        <input type="hidden" name="basketno" value="[% basketno %]" />
229
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
229
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
230
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
230
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
231
        <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
232
        <input type="hidden" name="listinc" id="listinc" value="[% listincgst %]" />
231
        <input type="hidden" name="listinc" id="listinc" value="[% listincgst %]" />
233
        <input type="hidden" name="applygst" id="applygst" value="[% gstreg %]" />
232
        <input type="hidden" name="applygst" id="applygst" value="[% gstreg %]" />
234
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst %]" />
233
        <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst %]" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 lines)
Lines 265-271 Link Here
265
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
265
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
266
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
266
    <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
267
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
267
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
268
    <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
269
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
268
    <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
270
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
269
    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
271
    <input type="hidden" name="gstrate" value="[% gstrate %]" />
270
    <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