Lines 38-46
use C4::Log qw(logaction);
Link Here
|
38 |
|
38 |
|
39 |
use Koha::Acquisition::Booksellers; |
39 |
use Koha::Acquisition::Booksellers; |
40 |
use Koha::Acquisition::Currencies qw( get_active ); |
40 |
use Koha::Acquisition::Currencies qw( get_active ); |
|
|
41 |
use Koha::AdditionalFields; |
41 |
use Koha::DateUtils qw( output_pref ); |
42 |
use Koha::DateUtils qw( output_pref ); |
42 |
use Koha::Misc::Files; |
43 |
use Koha::Misc::Files; |
43 |
use Koha::Acquisition::Invoice::Adjustments; |
44 |
use Koha::Acquisition::Invoice::Adjustments; |
|
|
45 |
use Koha::Acquisition::Invoices; |
44 |
|
46 |
|
45 |
my $input = CGI->new; |
47 |
my $input = CGI->new; |
46 |
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( |
48 |
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( |
Lines 125-130
elsif ( $op && $op eq 'mod' ) {
Link Here
|
125 |
MergeInvoices($invoiceid, \@sources); |
127 |
MergeInvoices($invoiceid, \@sources); |
126 |
defined($invoice_files) && $invoice_files->MergeFileRecIds(@sources); |
128 |
defined($invoice_files) && $invoice_files->MergeFileRecIds(@sources); |
127 |
} |
129 |
} |
|
|
130 |
|
131 |
my @additional_fields; |
132 |
my $invoice_fields = Koha::AdditionalFields->search({ tablename => 'aqinvoices' }); |
133 |
while ( my $field = $invoice_fields->next ) { |
134 |
my $value = $input->param('additional_field_' . $field->id); |
135 |
push @additional_fields, { |
136 |
id => $field->id, |
137 |
value => $value, |
138 |
}; |
139 |
} |
140 |
Koha::Acquisition::Invoices->find($invoiceid)->set_additional_fields(\@additional_fields); |
141 |
|
128 |
$template->param( modified => 1 ); |
142 |
$template->param( modified => 1 ); |
129 |
} |
143 |
} |
130 |
elsif ( $op && $op eq 'delete' ) { |
144 |
elsif ( $op && $op eq 'delete' ) { |
Lines 298-303
foreach my $r ( @{$budgets} ) {
Link Here
|
298 |
my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({ invoiceid => $details->{'invoiceid'} }); |
312 |
my $adjustments = Koha::Acquisition::Invoice::Adjustments->search({ invoiceid => $details->{'invoiceid'} }); |
299 |
if ( $adjustments ) { $template->param( adjustments => $adjustments ); } |
313 |
if ( $adjustments ) { $template->param( adjustments => $adjustments ); } |
300 |
|
314 |
|
|
|
315 |
my $invoice = Koha::Acquisition::Invoices->find($invoiceid); |
316 |
$template->param( |
317 |
available_additional_fields => Koha::AdditionalFields->search( { tablename => 'aqinvoices' } ), |
318 |
additional_field_values => { map { |
319 |
$_->field->id => $_->value |
320 |
} $invoice->additional_field_values->as_list }, |
321 |
); |
322 |
|
301 |
$template->param( |
323 |
$template->param( |
302 |
invoiceid => $details->{'invoiceid'}, |
324 |
invoiceid => $details->{'invoiceid'}, |
303 |
invoicenumber => $details->{'invoicenumber'}, |
325 |
invoicenumber => $details->{'invoicenumber'}, |