use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Output;
-use C4::Acquisition;
-use C4::Budgets;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
+use C4::Acquisition qw( CloseInvoice ReopenInvoice ModInvoice MergeInvoices DelInvoice GetInvoice GetInvoiceDetails get_rounded_price );
+use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget );
use Koha::Acquisition::Booksellers;
-use Koha::Acquisition::Currencies;
-use Koha::DateUtils;
+use Koha::Acquisition::Currencies qw( get_active );
+use Koha::DateUtils qw( output_pref );
use Koha::Misc::Files;
-use Koha::InvoiceAdjustments;
+use Koha::Acquisition::Invoice::Adjustments;
-my $input = new CGI;
+my $input = CGI->new;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
{
template_name => 'acqui/invoice.tt',
query => $input,
type => 'intranet',
- authnotrequired => 0,
flagsrequired => { 'acquisition' => '*' },
- debug => 1,
}
);
+my $logged_in_patron = Koha::Patrons->find( $loggedinuser );
my $invoiceid = $input->param('invoiceid');
my $op = $input->param('op');
+output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ if $op
+ && ! $logged_in_patron->has_permission( { acquisition => 'edit_invoices' } )
+ && ! $logged_in_patron->has_permission( { acquisition => 'reopen_closed_invoices' } )
+ && ! $logged_in_patron->has_permission( { acquisition => 'merge_invoices' } )
+ && ! $logged_in_patron->has_permission( { acquisition => 'delete_invoices' } );
+
my $invoice_files;
if ( C4::Context->preference('AcqEnableFiles') ) {
$invoice_files = Koha::Misc::Files->new(
}
if ( $op && $op eq 'close' ) {
- CloseInvoice($invoiceid);
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'edit_invoices' } );
+ my @invoiceid = $input->multi_param('invoiceid');
+ foreach my $invoiceid ( @invoiceid ) {
+ CloseInvoice($invoiceid);
+ }
my $referer = $input->param('referer');
if ($referer) {
print $input->redirect($referer);
}
}
elsif ( $op && $op eq 'reopen' ) {
- ReopenInvoice($invoiceid);
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'reopen_closed_invoices' } );
+ my @invoiceid = $input->multi_param('invoiceid');
+ foreach my $invoiceid ( @invoiceid ) {
+ ReopenInvoice($invoiceid);
+ }
my $referer = $input->param('referer');
if ($referer) {
print $input->redirect($referer);
shipmentcost_budgetid => $shipment_budget_id
);
if ($input->param('reopen')) {
- ReopenInvoice($invoiceid);
+ ReopenInvoice($invoiceid)
+ if $logged_in_patron->has_permission( { acquisition => 'reopen_closed_invoices' } );
} elsif ($input->param('close')) {
+
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'edit_invoices' } );
+
CloseInvoice($invoiceid);
} elsif ($input->param('merge')) {
+
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'merge_invoices' } );
+
my @sources = $input->multi_param('merge');
MergeInvoices($invoiceid, \@sources);
defined($invoice_files) && $invoice_files->MergeFileRecIds(@sources);
$template->param( modified => 1 );
}
elsif ( $op && $op eq 'delete' ) {
+
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'delete_invoices' } );
+
DelInvoice($invoiceid);
defined($invoice_files) && $invoice_files->DelAllFiles();
my $referer = $input->param('referer') || 'invoices.pl';
}
}
elsif ( $op && $op eq 'del_adj' ) {
+
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'edit_invoices' } );
+
my $adjustment_id = $input->param('adjustment_id');
- my $del_adj = Koha::InvoiceAdjustments->find( $adjustment_id );
+ my $del_adj = Koha::Acquisition::Invoice::Adjustments->find( $adjustment_id );
$del_adj->delete() if ($del_adj);
}
elsif ( $op && $op eq 'mod_adj' ) {
+
+ output_and_exit( $input, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'edit_invoices' } );
+
my @adjustment_id = $input->multi_param('adjustment_id');
my @adjustment = $input->multi_param('adjustment');
my @reason = $input->multi_param('reason');
for( my $i=0; $i < scalar @adjustment; $i++ ){
if( $adjustment_id[$i] eq 'new' ){
next unless ( $adjustment[$i] || $reason[$i] );
- my $new_adj = Koha::InvoiceAdjustment->new({
+ my $new_adj = Koha::Acquisition::Invoice::Adjustment->new({
invoiceid => $invoiceid,
adjustment => $adjustment[$i],
reason => $reason[$i],
note => $note[$i],
budget_id => $budget_id[$i] || undef,
- encumber_open => $encumber_open[$i],
+ encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0,
});
$new_adj->store();
}
else {
- my $old_adj = Koha::InvoiceAdjustments->find( $adjustment_id[$i] );
+ my $old_adj = Koha::Acquisition::Invoice::Adjustments->find( $adjustment_id[$i] );
unless ( $old_adj->adjustment == $adjustment[$i] && $old_adj->reason eq $reason[$i] && $old_adj->budget_id == $budget_id[$i] && $old_adj->encumber_open == $e_open{$adjustment_id[$i]} && $old_adj->note eq $note[$i] ){
$old_adj->timestamp(undef);
$old_adj->adjustment( $adjustment[$i] );
my $orders = $details->{'orders'};
my @foot_loop;
my %foot;
+my $shipmentcost = $details->{shipmentcost} || 0;
my $total_quantity = 0;
my $total_tax_excluded = 0;
my $total_tax_included = 0;
foreach my $order (@$orders) {
my $line = get_infos( $order, $bookseller);
- $line->{total_tax_excluded} = $line->{unitprice_tax_excluded} * $line->{quantity};
- $line->{total_tax_included} = $line->{unitprice_tax_included} * $line->{quantity};
+ $line->{total_tax_excluded} = get_rounded_price($line->{unitprice_tax_excluded}) * $line->{quantity};
+ $line->{total_tax_included} = get_rounded_price($line->{unitprice_tax_included}) * $line->{quantity};
$line->{tax_value} = $line->{tax_value_on_receiving};
$line->{tax_rate} = $line->{tax_rate_on_receiving};
$foot{$$line{tax_rate}}{tax_rate} = $$line{tax_rate};
- $foot{$$line{tax_rate}}{tax_value} += $$line{tax_value};
+ $foot{$$line{tax_rate}}{tax_value} += get_rounded_price($$line{tax_value});
$total_tax_value += $$line{tax_value};
$foot{$$line{tax_rate}}{quantity} += $$line{quantity};
$total_quantity += $$line{quantity};
- $foot{$$line{tax_rate}}{total_tax_excluded} += $$line{total_tax_excluded};
- $total_tax_excluded += $$line{total_tax_excluded};
- $foot{$$line{tax_rate}}{total_tax_included} += $$line{total_tax_included};
- $total_tax_included += $$line{total_tax_included};
+ $foot{$$line{tax_rate}}{total_tax_excluded} += get_rounded_price($$line{total_tax_excluded});
+ $total_tax_excluded += get_rounded_price($$line{total_tax_excluded});
+ $foot{$$line{tax_rate}}{total_tax_included} += get_rounded_price($$line{total_tax_included});
+ $total_tax_included += get_rounded_price($$line{total_tax_included});
$line->{orderline} = $line->{parent_ordernumber};
push @orders_loop, $line;
push @foot_loop, map {$_} values %foot;
-my $budgets = GetBudgets();
-my @budgets_loop;
my $shipmentcost_budgetid = $details->{shipmentcost_budgetid};
-foreach my $budget (@$budgets) {
- next unless CanUserUseBudget( $loggedinuser, $budget, $flags );
- my %line = %{$budget};
- if ( $shipmentcost_budgetid
- and $budget->{budget_id} == $shipmentcost_budgetid )
- {
- $line{selected} = 1;
- }
- push @budgets_loop, \%line;
+
+# build budget list
+my $budget_loop = [];
+my $budgets = GetBudgetHierarchy();
+foreach my $r ( @{$budgets} ) {
+ next unless ( CanUserUseBudget( $loggedinuser, $r, $flags ) );
+
+ my $selected = $shipmentcost_budgetid ? $r->{budget_id} eq $shipmentcost_budgetid : 0;
+
+ push @{$budget_loop},
+ {
+ b_id => $r->{budget_id},
+ b_txt => $r->{budget_name},
+ b_active => $r->{budget_period_active},
+ selected => $selected,
+ };
}
-my $adjustments = Koha::InvoiceAdjustments->search({ invoiceid => $details->{'invoiceid'} });
+@{$budget_loop} =
+ sort { uc( $a->{b_txt} ) cmp uc( $b->{b_txt} ) } @{$budget_loop};
+
+my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({ invoiceid => $details->{'invoiceid'} });
if ( $adjustments ) { $template->param( adjustments => $adjustments ); }
$template->param(
- invoiceid => $details->{'invoiceid'},
- invoicenumber => $details->{'invoicenumber'},
- suppliername => $details->{'suppliername'},
- booksellerid => $details->{'booksellerid'},
- shipmentdate => $details->{'shipmentdate'},
- billingdate => $details->{'billingdate'},
- invoiceclosedate => $details->{'closedate'},
- shipmentcost => $details->{'shipmentcost'},
- orders_loop => \@orders_loop,
- foot_loop => \@foot_loop,
- total_quantity => $total_quantity,
- total_tax_excluded => $total_tax_excluded,
- total_tax_included => $total_tax_included,
- total_tax_value => $total_tax_value,
- total_tax_excluded_shipment => $total_tax_excluded + $details->{shipmentcost},
- total_tax_included_shipment => $total_tax_included + $details->{shipmentcost},
- invoiceincgst => $bookseller->invoiceincgst,
- currency => Koha::Acquisition::Currencies->get_active,
- budgets_loop => \@budgets_loop,
+ invoiceid => $details->{'invoiceid'},
+ invoicenumber => $details->{'invoicenumber'},
+ suppliername => $details->{'suppliername'},
+ booksellerid => $details->{'booksellerid'},
+ shipmentdate => $details->{'shipmentdate'},
+ billingdate => $details->{'billingdate'},
+ invoiceclosedate => $details->{'closedate'},
+ shipmentcost => $shipmentcost,
+ orders_loop => \@orders_loop,
+ foot_loop => \@foot_loop,
+ total_quantity => $total_quantity,
+ total_tax_excluded => $total_tax_excluded,
+ total_tax_included => $total_tax_included,
+ total_tax_value => $total_tax_value,
+ total_tax_excluded_shipment => $total_tax_excluded + $shipmentcost,
+ total_tax_included_shipment => $total_tax_included + $shipmentcost,
+ invoiceincgst => $bookseller->invoiceincgst,
+ currency => Koha::Acquisition::Currencies->get_active,
+ budgets => $budget_loop,
+ budget => GetBudget( $shipmentcost_budgetid ),
);
defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );
$line{order_received} = ( $qty == $order->{'quantityreceived'} );
$line{budget_name} = $budget->{budget_name};
- if ( $line{uncertainprice} ) {
- $line{rrp} .= ' (Uncertain)';
- }
if ( $line{'title'} ) {
my $volume = $order->{'volume'};
my $seriestitle = $order->{'seriestitle'};
projects / srvgit / blobdiff