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

Return to bug 23320