gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 3050 - Add an option to upload scanned invoices #2/3 

(part #2: changes to existing acqui scripts & templates)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jacek Ablewicz 2014-05-09 11:45:29 +02:00 committed by Galen Charlton
parent 480847e81c
commit 35d323ae72
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
acqui/invoice.pl
View File

@ -35,6 +35,7 @@ use C4::Output;
use C4::Acquisition;
use C4::Bookseller qw/GetBookSellerFromId/;
use C4::Budgets;
use Koha::Misc::Files;
my $input = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
@ -51,6 +52,12 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
my $invoiceid = $input->param('invoiceid');
my $op = $input->param('op');
my $invoice_files;
if ( C4::Context->preference('AcqEnableFiles') ) {
$invoice_files = Koha::Misc::Files->new(
tabletag => 'aqinvoices', recordid => $invoiceid );
}
if ( $op && $op eq 'close' ) {
CloseInvoice($invoiceid);
my $referer = $input->param('referer');
@ -86,11 +93,13 @@ elsif ( $op && $op eq 'mod' ) {
} elsif ($input->param('merge')) {
my @sources = $input->param('merge');
MergeInvoices($invoiceid, \@sources);
defined($invoice_files) && $invoice_files->MergeFileRecIds(@sources);
}
$template->param( modified => 1 );
}
elsif ( $op && $op eq 'delete' ) {
DelInvoice($invoiceid);
defined($invoice_files) && $invoice_files->DelAllFiles();
my $referer = $input->param('referer') || 'invoices.pl';
if ($referer) {
print $input->redirect($referer);
@ -166,6 +175,8 @@ $template->param(
budgets_loop => \@budgets_loop,
);
defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );
# FIXME
# Fonction dupplicated from basket.pl
# Code must to be exported. Where ??

38
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
View File

@ -1,3 +1,4 @@
[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
@ -27,7 +28,17 @@
bFilter: false,
sDom: "t"
}));
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
$("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, {
"aoColumnDefs": [
{ "aTargets": [ 3 ], "sType": "natural" }
],
bInfo: false,
bPaginate: false,
bFilter: false,
sDom: "t"
}));
[% END %]
$("#show_all_details").click(function(){
updateColumnsVisibility($(this+":checked").val());
});
@ -108,6 +119,7 @@
</form>
<p>
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
[% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]">Manage invoice files</a>[% END %]
</p>
<h2>Invoice details</h2>
[% IF orders_loop.size %]
@ -199,6 +211,30 @@
[% ELSE %]
<div class="dialog message"><p>No orders yet</p></div>
[% END %]
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
<br />
<h2>Files attached to invoice</h2>
<table id="invoice_files_table">
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Description</th>
<th>Uploaded</th>
</tr>
</thead>
<tbody>
[% FOREACH f IN files %]
<tr>
<td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&amp;op=download&amp;view=1&amp;file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
<td>[% f.file_type | html %]</td>
<td>[% f.file_description | html %]</td>
<td><!-- [% f.date_uploaded %] -->[% f.date_uploaded | $KohaDates %]</td>
</tr>
[% END %]
</tbody>
</table>
[% END %]
</div>
</div>
<div class="yui-b">