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

(-)a/C4/Acquisition.pm (-2 / +2 lines)
Lines 1271-1280 sub NewOrder { Link Here
1271
        croak "Mandatory parameter $key missing" unless $orderinfo->{$key};
1271
        croak "Mandatory parameter $key missing" unless $orderinfo->{$key};
1272
    }
1272
    }
1273
1273
1274
    if (not defined $orderinfo->{createdby}) {
1274
    if (not defined $orderinfo->{created_by}) {
1275
        my $userenv = C4::Context->userenv;
1275
        my $userenv = C4::Context->userenv;
1276
        if ($userenv) {
1276
        if ($userenv) {
1277
            $orderinfo->{createdby} = $userenv->{number};
1277
            $orderinfo->{created_by} = $userenv->{number};
1278
        }
1278
        }
1279
    }
1279
    }
1280
1280
(-)a/acqui/orderreceive.pl (-1 / +1 lines)
Lines 190-196 if ( $bookseller->{listincgst} ) { Link Here
190
190
191
my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
191
my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber});
192
192
193
my $creator = GetMember( borrowernumber => $order->{createdby} );
193
my $creator = GetMember( borrowernumber => $order->{created_by} );
194
194
195
my $budget = GetBudget( $order->{budget_id} );
195
my $budget = GetBudget( $order->{budget_id} );
196
196
(-)a/acqui/showorder.pl (-2 / +2 lines)
Lines 4-10 Link Here
4
#
4
#
5
# Koha is free software; you can redistribute it and/or modify it under the
5
# Koha is free software; you can redistribute it and/or modify it under the
6
# terms of the GNU General Public License as published by the Free Software
6
# terms of the GNU General Public License as published by the Free Software
7
# Foundation; either version 2 of the License, or (at your option) any later
7
# Foundation; either version 3 of the License, or (at your option) any later
8
# version.
8
# version.
9
#
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
Lines 34-40 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ Link Here
34
34
35
my $ordernumber = $cgi->param('ordernumber');
35
my $ordernumber = $cgi->param('ordernumber');
36
my $order = GetOrder($ordernumber);
36
my $order = GetOrder($ordernumber);
37
my $creator = GetMember(borrowernumber => $order->{createdby});
37
my $creator = GetMember(borrowernumber => $order->{created_by});
38
38
39
$template->param(
39
$template->param(
40
    order => $order,
40
    order => $order,
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 3019-3025 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
3019
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3019
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3020
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3020
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3021
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3021
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3022
  createdby int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator
3022
  created_by int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator
3023
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
3023
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
3024
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3024
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3025
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
3025
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
(-)a/installer/data/mysql/updatedatabase.pl (-3 / +2 lines)
Lines 8709-8717 $DBversion = "XXX"; Link Here
8709
if ( CheckVersion($DBversion) ) {
8709
if ( CheckVersion($DBversion) ) {
8710
    $dbh->do(q{
8710
    $dbh->do(q{
8711
        ALTER TABLE aqorders
8711
        ALTER TABLE aqorders
8712
        ADD COLUMN createdby int(11) NULL DEFAULT NULL AFTER quantityreceived
8712
        ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived
8713
    });
8713
    });
8714
    print "Upgrade to $DBversion done (Bug 12395: Add aqorders.createdby column)\n";
8714
    print "Upgrade to $DBversion done (Bug 12395: Add aqorders.created_by column)\n";
8715
    SetVersion ($DBversion);
8715
    SetVersion ($DBversion);
8716
}
8716
}
8717
8717
8718
- 

Return to bug 12395