@@ -, +, @@ --- C4/Acquisition.pm | 8 +++- acqui/orderreceive.pl | 6 +-- acqui/showorder.pl | 44 ++++++++++++++++++++++ installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 10 +++++ .../prog/en/modules/acqui/orderreceive.tt | 14 ++++++- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +++- .../prog/en/modules/acqui/showorder.tt | 39 +++++++++++++++++++ 8 files changed, 122 insertions(+), 8 deletions(-) create mode 100755 acqui/showorder.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -1266,12 +1266,18 @@ sub NewOrder { my $dbh = C4::Context->dbh; my @params; - # if these parameters are missing, we can't continue for my $key (qw/basketno quantity biblionumber budget_id/) { croak "Mandatory parameter $key missing" unless $orderinfo->{$key}; } + if (not defined $orderinfo->{createdby}) { + my $userenv = C4::Context->userenv; + if ($userenv) { + $orderinfo->{createdby} = $userenv->{number}; + } + } + $orderinfo->{'entrydate'} ||= C4::Dates->new()->output("iso"); if (!$orderinfo->{quantityreceived}) { $orderinfo->{quantityreceived} = 0; --- a/acqui/orderreceive.pl +++ a/acqui/orderreceive.pl @@ -190,8 +190,7 @@ if ( $bookseller->{listincgst} ) { my $suggestion = GetSuggestionInfoFromBiblionumber($order->{biblionumber}); -my $authorisedby = $order->{authorisedby}; -my $member = GetMember( borrowernumber => $authorisedby ); +my $creator = GetMember( borrowernumber => $order->{createdby} ); my $budget = GetBudget( $order->{budget_id} ); @@ -216,8 +215,7 @@ $template->param( quantityreceived => $order->{'quantityreceived'}, rrp => sprintf( "%.2f", $rrp ), ecost => sprintf( "%.2f", $ecost ), - memberfirstname => $member->{firstname} || "", - membersurname => $member->{surname} || "", + creator => $creator, invoiceid => $invoice->{invoiceid}, invoice => $invoice->{invoicenumber}, datereceived => $datereceived->output(), --- a/acqui/showorder.pl +++ a/acqui/showorder.pl @@ -0,0 +1,44 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# 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 +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; +use CGI; + +use C4::Auth; +use C4::Acquisition; +use C4::Members; +use C4::Output; + +my $cgi = new CGI; +my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ + template_name => "acqui/showorder.tt", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => { acquisition => '*' }, +}); + +my $ordernumber = $cgi->param('ordernumber'); +my $order = GetOrder($ordernumber); +my $creator = GetMember(borrowernumber => $order->{createdby}); + +$template->param( + order => $order, + creator => $creator, +); + +output_html_with_http_headers $cgi, $cookie, $template->output; --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -3019,6 +3019,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 `cancelledby` varchar(10) default NULL, -- not used? always NULL `datecancellationprinted` date default NULL, -- the date the line item was deleted `order_internalnote` mediumtext, -- notes related to this order line, made for staff --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -8705,6 +8705,16 @@ if ( CheckVersion($DBversion) ) { } +$DBversion = "XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE aqorders + ADD COLUMN createdby int(11) NULL DEFAULT NULL AFTER quantityreceived + }); + print "Upgrade to $DBversion done (Bug 12395: Add aqorders.createdby column)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -279,7 +279,19 @@ [% END %]
  • (Current: [% budget_period_description %] - [% bookfund %])
  • -
  • [% IF ( memberfirstname and membersurname ) %][% IF ( memberfirstname ) %][% memberfirstname %][% END %] [% membersurname %][% ELSE %]No name[% END %]
  • +
  • + + + [% IF (creator && creator.firstname && creator.surname) %] + [% IF creator.firstname %] + [% creator.firstname %] + [% END %] + [% creator.surname %] + [% ELSE %] + No name + [% END %] + +
  • [% IF ( edit and not subscriptionid) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -244,7 +244,7 @@ Basket group Order line Summary - View record + More Quantity Unit cost Order cost @@ -287,7 +287,11 @@ [Add vendor note] [% END %] - MARC | Card + + Order
    + MARC
    + Card + [% loop_order.quantity %] [% loop_order.ecost %] [% loop_order.ordertotal %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt @@ -0,0 +1,39 @@ +[% INCLUDE 'doc-head-open.inc' %] + + + + [% IF order %] + + + + + + + + + + + + + + + + + + + +
    Creation date[% order.entrydate %]
    Creator[% creator.firstname %] [% creator.surname %]
    Claims count[% order.claims_count %]
    Last claim date[% order.claimed_date %]
    + [% ELSE %] + No order found. + [% END %] + + + --