|
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 128-161
if (! $subs->{periodicity}) {
Link Here
|
| 128 |
my $default_bib_view = get_default_view(); |
130 |
my $default_bib_view = get_default_view(); |
| 129 |
|
131 |
|
| 130 |
my ( $order, $bookseller, $tmpl_infos ); |
132 |
my ( $order, $bookseller, $tmpl_infos ); |
| 131 |
# FIXME = see http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5335#c52 |
133 |
if ( defined $subscriptionid ) { |
| 132 |
#if ( defined $subscriptionid ) { |
134 |
my $lastOrderNotReceived = GetLastOrderNotReceivedFromSubscriptionid $subscriptionid; |
| 133 |
# my $lastOrderNotReceived = GetLastOrderNotReceivedFromSubscriptionid $subscriptionid; |
135 |
my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid; |
| 134 |
# my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid; |
136 |
if ( defined $lastOrderNotReceived ) { |
| 135 |
# if ( defined $lastOrderNotReceived ) { |
137 |
my $basket = GetBasket $lastOrderNotReceived->{basketno}; |
| 136 |
# my $basket = GetBasket $lastOrderNotReceived->{basketno}; |
138 |
my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
| 137 |
# my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
139 |
( $tmpl_infos->{valuegsti_ordered}, $tmpl_infos->{valuegste_ordered} ) = get_value_with_gst_params ( $lastOrderNotReceived->{ecost}, $lastOrderNotReceived->{gstrate}, $bookseller ); |
| 138 |
# ( $tmpl_infos->{valuegsti_ordered}, $tmpl_infos->{valuegste_ordered} ) = get_value_with_gst_params ( $lastOrderNotReceived->{ecost}, $lastOrderNotReceived->{gstrate}, $bookseller ); |
140 |
$tmpl_infos->{valuegsti_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegsti_ordered} ); |
| 139 |
# $tmpl_infos->{valuegsti_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegsti_ordered} ); |
141 |
$tmpl_infos->{valuegste_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegste_ordered} ); |
| 140 |
# $tmpl_infos->{valuegste_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegste_ordered} ); |
142 |
$tmpl_infos->{budget_name_ordered} = GetBudgetName $lastOrderNotReceived->{budget_id}; |
| 141 |
# $tmpl_infos->{budget_name_ordered} = GetBudgetName $lastOrderNotReceived->{budget_id}; |
143 |
$tmpl_infos->{basketno} = $lastOrderNotReceived->{basketno}; |
| 142 |
# $tmpl_infos->{basketno} = $lastOrderNotReceived->{basketno}; |
144 |
$tmpl_infos->{ordered_exists} = 1; |
| 143 |
# $tmpl_infos->{ordered_exists} = 1; |
145 |
} |
| 144 |
# } |
146 |
if ( defined $lastOrderReceived ) { |
| 145 |
# if ( defined $lastOrderReceived ) { |
147 |
my $basket = GetBasket $lastOrderReceived->{basketno}; |
| 146 |
# my $basket = GetBasket $lastOrderReceived->{basketno}; |
148 |
my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
| 147 |
# my $bookseller = GetBookSellerFromId $basket->{booksellerid}; |
149 |
( $tmpl_infos->{valuegsti_spent}, $tmpl_infos->{valuegste_spent} ) = get_value_with_gst_params ( $lastOrderReceived->{unitprice}, $lastOrderReceived->{gstrate}, $bookseller ); |
| 148 |
# ( $tmpl_infos->{valuegsti_spent}, $tmpl_infos->{valuegste_spent} ) = get_value_with_gst_params ( $lastOrderReceived->{unitprice}, $lastOrderReceived->{gstrate}, $bookseller ); |
150 |
$tmpl_infos->{valuegsti_spent} = sprintf( "%.2f", $tmpl_infos->{valuegsti_spent} ); |
| 149 |
# $tmpl_infos->{valuegsti_spent} = sprintf( "%.2f", $tmpl_infos->{valuegsti_spent} ); |
151 |
$tmpl_infos->{valuegste_spent} = sprintf( "%.2f", $tmpl_infos->{valuegste_spent} ); |
| 150 |
# $tmpl_infos->{valuegste_spent} = sprintf( "%.2f", $tmpl_infos->{valuegste_spent} ); |
152 |
$tmpl_infos->{budget_name_spent} = GetBudgetName $lastOrderReceived->{budget_id}; |
| 151 |
# $tmpl_infos->{budget_name_spent} = GetBudgetName $lastOrderReceived->{budget_id}; |
153 |
$tmpl_infos->{invoicenumber} = $lastOrderReceived->{booksellerinvoicenumber}; |
| 152 |
# $tmpl_infos->{invoicenumber} = $lastOrderReceived->{booksellerinvoicenumber}; |
154 |
$tmpl_infos->{spent_exists} = 1; |
| 153 |
# $tmpl_infos->{spent_exists} = 1; |
155 |
} |
| 154 |
# } |
156 |
} |
| 155 |
#} |
|
|
| 156 |
|
157 |
|
| 157 |
$template->param( |
158 |
$template->param( |
| 158 |
subscriptionid => $subscriptionid, |
159 |
subscriptionid => $subscriptionid, |
| 159 |
serialslist => \@serialslist, |
160 |
serialslist => \@serialslist, |
| 160 |
hasRouting => $hasRouting, |
161 |
hasRouting => $hasRouting, |
| 161 |
routing => C4::Context->preference("RoutingSerials"), |
162 |
routing => C4::Context->preference("RoutingSerials"), |
|
Lines 175-181
$template->param(
Link Here
|
| 175 |
default_bib_view => $default_bib_view, |
176 |
default_bib_view => $default_bib_view, |
| 176 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
177 |
(uc(C4::Context->preference("marcflavour"))) => 1, |
| 177 |
show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, |
178 |
show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, |
| 178 |
); |
179 |
basketno => $order->{basketno}, |
|
|
180 |
%$tmpl_infos, |
| 181 |
); |
| 179 |
|
182 |
|
| 180 |
output_html_with_http_headers $query, $cookie, $template->output; |
183 |
output_html_with_http_headers $query, $cookie, $template->output; |
| 181 |
|
184 |
|
|
Lines 193-195
sub get_default_view {
Link Here
|
| 193 |
} |
196 |
} |
| 194 |
return 'detail'; |
197 |
return 'detail'; |
| 195 |
} |
198 |
} |
| 196 |
- |
199 |
|
|
|
200 |
sub get_value_with_gst_params { |
| 201 |
my $value = shift; |
| 202 |
my $gstrate = shift; |
| 203 |
my $bookseller = shift; |
| 204 |
if ( $bookseller->{listincgst} ) { |
| 205 |
return ( $value, $value / ( 1 + $gstrate ) ); |
| 206 |
} else { |
| 207 |
return ( $value * ( 1 + $gstrate ), $value ); |
| 208 |
} |
| 209 |
} |
| 210 |
|
| 211 |
sub get_gste { |
| 212 |
my $value = shift; |
| 213 |
my $gstrate = shift; |
| 214 |
my $bookseller = shift; |
| 215 |
if ( $bookseller->{invoiceincgst} ) { |
| 216 |
return $value / ( 1 + $gstrate ); |
| 217 |
} else { |
| 218 |
return $value; |
| 219 |
} |
| 220 |
} |
| 221 |
|
| 222 |
sub get_gst { |
| 223 |
my $value = shift; |
| 224 |
my $gstrate = shift; |
| 225 |
my $bookseller = shift; |
| 226 |
if ( $bookseller->{invoiceincgst} ) { |
| 227 |
return $value / ( 1 + $gstrate ) * $gstrate; |
| 228 |
} else { |
| 229 |
return $value * ( 1 + $gstrate ) - $value; |
| 230 |
} |
| 231 |
} |
| 232 |
|