Lines 197-202
my @gst_values = map {
Link Here
|
197 |
option => $_ + 0.0 |
197 |
option => $_ + 0.0 |
198 |
}, split( '\|', C4::Context->preference("gist") ); |
198 |
}, split( '\|', C4::Context->preference("gist") ); |
199 |
|
199 |
|
|
|
200 |
my $order_internalnote = $order->{order_internalnote}; |
201 |
my $order_vendornote = $order->{order_vendornote}; |
200 |
if ( $order->{subscriptionid} ) { |
202 |
if ( $order->{subscriptionid} ) { |
201 |
# Order from a subscription, we will display an history of what has been received |
203 |
# Order from a subscription, we will display an history of what has been received |
202 |
my $orders = Koha::Acquisition::Orders->search( |
204 |
my $orders = Koha::Acquisition::Orders->search( |
Lines 206-212
if ( $order->{subscriptionid} ) {
Link Here
|
206 |
ordernumber => { '!=' => $order->{ordernumber} } |
208 |
ordernumber => { '!=' => $order->{ordernumber} } |
207 |
} |
209 |
} |
208 |
); |
210 |
); |
209 |
$template->param( orders => $orders ); |
211 |
if ( $order->{parent_ordernumber} != $order->{ordernumber} ) { |
|
|
212 |
my $parent_order = Koha::Acquisition::Orders->find($order->{parent_ordernumber}); |
213 |
$order_internalnote = $parent_order->{order_internalnote}; |
214 |
$order_vendornote = $parent_order->{order_vendornote}; |
215 |
} |
216 |
$template->param( |
217 |
orders => $orders, |
218 |
); |
210 |
} |
219 |
} |
211 |
|
220 |
|
212 |
$template->param( |
221 |
$template->param( |
Lines 240-247
$template->param(
Link Here
|
240 |
invoiceid => $invoice->{invoiceid}, |
249 |
invoiceid => $invoice->{invoiceid}, |
241 |
invoice => $invoice->{invoicenumber}, |
250 |
invoice => $invoice->{invoicenumber}, |
242 |
datereceived => $datereceived, |
251 |
datereceived => $datereceived, |
243 |
order_internalnote => $order->{order_internalnote}, |
252 |
order_internalnote => $order_internalnote, |
244 |
order_vendornote => $order->{order_vendornote}, |
253 |
order_vendornote => $order_vendornote, |
245 |
suggestionid => $suggestion->{suggestionid}, |
254 |
suggestionid => $suggestion->{suggestionid}, |
246 |
surnamesuggestedby => $suggestion->{surnamesuggestedby}, |
255 |
surnamesuggestedby => $suggestion->{surnamesuggestedby}, |
247 |
firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, |
256 |
firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, |