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

(-)a/acqui/neworderempty.pl (-4 / +8 lines)
Lines 317-326 if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { Link Here
317
    unless($marc) {
317
    unless($marc) {
318
        $template->param('NoACQframework' => 1);
318
        $template->param('NoACQframework' => 1);
319
    }
319
    }
320
    $template->param(
320
    unless($subscriptionid){
321
        AcqCreateItemOrdering => 1,
321
        $template->param(
322
        UniqueItemFields => C4::Context->preference('UniqueItemFields'),
322
            AcqCreateItemOrdering => 1,
323
    );
323
            UniqueItemFields => C4::Context->preference('UniqueItemFields'),
324
        );
325
    } else {
326
        $template->param( subscription  => 1,);
327
    }
324
}
328
}
325
# Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio
329
# Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio
326
my @itemtypes;
330
my @itemtypes;
(-)a/acqui/orderreceive.pl (-1 / +7 lines)
Lines 93-98 my $datereceived = $input->param('datereceived'); Link Here
93
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
93
$datereceived = $datereceived ? C4::Dates->new($datereceived, 'iso') : C4::Dates->new();
94
94
95
my $bookseller = GetBookSellerFromId($booksellerid);
95
my $bookseller = GetBookSellerFromId($booksellerid);
96
my $sub = GetOrder($ordernumber);
97
my $subscriptionid = $sub->{'subscriptionid'};
96
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
98
my $input_gst = ($input->param('gst') eq '' ? undef : $input->param('gst'));
97
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
99
my $gst= $input_gst // $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
98
my $results = SearchOrder($ordernumber,$search);
100
my $results = SearchOrder($ordernumber,$search);
Lines 121-130 if ( $count == 1 ) { Link Here
121
123
122
    my $AcqCreateItem = C4::Context->preference('AcqCreateItem');
124
    my $AcqCreateItem = C4::Context->preference('AcqCreateItem');
123
    if ($AcqCreateItem eq 'receiving') {
125
    if ($AcqCreateItem eq 'receiving') {
124
        $template->param(
126
      unless($subscriptionid){
127
          $template->param(
125
            AcqCreateItemReceiving => 1,
128
            AcqCreateItemReceiving => 1,
126
            UniqueItemFields => C4::Context->preference('UniqueItemFields'),
129
            UniqueItemFields => C4::Context->preference('UniqueItemFields'),
127
        );
130
        );
131
        } else {
132
            $template->param( subscription  => 1,);
133
        }
128
    } elsif ($AcqCreateItem eq 'ordering') {
134
    } elsif ($AcqCreateItem eq 'ordering') {
129
        my $fw = ($acq_fw) ? 'ACQ' : '';
135
        my $fw = ($acq_fw) ? 'ACQ' : '';
130
        my @itemnumbers = GetItemnumbersFromOrder($order->{ordernumber});
136
        my @itemnumbers = GetItemnumbersFromOrder($order->{ordernumber});
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (+5 lines)
Lines 383-388 $(document).ready(function() Link Here
383
383
384
    </fieldset>
384
    </fieldset>
385
    [% END %][%# IF (AcqCreateItemOrdering) %]
385
    [% END %][%# IF (AcqCreateItemOrdering) %]
386
    [% IF (subscription) %]
387
                <p class="required">
388
                    This order is for a serial subscription. Items are added in the serial module.
389
                </p>
390
    [% END %]
386
    <fieldset class="rows">
391
    <fieldset class="rows">
387
        <legend>Accounting Details</legend>
392
        <legend>Accounting Details</legend>
388
        <ol>
393
        <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +4 lines)
Lines 234-239 Link Here
234
                </table>
234
                </table>
235
            </div>
235
            </div>
236
        [% END %]
236
        [% END %]
237
        [% ELSIF (subscription) %]
238
                <p class="required">
239
                    This order is for a serial subscription. Items are added in the serial module.
240
                </p>
237
    [% END %]
241
    [% END %]
238
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
242
    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
239
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
243
    <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
240
- 

Return to bug 8456