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

(-)a/acqui/addorder.pl (-16 / +17 lines)
Lines 170-191 if ( $orderinfo->{quantity} ne '0' ) { Link Here
170
        my $record = TransformKohaToMarc(
170
        my $record = TransformKohaToMarc(
171
            {
171
            {
172
                "biblio.title"                => "$$orderinfo{title}",
172
                "biblio.title"                => "$$orderinfo{title}",
173
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
173
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}           : "",
174
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
174
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}           : "",
175
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
175
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}             : "",
176
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
176
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}              : "",
177
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
177
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode}    : "",
178
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
178
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}  : "",
179
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
179
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}  : "",
180
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
180
                "biblioitems.place"           => $$orderinfo{place}           ? $$orderinfo{place}            : "",
181
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
181
                "biblioitems.itemtype"        => $$orderinfo{itemtype}        ? $$orderinfo{itemtype}         : "",
182
                "aqorders.branchcode"         => $$orderinfo{branchcode} ? $$orderinfo{branchcode} : "",
182
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement}? $$orderinfo{editionstatement} : "",
183
                "aqorders.quantity"           => $$orderinfo{quantity} ? $$orderinfo{quantity} : "",
183
                "aqorders.branchcode"         => $$orderinfo{branchcode}      ? $$orderinfo{branchcode}       : "",
184
                "aqorders.listprice"          => $$orderinfo{listprice} ? $$orderinfo{listprice} : "",
184
                "aqorders.quantity"           => $$orderinfo{quantity}        ? $$orderinfo{quantity}         : "",
185
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice} ? $$orderinfo{uncertainprice} : "",
185
                "aqorders.listprice"          => $$orderinfo{listprice}       ? $$orderinfo{listprice}        : "",
186
                "aqorders.rrp"                => $$orderinfo{rrp} ? $$orderinfo{rrp} : "",
186
                "aqorders.uncertainprice"     => $$orderinfo{uncertainprice}  ? $$orderinfo{uncertainprice}   : "",
187
                "aqorders.ecost"              => $$orderinfo{ecost} ? $$orderinfo{ecost} : "",
187
                "aqorders.rrp"                => $$orderinfo{rrp}             ? $$orderinfo{rrp}              : "",
188
                "aqorders.discount"           => $$orderinfo{discount} ? $$orderinfo{discount} : "",
188
                "aqorders.ecost"              => $$orderinfo{ecost}           ? $$orderinfo{ecost}            : "",
189
                "aqorders.discount"           => $$orderinfo{discount}        ? $$orderinfo{discount}         : "",
189
            });
190
            });
190
191
191
        # create the record in catalogue, with framework ''
192
        # 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 (-4 / +14 lines)
Lines 293-298 $(document).ready(function() Link Here
293
        </li>
293
        </li>
294
        <li>
294
        <li>
295
            [% IF ( biblionumber ) %]
295
            [% IF ( biblionumber ) %]
296
            <span class="label">Publication place: </span>
297
                <input type="hidden" size="10" name="place" id="place" value="[% place %]" />[% place %]
298
            [% ELSE %]
299
            <label for="place">Publication place: </label>
300
                <input type="text" size="10" name="place" id="place" value="[% place %]" />
301
            [% END %]
302
        </li>
303
304
        <li>
305
            [% IF ( biblionumber ) %]
296
            <span class="label">Publication year: </span>
306
            <span class="label">Publication year: </span>
297
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
307
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
298
            [% ELSE %]
308
            [% ELSE %]
Lines 322-332 $(document).ready(function() Link Here
322
        [% END %]
332
        [% END %]
323
        <li>
333
        <li>
324
            [% IF ( biblionumber ) %]
334
            [% IF ( biblionumber ) %]
325
            <span class="label">Series: </span>
335
            <span class="label">Collection title: </span>
326
                <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
336
                <input type="hidden" size="50" name="series" id="series" value="[% collectiontitle %]" />[% collectiontitle %]
327
            [% ELSE %]
337
            [% ELSE %]
328
            <label for="series">Series: </label>
338
            <label for="series">Collection title: </label>
329
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
339
                <input type="text" size="50" name="series" id="series" value="[% collectiontitle %]" />
330
            [% END %]
340
            [% END %]
331
        </li>
341
        </li>
332
        </li>
342
        </li>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt (-4 / +3 lines)
Lines 105-112 $.tablesorter.addParser({ Link Here
105
   <fieldset class="rows"> <ol>
105
   <fieldset class="rows"> <ol>
106
    <li><label class="required" for="title">Title:</label><input type="text" id="title" name="title" size="50" maxlength="80" /></li>
106
    <li><label class="required" for="title">Title:</label><input type="text" id="title" name="title" size="50" maxlength="80" /></li>
107
    <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" /></li>
107
    <li><label for="author">Author:</label><input type="text" id="author" name="author" size="50" maxlength="80" /></li>
108
    <li><label for="copyrightdate">Copyright Date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></li>
108
    <li><label for="copyrightdate">Copyright date:</label><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></li>
109
    <li><label for="isbn">Standard Number (ISBN, ISSN or Other):</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" /></li>
109
    <li><label for="isbn">Standard number (ISBN, ISSN or Other):</label><input type="text" id="isbn" name="isbn" size="50" maxlength="80" /></li>
110
    <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></li>
110
    <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></li>
111
    <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
111
    <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" /></li>
112
    <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
112
    <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" /></li>
Lines 134-140 $.tablesorter.addParser({ Link Here
134
    [% END %]</select></li>[% END %]
134
    [% END %]</select></li>[% END %]
135
    <li><label for="note">Notes:</label><textarea name="note" id="note" rows="5" cols="40"></textarea></li>
135
    <li><label for="note">Notes:</label><textarea name="note" id="note" rows="5" cols="40"></textarea></li>
136
    </ol></fieldset>
136
    </ol></fieldset>
137
        <fieldset class="action"><input type="hidden" name="suggestedby" value="[% suggestedbyme %]" /><input type="hidden" name="op" value="add_confirm" /><input type="submit" onclick="Check(this.form); return false;" value="Submit Your Suggestion" /> <a class="action" href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a></fieldset>
137
        <fieldset class="action"><input type="hidden" name="suggestedby" value="[% suggestedbyme %]" /><input type="hidden" name="op" value="add_confirm" /><input type="submit" onclick="Check(this.form); return false;" value="Submit your suggestion" /> <a class="action" href="/cgi-bin/koha/opac-suggestions.pl">Cancel</a></fieldset>
138
    </form>
138
    </form>
139
139
140
[% END %]
140
[% END %]
141
- 

Return to bug 6070