View | Details | Raw Unified | Return to bug 7583
Collapse All | Expand All

(-)a/acqui/parcel.pl (-1 / +9 lines)
Lines 186-192 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
186
    $line{gst}     = $gst;
186
    $line{gst}     = $gst;
187
    $line{total} = sprintf($cfstr, $total);
187
    $line{total} = sprintf($cfstr, $total);
188
    $line{booksellerid} = $booksellerid;
188
    $line{booksellerid} = $booksellerid;
189
    push @loop_received, \%line;
190
    $totalprice += $parcelitems[$i]->{'unitprice'};
189
    $totalprice += $parcelitems[$i]->{'unitprice'};
191
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
190
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
192
191
Lines 195-200 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
195
    $line{surnamesuggestedby}   = $suggestion->{surnamesuggestedby};
194
    $line{surnamesuggestedby}   = $suggestion->{surnamesuggestedby};
196
    $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
195
    $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
197
196
197
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
198
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
199
            @parcelitems )
200
        {
201
            $line{cannot_cancel} = 1;
202
        }
203
    }
204
205
    push @loop_received, \%line;
198
    #double FIXME - totalfreight is redefined later.
206
    #double FIXME - totalfreight is redefined later.
199
207
200
# FIXME - each order in a  parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
208
# FIXME - each order in a  parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-6 / +24 lines)
Lines 229-239 Link Here
229
      Cannot cancel receipt. Possible reasons :
229
      Cannot cancel receipt. Possible reasons :
230
      <ul>
230
      <ul>
231
        <li>
231
        <li>
232
          You are trying to cancel the receipt of an order line whose parent
232
          The order line you trying to cancel was created from a partial receipt
233
          order line is already received. Cancel this parent order line and
233
          of another order line which is already received. Try to cancel this
234
          retry.
234
          one first and retry.
235
        </li>
236
        <li>
237
          The order line you trying to cancel was created from a partial receipt
238
          of another order line which has been deleted. Cancellation is not
239
          possible.
235
        </li>
240
        </li>
236
        <li>Parent order line has been deleted.</li>
237
      </ul>
241
      </ul>
238
      </div>
242
      </div>
239
    [% END %]
243
    [% END %]
Lines 420-426 Link Here
420
                <td>[% loop_receive.ecost %]</td>
424
                <td>[% loop_receive.ecost %]</td>
421
                <td>[% loop_receive.unitprice %]</td>
425
                <td>[% loop_receive.unitprice %]</td>
422
                <td>[% loop_receive.total %]</td>
426
                <td>[% loop_receive.total %]</td>
423
                <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% loop_receive.invoice %]&booksellerid=[% booksellerid %]&datereceived=[% datereceived %]&op=cancelreceipt&ordernumber=[% loop_receive.ordernumber %]">Cancel receipt</a></td>
427
                <td>
428
                    [% IF (loop_receive.cannot_cancel) %]
429
                        [% span_title = BLOCK %]
430
                            Cannot cancel receipt of this order line because it
431
                            was created from a partial receipt of order line no.
432
                            [% loop_receive.parent_ordernumber %], which is
433
                            already received. Try cancelling this one first and
434
                            retry.
435
                        [% END %]
436
                        <span title="[% span_title | collapse %]">
437
                            Can't cancel receipt
438
                        </span>
439
                    [% ELSE %]
440
                        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% loop_receive.invoice %]&booksellerid=[% booksellerid %]&datereceived=[% datereceived %]&op=cancelreceipt&ordernumber=[% loop_receive.ordernumber %]">Cancel receipt</a>
441
                    [% END %]
442
                </td>
424
            </tr>
443
            </tr>
425
	    [% END %]
444
	    [% END %]
426
	</tbody>
445
	</tbody>
427
- 

Return to bug 7583