Lines 15-24
Link Here
|
15 |
# with Koha; if not, write to the Free Software Foundation, Inc., |
15 |
# with Koha; if not, write to the Free Software Foundation, Inc., |
16 |
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
16 |
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
17 |
|
17 |
|
18 |
use strict; |
18 |
use Modern::Perl; |
19 |
use warnings; |
|
|
20 |
use CGI; |
19 |
use CGI; |
|
|
20 |
use C4::Acquisition; |
21 |
use C4::Auth; |
21 |
use C4::Auth; |
|
|
22 |
use C4::Bookseller qw/GetBookSellerFromId/; |
23 |
use C4::Budgets; |
22 |
use C4::Koha; |
24 |
use C4::Koha; |
23 |
use C4::Dates qw/format_date/; |
25 |
use C4::Dates qw/format_date/; |
24 |
use C4::Serials; |
26 |
use C4::Serials; |
Lines 121-154
if (! $subs->{periodicity}) {
Link Here
|
121 |
my $default_bib_view = get_default_view(); |
123 |
my $default_bib_view = get_default_view(); |
122 |
|
124 |
|
123 |
my ( $order, $bookseller, $tmpl_infos ); |
125 |
my ( $order, $bookseller, $tmpl_infos ); |
124 |
# FIXME = see http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5335#c52 |
126 |
if ( defined $subscriptionid ) { |
125 |
#if ( defined $subscriptionid ) { |
127 |
my $lastOrderNotReceived = GetLastOrderNotReceivedFromSubscriptionid $subscriptionid; |
126 |
# my $lastOrderNotReceived = GetLastOrderNotReceivedFromSubscriptionid $subscriptionid; |
128 |
my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid; |
127 |
# my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid; |
129 |
if ( defined $lastOrderNotReceived ) { |
128 |
# if ( defined $lastOrderNotReceived ) { |
130 |
my $basket = GetBasket $lastOrderNotReceived->{basketno}; |
129 |
# my $basket = GetBasket $lastOrderNotReceived->{basketno}; |
131 |
my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
130 |
# my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
132 |
( $tmpl_infos->{valuegsti_ordered}, $tmpl_infos->{valuegste_ordered} ) = get_value_with_gst_params ( $lastOrderNotReceived->{ecost}, $lastOrderNotReceived->{gstrate}, $bookseller ); |
131 |
# ( $tmpl_infos->{valuegsti_ordered}, $tmpl_infos->{valuegste_ordered} ) = get_value_with_gst_params ( $lastOrderNotReceived->{ecost}, $lastOrderNotReceived->{gstrate}, $bookseller ); |
133 |
$tmpl_infos->{valuegsti_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegsti_ordered} ); |
132 |
# $tmpl_infos->{valuegsti_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegsti_ordered} ); |
134 |
$tmpl_infos->{valuegste_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegste_ordered} ); |
133 |
# $tmpl_infos->{valuegste_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegste_ordered} ); |
135 |
$tmpl_infos->{budget_name_ordered} = GetBudgetName $lastOrderNotReceived->{budget_id}; |
134 |
# $tmpl_infos->{budget_name_ordered} = GetBudgetName $lastOrderNotReceived->{budget_id}; |
136 |
$tmpl_infos->{basketno} = $lastOrderNotReceived->{basketno}; |
135 |
# $tmpl_infos->{basketno} = $lastOrderNotReceived->{basketno}; |
137 |
$tmpl_infos->{ordered_exists} = 1; |
136 |
# $tmpl_infos->{ordered_exists} = 1; |
138 |
} |
137 |
# } |
139 |
if ( defined $lastOrderReceived ) { |
138 |
# if ( defined $lastOrderReceived ) { |
140 |
my $basket = GetBasket $lastOrderReceived->{basketno}; |
139 |
# my $basket = GetBasket $lastOrderReceived->{basketno}; |
141 |
my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
140 |
# my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
142 |
( $tmpl_infos->{valuegsti_spent}, $tmpl_infos->{valuegste_spent} ) = get_value_with_gst_params ( $lastOrderReceived->{unitprice}, $lastOrderReceived->{gstrate}, $bookseller ); |
141 |
# ( $tmpl_infos->{valuegsti_spent}, $tmpl_infos->{valuegste_spent} ) = get_value_with_gst_params ( $lastOrderReceived->{unitprice}, $lastOrderReceived->{gstrate}, $bookseller ); |
143 |
$tmpl_infos->{valuegsti_spent} = sprintf( "%.2f", $tmpl_infos->{valuegsti_spent} ); |
142 |
# $tmpl_infos->{valuegsti_spent} = sprintf( "%.2f", $tmpl_infos->{valuegsti_spent} ); |
144 |
$tmpl_infos->{valuegste_spent} = sprintf( "%.2f", $tmpl_infos->{valuegste_spent} ); |
143 |
# $tmpl_infos->{valuegste_spent} = sprintf( "%.2f", $tmpl_infos->{valuegste_spent} ); |
145 |
$tmpl_infos->{budget_name_spent} = GetBudgetName $lastOrderReceived->{budget_id}; |
144 |
# $tmpl_infos->{budget_name_spent} = GetBudgetName $lastOrderReceived->{budget_id}; |
146 |
$tmpl_infos->{invoicenumber} = $lastOrderReceived->{booksellerinvoicenumber}; |
145 |
# $tmpl_infos->{invoicenumber} = $lastOrderReceived->{booksellerinvoicenumber}; |
147 |
$tmpl_infos->{spent_exists} = 1; |
146 |
# $tmpl_infos->{spent_exists} = 1; |
148 |
} |
147 |
# } |
149 |
} |
148 |
#} |
|
|
149 |
|
150 |
|
150 |
$template->param( |
151 |
$template->param( |
151 |
subscriptionid => $subscriptionid, |
152 |
subscriptionid => $subscriptionid, |
152 |
serialslist => \@serialslist, |
153 |
serialslist => \@serialslist, |
153 |
hasRouting => $hasRouting, |
154 |
hasRouting => $hasRouting, |
154 |
routing => C4::Context->preference("RoutingSerials"), |
155 |
routing => C4::Context->preference("RoutingSerials"), |
Lines 168-174
$template->param(
Link Here
|
168 |
default_bib_view => $default_bib_view, |
169 |
default_bib_view => $default_bib_view, |
169 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
170 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
170 |
show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, |
171 |
show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, |
171 |
); |
172 |
basketno => $order->{basketno}, |
|
|
173 |
%$tmpl_infos, |
174 |
); |
172 |
|
175 |
|
173 |
output_html_with_http_headers $query, $cookie, $template->output; |
176 |
output_html_with_http_headers $query, $cookie, $template->output; |
174 |
|
177 |
|
Lines 186-188
sub get_default_view {
Link Here
|
186 |
} |
189 |
} |
187 |
return 'detail'; |
190 |
return 'detail'; |
188 |
} |
191 |
} |
189 |
- |
192 |
|
|
|
193 |
sub get_value_with_gst_params { |
194 |
my $value = shift; |
195 |
my $gstrate = shift; |
196 |
my $bookseller = shift; |
197 |
if ( $bookseller->{listincgst} ) { |
198 |
return ( $value, $value / ( 1 + $gstrate ) ); |
199 |
} else { |
200 |
return ( $value * ( 1 + $gstrate ), $value ); |
201 |
} |
202 |
} |
203 |
|
204 |
sub get_gste { |
205 |
my $value = shift; |
206 |
my $gstrate = shift; |
207 |
my $bookseller = shift; |
208 |
if ( $bookseller->{invoiceincgst} ) { |
209 |
return $value / ( 1 + $gstrate ); |
210 |
} else { |
211 |
return $value; |
212 |
} |
213 |
} |
214 |
|
215 |
sub get_gst { |
216 |
my $value = shift; |
217 |
my $gstrate = shift; |
218 |
my $bookseller = shift; |
219 |
if ( $bookseller->{invoiceincgst} ) { |
220 |
return $value / ( 1 + $gstrate ) * $gstrate; |
221 |
} else { |
222 |
return $value * ( 1 + $gstrate ) - $value; |
223 |
} |
224 |
} |
225 |
|