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

(-)a/C4/Barcodes/hbyymmincr.pm (-1 / +1 lines)
Lines 44-50 INIT { Link Here
44
44
45
sub db_max {
45
sub db_max {
46
	my $self = shift;
46
	my $self = shift;
47
    my $query = "SELECT SUBSTRING(barcode,-$width) AS chunk, barcode FROM items WHERE barcode REGEXP ?  ORDER BY chunk DESC LIMIT 1";
47
    my $query = "SELECT SUBSTRING(barcode,-$width) AS chunk, barcode FROM items WHERE barcode REGEXP ? ORDER BY chunk DESC LIMIT 1";
48
	$debug and print STDERR "(hbyymmincr) db_max query: $query\n";
48
	$debug and print STDERR "(hbyymmincr) db_max query: $query\n";
49
	my $sth = C4::Context->dbh->prepare($query);
49
	my $sth = C4::Context->dbh->prepare($query);
50
	my ($iso);
50
	my ($iso);
(-)a/acqui/addorder.pl (-1 / +1 lines)
Lines 316-322 if ( $basket->{is_standing} || $orderinfo->{quantity} ne '0' ) { Link Here
316
                                    'ITEM');
316
                                    'ITEM');
317
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
317
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
318
            my ($barcodefield,$barcodesubfield) = GetMarcFromKohaField('items.barcode');
318
            my ($barcodefield,$barcodesubfield) = GetMarcFromKohaField('items.barcode');
319
            my $barcode = $record->subfield($barcodefield,$barcodesubfield);
319
            my $barcode = $record->subfield($barcodefield,$barcodesubfield) || '';
320
            my $aBpref = C4::Context->preference('autoBarcode');
320
            my $aBpref = C4::Context->preference('autoBarcode');
321
            if( $barcode eq '' && $aBpref ne 'OFF'){
321
            if( $barcode eq '' && $aBpref ne 'OFF'){
322
                my $barcodeobj;
322
                my $barcodeobj;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/additem.js.inc (+1 lines)
Lines 3-8 Link Here
3
var MSG_ADDITEM_JS_ADDITEM = _("Add item");
3
var MSG_ADDITEM_JS_ADDITEM = _("Add item");
4
var MSG_ADDITEM_JS_ADDMULTI = _("Add multiple items");
4
var MSG_ADDITEM_JS_ADDMULTI = _("Add multiple items");
5
var MSG_ADDITEM_JS_MULTIVAL = _("Number of items to add");
5
var MSG_ADDITEM_JS_MULTIVAL = _("Number of items to add");
6
var MSG_ADDITEM_JS_MULTI_UNIQUE_NOTE = _("NOTE: Fields listed in the \'UniqueItemsFields\' system preference will not be copied");
6
var MSG_ADDITEM_JS_SUBMITMULTI = _("Add");
7
var MSG_ADDITEM_JS_SUBMITMULTI = _("Add");
7
var MSG_ADDITEM_JS_UPDATEITEM = _("Update item");
8
var MSG_ADDITEM_JS_UPDATEITEM = _("Update item");
8
var MSG_ADDITEM_JS_EDIT = _("Edit");
9
var MSG_ADDITEM_JS_EDIT = _("Edit");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-16 lines)
Lines 658-679 $(document).ready(function() Link Here
658
    </div>
658
    </div>
659
</div>
659
</div>
660
660
661
[% IF UniqueItemFields %]
662
<div id="uniqueFieldsModal" class="modal hide fade" aria-labelledby="uniqueFieldsModal" aria-hidden="true">
663
    <div class="modal-body">
664
    <h3>The following fields are listed in the UniqueItemFields system preference and will not be copied</h3>
665
    <ul id="uniqueItemFields">
666
    [% FOREACH uniqueField IN UniqueItemFields.split(" ") %]
667
        <li>[% uniqueField %]</li>
668
    [% END %]
669
    </ul>
670
    [% UNLESS Koha.Preference('autoBarcode') == 'OFF' %]
671
    <h3>If barcode is blank and/or listed in UniqueItemFields barcodes will be generate using the autoBarcode preference setting ([% Koha.Preference('autoBarcode') %]) when saved</h3>
672
    [% END %]
673
    </div>
674
</div>
675
[% END %]
676
677
<div id="multiCountModal" class="modal hide fade" aria-labelledby="multiCountModal" aria-hidden="true">
661
<div id="multiCountModal" class="modal hide fade" aria-labelledby="multiCountModal" aria-hidden="true">
678
    <h3>Invalid number of copies</h3>
662
    <h3>Invalid number of copies</h3>
679
    <p>Please enter a <b>number</b>, greater than or equal to 1</p>
663
    <p>Please enter a <b>number</b>, greater than or equal to 1</p>
(-)a/koha-tmpl/intranet-tmpl/prog/js/additem.js (-3 / +6 lines)
Lines 180-187 function cloneItemBlock(index, unique_item_fields, callback) { Link Here
180
            var buttonPlus = "<fieldset class=\"action\">";
180
            var buttonPlus = "<fieldset class=\"action\">";
181
                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + (window.MSG_ADDITEM_JS_ADDITEM || 'Add item')+ '" />';
181
                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlus" style="cursor:pointer; margin:0 1em;" onclick="addItem(this,\'' + unique_item_fields + '\')" value="' + (window.MSG_ADDITEM_JS_ADDITEM || 'Add item')+ '" />';
182
                buttonPlus += '<input type="button" class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)" value="' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear')+ '" />';
182
                buttonPlus += '<input type="button" class="addItemControl cancel" name="buttonClear" style="cursor:pointer;" onclick="clearItemBlock(this)" value="' + (window.MSG_ADDITEM_JS_CLEAR || 'Clear')+ '" />';
183
                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlusMulti" data-toggle="modal" data-target="#uniqueFieldsModal" onclick="javascript:this.nextSibling.style.visibility=\'visible\'; return false;" style="cursor:pointer; margin:0 1em;" value="' + (window.MSG_ADDITEM_JS_ADDMULTI || 'Add multiple items')+ '" />';
183
                buttonPlus += '<input type="button" class="addItemControl" name="buttonPlusMulti" onclick="javascript:this.nextSibling.style.display=\'inline\'; return false;" style="cursor:pointer; margin:0 1em;" value="' + (window.MSG_ADDITEM_JS_ADDMULTI || 'Add multiple items')+ '" />';
184
                buttonPlus +='<span id="add_multiple_copies" style="visibility:hidden"><input type="number" class="addItemControl" id="multiValue" name="multiValue" placeholder="'+window.MSG_ADDITEM_JS_MULTIVAL+'" /><input type="button" class="addItemControl" name=buttonAddMulti" style="cursor:pointer; margin:0 1em;" onclick="checkCount( this ,\'' + unique_item_fields + '\')" value="' + (window.MSG_ADDITEM_JS_SUBMITMULTI || 'Add') + '" /></span>';
184
                buttonPlus += '<span id="add_multiple_copies" style="display:none">'
185
                            +     '<input type="number" class="addItemControl" id="multiValue" name="multiValue" placeholder="'+window.MSG_ADDITEM_JS_MULTIVAL+'" />'
186
                            +     '<input type="button" class="addItemControl" name=buttonAddMulti" style="cursor:pointer; margin:0 1em;" onclick="checkCount( this ,\'' + unique_item_fields + '\')" value="' + (window.MSG_ADDITEM_JS_SUBMITMULTI || 'Add') + '" />'
187
                            +     '<div class="dialog message">' + window.MSG_ADDITEM_JS_MULTI_UNIQUE_NOTE + '</div>'
188
                            + '</span>';
185
                buttonPlus += "</fieldset>";
189
                buttonPlus += "</fieldset>";
186
            $(clone).append(buttonPlus);
190
            $(clone).append(buttonPlus);
187
            /* Copy values from the original block (input) */
191
            /* Copy values from the original block (input) */
188
- 

Return to bug 14752