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

(-)a/acqui/addorder.pl (-16 / +27 lines)
Lines 139-144 use C4::Barcodes; Link Here
139
# not just blindly call C4 functions and print a redirect.  
139
# not just blindly call C4 functions and print a redirect.  
140
140
141
my $input = new CGI;
141
my $input = new CGI;
142
my $use_ACQ_framework = $input->param('use_ACQ_framework');
142
143
143
# Check if order total amount exceed allowed budget
144
# Check if order total amount exceed allowed budget
144
my $confirm_budget_exceeding = $input->param('confirm_budget_exceeding');
145
my $confirm_budget_exceeding = $input->param('confirm_budget_exceeding');
Lines 240-260 my $basket = Koha::Acquisition::Baskets->find($basketno); Link Here
240
if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) {
241
if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) {
241
    #TODO:check to see if biblio exists
242
    #TODO:check to see if biblio exists
242
    unless ( $$orderinfo{biblionumber} ) {
243
    unless ( $$orderinfo{biblionumber} ) {
243
        #if it doesn't create it
244
        my $record = TransformKohaToMarc(
245
            {
246
                "biblio.title"                => "$$orderinfo{title}",
247
                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
248
                "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
249
                "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
250
                "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
251
                "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
252
                "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
253
                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
254
                "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
255
                "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
256
            });
257
244
245
        my $record;
246
        if ( $use_ACQ_framework ) {
247
            my @tags         = $input->multi_param('bib_tag');
248
            my @subfields    = $input->multi_param('bib_subfield');
249
            my @field_values = $input->multi_param('bib_field_value');
250
            my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values );
251
            $record=MARC::Record::new_from_xml($xml, 'UTF-8');
252
        } else {
253
            #if it doesn't create it
254
            $record = TransformKohaToMarc(
255
                {
256
                    "biblio.title"                => "$$orderinfo{title}",
257
                    "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
258
                    "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
259
                    "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
260
                    "biblioitems.ean"             => $$orderinfo{ean}             ? $$orderinfo{ean}           : "",
261
                    "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
262
                    "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
263
                    "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
264
                    "biblioitems.itemtype"        => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "",
265
                    "biblioitems.editionstatement"=> $$orderinfo{editionstatement} ? $$orderinfo{editionstatement} : "",
266
                });
267
268
        }
258
        C4::Acquisition::FillWithDefaultValues( $record );
269
        C4::Acquisition::FillWithDefaultValues( $record );
259
270
260
        # create the record in catalogue, with framework ''
271
        # create the record in catalogue, with framework ''
Lines 309-316 if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { Link Here
309
            unless ($itemhash{$itemid[$i]}){
320
            unless ($itemhash{$itemid[$i]}){
310
            $countdistinct++;
321
            $countdistinct++;
311
            }
322
            }
312
            push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
323
        push @{$itemhash{$itemid[$i]}->{'tags'}},$tags[$i];
313
            push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
324
        push @{$itemhash{$itemid[$i]}->{'subfields'}},$subfields[$i];
314
            push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
325
            push @{$itemhash{$itemid[$i]}->{'field_values'}},$field_values[$i];
315
            push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
326
            push @{$itemhash{$itemid[$i]}->{'ind_tag'}},$ind_tag[$i];
316
            push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
327
            push @{$itemhash{$itemid[$i]}->{'indicator'}},$indicator[$i];
(-)a/acqui/neworderempty.pl (-9 / +109 lines)
Lines 89-96 use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus/; Link Here
89
89
90
use Koha::Acquisition::Booksellers;
90
use Koha::Acquisition::Booksellers;
91
use Koha::Acquisition::Currencies;
91
use Koha::Acquisition::Currencies;
92
use Koha::BiblioFrameworks;
93
use Koha::DateUtils qw( dt_from_string );
94
use Koha::MarcSubfieldStructures;
92
use Koha::ItemTypes;
95
use Koha::ItemTypes;
93
use Koha::Patrons;
96
use Koha::Patrons;
97
use Koha::RecordProcessor;
94
98
95
our $input           = new CGI;
99
our $input           = new CGI;
96
my $booksellerid    = $input->param('booksellerid');	# FIXME: else ERROR!
100
my $booksellerid    = $input->param('booksellerid');	# FIXME: else ERROR!
Lines 174-194 if ( $ordernumber eq '' and defined $params->{'breedingid'}){ Link Here
174
178
175
179
176
180
177
my ( @order_user_ids, @order_users );
181
my ( @order_user_ids, @order_users, @catalog_details );
178
if ( $ordernumber eq '' ) {    # create order
182
our $tagslib = GetMarcStructure(1, 'ACQ', { unsafe => 1 } );
183
my ( $itemnumber_tag, $itemnumber_subtag ) = GetMarcFromKohaField( 'items.itemnumber', 'ACQ' );
184
if ( not $ordernumber ) {    # create order
179
    $new = 'yes';
185
    $new = 'yes';
180
186
181
    # 	$ordernumber=newordernum;
187
    if ( $biblionumber ) {
182
    if ( $biblionumber && !$suggestionid ) {
183
        $data = GetBiblioData($biblionumber);
188
        $data = GetBiblioData($biblionumber);
184
    }
189
    }
185
190
    # get suggestion fields if applicable. If it's a subscription renewal, then the biblio already exists
186
# get suggestion fields if applicable. If it's a subscription renewal, then the biblio already exists
191
    # otherwise, retrieve suggestion information.
187
# otherwise, retrieve suggestion information.
192
    elsif ($suggestionid) {
188
    if ($suggestionid) {
193
        $data = GetSuggestion($suggestionid);
189
        $data = ($biblionumber) ? GetBiblioData($biblionumber) : GetSuggestion($suggestionid);
190
        $budget_id ||= $data->{'budgetid'} // 0;
194
        $budget_id ||= $data->{'budgetid'} // 0;
191
    }
195
    }
196
197
    if ( not $biblionumber and Koha::BiblioFrameworks->find('ACQ') ) {
198
        #my $acq_mss = Koha::MarcSubfieldStructures->search({ frameworkcode => 'ACQ', tagfield => { '!=' => $itemnumber_tag } });
199
        foreach my $tag ( sort keys %{$tagslib} ) {
200
            next if $tag eq '';
201
            next if $tag eq $itemnumber_tag;    # skip items fields
202
            foreach my $subfield ( sort keys %{ $tagslib->{$tag} } ) {
203
                my $mss = $tagslib->{$tag}{$subfield};
204
                next if IsMarcStructureInternal($mss);
205
                next if $mss->{tab} == -1;
206
                my $value = $mss->{defaultvalue};
207
208
                if ($suggestionid and $mss->{kohafield}) {
209
                    # Reading suggestion info if ordering from a suggestion
210
                    if ( $mss->{kohafield} eq 'biblio.title' ) {
211
                        $value = $data->{title};
212
                    }
213
                    elsif ( $mss->{kohafield} eq 'biblio.author' ) {
214
                        $value = $data->{author};
215
                    }
216
                    elsif ( $mss->{kohafield} eq 'biblioitems.publishercode' ) {
217
                        $value = $data->{publishercode};
218
                    }
219
                    elsif ( $mss->{kohafield} eq 'biblioitems.editionstatement' ) {
220
                        $value = $data->{editionstatement};
221
                    }
222
                    elsif ( $mss->{kohafield} eq 'biblioitems.publicationyear' ) {
223
                        $value = $data->{publicationyear};
224
                    }
225
                    elsif ( $mss->{kohafield} eq 'biblioitems.isbn' ) {
226
                        $value = $data->{isbn};
227
                    }
228
                    elsif ( $mss->{kohafield} eq 'biblio.seriestitle' ) {
229
                        $value = $data->{seriestitle};
230
                    }
231
                }
232
233
                if ( $value eq '' ) {
234
235
                    # get today date & replace <<YYYY>>, <<MM>>, <<DD>> if provided in the default value
236
                    my $today_dt = dt_from_string;
237
                    my $year     = $today_dt->strftime('%Y');
238
                    my $month    = $today_dt->strftime('%m');
239
                    my $day      = $today_dt->strftime('%d');
240
                    $value =~ s/<<YYYY>>/$year/g;
241
                    $value =~ s/<<MM>>/$month/g;
242
                    $value =~ s/<<DD>>/$day/g;
243
244
                    # And <<USER>> with surname (?)
245
                    my $username =
246
                      (   C4::Context->userenv
247
                        ? C4::Context->userenv->{'surname'}
248
                        : "superlibrarian" );
249
                    $value =~ s/<<USER>>/$username/g;
250
                }
251
                push @catalog_details, {
252
                    tag      => $tag,
253
                    subfield => $subfield,
254
                    %$mss,    # Do we need plugins support (?)
255
                    value => $value,
256
                };
257
            }
258
        }
259
    }
192
}
260
}
193
else {    #modify order
261
else {    #modify order
194
    $data   = GetOrder($ordernumber);
262
    $data   = GetOrder($ordernumber);
Lines 206-211 else { #modify order Link Here
206
    }
274
    }
207
}
275
}
208
276
277
# We can have:
278
# - no ordernumber but a biblionumber: from a subscription, from an existing record
279
# - no ordernumber, no biblionumber: from a suggestion, from a new order
280
if ( not $ordernumber or $biblionumber ) {
281
    if ( C4::Context->preference('UseACQFrameworkForBiblioRecords') ) {
282
        my $record = $biblionumber ? GetMarcBiblio({ biblionumber => $biblionumber }) : undef;
283
        foreach my $tag ( sort keys %{$tagslib} ) {
284
            next if $tag eq '';
285
            next if $tag eq $itemnumber_tag; # skip items fields
286
            my @fields = $biblionumber ? $record->field($tag) : ();
287
            foreach my $subfield ( sort keys %{ $tagslib->{$tag} } ) {
288
                my $mss = $tagslib->{$tag}{$subfield};
289
                next if IsMarcStructureInternal($mss);
290
                next if $mss->{tab} == -1;
291
                # We only need to display the values
292
                my $value = join '; ', map { $_->subfield( $subfield ) } @fields;
293
                if ( $value ) {
294
                    push @catalog_details, {
295
                        tag => $tag,
296
                        subfield => $subfield,
297
                        %$mss,
298
                        value => $value,
299
                    };
300
                }
301
            }
302
        }
303
    }
304
}
305
306
$template->param( catalog_details => \@catalog_details, );
307
209
my $suggestion;
308
my $suggestion;
210
$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid;
309
$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid;
211
310
Lines 255-260 if ($basketobj->effective_create_items eq 'ordering' && !$ordernumber) { Link Here
255
        UniqueItemFields => C4::Context->preference('UniqueItemFields'),
354
        UniqueItemFields => C4::Context->preference('UniqueItemFields'),
256
    );
355
    );
257
}
356
}
357
258
# 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
358
# 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
259
my @itemtypes;
359
my @itemtypes;
260
@itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes');
360
@itemtypes = Koha::ItemTypes->search unless C4::Context->preference('item-level_itypes');
(-)a/catalogue/ISBDdetail.pl (-1 / +1 lines)
Lines 97-103 my $record_processor = Koha::RecordProcessor->new({ Link Here
97
    filters => 'ViewPolicy',
97
    filters => 'ViewPolicy',
98
    options => {
98
    options => {
99
        interface => 'intranet',
99
        interface => 'intranet',
100
        frameworkcode => $framework
100
        frameworkcode => 'ACQ'
101
    },
101
    },
102
});
102
});
103
$record_processor->process($record);
103
$record_processor->process($record);
(-)a/installer/data/mysql/atomicupdate/bug_19289.sql (+2 lines)
Line 0 Link Here
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`)
2
VALUES ('UseACQFrameworkForBiblioRecords','0','','Use the ACQ framework for the catalog details','YesNo');
(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 570-575 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
570
('UsageStatsLibraryType', '', 'public|school|academic|research|private|societyAssociation|corporate|government|religiousOrg|subscription', 'The library type to be shown on the Hea Koha community website', 'Choice'),
570
('UsageStatsLibraryType', '', 'public|school|academic|research|private|societyAssociation|corporate|government|religiousOrg|subscription', 'The library type to be shown on the Hea Koha community website', 'Choice'),
571
('UsageStatsLibraryUrl', '', NULL, 'The library URL to be shown on Hea Koha community website', 'Free'),
571
('UsageStatsLibraryUrl', '', NULL, 'The library URL to be shown on Hea Koha community website', 'Free'),
572
('UsageStatsPublicID', '', NULL, 'Public ID for Hea website', 'Free'),
572
('UsageStatsPublicID', '', NULL, 'Public ID for Hea website', 'Free'),
573
('UseACQFrameworkForBiblioRecords','0','','Use the ACQ framework for the catalog details','YesNo'),
573
('UseAuthoritiesForTracings','1','0','Use authority record numbers for subject tracings instead of heading strings.','YesNo'),
574
('UseAuthoritiesForTracings','1','0','Use authority record numbers for subject tracings instead of heading strings.','YesNo'),
574
('UseBranchTransferLimits','0','','If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.','YesNo'),
575
('UseBranchTransferLimits','0','','If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.','YesNo'),
575
('UseControlNumber','0','','If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','YesNo'),
576
('UseControlNumber','0','','If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','YesNo'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (+12 lines)
Lines 17-19 Link Here
17
        [% END %]
17
        [% END %]
18
    [% END %]
18
    [% END %]
19
[% END %]
19
[% END %]
20
21
[% BLOCK options_for_item_types %]
22
    [% FOREACH itemtype IN itemtypes %]
23
        [% IF itemtype.itemtype == selected_itemtype %]
24
            <option value="[% itemtype.itemtype %]" selected="selected">
25
        [% ELSE %]
26
            <option value="[% itemtype.itemtype %]">
27
        [% END %]
28
            [% itemtype.translated_description %]
29
        </option>
30
    [% END %]
31
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-83 / +141 lines)
Lines 7-12 Link Here
7
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
7
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
8
[% INCLUDE 'additem.js.inc' %]
8
[% INCLUDE 'additem.js.inc' %]
9
<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script>
9
<script type="text/javascript" src="[% interface %]/[% theme %]/js/additem.js"></script>
10
<script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_details.js"></script>
10
<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
11
<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging.js"></script>
11
<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script>
12
<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit.js"></script>
12
<script type="text/javascript">
13
<script type="text/javascript">
Lines 307-401 $(document).ready(function() Link Here
307
            <input type="hidden" id="currency_rate_[% c.currency %]"  name="[% c.currency %]" value="[% c.rate %]" />
308
            <input type="hidden" id="currency_rate_[% c.currency %]"  name="[% c.currency %]" value="[% c.rate %]" />
308
        [% END %]
309
        [% END %]
309
310
310
        <ol><li>
311
        [% IF NOT Koha.Preference('UseACQFrameworkForBiblioRecords') OR NoACQframework %]
311
            [% IF ( biblionumber ) %]
312
            <ol><li>
312
            <span class="label">Title</span>
313
                [% IF ( biblionumber ) %]
313
                <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
314
                <span class="label">Title</span>
314
            [% ELSE %]
315
                    <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
315
            <label for="entertitle" class="required">Title: </label>
316
                [% ELSE %]
316
                <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" class="focus" />
317
                <label for="entertitle" class="required">Title: </label>
317
                <span class="required">Required</span>
318
                    <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" class="focus" />
318
            [% END %]
319
                    <span class="required">Required</span>
319
        </li>
320
                [% END %]
320
        <li>
321
            </li>
321
            [% IF ( biblionumber ) %]
322
            <li>
322
            <span class="label">Author: </span>
323
                [% IF ( biblionumber ) %]
323
                <input type="hidden" name="author" id="author" value="[% author %]" />[% author %]
324
                <span class="label">Author: </span>
324
            [% ELSE %]
325
                    <input type="hidden" name="author" id="author" value="[% author %]" />[% author %]
325
            <label for="author">Author: </label>
326
                [% ELSE %]
326
                <input type="text" size="50" name="author" id="author" value="[% author %]" />
327
                <label for="author">Author: </label>
327
            [% END %]
328
                    <input type="text" size="50" name="author" id="author" value="[% author %]" />
328
        </li>
329
                [% END %]
329
        <li>
330
            </li>
330
            [% IF ( biblionumber ) %]
331
            <li>
331
            <span class="label">Publisher: </span>
332
                [% IF ( biblionumber ) %]
332
                <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
333
                <span class="label">Publisher: </span>
333
            [% ELSE %]
334
                    <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
334
            <label for="publishercode"> Publisher: </label>
335
                [% ELSE %]
335
                <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
336
                <label for="publishercode"> Publisher: </label>
336
            [% END %]
337
                    <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
337
        </li>
338
                [% END %]
338
        <li>
339
            </li>
339
            [% IF ( biblionumber ) %]
340
            <li>
340
            <span class="label">Edition: </span>
341
                [% IF ( biblionumber ) %]
341
                <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
342
                <span class="label">Edition: </span>
343
                    <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
342
344
343
            [% ELSE %]
345
                [% ELSE %]
344
            <label for="editionstatement">Edition: </label>
346
                <label for="editionstatement">Edition: </label>
345
                <input type="text" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />
347
                    <input type="text" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />
346
            [% END %]
348
                [% END %]
347
        </li>
349
            </li>
348
        <li>
349
            [% IF ( biblionumber ) %]
350
            <span class="label">Publication year: </span>
351
                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
352
            [% ELSE %]
353
            <label for="publicationyear">Publication year: </label>
354
                <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
355
            [% END %]
356
        </li>
357
        <li>
358
            [% IF ( biblionumber ) %]
359
            <span class="label">ISBN: </span>
360
                <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
361
            [% ELSE %]
362
            <label for="ISBN">ISBN: </label>
363
                <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
364
            [% END %]
365
        </li>
366
        [% IF (UNIMARC) %]
367
        <li>
368
            [% IF ( biblionumber ) %]
369
            <span class="label">EAN: </span>
370
                <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %]
371
            [% ELSE %]
372
            <label for="EAN">EAN: </label>
373
                <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" />
374
            [% END %]
375
        </li>
376
        [% END %]
377
        <li>
378
            [% IF ( biblionumber ) %]
379
            <span class="label">Series: </span>
380
                <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
381
            [% ELSE %]
382
            <label for="series">Series: </label>
383
                <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
384
            [% END %]
385
        </li>
386
            [% UNLESS ( biblionumber ) %]
387
            [% IF ( itemtypeloop ) %]
388
            <li>
350
            <li>
389
                <span class="label">Item type:</span>
351
                [% IF ( biblionumber ) %]
390
                <select name="itemtype" style="width:12em;">
352
                <span class="label">Publication year: </span>
391
                [% FOREACH itemtype IN itemtypeloop %]
353
                    <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
392
                    <option value="[% itemtype.itemtype %]">[% itemtype.description %]</option>
354
                [% ELSE %]
355
                <label for="publicationyear">Publication year: </label>
356
                    <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
357
                [% END %]
358
            </li>
359
            <li>
360
                [% IF ( biblionumber ) %]
361
                <span class="label">ISBN: </span>
362
                    <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
363
                [% ELSE %]
364
                <label for="ISBN">ISBN: </label>
365
                    <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
366
                [% END %]
367
            </li>
368
            [% IF (UNIMARC) %]
369
            <li>
370
                [% IF ( biblionumber ) %]
371
                <span class="label">EAN: </span>
372
                    <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %]
373
                [% ELSE %]
374
                <label for="EAN">EAN: </label>
375
                    <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" />
393
                [% END %]
376
                [% END %]
394
                </select>
395
            </li>
377
            </li>
396
            [% END %]
378
            [% END %]
379
            <li>
380
                [% IF ( biblionumber ) %]
381
                <span class="label">Series: </span>
382
                    <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
383
                [% ELSE %]
384
                <label for="series">Series: </label>
385
                    <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
386
                [% END %]
387
            </li>
388
                [% UNLESS ( biblionumber ) %]
389
                [% IF ( itemtypeloop ) %]
390
                <li>
391
                    <span class="label">Item type:</span>
392
                    <select name="itemtype" style="width:12em;">
393
                    [% FOREACH itemtype IN itemtypeloop %]
394
                        <option value="[% itemtype.itemtype %]">[% itemtype.description %]</option>
395
                    [% END %]
396
                    </select>
397
                </li>
398
                [% END %]
399
                [% END %]
400
            </ol>
401
        [% ELSE %]
402
            <input type="hidden" name="use_ACQ_framework" value="1" />
403
            [% IF biblionumber %]
404
                <ol>
405
                    [% FOREACH field IN catalog_details %]
406
                        <li>
407
                            <div class="subfield_line">
408
                                <label>[% field.lib %] ([% field.tag %][% field.subfield %])</label>
409
                                [% field.value %]
410
                            </div>
411
                        </li>
412
                    [% END %]
413
                </ol>
414
            [% ELSE %]
415
                <ol>
416
                    [% FOREACH field IN catalog_details %]
417
                        <li>
418
                            <div class="subfield_line">
419
                                [% PROCESS display_subfield field=field %]
420
                            </div>
421
                        </li>
422
                    [% END %]
423
                </ol>
397
            [% END %]
424
            [% END %]
398
        </ol>
425
        [% END %]
399
    </fieldset>
426
    </fieldset>
400
427
401
    [% IF ( suggestionid ) %]
428
    [% IF ( suggestionid ) %]
Lines 680-682 $(document).ready(function() Link Here
680
</div>
707
</div>
681
</div>
708
</div>
682
[% INCLUDE 'intranet-bottom.inc' %]
709
[% INCLUDE 'intranet-bottom.inc' %]
710
711
[% BLOCK display_subfield %]
712
    [% IF field.mandatory %]
713
        <label class="required">[% field.lib %] ([% field.tag %][% field.subfield %])</label>
714
    [% ELSE %]
715
        <label>[% field.lib %] ([% field.tag %][% field.subfield %])</label>
716
    [% END %]
717
    [% IF field.authorised_value %]
718
        [% SWITCH field.authorised_value %]
719
        [% CASE 'branches' %]
720
            <select name="bib_field_value">
721
                <option value=""></option>
722
                [% PROCESS options_for_libraries libraries => Branches.all( selected => "FIXME" ) %]
723
            </select>
724
        [% CASE 'itemtypes' %]
725
            <select name="bib_field_value">
726
                <option value=""></option>
727
                [% PROCESS options_for_itemtypes itemtypes => ItemTypes.Get(), selected_itemtype => "FIXME" %]
728
            </select>
729
        [% CASE 'cn_source' %]
730
        [% CASE %]
731
            [% PROCESS 'av-build-dropbox.inc' name="bib_field_value", category=field.authorised_value, default="FIXME" %]
732
        [% END %]
733
    [% ELSE %]
734
        <input type="text" name="bib_field_value" value="[% field.value %]" />
735
    [% END %]
736
    <input type="hidden" name="bib_kohafield" value="[% field.kohafield %]" />
737
    <input type="hidden" name="bib_tag" value="[% field.tag %]" />
738
    <input type="hidden" name="bib_subfield" value="[% field.subfield %]" />
739
    [% IF field.mandatory %] <span class="required">Required</span>[% END %]
740
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-2 / +7 lines)
Lines 76-82 Acquisitions: Link Here
76
                yes: Send
76
                yes: Send
77
                no: Don't send
77
                no: Don't send
78
            - blind copy (BCC) to logged in user when sending serial or acquisitions claims notices.
78
            - blind copy (BCC) to logged in user when sending serial or acquisitions claims notices.
79
79
        -
80
            - pref: UseACQFrameworkForBiblioRecords
81
              default: no
82
              choices:
83
                yes: "Use"
84
                no: "Don't use"
85
            - " the framework 'ACQ' for bibliographic records fields"
80
    Printing:
86
    Printing:
81
        -
87
        -
82
            - Use the
88
            - Use the
83
- 

Return to bug 19289