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

(-)a/acqui/parcel.pl (-1 / +9 lines)
Lines 142-148 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
142
    $line{gst}     = $gst;
142
    $line{gst}     = $gst;
143
    $line{total} = sprintf($cfstr, $total);
143
    $line{total} = sprintf($cfstr, $total);
144
    $line{booksellerid} = $booksellerid;
144
    $line{booksellerid} = $booksellerid;
145
    push @loop_received, \%line;
146
    $totalprice += $parcelitems[$i]->{'unitprice'};
145
    $totalprice += $parcelitems[$i]->{'unitprice'};
147
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
146
    $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
148
147
Lines 151-156 for (my $i = 0 ; $i < $countlines ; $i++) { Link Here
151
    $line{surnamesuggestedby}   = $suggestion->{surnamesuggestedby};
150
    $line{surnamesuggestedby}   = $suggestion->{surnamesuggestedby};
152
    $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
151
    $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
153
152
153
    if ( $line{parent_ordernumber} != $line{ordernumber} ) {
154
        if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
155
            @parcelitems )
156
        {
157
            $line{cannot_cancel} = 1;
158
        }
159
    }
160
161
    push @loop_received, \%line;
154
    #double FIXME - totalfreight is redefined later.
162
    #double FIXME - totalfreight is redefined later.
155
163
156
# 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..
164
# 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 166-176 Link Here
166
      Cannot cancel receipt. Possible reasons :
166
      Cannot cancel receipt. Possible reasons :
167
      <ul>
167
      <ul>
168
        <li>
168
        <li>
169
          You are trying to cancel the receipt of an order line whose parent
169
          The order line you trying to cancel was created from a partial receipt
170
          order line is already received. Cancel this parent order line and
170
          of another order line which is already received. Try to cancel this
171
          retry.
171
          one first and retry.
172
        </li>
173
        <li>
174
          The order line you trying to cancel was created from a partial receipt
175
          of another order line which has been deleted. Cancellation is not
176
          possible.
172
        </li>
177
        </li>
173
        <li>Parent order line has been deleted.</li>
174
      </ul>
178
      </ul>
175
      </div>
179
      </div>
176
    [% END %]
180
    [% END %]
Lines 357-363 Link Here
357
                <td>[% loop_receive.ecost %]</td>
361
                <td>[% loop_receive.ecost %]</td>
358
                <td>[% loop_receive.unitprice %]</td>
362
                <td>[% loop_receive.unitprice %]</td>
359
                <td>[% loop_receive.total %]</td>
363
                <td>[% loop_receive.total %]</td>
360
                <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>
364
                <td>
365
                    [% IF (loop_receive.cannot_cancel) %]
366
                        [% span_title = BLOCK %]
367
                            Cannot cancel receipt of this order line because it
368
                            was created from a partial receipt of order line no.
369
                            [% loop_receive.parent_ordernumber %], which is
370
                            already received. Try cancelling this one first and
371
                            retry.
372
                        [% END %]
373
                        <span title="[% span_title | collapse %]">
374
                            Can't cancel receipt
375
                        </span>
376
                    [% ELSE %]
377
                        <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>
378
                    [% END %]
379
                </td>
361
            </tr>
380
            </tr>
362
	    [% END %]
381
	    [% END %]
363
	</tbody>
382
	</tbody>
364
- 

Return to bug 7583