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

Bug 12970: Cancelled orders 

Previous patch does modify the code for cancelled orders.

Test plan:
Cancel 1+ orders and verify the prices are correct (i.e. the same as
the non-cancelled orders) and that the prices are formated.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2014-09-25 16:39:11 +02:00 committed by Tomas Cohen Arazi
parent 7e94b04eab
commit 82a100abb5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acqui/basket.pl
View File

@ -369,6 +369,7 @@ if ( $op eq 'delete_confirm' ) {
my @cancelledorders = GetCancelledOrders($basketno);
my @cancelledorders_loop;
for my $order (@cancelledorders) {
$order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $booksellerid, ordering => 1 });
my $line = get_order_infos( $order, $bookseller);
push @cancelledorders_loop, $line;
}

16
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -614,15 +614,15 @@
</p>
[% END %]
</td>
<td class="number gste">[% order.rrpgste %]</td>
<td class="number gste">[% order.ecostgste %]</td>
<td class="number gsti">[% order.rrpgsti %]</td>
<td class="number gsti">[% order.ecostgsti %]</td>
<td class="number gste">[% order.rrpgste | $Price %]</td>
<td class="number gste">[% order.ecostgste | $Price %]</td>
<td class="number gsti">[% order.rrpgsti | $Price %]</td>
<td class="number gsti">[% order.ecostgsti | $Price %]</td>
<td class="number">[% order.quantity %]</td>
<td class="number gste">[% order.totalgste %]</td>
<td class="number gsti">[% order.totalgsti %]</td>
<td class="number">[% order.gstrate * 100 %]</td>
<td class="number">[% order.gstvalue %]</td>
<td class="number gste">[% order.totalgste | $Price %]</td>
<td class="number gsti">[% order.totalgsti | $Price %]</td>
<td class="number">[% order.gstrate * 100 | $Price %]</td>
<td class="number">[% order.gstvalue | $Price %]</td>
<td>[% order.budget_name %]
</tr>
[% END %]