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

(-)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 368-373 $template->param( Link Here
368
    budget_loop      => $budget_loop,
368
    budget_loop      => $budget_loop,
369
    isbn             => $data->{'isbn'},
369
    isbn             => $data->{'isbn'},
370
    seriestitle      => $data->{'seriestitle'},
370
    seriestitle      => $data->{'seriestitle'},
371
    collectiontitle  => $data->{'collectiontitle'},
371
    quantity         => $data->{'quantity'},
372
    quantity         => $data->{'quantity'},
372
    quantityrec      => $data->{'quantity'},
373
    quantityrec      => $data->{'quantity'},
373
    rrp              => $data->{'rrp'},
374
    rrp              => $data->{'rrp'},
Lines 376-384 $template->param( Link Here
376
    ecost            => $data->{'ecost'},
377
    ecost            => $data->{'ecost'},
377
    notes            => $data->{'notes'},
378
    notes            => $data->{'notes'},
378
    publishercode    => $data->{'publishercode'},
379
    publishercode    => $data->{'publishercode'},
379
    
380
    place            => $data->{'place'},
380
    import_batch_id  => $import_batch_id,
381
    import_batch_id  => $import_batch_id,
381
382
# CHECKME: gst-stuff needs verifing, mason.
382
# CHECKME: gst-stuff needs verifing, mason.
383
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
383
    gstrate          => $bookseller->{'gstrate'} // C4::Context->preference("gist") // 0,
384
    gstreg           => $bookseller->{'gstreg'},
384
    gstreg           => $bookseller->{'gstreg'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-6 / +24 lines)
Lines 215-233 $(document).ready(function() Link Here
215
        </li>
215
        </li>
216
        <li>
216
        <li>
217
            [% IF ( biblionumber ) %]
217
            [% IF ( biblionumber ) %]
218
            <span class="label">Publisher: </span>
218
            <span class="label">Published by: </span>
219
                <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
219
                <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
220
            [% ELSE %]
220
            [% ELSE %]
221
            <label for="publishercode"> Publisher: </label>
221
            <label for="publishercode"> Published by: </label>
222
                <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
222
                <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
223
            [% END %]
223
            [% END %]
224
        </li>
224
        </li>
225
        <li>
225
        <li>
226
            [% IF ( biblionumber ) %]
226
            <span>[% IF ( biblionumber ) %]
227
            <span class="label">Publication year: </span>
227
                <span class="label">&nbsp;At: </span>
228
                    <input type="hidden" size="20" name="place" id="place" value="[% place %]" -->" />[% place %]
229
                [% ELSE %]
230
                <label for="place">&nbsp;At: </label>
231
                    <input type="text" size="20" name="place" id="place" value="[% place %]" />
232
                [% END %]
233
            </span>
234
         </li>
235
         <li>
236
            <span>            [% IF ( biblionumber ) %]
237
            <span class="label">&nbsp;On: </span>
228
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
238
                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
229
            [% ELSE %]
239
            [% ELSE %]
230
            <label for="publicationyear">Publication year: </label>
240
            <label for="publicationyear">&nbsp;On: </label>
231
                <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
241
                <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
232
            [% END %]
242
            [% END %]
233
        </li>
243
        </li>
Lines 249-254 $(document).ready(function() Link Here
249
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
259
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
250
            [% END %]
260
            [% END %]
251
        </li>
261
        </li>
262
        <li>
263
            [% IF ( biblionumber ) %]
264
            <span class="label">Collection: </span>
265
                <input type="hidden" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" />[% collectiontitle %]
266
            [% ELSE %]
267
            <label for="collectiontitle">collectiontitle: </label>
268
                <input type="text" size="50" name="collectiontitle" id="collectiontitle" value="[% collectiontitle %]" />
269
            [% END %]
270
        </li>
252
        </ol>
271
        </ol>
253
    </fieldset>
272
    </fieldset>
254
    [% IF ( items ) %]
273
    [% IF ( items ) %]
255
- 

Return to bug 6070