use C4::Acquisition;
use C4::Budgets;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId);
use C4::Dates qw/format_date/;
use C4::Debug;
$op = q{};
}
+my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
+$template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2';
+
if ( $op eq 'delete_confirm' ) {
my $basketno = $query->param('basketno');
DelBasket($basketno);
address3 => $bookseller->{'address3'},
address4 => $bookseller->{'address4'},
);
-} elsif ($op eq 'attachbasket' && $template->{'param_map'}->{'CAN_user_acquisition_group_manage'} == 1) {
+} elsif ($op eq 'attachbasket' && $template->{'VARS'}->{'CAN_user_acquisition_group_manage'} == 1) {
print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno=' . $basket->{'basketno'} . '&op=attachbasket&booksellerid=' . $booksellerid);
# check if we have to "close" a basket before building page
} elsif ($op eq 'export') {
print GetBasketAsCSV($query->param('basketno'));
exit;
} elsif ($op eq 'close') {
- my $confirm = $query->param('confirm');
+ my $confirm = $query->param('confirm') || $confirm_pref eq '2';
if ($confirm) {
my $basketno = $query->param('basketno');
my $booksellerid = $query->param('booksellerid');
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
my $basketgroups;
my $member = GetMember(borrowernumber => $loggedinuser);
- if ($basket->{closedate} && haspermission({ flagsrequired => { acquisition => 'group_manage'} })) {
+ if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
for my $bg ( @{$basketgroups} ) {
- if ($basket->{basketgroupid} == $bg->{id}){
+ if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
$bg->{default} = 1;
}
}
name => "No group");
if ( ! $basket->{basketgroupid} ) {
$emptygroup{default} = 1;
+ $emptygroup{nogroup} = 1;
}
unshift( @$basketgroups, \%emptygroup );
}
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
$basket->{creationdate}, $basket->{authorisedby};
+ #to get active currency
+ my $cur = GetCurrency();
+
+
my @results = GetOrders( $basketno );
- my $gist = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
+ my $gist = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
+ $gist = 0 if $gist == 0.0000;
my $discount = $bookseller->{'discount'} / 100;
my $total_rrp; # RRP Total, its value will be assigned to $total_rrp_gsti or $total_rrp_gste depending of $bookseller->{'listincgst'}
my $total_rrp_gsti; # RRP Total, GST included
my $total_rrp_gste; # RRP Total, GST excluded
my $gist_rrp;
+ my $total_rrp_est;
my $qty_total;
my @books_loop;
$total_rrp += $qty * $order->{'rrp'};
my $line_total = $qty * $order->{'ecost'};
+ $total_rrp_est += $qty * $order->{'ecost'};
# FIXME: what about the "actual cost" field?
$qty_total += $qty;
my %line = %{ $order };
push @books_loop, \%line;
}
- if ($bookseller->{'listincgst'}) { # if prices already includes GST
- $total_rrp_gsti = $total_rrp; # we know $total_rrp_gsti
- $total_rrp_gste = $total_rrp_gsti / ($gist + 1); # and can reverse compute other values
- $gist_rrp = $total_rrp_gsti - $total_rrp_gste; #
- } else { # if prices does not include GST
- $total_rrp_gste = $total_rrp; # then we use the common way to compute other values
- $gist_rrp = $total_rrp_gste * $gist; #
- $total_rrp_gsti = $total_rrp_gste + $gist_rrp; #
- }
- # These vars are estimated totals and GST, taking in account the booksellet discount
- my $total_est_gsti = $total_rrp_gsti - ($total_rrp_gsti * $discount);
- my $gist_est = $gist_rrp - ($gist_rrp * $discount);
- my $total_est_gste = $total_rrp_gste - ($total_rrp_gste * $discount);
+my $total_est_gste;
+ my $total_est_gsti;
+ my $gist_est;
+ if ($gist){ # if we have GST
+ if ( $bookseller->{'listincgst'} ) { # if prices already includes GST
+ $total_rrp_gsti = $total_rrp; # we know $total_rrp_gsti
+ $total_rrp_gste = $total_rrp_gsti / ( $gist + 1 ); # and can reverse compute other values
+ $gist_rrp = $total_rrp_gsti - $total_rrp_gste; #
+ $total_est_gste = $total_rrp_gste - ( $total_rrp_gste * $discount );
+ $total_est_gsti = $total_rrp_est;
+ } else { # if prices does not include GST
+ $total_rrp_gste = $total_rrp; # then we use the common way to compute other values
+ $gist_rrp = $total_rrp_gste * $gist; #
+ $total_rrp_gsti = $total_rrp_gste + $gist_rrp; #
+ $total_est_gste = $total_rrp_est;
+ $total_est_gsti = $total_rrp_gsti - ( $total_rrp_gsti * $discount );
+ }
+ $gist_est = $gist_rrp - ( $gist_rrp * $discount );
+ } else {
+ $total_rrp_gsti = $total_rrp;
+ $total_est_gsti = $total_rrp_est;
+}
my $contract = &GetContract($basket->{contractnumber});
my @orders = GetOrders($basketno);
+
+ my $borrower= GetMember('borrowernumber' => $loggedinuser);
+ my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+ my $has_budgets = 0;
+ foreach my $r (@{$budgets}) {
+ if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+ next;
+ }
+ $has_budgets = 1;
+ last;
+ }
+
$template->param(
basketno => $basketno,
basketname => $basket->{'basketname'},
gist_rrp => sprintf( "%.2f", $gist_rrp ),
total_rrp_gsti => sprintf( "%.2f", $total_rrp_gsti ),
total_est_gsti => sprintf( "%.2f", $total_est_gsti ),
- currency => $bookseller->{'listprice'},
+# currency => $bookseller->{'listprice'},
+ currency => $cur->{'currency'},
qty_total => $qty_total,
GST => $gist,
basketgroups => $basketgroups,
grouped => $basket->{basketgroupid},
unclosable => @orders ? 0 : 1,
+ has_budgets => $has_budgets,
);
}
projects / koha_gimpoz / blobdiff