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

(-)a/acqui/addorder.pl (+2 lines)
Lines 204-209 if ( $orderinfo->{quantity} ne '0' ) { Link Here
204
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
204
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
205
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
205
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
206
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
206
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
207
                "biblioitems.place"           => $$orderinfo{place} ? $$orderinfo{place}: "",
208
                "biblioitems.collectiontitle" => $$orderinfo{collectiontitle} ? $$orderinfo{collectiontitle}: "",
207
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
209
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
208
            });
210
            });
209
211
(-)a/acqui/neworderempty.pl (-3 / +3 lines)
Lines 98-104 my $title = $input->param('title'); Link Here
98
my $author          = $input->param('author');
98
my $author          = $input->param('author');
99
my $publicationyear = $input->param('publicationyear');
99
my $publicationyear = $input->param('publicationyear');
100
my $bookseller      = GetBookSellerFromId($booksellerid);	# FIXME: else ERROR!
100
my $bookseller      = GetBookSellerFromId($booksellerid);	# FIXME: else ERROR!
101
my $ordernumber          = $input->param('ordernumber') || '';
101
my $ordernumber     = $input->param('ordernumber') || '';
102
my $biblionumber    = $input->param('biblionumber');
102
my $biblionumber    = $input->param('biblionumber');
103
my $basketno        = $input->param('basketno');
103
my $basketno        = $input->param('basketno');
104
my $suggestionid    = $input->param('suggestionid');
104
my $suggestionid    = $input->param('suggestionid');
Lines 376-381 $template->param( Link Here
376
    isbn             => $data->{'isbn'},
376
    isbn             => $data->{'isbn'},
377
    seriestitle      => $data->{'seriestitle'},
377
    seriestitle      => $data->{'seriestitle'},
378
    itemtypeloop     => \@itemtypes,
378
    itemtypeloop     => \@itemtypes,
379
    collectiontitle  => $data->{'collectiontitle'},
379
    quantity         => $data->{'quantity'},
380
    quantity         => $data->{'quantity'},
380
    quantityrec      => $data->{'quantity'},
381
    quantityrec      => $data->{'quantity'},
381
    rrp              => $data->{'rrp'},
382
    rrp              => $data->{'rrp'},
Lines 384-392 $template->param( Link Here
384
    ecost            => $data->{'ecost'},
385
    ecost            => $data->{'ecost'},
385
    notes            => $data->{'notes'},
386
    notes            => $data->{'notes'},
386
    publishercode    => $data->{'publishercode'},
387
    publishercode    => $data->{'publishercode'},
387
    
388
    place            => $data->{'place'},
388
    import_batch_id  => $import_batch_id,
389
    import_batch_id  => $import_batch_id,
389
390
# CHECKME: gst-stuff needs verifing, mason.
390
# CHECKME: gst-stuff needs verifing, mason.
391
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
391
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
392
    gstreg           => $bookseller->{'gstreg'},
392
    gstreg           => $bookseller->{'gstreg'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-14 / +33 lines)
Lines 214-246 $(document).ready(function() Link Here
214
            [% END %]
214
            [% END %]
215
        </li>
215
        </li>
216
        <li>
216
        <li>
217
            [% IF ( biblionumber ) %]
217
            <span>            [% IF ( biblionumber ) %]
218
            <span class="label">Publisher: </span>
218
            <span class="label">&nbsp;Copyright date: </span>
219
                <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
219
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
220
            [% ELSE %]
220
            [% ELSE %]
221
            <label for="publishercode"> Publisher: </label>
221
            <label for="publicationyear">&nbsp;Copyright date: </label>
222
                <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
222
                <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
223
            [% END %]
223
            [% END %]
224
        </li>
224
        </li>
225
        <li>
225
        <li>
226
            [% IF ( biblionumber ) %]
226
            [% IF ( biblionumber ) %]
227
            <span class="label">Publication year: </span>
227
            <span class="label">ISBN or ISSN or other standard number: </span>
228
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
228
                <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
229
            [% ELSE %]
229
            [% ELSE %]
230
            <label for="publicationyear">Publication year: </label>
230
            <label for="ISBN">ISBN or ISSN or other standard number: </label>
231
                <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
231
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
232
            [% END %]
232
            [% END %]
233
        </li>
233
        </li>
234
234
        <li>
235
        <li>
235
            [% IF ( biblionumber ) %]
236
            [% IF ( biblionumber ) %]
236
            <span class="label">ISBN: </span>
237
            <span class="label">Publisher: </span>
237
                <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
238
                <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
238
            [% ELSE %]
239
            [% ELSE %]
239
            <label for="ISBN">ISBN: </label>
240
            <label for="publishercode"> Publisher: </label>
240
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
241
                <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
241
            [% END %]
242
            [% END %]
242
        </li>
243
        </li>
243
        <li>
244
        <li>
245
            <span>[% IF ( biblionumber ) %]
246
                <span class="label">&nbsp;Publication place: </span>
247
                    <input type="hidden" size="20" name="place" id="place" value="[% place %]" />[% place %]
248
                [% ELSE %]
249
                <label for="place">&nbsp;Publication place: </label>
250
                    <input type="text" size="20" name="place" id="place" value="[% place %]" />
251
                [% END %]
252
            </span>
253
         </li>
254
        <li>
244
            [% IF ( biblionumber ) %]
255
            [% IF ( biblionumber ) %]
245
            <span class="label">Series: </span>
256
            <span class="label">Series: </span>
246
                <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
257
                <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
Lines 266-271 $(document).ready(function() Link Here
266
            </li>
277
            </li>
267
            [% END %]
278
            [% END %]
268
            [% END %]
279
            [% END %]
280
        <li>
281
            [% IF ( biblionumber ) %]
282
            <span class="label">Collection title: </span>
283
                <input type="hidden" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" />[% collectiontitle %]
284
            [% ELSE %]
285
            <label for="collectiontitle">Collection title: </label>
286
                <input type="text" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" />
287
            [% END %]
288
        </li>
269
        </ol>
289
        </ol>
270
    </fieldset>
290
    </fieldset>
271
    [% IF ( items ) %]
291
    [% IF ( items ) %]
272
- 

Return to bug 6070