# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# 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.
=head1 NAME
orderreceive.pl
=head1 DESCRIPTION
+
This script shows all order already receive and all pendings orders.
It permit to write a new order as 'received'.
=over 4
=item supplierid
+
to know on what supplier this script has to display receive order.
=item receive
=item invoice
+
the number of this invoice.
=item freight
=item biblio
+
The biblionumber of this order.
=item datereceived
=cut
use strict;
-# use warnings; # FIXME
+#use warnings; FIXME - Bug 2505
use CGI;
use C4::Context;
use C4::Koha; # GetKohaAuthorisedValues GetItemTypes
use C4::Auth;
use C4::Output;
use C4::Dates qw/format_date/;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
+use C4::Budgets qw/ GetBudget /;
use C4::Members;
use C4::Branch; # GetBranches
use C4::Items;
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
my $bookseller = GetBookSellerFromId($supplierid);
-my $gst= $input->param('gst') || $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
+my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
+my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
my $results = SearchOrder($ordernumber,$search);
if ( $count == 1 ) {
if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
# prepare empty item form
- my $cell = PrepareItemrecordDisplay();
+ my $cell = PrepareItemrecordDisplay('','','','ACQ');
+ unless ($cell) {
+ $cell = PrepareItemrecordDisplay('','','','');
+ $template->param('NoACQframework' => 1);
+ }
my @itemloop;
push @itemloop,$cell;
if ( @$results[0]->{'unitprice'} == 0 ) {
@$results[0]->{'unitprice'} = '';
}
+
+ my $authorisedby = @$results[0]->{'authorisedby'};
+ my $member = GetMember( borrowernumber => $authorisedby );
+
+ my $budget = GetBudget( @$results[0]->{'budget_id'} );
+
$template->param(
count => 1,
biblionumber => @$results[0]->{'biblionumber'},
copyrightdate => @$results[0]->{'copyrightdate'},
isbn => @$results[0]->{'isbn'},
seriestitle => @$results[0]->{'seriestitle'},
- bookfund => @$results[0]->{'bookfundid'},
+ bookfund => $budget->{budget_name},
quantity => @$results[0]->{'quantity'},
quantityreceivedplus1 => @$results[0]->{'quantityreceived'} + 1,
quantityreceived => @$results[0]->{'quantityreceived'},
rrp => @$results[0]->{'rrp'},
ecost => @$results[0]->{'ecost'},
unitprice => @$results[0]->{'unitprice'},
+ memberfirstname => $member->{firstname} || "",
+ membersurname => $member->{surname} || "",
invoice => $invoice,
datereceived => $datereceived->output(),
- datereceived_iso => $datereceived->output('iso'),
- notes => $order->{notes}
+ datereceived_iso => $datereceived->output('iso'),
+ notes => $order->{notes}
);
}
else {