projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 8255: allow local cover images to be cached
[koha_gimpoz]
/
acqui
/
orderreceive.pl
diff --git
a/acqui/orderreceive.pl
b/acqui/orderreceive.pl
index
753071d
..
2b59698
100755
(executable)
--- a/
acqui/orderreceive.pl
+++ b/
acqui/orderreceive.pl
@@
-34,7
+34,7
@@
It permit to write a new order as 'received'.
=over 4
=over 4
-=item
suppli
erid
+=item
booksell
erid
to know on what supplier this script has to display receive order.
to know on what supplier this script has to display receive order.
@@
-75,12
+75,13
@@
use C4::Members;
use C4::Branch; # GetBranches
use C4::Items;
use C4::Biblio;
use C4::Branch; # GetBranches
use C4::Items;
use C4::Biblio;
+use C4::Suggestions;
my $input = new CGI;
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $dbh = C4::Context->dbh;
-my $
supplierid = $input->param('suppli
erid');
+my $
booksellerid = $input->param('booksell
erid');
my $ordernumber = $input->param('ordernumber');
my $search = $input->param('receive');
my $invoice = $input->param('invoice');
my $ordernumber = $input->param('ordernumber');
my $search = $input->param('receive');
my $invoice = $input->param('invoice');
@@
-90,7
+91,7
@@
my $datereceived = $input->param('datereceived');
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
-my $bookseller = GetBookSellerFromId($
suppli
erid);
+my $bookseller = GetBookSellerFromId($
booksell
erid);
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);
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);
@@
-116,16
+117,15
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
# prepare the form for receiving
if ( $count == 1 ) {
if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
# prepare the form for receiving
if ( $count == 1 ) {
if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
- # prepare empty item form
- my $cell = PrepareItemrecordDisplay('','','','ACQ');
- unless ($cell) {
- $cell = PrepareItemrecordDisplay('','','','');
+ # Check if ACQ framework exists
+ my $marc = GetMarcStructure(1, 'ACQ');
+ unless($marc) {
$template->param('NoACQframework' => 1);
}
$template->param('NoACQframework' => 1);
}
- my @itemloop;
- push @itemloop,$cell;
-
-
$template->param(items => \@itemloop
);
+ $template->param(
+ AcqCreateItemReceiving => 1,
+ UniqueItemFields => C4::Context->preference('UniqueItemFields'),
+ );
}
if ( @$results[0]->{'quantityreceived'} == 0 ) {
}
if ( @$results[0]->{'quantityreceived'} == 0 ) {
@@
-135,6
+135,8
@@
if ( $count == 1 ) {
@$results[0]->{'unitprice'} = '';
}
@$results[0]->{'unitprice'} = '';
}
+ my $suggestion = GetSuggestionInfoFromBiblionumber(@$results[0]->{'biblionumber'});
+
my $authorisedby = @$results[0]->{'authorisedby'};
my $member = GetMember( borrowernumber => $authorisedby );
my $authorisedby = @$results[0]->{'authorisedby'};
my $member = GetMember( borrowernumber => $authorisedby );
@@
-145,7
+147,7
@@
if ( $count == 1 ) {
biblionumber => @$results[0]->{'biblionumber'},
ordernumber => @$results[0]->{'ordernumber'},
biblioitemnumber => @$results[0]->{'biblioitemnumber'},
biblionumber => @$results[0]->{'biblionumber'},
ordernumber => @$results[0]->{'ordernumber'},
biblioitemnumber => @$results[0]->{'biblioitemnumber'},
-
suppli
erid => @$results[0]->{'booksellerid'},
+
booksell
erid => @$results[0]->{'booksellerid'},
freight => $freight,
gst => $gst,
name => $bookseller->{'name'},
freight => $freight,
gst => $gst,
name => $bookseller->{'name'},
@@
-167,7
+169,10
@@
if ( $count == 1 ) {
invoice => $invoice,
datereceived => $datereceived->output(),
datereceived_iso => $datereceived->output('iso'),
invoice => $invoice,
datereceived => $datereceived->output(),
datereceived_iso => $datereceived->output('iso'),
- notes => $order->{notes}
+ notes => $order->{notes},
+ suggestionid => $suggestion->{suggestionid},
+ surnamesuggestedby => $suggestion->{surnamesuggestedby},
+ firstnamesuggestedby => $suggestion->{firstnamesuggestedby},
);
}
else {
);
}
else {
@@
-181,13
+186,13
@@
else {
$line{gst} = $gst;
$line{title} = @$results[$i]->{'title'};
$line{author} = @$results[$i]->{'author'};
$line{gst} = $gst;
$line{title} = @$results[$i]->{'title'};
$line{author} = @$results[$i]->{'author'};
- $line{
supplierid} = $suppli
erid;
+ $line{
booksellerid} = $booksell
erid;
push @loop, \%line;
}
$template->param(
loop => \@loop,
push @loop, \%line;
}
$template->param(
loop => \@loop,
-
supplierid => $suppli
erid,
+
booksellerid => $booksell
erid,
);
}
my $op = $input->param('op');
);
}
my $op = $input->param('op');