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

(-)a/installer/data/mysql/kohastructure.sql (-1 lines)
Lines 3002-3008 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
3002
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3002
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3003
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3003
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3004
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3004
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3005
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
3006
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3005
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3007
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
3006
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
3008
  `order_vendornote` mediumtext, -- notes related to this order line, made for vendor
3007
  `order_vendornote` mediumtext, -- notes related to this order line, made for vendor
(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
Lines 8613-8618 if ( CheckVersion($DBversion) ) { Link Here
8613
    SetVersion($DBversion);
8613
    SetVersion($DBversion);
8614
}
8614
}
8615
8615
8616
$DBversion = "3.17.00.XXX";
8617
if ( CheckVersion($DBversion) ) {
8618
    $dbh->do(q|
8619
        ALTER TABLE aqorders DROP COLUMN cancelledby;
8620
    |);
8621
8622
    print "Upgrade to $DBversion done (Bug 11007 - DROP column aqorders.cancelledby)\n";
8623
    SetVersion($DBversion);
8624
}
8625
8616
=head1 FUNCTIONS
8626
=head1 FUNCTIONS
8617
8627
8618
=head2 TableExists($table)
8628
=head2 TableExists($table)
(-)a/t/db_dependent/Acquisition.t (-4 lines)
Lines 363-369 my @expectedfields = qw( Link Here
363
  freight
363
  freight
364
  unitprice
364
  unitprice
365
  quantityreceived
365
  quantityreceived
366
  cancelledby
367
  datecancellationprinted
366
  datecancellationprinted
368
  supplierreference
367
  supplierreference
369
  purchaseordernumber
368
  purchaseordernumber
Lines 439-445 my @base_expectedfields = qw( Link Here
439
  ecost
438
  ecost
440
  uncertainprice
439
  uncertainprice
441
  marc
440
  marc
442
  cancelledby
443
  url
441
  url
444
  isbn
442
  isbn
445
  copyrightdate
443
  copyrightdate
Lines 604-610 ok( Link Here
604
  datereceived
602
  datereceived
605
  orderstatus
603
  orderstatus
606
  supplierreference
604
  supplierreference
607
  cancelledby
608
  isbn
605
  isbn
609
  copyrightdate
606
  copyrightdate
610
  gstrate
607
  gstrate
611
- 

Return to bug 11007