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

(-)a/acqui/neworderempty.pl (-14 / +1 lines)
Lines 60-67 if this order comes from a suggestion. Link Here
60
=item breedingid
60
=item breedingid
61
the item's id in the breeding reservoir
61
the item's id in the breeding reservoir
62
62
63
=item close
64
65
=back
63
=back
66
64
67
=cut
65
=cut
Lines 106-112 my $ordernumber = $input->param('ordernumber') || ''; Link Here
106
our $biblionumber    = $input->param('biblionumber');
104
our $biblionumber    = $input->param('biblionumber');
107
our $basketno        = $input->param('basketno');
105
our $basketno        = $input->param('basketno');
108
my $suggestionid    = $input->param('suggestionid');
106
my $suggestionid    = $input->param('suggestionid');
109
my $close           = $input->param('close');
110
my $uncertainprice  = $input->param('uncertainprice');
107
my $uncertainprice  = $input->param('uncertainprice');
111
my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order !
108
my $import_batch_id = $input->param('import_batch_id'); # if this is filled, we come from a staged file, and we will return here after saving the order !
112
my $from_subscriptionid  = $input->param('from_subscriptionid');
109
my $from_subscriptionid  = $input->param('from_subscriptionid');
Lines 338-348 foreach my $r (@{$budgets}) { Link Here
338
    };
335
    };
