projects
/
koha-ffzg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11349: Change .tmpl -> .tt in scripts using templates
[koha-ffzg.git]
/
acqui
/
supplier.pl
diff --git
a/acqui/supplier.pl
b/acqui/supplier.pl
index
fdeef06
..
1e6954a
100755
(executable)
--- a/
acqui/supplier.pl
+++ b/
acqui/supplier.pl
@@
-46,7
+46,6
@@
use C4::Auth;
use C4::Contract qw/GetContract/;
use C4::Biblio;
use C4::Output;
use C4::Contract qw/GetContract/;
use C4::Biblio;
use C4::Output;
-use C4::Dates qw/format_date /;
use CGI;
use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
use CGI;
use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
@@
-60,7
+59,7
@@
if ($booksellerid) {
}
my $op = $query->param('op') || 'display';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
my $op = $query->param('op') || 'display';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- { template_name => 'acqui/supplier.t
mpl
',
+ { template_name => 'acqui/supplier.t
t
',
query => $query,
type => 'intranet',
authnotrequired => 0,
query => $query,
type => 'intranet',
authnotrequired => 0,
@@
-68,22
+67,12
@@
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
debug => 1,
}
);
debug => 1,
}
);
-my $seller_gstrate = $supplier->{'gstrate'};
-# ensure the scalar isn't flagged as a string
-$seller_gstrate = ( defined $seller_gstrate ) ? $seller_gstrate + 0 : undef;
-my $tax_rate = $seller_gstrate // C4::Context->preference('gist') // 0;
-$tax_rate *= 100;
#build array for currencies
if ( $op eq 'display' ) {
my $contracts = GetContract( { booksellerid => $booksellerid } );
#build array for currencies
if ( $op eq 'display' ) {
my $contracts = GetContract( { booksellerid => $booksellerid } );
- for ( @{$contracts} ) {
- $_->{contractstartdate} = format_date( $_->{contractstartdate} );
- $_->{contractenddate} = format_date( $_->{contractenddate} );
- }
-
$template->param(
booksellerid => $booksellerid,
name => $supplier->{'name'},
$template->param(
booksellerid => $booksellerid,
name => $supplier->{'name'},
@@
-108,11
+97,11
@@
if ( $op eq 'display' ) {
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
+ gstrate => $supplier->{'gstrate'} + 0.0,
discount => $supplier->{'discount'},
discount => $supplier->{'discount'},
+ deliverytime => $supplier->{deliverytime},
invoiceprice => $supplier->{'invoiceprice'},
listprice => $supplier->{'listprice'},
invoiceprice => $supplier->{'invoiceprice'},
listprice => $supplier->{'listprice'},
- GST => $tax_rate,
- default_tax => defined($seller_gstrate),
basketcount => $supplier->{'basketcount'},
subscriptioncount => $supplier->{'subscriptioncount'},
contracts => $contracts,
basketcount => $supplier->{'basketcount'},
subscriptioncount => $supplier->{'subscriptioncount'},
contracts => $contracts,
@@
-146,9
+135,11
@@
if ( $op eq 'display' ) {
};
}
};
}
- my $default_gst_rate = (C4::Context->preference('gist') * 100) || '0.0';
+ # get option values from gist syspref
+ my @gst_values = map {
+ option => $_ + 0.0
+ }, split( '\|', C4::Context->preference("gist") );
- my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
$template->param(
booksellerid => $booksellerid,
name => $supplier->{'name'},
$template->param(
booksellerid => $booksellerid,
name => $supplier->{'name'},
@@
-174,12
+165,12
@@
if ( $op eq 'display' ) {
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
gstreg => $supplier->{'gstreg'},
listincgst => $supplier->{'listincgst'},
invoiceincgst => $supplier->{'invoiceincgst'},
- gstrate => $gstrate,
+ gstrate => $supplier->{gstrate} ? $supplier->{'gstrate'}+0.0 : 0,
+ gst_values => \@gst_values,
discount => $supplier->{'discount'},
discount => $supplier->{'discount'},
+ deliverytime => $supplier->{deliverytime},
loop_currency => $loop_currency,
loop_currency => $loop_currency,
- GST => $tax_rate,
enter => 1,
enter => 1,
- default_gst_rate => $default_gst_rate,
);
}
);
}