X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Finvoice.pl;h=b9d1bf5d0b9ae90a474faa357ae68fec25cc8742;hb=df6432fcc833f00bb6e45894004a0ad26d5ced28;hp=dd1360fd6906ef7eacd1c62919ee182f224af1b9;hpb=3d720e9ede3da4cb612d1517c776d5636e12452e;p=koha-ffzg.git diff --git a/acqui/invoice.pl b/acqui/invoice.pl index dd1360fd69..b9d1bf5d0b 100755 --- a/acqui/invoice.pl +++ b/acqui/invoice.pl @@ -26,35 +26,45 @@ Invoice details =cut -use strict; -use warnings; +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 JSON qw( encode_json ); +use C4::Log qw(logaction); use Koha::Acquisition::Booksellers; -use Koha::Acquisition::Currencies; -use Koha::DateUtils; +use Koha::Acquisition::Currencies qw( get_active ); +use Koha::AdditionalFields; +use Koha::DateUtils qw( output_pref ); use Koha::Misc::Files; +use Koha::Acquisition::Invoice::Adjustments; +use Koha::Acquisition::Invoices; -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( @@ -62,7 +72,12 @@ if ( C4::Context->preference('AcqEnableFiles') ) { } 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); @@ -70,7 +85,12 @@ if ( $op && $op eq 'close' ) { } } 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); @@ -84,23 +104,48 @@ elsif ( $op && $op eq 'mod' ) { ModInvoice( invoiceid => $invoiceid, invoicenumber => $invoicenumber, - shipmentdate => scalar output_pref( { str => scalar $input->param('shipmentdate'), dateformat => 'iso', dateonly => 1 } ), - billingdate => scalar output_pref( { str => scalar $input->param('billingdate'), dateformat => 'iso', dateonly => 1 } ), + shipmentdate => scalar $input->param('shipmentdate'), + billingdate => scalar $input->param('billingdate'), shipmentcost => $shipmentcost, 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); } + + my @additional_fields; + my $invoice_fields = Koha::AdditionalFields->search({ tablename => 'aqinvoices' }); + while ( my $field = $invoice_fields->next ) { + my $value = $input->param('additional_field_' . $field->id); + push @additional_fields, { + id => $field->id, + value => $value, + }; + } + Koha::Acquisition::Invoices->find($invoiceid)->set_additional_fields(\@additional_fields); + $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'; @@ -109,77 +154,200 @@ elsif ( $op && $op eq 'delete' ) { exit 0; } } +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::Acquisition::Invoice::Adjustments->find( $adjustment_id ); + if ($del_adj) { + if (C4::Context->preference("AcquisitionLog")) { + my $infos = { + invoiceid => $del_adj->invoiceid, + budget_id => $del_adj->budget_id, + encumber_open => $del_adj->encumber_open, + adjustment => $del_adj->adjustment, + reason => $del_adj->reason + }; + logaction( + 'ACQUISITIONS', + 'DELETE_INVOICE_ADJUSTMENT', + $adjustment_id, + encode_json($infos) + ); + } + $del_adj->delete(); + } +} +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'); + my @note = $input->multi_param('note'); + my @budget_id = $input->multi_param('budget_id'); + my @encumber_open = $input->multi_param('encumber_open'); + my %e_open = map { $_ => 1 } @encumber_open; + my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open'); + for( my $i=0; $i < scalar @adjustment; $i++ ){ + if( $adjustment_id[$i] eq 'new' ){ + next unless ( $adjustment[$i] || $reason[$i] ); + my $adj = { + invoiceid => $invoiceid, + adjustment => $adjustment[$i], + reason => $reason[$i], + note => $note[$i], + budget_id => $budget_id[$i] || undef, + encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0, + }; + my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj); + $new_adj->store(); + # Log this addition + if (C4::Context->preference("AcquisitionLog")) { + logaction( + 'ACQUISITIONS', + 'CREATE_INVOICE_ADJUSTMENT', + $new_adj->adjustment_id, + encode_json($adj) + ); + } + } + else { + 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] ){ + # Log this modification + if (C4::Context->preference("AcquisitionLog")) { + my $infos = { + adjustment => $adjustment[$i], + reason => $reason[$i], + budget_id => $budget_id[$i], + encumber_open => $e_open{$adjustment_id[$i]}, + adjustment_old => $old_adj->adjustment, + reason_old => $old_adj->reason, + budget_id_old => $old_adj->budget_id, + encumber_open_old => $old_adj->encumber_open + }; + logaction( + 'ACQUISITIONS', + 'UPDATE_INVOICE_ADJUSTMENT', + $adjustment_id[$i], + encode_json($infos) + ); + } + $old_adj->timestamp(undef); + $old_adj->adjustment( $adjustment[$i] ); + $old_adj->reason( $reason[$i] ); + $old_adj->note( $note[$i] ); + $old_adj->budget_id( $budget_id[$i] || undef ); + $old_adj->encumber_open( $e_open{$adjustment_id[$i]} ? 1 : 0 ); + $old_adj->update(); + } + } + } +} + +my $active_currency = Koha::Acquisition::Currencies->get_active, my $details = GetInvoiceDetails($invoiceid); my $bookseller = Koha::Acquisition::Booksellers->find( $details->{booksellerid} ); my @orders_loop = (); 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; my $total_tax_value = 0; +my $has_invoice_unitprice; 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}; + $has_invoice_unitprice = 1 if $line->{invoice_currency} ne $active_currency->currency; 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, + b_sort1_authcat => $r->{'sort1_authcat'}, + b_sort2_authcat => $r->{'sort2_authcat'}, + }; } +@{$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 ); } + +my $invoice = Koha::Acquisition::Invoices->find($invoiceid); $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, + available_additional_fields => Koha::AdditionalFields->search( { tablename => 'aqinvoices' } ), + additional_field_values => { map { + $_->field->id => $_->value + } $invoice->additional_field_values->as_list }, +); + +$template->param( + invoiceid => $details->{'invoiceid'}, + invoicenumber => $details->{'invoicenumber'}, + suppliername => $details->{'suppliername'}, + booksellerid => $details->{'booksellerid'}, + shipmentdate => $details->{'shipmentdate'}, + shipment_budget_id => $shipmentcost_budgetid, + 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 => $active_currency, + budgets => $budget_loop, + budget => GetBudget( $shipmentcost_budgetid ), + has_invoice_unitprice => $has_invoice_unitprice, ); defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() ); @@ -200,10 +368,6 @@ sub get_infos { $line{order_received} = ( $qty == $order->{'quantityreceived'} ); $line{budget_name} = $budget->{budget_name}; - if ( $line{uncertainprice} ) { - $template->param( uncertainprices => 1 ); - $line{rrp} .= ' (Uncertain)'; - } if ( $line{'title'} ) { my $volume = $order->{'volume'}; my $seriestitle = $order->{'seriestitle'};