339
}
336
}
340
337
341
if ($close) {
342
    $budget_id      =  $data->{'budget_id'};
343
    $budget_name    =   $budget->{'budget_name'};
344
345
}
346
338
347
$template->param( sort1 => $data->{'sort1'} );
339
$template->param( sort1 => $data->{'sort1'} );
348
$template->param( sort2 => $data->{'sort2'} );
340
$template->param( sort2 => $data->{'sort2'} );
Lines 394-405 if ( defined $from_subscriptionid ) { Link Here
394
# Find the items.barcode subfield for barcode validations
386
# Find the items.barcode subfield for barcode validations
395
my (undef, $barcode_subfield) = GetMarcFromKohaField( 'items.barcode' );
387
my (undef, $barcode_subfield) = GetMarcFromKohaField( 'items.barcode' );
396
388
397
# fill template
398
$template->param(
399
    close        => $close,
400
    budget_id    => $budget_id,
401
    budget_name  => $budget_name
402
) if ($close);
403
389
404
# get option values for gist syspref
390
# get option values for gist syspref
405
my @gst_values = map {
391
my @gst_values = map {
Lines 411-416 my $quantity = $input->param('rr_quantity_to_order') ? Link Here
411
      $data->{'quantity'};
397
      $data->{'quantity'};
412
$quantity //= 0;
398
$quantity //= 0;
413
399
400
# fill template
414
$template->param(
401
$template->param(
415
    existing         => $biblionumber,
402
    existing         => $biblionumber,
416
    ordernumber           => $ordernumber,
403
    ordernumber           => $ordernumber,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-70 / +29 lines)
Lines 299-326 Link Here
299
        <legend>Accounting details</legend>
299
        <legend>Accounting details</legend>
300
        <ol>
300
        <ol>
301
            <li>
301
            <li>
302
                [% IF ( close ) %]
302
                <label class="required" for="quantity">Quantity: </label>
303
                    <span class="label required">Quantity: </span>
303
                [% IF subscriptionid %]
304
                    <input type="hidden" name="quantity" value="[% quantity | html %]" />[% quantity | html %]
304
                    <input type="text" size="20" id="quantity" name="quantity" value="1" onchange="updateCosts();" />
305
                [% ELSIF AcqCreateItemOrdering %]
306
                    [% IF basket.is_standing %]
307
                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
308
                    [% ELSE %]
309
                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="0" />
310
                    [% END %]
305
                [% ELSE %]
311
                [% ELSE %]
306
                    <label class="required" for="quantity">Quantity: </label>
312
                    [% IF basket.is_standing %]
307
                    [% IF subscriptionid %]
313
                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
308
                        <input type="text" size="20" id="quantity" name="quantity" value="1" onchange="updateCosts();" />
309
                    [% ELSIF AcqCreateItemOrdering %]
310
                        [% IF basket.is_standing %]
311
                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
312
                        [% ELSE %]
313
                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="0" />
314
                        [% END %]
315
                    [% ELSE %]
314
                    [% ELSE %]
316
                        [% IF basket.is_standing %]
315
                        <input type="text" size="20" id="quantity" name="quantity" value="[% quantityrec | html %]" onchange="updateCosts();" />
317
                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
318
                        [% ELSE %]
319
                            <input type="text" size="20" id="quantity" name="quantity" value="[% quantityrec | html %]" onchange="updateCosts();" />
320
                        [% END %]
321
                    [% END %]
316
                    [% END %]
322
                    <span class="required">Required</span>
323
                [% END %]
317
                [% END %]
318
                <span class="required">Required</span>
324
                <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
319
                <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
325
                <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
320
                <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
326
321
Lines 335-344 Link Here
335
                [% END %]
330
                [% END %]
336
            </li>
331
            </li>
337
            <li>
332
            <li>
338
                [% IF ( close ) %]
339
            <span class="label required">Fund: </span>
340
                    <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
341
                [% ELSE %]
342
                <label class="required" for="budget_id">Fund: </label>
333
                <label class="required" for="budget_id">Fund: </label>
343
                [% active_count = 0 %]
334
                [% active_count = 0 %]
344
                [% IF !ordernumber %]
335
                [% IF !ordernumber %]
Lines 364-383 Link Here
364
                                style="padding-left:[% budget_loo.b_level | html %]em;"
355
                                style="padding-left:[% budget_loo.b_level | html %]em;"
365
                        >
356
                        >
366
                    [% END %]
357
                    [% END %]
367
                    [% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
358
                        [% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
368
                    </option>
359
                    </option>
369
                [% END %]
360
                [% END %]
370
                </select>
361
                </select>
371
                <span class="required">Required</span>
362
                <span class="required">Required</span>
372
                <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
363
                <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
373
                <input type="checkbox" id="showallbudgets" />
364
                <input type="checkbox" id="showallbudgets" />
374
                [% END %]
375
            </li>
365
            </li>
376
		<li>
366
		<li>
377
                [% IF ( close ) %]
378
			<span class="label">Currency: </span>
379
            <input type="hidden" name="currency" id="currency" value="[% currency | html %]" />[% currency | html %]
380
                [% ELSE %]
381
			<label for="currency">Currency:</label>
367
			<label for="currency">Currency:</label>
382
            <select name="currency" id="currency" onchange="updateCosts();">
368
            <select name="currency" id="currency" onchange="updateCosts();">
383
                [% FOREACH c IN currencies %]
369
                [% FOREACH c IN currencies %]
Lines 388-405 Link Here
388
                    [% END %]
374
                    [% END %]
389
                [% END %]
375
                [% END %]
390
            </select>
376
            </select>
391
		[% END %]
392
                </li>
377
                </li>
393
            <li>
378
            <li>
394
                [% IF ( close ) %]
395
                    <span class="label">Vendor price: </span>
396
                    <input type="hidden" name="listprice" id="listprice" value="[% listprice | html %]" />[% listprice | html %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
397
                [% ELSE %]
398
                <label for="listprice">Vendor price: </label>
379
                <label for="listprice">Vendor price: </label>
399
                    <input type="text" size="20" name="listprice" id="listprice" value="[% listprice | html %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
380
                    <input type="text" size="20" name="listprice" id="listprice" value="[% listprice | html %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
400
                [% END %]
401
            </li>
381
            </li>
402
            [% UNLESS ( close ) %]
403
            <li>
382
            <li>
404
                    <label for="uncertainprice">Uncertain price: </label>
383
                    <label for="uncertainprice">Uncertain price: </label>
405
                    [% IF ( uncertainprice ) %]
384
                    [% IF ( uncertainprice ) %]
Lines 408-459 Link Here
408
                    <input type="checkbox" name="uncertainprice" id="uncertainprice" value="1" />
387
                    <input type="checkbox" name="uncertainprice" id="uncertainprice" value="1" />
409
                [% END %]
388
                [% END %]
410
            </li>
389
            </li>
411
            [% END %]
412
            [% IF ( gst_values ) %]
390
            [% IF ( gst_values ) %]
413
                <li>
391
                <li>
414
                    [% IF ( close ) %]
392
                    <label for="tax_rate">Tax rate: </label>
415
                        <span class="label">Tax rate: </span>
393
                    <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
416
                        <input type="hidden" name="tax_rate" id="tax_rate" value="[% tax_rate | html %]" />[% tax_rate | html %]%
394
                    [% FOREACH gst IN gst_values %]
417
                    [% ELSE %]
395
                      [% IF ( gst.option == tax_rate ) %]
418
                        <label for="tax_rate">Tax rate: </label>
396
                        <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %]%</option>
419
                        <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
397
                      [% ELSE %]
420
                        [% FOREACH gst IN gst_values %]
398
                        <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
421
                          [% IF ( gst.option == tax_rate ) %]
399
                      [% END %]
422
                            <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %]%</option>
423
                          [% ELSE %]
424
                            <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
425
                          [% END %]
426
                        [% END %]
427
                        </select>
428
                    [% END %]
400
                    [% END %]
429
                [% ELSE %]
401
                    </select>
402
            [% ELSE %]
430
                    <input type="hidden" name="tax_rate" value="0" />
403
                    <input type="hidden" name="tax_rate" value="0" />
431
                </li>
404
                </li>
432
            [% END %]
405
            [% END %]
433
            <li>
406
            <li>
434
                <label for="discount">Discount: </label>
407
                <label for="discount">Discount: </label>
435
                [% IF ( close ) %]
408
                [% IF ( orderdiscount ) %]
436
                    [% IF ( orderdiscount ) %]
409
                    <input type="text" size="6" name="discount" id="discount" value="[% orderdiscount | html %]" onchange="updateCosts();" />%
437
                        <input type="hidden" name="discount" id="discount" value="[% orderdiscount | html %]" />[% orderdiscount_2dp | html %]%
438
                    [% ELSE %]
439
                        <input type="hidden" name="discount" id="discount" value="[% discount | html %]" />[% discount_2dp | html %]%
440
                    [% END %]
441
                [% ELSE %]
410
                [% ELSE %]
442
                    [% IF ( orderdiscount ) %]
411
                    <input type="text" size="6" name="discount" id="discount" value="[% discount | html %]" onchange="updateCosts();" />%
443
                        <input type="text" size="6" name="discount" id="discount" value="[% orderdiscount | html %]" onchange="updateCosts();" />%
444
                    [% ELSE %]
445
                        <input type="text" size="6" name="discount" id="discount" value="[% discount | html %]" onchange="updateCosts();" />%
446
                    [% END %]
447
                [% END %]
412
                [% END %]
448
            </li>
413
            </li>
449
            <li>
414
            <li>
450
                [% IF ( close ) %]
415
                <label for="rrp">Retail price: </label>
451
                    <span class="label">Retail price: </span>
416
                <input type="text" size="20" name="rrp" id="rrp" value="[% rrp | html %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
452
                    <input type="hidden" name="rrp" id="rrp" value="[% rrp | html %]" />[% rrp | html %]  (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
453
                [% ELSE %]
454
                    <label for="rrp">Retail price: </label>
455
                    <input type="text" size="20" name="rrp" id="rrp" value="[% rrp | html %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
456
                [% END %]
457
            </li>
417
            </li>
458
            <li>
418
            <li>
459
                <label for="replacementprice">Replacement cost: </label>
419
                <label for="replacementprice">Replacement cost: </label>
460
- 

Return to bug 23320