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

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (-1 lines)
Lines 287-293 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
287
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
287
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('ShelfBrowserUsesLocation','1','Use the item location when finding items for the shelf browser.','1','YesNo');
288
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
288
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesHomeBranch','1','Use the item home branch when finding items for the shelf browser.','1','YesNo');
289
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
289
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShelfBrowserUsesCcode','1','Use the item collection code when finding items for the shelf browser.','0','YesNo');
290
<<<<<<< HEAD:installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
291
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowFineOverride','0','If on, staff will be able to issue books to patrons with fines greater than noissuescharge.','0','YesNo');
290
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowFineOverride','0','If on, staff will be able to issue books to patrons with fines greater than noissuescharge.','0','YesNo');
292
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllFinesNeedOverride','1','If on, staff will be asked to override every fine, even if it is below noissuescharge.','0','YesNo');
291
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllFinesNeedOverride','1','If on, staff will be asked to override every fine, even if it is below noissuescharge.','0','YesNo');
293
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('TypeOfMaterialsView_006_008','0','Display Type of Materials for plugin of fields 006 and 008 when cataloguing','','YesNo');
292
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('TypeOfMaterialsView_006_008','0','Display Type of Materials for plugin of fields 006 and 008 when cataloguing','','YesNo');
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js (-30 / +21 lines)
Lines 174-181 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here
174
        this.h4_result = h4_result;
174
        this.h4_result = h4_result;
175
        this.tr_result = tr_result;
175
        this.tr_result = tr_result;
176
    };//xmlControlField
176
    };//xmlControlField
177
    
177
178
    
178
179
    xmlControlField.prototype =
179
    xmlControlField.prototype =
180
    {
180
    {
181
        tagfield: "",
181
        tagfield: "",
Lines 187-221 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here
187
        table: null,
187
        table: null,
188
        h4_result: "",
188
        h4_result: "",
189
        tr_result: "",
189
        tr_result: "",
190
        
190
191
        
191
192
        setIdMaterial: function(idMaterial)
192
        setIdMaterial: function(idMaterial)
193
        {
193
        {
194
            this.idMaterial = idMaterial;
194
            this.idMaterial = idMaterial;
195
        },//setIdMaterial
195
        },//setIdMaterial
196
        
196
197
        loadXmlValues: function()
197
        loadXmlValues: function()
198
        {
198
        {
199
            var xmlhttp;
199
            this.xmlDoc = $.ajax({
200
            try {
200
                type: "GET",
201
                if (window.XMLHttpRequest) {
201
                url: "/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_" + this.tagfield + ".xml",
202
                    xmlhttp = new XMLHttpRequest();
202
                dataType: "xml",
203
                    if (xmlhttp.overrideMimeType) {
203
                async: false
204
                        xmlhttp.overrideMimeType('text/xml');
204
            }).responseXML;
205
                    }
205
            if (this.xmlDoc) this.renderTemplate();
206
                } else if (window.ActiveXObject) {
206
            $("*").ajaxError(function(evt, request, settings){
207
                    xmlhttp = new ActiveXObject("Microsoft.XMLHTTP") || new ActiveXObject("Msxml2.XMLHTTP");
207
                alert("AJAX error: failed data receiving");
208
                }
208
            });
209
                xmlhttp.open("GET", "/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_" + this.tagfield + ".xml", false);
210
                xmlhttp.send(null);
211
                this.xmlDoc = xmlhttp.responseXML;
212
                if (this.xmlDoc) this.renderTemplate();
213
            } catch (e) {
214
                //alert(e);
215
            }
216
        },//loadXmlValues
209
        },//loadXmlValues
217
        
210
218
        
211
219
        renderTemplate: function()
212
        renderTemplate: function()
220
        {
213
        {
221
            this.root = this.xmlDoc.documentElement;
214
            this.root = this.xmlDoc.documentElement;
Lines 229-236 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here
229
                }
222
                }
230
            }
223
            }
231
        },//renderTemplate
224
        },//renderTemplate
232
        
225
233
        
226
234
        renderSelectMaterial: function(nodeMaterial)
227
        renderSelectMaterial: function(nodeMaterial)
235
        {
228
        {
236
            if (this.select != null && nodeMaterial != null && nodeMaterial.length > 0) {
229
            if (this.select != null && nodeMaterial != null && nodeMaterial.length > 0) {
Lines 258-265 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here
258
                }
251
                }
259
            }
252
            }
260
        },//renderSelectMaterial
253
        },//renderSelectMaterial
261
        
254
262
        
255
263
        renderPositions: function(nodeMaterial, result)
256
        renderPositions: function(nodeMaterial, result)
264
        {
257
        {
265
            var materialNode;
258
            var materialNode;
Lines 327-333 function changeH4Result(form, h4_result, tr_result, pos, value) Link Here
327
                                }
320
                                }
328
                                strInnerHTML += "</select>";
321
                                strInnerHTML += "</select>";
329
                            }
322
                            }
330
                            //alert(strInnerHTML);
331
                            td.innerHTML = strInnerHTML;
323
                            td.innerHTML = strInnerHTML;
332
                        }
324
                        }
333
                        nodePos = nodePos.nextSibling;
325
                        nodePos = nodePos.nextSibling;
334
- 

Return to bug 3013