projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'kc/master' into merged_5549
[koha_gimpoz]
/
acqui
/
basket.pl
diff --git
a/acqui/basket.pl
b/acqui/basket.pl
index
b559732
..
4386125
100755
(executable)
--- a/
acqui/basket.pl
+++ b/
acqui/basket.pl
@@
-29,11
+29,12
@@
use CGI;
use C4::Acquisition;
use C4::Budgets;
use C4::Bookseller qw( GetBookSellerFromId);
use C4::Acquisition;
use C4::Budgets;
use C4::Bookseller qw( GetBookSellerFromId);
-use C4::Dates qw/format_date/;
use C4::Debug;
use C4::Biblio;
use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket
use C4::Items;
use C4::Debug;
use C4::Biblio;
use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket
use C4::Items;
+use C4::Suggestions;
+
=head1 NAME
basket.pl
=head1 NAME
basket.pl
@@
-52,7
+53,7
@@
basket.pl
The basket number.
The basket number.
-=item
suppli
erid
+=item
booksell
erid
the supplier this script have to display the basket.
the supplier this script have to display the basket.
@@
-64,7
+65,7
@@
the supplier this script have to display the basket.
my $query = new CGI;
my $basketno = $query->param('basketno');
my $query = new CGI;
my $basketno = $query->param('basketno');
-my $booksellerid = $query->param('
suppli
erid');
+my $booksellerid = $query->param('
booksell
erid');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@
-80,7
+81,7
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my $basket = GetBasket($basketno);
# FIXME : what about the "discount" percentage?
my $basket = GetBasket($basketno);
# FIXME : what about the "discount" percentage?
-# FIXME : the query->param('
suppli
erid') below is probably useless. The bookseller is always known from the basket
+# FIXME : the query->param('
booksell
erid') below is probably useless. The bookseller is always known from the basket
# if no booksellerid in parameter, get it from basket
# warn "=>".$basket->{booksellerid};
$booksellerid = $basket->{booksellerid} unless $booksellerid;
# if no booksellerid in parameter, get it from basket
# warn "=>".$basket->{booksellerid};
$booksellerid = $basket->{booksellerid} unless $booksellerid;
@@
-124,10
+125,10
@@
if ( $op eq 'delete_confirm' ) {
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
- creationdate =>
format_date( $basket->{creationdate} )
,
+ creationdate =>
$basket->{creationdate}
,
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
- closedate =>
format_date( $basket->{closedate} )
,
+ closedate =>
$basket->{closedate}
,
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
@@
-162,7
+163,7
@@
if ( $op eq 'delete_confirm' ) {
basketgroupid => $basketgroupid } );
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
} else {
basketgroupid => $basketgroupid } );
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
} else {
- print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?
suppli
erid=' . $booksellerid);
+ print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?
booksell
erid=' . $booksellerid);
}
exit;
} else {
}
exit;
} else {
@@
-237,6
+238,7
@@
if ( $op eq 'delete_confirm' ) {
my $qty_total;
my @books_loop;
my $qty_total;
my @books_loop;
+ my $suggestion;
for my $order ( @results ) {
my $rrp = $order->{'listprice'} || 0;
for my $order ( @results ) {
my $rrp = $order->{'listprice'} || 0;
@@
-303,6
+305,12
@@
if ( $op eq 'delete_confirm' ) {
} else {
$line{'title'} = "Deleted bibliographic notice, can't find title.";
}
} else {
$line{'title'} = "Deleted bibliographic notice, can't find title.";
}
+
+ $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
+ $line{suggestionid} = $suggestion->{suggestionid};
+ $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby};
+ $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
+
push @books_loop, \%line;
}
push @books_loop, \%line;
}
@@
-355,14
+363,13
@@
my $total_est_gste;
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
- creationdate =>
C4::Dates->new($basket->{creationdate},'iso')->output
,
+ creationdate =>
$basket->{creationdate}
,
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
- closedate =>
C4::Dates->new($basket->{closedate},'iso')->output
,
+ closedate =>
$basket->{closedate}
,
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
- entrydate => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
books_loop => \@books_loop,
cancelledorders_loop => \@cancelledorders,
gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',
books_loop => \@books_loop,
cancelledorders_loop => \@cancelledorders,
gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',