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

(-)a/acqui/addorder.pl (-16 / +17 lines)
Lines 241-262 if ( $orderinfo->{quantity} ne '0' ) { Link Here
241
        my $record = TransformKohaToMarc(
241
        my $record = TransformKohaToMarc(
242
            {
242
            {
243
                "biblio.title"                => "$$orderinfo{title}",
243
                "biblio.title"                => "$$orderinfo{title}",
244
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
244
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}           : "",
245
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
245
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}           : "",
246
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
246
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}             : "",
247
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
247
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}              : "",
248
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
248
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode}    : "",
249
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
249
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}  : "",
250
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
250
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}  : "",
251
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
251
                "biblioitems.place"           => $$orderinfo{place}           ? $$orderinfo{place}            : "",
252
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
252
                "biblioitems.itemtype"        => $$orderinfo{itemtype}        ? $$orderinfo{itemtype}         : "",
253
                "aqorders.branchcode"         => $$orderinfo{branchcode} ? $$orderinfo{branchcode} : "",
253
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement}? $$orderinfo{editionstatement} : "",
254
                "aqorders.quantity"           => $$orderinfo{quantity} ? $$orderinfo{quantity} : "",
254
                "aqorders.branchcode"         => $$orderinfo{branchcode}      ? $$orderinfo{branchcode}       : "",
255
                "aqorders.listprice"          => $$orderinfo{listprice} ? $$orderinfo{listprice} : "",
255
                "aqorders.quantity"           => $$orderinfo{quantity}        ? $$orderinfo{quantity}         : "",
256
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice} ? $$orderinfo{uncertainprice} : "",
256
                "aqorders.listprice"          => $$orderinfo{listprice}       ? $$orderinfo{listprice}        : "",
257
                "aqorders.rrp"                => $$orderinfo{rrp} ? $$orderinfo{rrp} : "",
257
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice}  ? $$orderinfo{uncertainprice}   : "",
258
                "aqorders.ecost"              => $$orderinfo{ecost} ? $$orderinfo{ecost} : "",
258
                "aqorders.rrp"                => $$orderinfo{rrp}             ? $$orderinfo{rrp}              : "",
259
                "aqorders.discount"           => $$orderinfo{discount} ? $$orderinfo{discount} : "",
259
                "aqorders.ecost"              => $$orderinfo{ecost}           ? $$orderinfo{ecost}            : "",
260
                "aqorders.discount"           => $$orderinfo{discount}        ? $$orderinfo{discount}         : "",
260
            });
261
            });
261
262
262
        # create the record in catalogue, with framework ''
263
        # create the record in catalogue, with framework ''
(-)a/acqui/neworderempty.pl (+2 lines)
Lines 400-405 $template->param( Link Here
400
    ean              => $data->{'ean'},
400
    ean              => $data->{'ean'},
401
    seriestitle      => $data->{'seriestitle'},
401
    seriestitle      => $data->{'seriestitle'},
402
    itemtypeloop     => \@itemtypes,
402
    itemtypeloop     => \@itemtypes,
403
    collectiontitle  => $data->{'collectiontitle'},
404
    place            => $data->{'place'},
403
    quantity         => $data->{'quantity'},
405
    quantity         => $data->{'quantity'},
404
    quantityrec      => $data->{'quantity'},
406
    quantityrec      => $data->{'quantity'},
405
    rrp              => $data->{'rrp'},
407
    rrp              => $data->{'rrp'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-5 / +14 lines)
Lines 272-277 $(document).ready(function() Link Here
272
        </li>
272
        </li>
273
        <li>
273
        <li>
274
            [% IF ( biblionumber ) %]
274
            [% IF ( biblionumber ) %]
275
            <span class="label">Publication place: </span>
276
                <input type="hidden" name="place" id="place" value="[% place %]" />[% place %]
277
            [% ELSE %]
278
            <label for="place">Publication place: </label>
279
                <input type="text" size="10" name="place" id="place" value="[% place %]" />
280
            [% END %]
281
        </li>
282
283
        <li>
284
            [% IF ( biblionumber ) %]
275
            <span class="label">Publication year: </span>
285
            <span class="label">Publication year: </span>
276
                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
286
                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
277
            [% ELSE %]
287
            [% ELSE %]
Lines 301-311 $(document).ready(function() Link Here
301
        [% END %]
311
        [% END %]
302
        <li>
312
        <li>
303
            [% IF ( biblionumber ) %]
313
            [% IF ( biblionumber ) %]
304
            <span class="label">Series: </span>
314
            <span class="label">Collection title: </span>
305
                <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
315
                <input type="hidden" name="series" id="series" value="[% collectiontitle %]" />[% collectiontitle %]
306
            [% ELSE %]
316
            [% ELSE %]
307
            <label for="series">Series: </label>
317
            <label for="series">Collection title: </label>
308
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
318
                <input type="text" size="50" name="series" id="series" value="[% collectiontitle %]" />
309
            [% END %]
319
            [% END %]
310
        </li>
320
        </li>
311
            [% UNLESS ( biblionumber ) %]
321
            [% UNLESS ( biblionumber ) %]
312
- 

Return to bug 6070