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

(-)a/Koha/Acquisition/Order.pm (-2 / +2 lines)
Lines 32-41 sub insert { Link Here
32
          unless $self->{$key};
32
          unless $self->{$key};
33
    }
33
    }
34
34
35
    if (not defined $self->{createdby}) {
35
    if (not defined $self->{created_by}) {
36
        my $userenv = C4::Context->userenv;
36
        my $userenv = C4::Context->userenv;
37
        if ($userenv) {
37
        if ($userenv) {
38
            $self->{createdby} = $userenv->{number};
38
            $self->{created_by} = $userenv->{number};
39
        }
39
        }
40
    }
40
    }
41
41
(-)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 3051-3057 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
3051
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3051
  `freight` decimal(28,6) default NULL, -- shipping costs (not used)
3052
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3052
  `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3053
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3053
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3054
  createdby int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator
3054
  created_by int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator
3055
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3055
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
3056
  `cancellationreason` text default NULL, -- reason of cancellation
3056
  `cancellationreason` text default NULL, -- reason of cancellation
3057
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
3057
  `order_internalnote` mediumtext, -- notes related to this order line, made for staff
(-)a/installer/data/mysql/updatedatabase.pl (-3 / +2 lines)
Lines 9538-9546 $DBversion = "XXX"; Link Here
9538
if ( CheckVersion($DBversion) ) {
9538
if ( CheckVersion($DBversion) ) {
9539
    $dbh->do(q{
9539
    $dbh->do(q{
9540
        ALTER TABLE aqorders
9540
        ALTER TABLE aqorders
9541
        ADD COLUMN createdby int(11) NULL DEFAULT NULL AFTER quantityreceived
9541
        ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived
9542
    });
9542
    });
9543
    print "Upgrade to $DBversion done (Bug 12395: Add aqorders.createdby column)\n";
9543
    print "Upgrade to $DBversion done (Bug 12395: Add aqorders.created_by column)\n";
9544
    SetVersion ($DBversion);
9544
    SetVersion ($DBversion);
9545
}
9545
}
9546
9546
9547
- 

Return to bug 12395