Bugzilla – Attachment 33838 Details for
Bug 12395
Save order line's creator
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12395 [QA Followup]
Bug-12395-QA-Followup.patch (text/plain), 4.05 KB, created by
Jonathan Druart
on 2014-11-24 11:33:44 UTC
(
hide
)
Description:
Bug 12395 [QA Followup]
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-11-24 11:33:44 UTC
Size:
4.05 KB
patch
obsolete
>From 5f207e3e304d2f2baeaac0a429e7f5511e71123b Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 25 Jul 2014 10:48:57 -0400 >Subject: [PATCH] Bug 12395 [QA Followup] > >* Rename createdby to created_by >* Fix GPL versioning >--- > Koha/Acquisition/Order.pm | 4 ++-- > acqui/orderreceive.pl | 2 +- > acqui/showorder.pl | 4 ++-- > installer/data/mysql/kohastructure.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 4 ++-- > 5 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/Koha/Acquisition/Order.pm b/Koha/Acquisition/Order.pm >index 89649a3..ff5143c 100644 >--- a/Koha/Acquisition/Order.pm >+++ b/Koha/Acquisition/Order.pm >@@ -32,10 +32,10 @@ sub insert { > unless $self->{$key}; > } > >- if (not defined $self->{createdby}) { >+ if (not defined $self->{created_by}) { > my $userenv = C4::Context->userenv; > if ($userenv) { >- $self->{createdby} = $userenv->{number}; >+ $self->{created_by} = $userenv->{number}; > } > } > >diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl >index 5c22837..e309f08 100755 >--- a/acqui/orderreceive.pl >+++ b/acqui/orderreceive.pl >@@ -190,7 +190,7 @@ if ( $bookseller->{listincgst} ) { > > my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber}); > >-my $creator = GetMember( borrowernumber => $order->{createdby} ); >+my $creator = GetMember( borrowernumber => $order->{created_by} ); > > my $budget = GetBudget( $order->{budget_id} ); > >diff --git a/acqui/showorder.pl b/acqui/showorder.pl >index 048eb9f..2c92ea0 100755 >--- a/acqui/showorder.pl >+++ b/acqui/showorder.pl >@@ -4,7 +4,7 @@ > # > # Koha is free software; you can redistribute it and/or modify it under the > # terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 2 of the License, or (at your option) any later >+# Foundation; either version 3 of the License, or (at your option) any later > # version. > # > # Koha is distributed in the hope that it will be useful, but WITHOUT ANY >@@ -34,7 +34,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ > > my $ordernumber = $cgi->param('ordernumber'); > my $order = GetOrder($ordernumber); >-my $creator = GetMember(borrowernumber => $order->{createdby}); >+my $creator = GetMember(borrowernumber => $order->{created_by}); > > $template->param( > order => $order, >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index ced4737..536466f 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -3051,7 +3051,7 @@ CREATE TABLE `aqorders` ( -- information related to the basket line items > `freight` decimal(28,6) default NULL, -- shipping costs (not used) > `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item > `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far >- createdby int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator >+ created_by int(11) NULL DEFAULT NULL, -- the borrowernumber of order line's creator > `datecancellationprinted` date default NULL, -- the date the line item was deleted > `cancellationreason` text default NULL, -- reason of cancellation > `order_internalnote` mediumtext, -- notes related to this order line, made for staff >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index a3c9a94..e63194d 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -9538,9 +9538,9 @@ $DBversion = "XXX"; > if ( CheckVersion($DBversion) ) { > $dbh->do(q{ > ALTER TABLE aqorders >- ADD COLUMN createdby int(11) NULL DEFAULT NULL AFTER quantityreceived >+ ADD COLUMN created_by int(11) NULL DEFAULT NULL AFTER quantityreceived > }); >- print "Upgrade to $DBversion done (Bug 12395: Add aqorders.createdby column)\n"; >+ print "Upgrade to $DBversion done (Bug 12395: Add aqorders.created_by column)\n"; > SetVersion ($DBversion); > } > >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12395
:
28754
|
28943
|
30128
|
30129
|
31409
|
31410
|
31411
|
33837
|
33838
|
33839
|
35769
|
35770
|
35771
|
35772
|
35779
|
35780
|
35781
|
35782
|
35864
|
36063
|
36075
|
36076
|
36077
|
36078
|
36079
|
36080
|
40132
|
40133
|
40134
|
40135
|
40136
|
40137
|
40138
|
40139
|
40161
|
43951
|
45387
|
58745
|
58746
|
58747
|
58748
|
58749
|
58750
|
61383
|
61384
|
71344
|
71345
|
71346
|
71347
|
71348
|
71349
|
72720
|
72721
|
72722
|
72723
|
72724
|
72725
|
74207
|
74208
|
74209
|
74210
|
74211
|
74212
|
74276
|
74277
|
74278
|
74279
|
74280
|
74281
|
74282
|
75900
|
75901
|
75902
|
75903
|
75904
|
75905
|
75906
|
75907
|
76074
|
76075
|
76076
|
76077
|
76078
|
76079
|
76080
|
76081
|
76082
|
76083
|
76084
|
76085
|
76086
|
76087
|
76088
|
76089